替换字段名称

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -335,7 +335,7 @@ public class UserController implements IBaseController {
         if (user != null) {
             // 用户注册使用新加密方式
 //            user.setPassword(PasswordUtil.MD5WithSalt(password));
-            user.setEncryptedPassword(BctyptPasswordUtil.BCryptWithSalt(password));
+            user.setBcryptPassword(BctyptPasswordUtil.BCryptWithSalt(password));
             userService.saveUser(user);
             log.info("用户注册失败，该手机号已经被注册：register -> registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
             //已存在的用户, 经过短信认证, 也认为是注册成功的
@@ -457,8 +457,8 @@ public class UserController implements IBaseController {
             return JsonResult.buildErrorStateResult("修改密码失败", null);
         }
         // 优先校验新的密码
-        if (StringUtils.isNotBlank(user.getEncryptedPassword()) ) {
-            if (!BctyptPasswordUtil.BCryptCheckPw(password, user.getEncryptedPassword())) {
+        if (StringUtils.isNotBlank(user.getBcryptPassword()) ) {
+            if (!BctyptPasswordUtil.BCryptCheckPw(password, user.getBcryptPassword())) {
                 return JsonResult.buildErrorStateResult("修改密码失败", null);
             }
         } else {
@@ -752,8 +752,8 @@ public class UserController implements IBaseController {
         }
 
         // 优先校验新密码加密方式 如果有并且密码校验不通过
-        if (StringUtils.isNotBlank(user.getEncryptedPassword())) {
-            if (!BctyptPasswordUtil.BCryptCheckPw(pass, user.getEncryptedPassword())) {
+        if (StringUtils.isNotBlank(user.getBcryptPassword())) {
+            if (!BctyptPasswordUtil.BCryptCheckPw(pass, user.getBcryptPassword())) {
                 // 向该ipv4添加错误计数器
                 lockIpv4Service.countErrorByIpv4(clientIp);
                 // 向该phoneNo添加错误计数器
@@ -770,7 +770,7 @@ public class UserController implements IBaseController {
                 return null;
             }
             // 校验老密码正确更新新加密方式
-            user.setEncryptedPassword(BctyptPasswordUtil.BCryptWithSalt(pass));
+            user.setBcryptPassword(BctyptPasswordUtil.BCryptWithSalt(pass));
             userService.saveUser(user);
         }
 

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

@@ -1368,8 +1368,8 @@ public class InnerController implements IBaseController {
         }
 
         // 有限校验新密码加密方式
-        if (StringUtils.isNotBlank(user.getEncryptedPassword())) {
-            if (!BctyptPasswordUtil.BCryptCheckPw(password, user.getEncryptedPassword())) {
+        if (StringUtils.isNotBlank(user.getBcryptPassword())) {
+            if (!BctyptPasswordUtil.BCryptCheckPw(password, user.getBcryptPassword())) {
                 return null;
             }
         } else {
@@ -1378,7 +1378,7 @@ public class InnerController implements IBaseController {
                 return null;
             }
             // 老密码校验后更新新密码加密方式
-            user.setEncryptedPassword(BctyptPasswordUtil.BCryptWithSalt(password));
+            user.setBcryptPassword(BctyptPasswordUtil.BCryptWithSalt(password));
             userService.saveUser(user);
         }
         return user;

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/common/PwdVerifyStrategy.java

@@ -21,9 +21,9 @@ public class PwdVerifyStrategy implements IVerifyStrategy {
     @Override
     public void verify(User user, String verify) {
         // 如果新加密的密码不为空校验新密码
-        String encryptedPassword = user.getEncryptedPassword();
-        if (!"".equals(encryptedPassword)) {
-            if (Objects.equals(encryptedPassword, BctyptPasswordUtil.BCryptWithSalt(verify))) {
+        String bcryptPassword = user.getBcryptPassword();
+        if (!"".equals(bcryptPassword)) {
+            if (Objects.equals(bcryptPassword, BctyptPasswordUtil.BCryptWithSalt(verify))) {
                 return;
             }
             throw new DataException("用户名或密码错误");

src/main/java/cn/quantgroup/xyqb/entity/User.java

@@ -45,8 +45,8 @@ public class User extends BaseEntity implements Serializable {
     @Convert(converter = EncryptConverter.class)
     private String encryptedPhoneNo;
 
-    @Column(name = "encrypted_password")
-    private String encryptedPassword;
+    @Column(name = "bcrypt_password")
+    private String bcryptPassword;
 
     public String getEncryptedPhoneNo() {
         return StringUtils.isBlank(encryptedPhoneNo) ? phoneNo : encryptedPhoneNo;

src/main/java/cn/quantgroup/xyqb/service/register/impl/UserRegisterServiceImpl.java

@@ -161,7 +161,7 @@ public class UserRegisterServiceImpl implements IUserRegisterService {
         if (StringUtils.isNotBlank(password)) {
 //            user.setPassword(PasswordUtil.MD5WithSalt(password));
             // 新建用户使用新加密方式
-            user.setEncryptedPassword(BctyptPasswordUtil.BCryptWithSalt(password));
+            user.setBcryptPassword(BctyptPasswordUtil.BCryptWithSalt(password));
         }
         user = userService.saveUser(user);
 

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -231,10 +231,10 @@ public class UserServiceImpl implements IUserService, IBaseController {
         }
         //修改密码使用新加密方式
 //        user.setPassword(PasswordUtil.MD5WithSalt(password));
-        user.setEncryptedPassword(BctyptPasswordUtil.BCryptWithSalt(password));
+        user.setBcryptPassword(BctyptPasswordUtil.BCryptWithSalt(password));
         user = userRepository.save(user);
         stringRedisTemplate.expire("usercache:xyqbuser" + phoneNo, 1L, TimeUnit.MILLISECONDS);
-        return BctyptPasswordUtil.BCryptCheckPw(password, user.getEncryptedPassword());
+        return BctyptPasswordUtil.BCryptCheckPw(password, user.getBcryptPassword());
     }
 
     @Override