fix(auth): 修改账号查询逻辑为邮箱查询

- 将 AdminAuthController 中的 getUserInfoByAccount 替换为 getUserInfoByEmail
- 将 ClientAuthController 中的 getUserInfoByAccount 替换为 getUserInfoByEmail
- 在 UserService 和 UserServiceImpl 中将方法名从 getUserInfoByAccount 改为 getUserInfoByEmail
- 更新了相关调用点以使用邮箱作为查询条件
- 添加了新密码不能与旧密码相同的验证逻辑
-修复了客户端登录接口参数传递问题

Signed-off-by: LiggMax <wenzhouli06@gmail.com>

Author: LiggMax

common/src/main/java/com/ligg/common/service/UserService.java

@@ -24,7 +24,7 @@ public interface UserService extends IService<UserEntity> {
     /**
      * 根据账号获取用户信息
      */
-    UserEntity getUserInfoByAccount(String account);
+    UserEntity getUserInfoByEmail(String email);
 
     /**
      * 获取用户信息

common/src/main/java/com/ligg/common/service/impl/UserServiceImpl.java

@@ -79,8 +79,9 @@ public void register(String account, String password) {
      * 根据账号获取用户信息
      */
     @Override
-    public UserEntity getUserInfoByAccount(String account) {
-        return userMapper.selectOne(new LambdaQueryWrapper<UserEntity>().eq(UserEntity::getAccount, account));
+    public UserEntity getUserInfoByEmail(String email) {
+        return userMapper.selectOne(new LambdaQueryWrapper<UserEntity>()
+                .eq(UserEntity::getEmail, email));
     }
 
     /**

web/api-admin/src/main/java/com/ligg/apiadmin/controller/AdminAuthController.java

@@ -42,7 +42,7 @@ public Response<String> register(@Schema(description = "账号") @NotNull String
             return Response.error(BusinessStates.VALIDATION_FAILED);
         }
 
-        if (userService.getUserInfoByAccount(account) != null) {
+        if (userService.getUserInfoByEmail(account) != null) {
             return Response.error(BusinessStates.METHOD_NOT_ALLOWED, "该账号已被注册");
         }
         userService.register(account, password);
@@ -55,7 +55,7 @@ public Response<String> register(@Schema(description = "账号") @NotNull String
     @PostMapping("/login")
     public Response<String> login(@Schema(description = "账号") @RequestParam @NotNull String account,
                                   @Schema(description = "密码") @RequestParam @NotNull String password) {
-        UserEntity userInfo = userService.getUserInfoByAccount(account);
+        UserEntity userInfo = userService.getUserInfoByEmail(account);
         if (userInfo == null || !BCryptUtil.verify(password, userInfo.getPassword())) {
             return Response.error(BusinessStates.FORBIDDEN, "账号或密码错误");
         }

web/api-client/src/main/java/com/ligg/apiclient/controller/ClientAuthController.java

@@ -91,7 +91,7 @@ public Response<String> verify(@Email String email,
         if (!emailService.verifyEmailCode(email, emailCode)) {
             return Response.error(BusinessStates.METHOD_NOT_ALLOWED, "验证码错误或已过期");
         }
-        return clientAccountService.updateOrInsertUserInfo(redisUserInfo,type) > 0
+        return clientAccountService.updateOrInsertUserInfo(redisUserInfo, type) > 0
                 ? Response.success(BusinessStates.SUCCESS)
                 : Response.error(BusinessStates.INTERNAL_SERVER_ERROR);
     }
@@ -100,7 +100,7 @@ public Response<String> verify(@Email String email,
     @PostMapping("/login")
     @Operation(summary = "登录", description = "提交登录信息获取token")
     public Response<String> login(@Validated @RequestBody LoginDto account) {
-        UserEntity userInfo = userService.getUserInfoByAccount(account.getEmail());
+        UserEntity userInfo = userService.getUserInfoByEmail(account.getEmail());
         if (userInfo == null || !BCryptUtil.verify(account.getPassword(), userInfo.getPassword())) {
             return Response.error(BusinessStates.FORBIDDEN, "账号或密码错误");
         }
@@ -127,12 +127,16 @@ public Response<String> forget(@Email(message = "参数不合法") String email,
         if (!captchaService.verifyCaptcha(code, uuid)) {
             Response.error(BusinessStates.VALIDATION_FAILED, "验证码错误");
         }
-        UserEntity userInfo = userService.getUserInfoByAccount(email);
 
+        UserEntity userInfo = userService.getUserInfoByEmail(email);
         if (userInfo == null) {
             return Response.error(BusinessStates.NOT_FOUND, "查找的账户不存在");
         }
 
+        if (BCryptUtil.verify(password, userInfo.getPassword())) {
+            return Response.error(BusinessStates.METHOD_NOT_ALLOWED, "新密码不能与旧密码相同");
+        }
+
         if (emailService.canSendVerificationCode(email)) {
             return Response.error(BusinessStates.METHOD_NOT_ALLOWED, "请勿重复发送验证码");
         }