修复密码强度检测BUG

opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserAndOrgModel.java

@@ -53,6 +53,13 @@ public class UserAndOrgModel extends ApiWrapper {
     @ValidationArgsLenMax(50)
     private String password;
 
+    /** 登录密码强度 */
+    @ApiModelProperty(value = "登录密码强度")
+    @ExcelIgnore
+    @ValidationArgsLenMin(1)
+    @ValidationArgsLenMax(1)
+    private String passwordLevel;
+
     /** 盐值，密码秘钥 */
     @ApiModelProperty(value = "盐值，密码秘钥")
     @ExcelIgnore

opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserModel.java

@@ -53,6 +53,13 @@ public class UserModel extends ApiWrapper {
     @ValidationArgsLenMax(50)
     private String password;
 
+    /** 登录密码强度 */
+    @ApiModelProperty(value = "登录密码强度")
+    @ExcelIgnore
+    @ValidationArgsLenMin(1)
+    @ValidationArgsLenMax(1)
+    private String passwordLevel;
+
     /** 盐值，密码秘钥 */
     @ApiModelProperty(value = "盐值，密码秘钥")
     @ExcelIgnore

opsli-api/src/main/java/org/opsli/api/wrapper/system/user/UserPassword.java

@@ -59,10 +59,17 @@ public class UserPassword implements Serializable {
     @ValidationArgsLenMax(50)
     private String newPassword;
 
-    /** 盐值，密码秘钥 */
+    /** 盐值，密码秘钥 前端不可改*/
-    @ApiModelProperty(value = "盐值，密码秘钥")
+    @ApiModelProperty(value = "盐值，密码秘钥 前端不可改")
     @ExcelIgnore
     @ValidationArgsLenMax(50)
     private String salt;
 
+    /** 登录密码强度 前端不可改 */
+    @ApiModelProperty(value = "登录密码强度 前端不可改")
+    @ExcelIgnore
+    @ValidationArgsLenMin(1)
+    @ValidationArgsLenMax(1)
+    private String passwordLevel;
+
 }

opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/CheckStrength.java

@@ -261,7 +261,7 @@ public class CheckStrength {
     return level;
   }
   /**
-   *获得密码强度等级，包括简单、复杂、强、强、强
+   *获得密码强度等级，包括简单、复杂、高、很高、非常高
    *
    * @param passwd
    * @return

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/entity/SysUser.java

@@ -40,6 +40,9 @@ public class SysUser extends BaseEntity {
     /** 登录密码 */
     private String password;
 
+    /** 登录密码强度 */
+    private String passwordLevel;
+
     /** 盐值，密码秘钥 */
     private String secretKey;
 

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/entity/SysUserAndOrg.java

@@ -43,6 +43,9 @@ public class SysUserAndOrg extends BaseEntity {
     /** 登录密码 */
     private String password;
 
+    /** 登录密码强度 */
+    private String passwordLevel;
+
     /** 盐值，密码秘钥 */
     private String secretKey;
 

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/mapper/xml/UserMapper.xml

@@ -8,6 +8,7 @@
 
 		a.username as username,
         a.password as password,
+        a.password_level as passwordLevel,
         a.secret_key as secretKey,
         a.no as no,
         a.real_name as realName,
@@ -146,6 +147,7 @@
         update sys_user
         set
             password = #{newPassword},
+            password_level = #{passwordLevel},
             secret_key = #{salt}
         where id = #{userId}
     </update>

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java

@@ -33,6 +33,7 @@ import org.opsli.api.wrapper.system.user.UserPassword;
 import org.opsli.common.constants.MyBatisConstants;
 import org.opsli.common.enums.DictType;
 import org.opsli.common.exception.ServiceException;
+import org.opsli.common.utils.CheckStrength;
 import org.opsli.common.utils.HumpUtil;
 import org.opsli.common.utils.ListDistinctUtil;
 import org.opsli.common.utils.WrapperUtil;
@@ -123,6 +124,10 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
             model.setSecretKey(
                     RandomUtil.randomString(20)
             );
+            // 获得密码强度
+            model.setPasswordLevel(
+                    CheckStrength.getPasswordLevel(model.getPassword()).getCode()
+            );
             // 处理密码
             model.setPassword(
                     UserUtil.handlePassword(model.getPassword(),
@@ -590,6 +595,10 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
         userPassword.setSalt(
                 RandomUtil.randomString(20)
         );
+        // 获得密码强度
+        userPassword.setPasswordLevel(
+                CheckStrength.getPasswordLevel(userPassword.getNewPassword()).getCode()
+        );
         // 处理密码
         userPassword.setNewPassword(
                 UserUtil.handlePassword(userPassword.getNewPassword(),
@@ -620,6 +629,10 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
         userPassword.setSalt(
                 RandomUtil.randomString(20)
         );
+        // 获得密码强度
+        userPassword.setPasswordLevel(
+                CheckStrength.getPasswordLevel(userPassword.getNewPassword()).getCode()
+        );
         // 处理密码
         userPassword.setNewPassword(
                 UserUtil.handlePassword(userPassword.getNewPassword(),

opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/web/UserRestController.java

@@ -119,10 +119,6 @@ public class UserRestController extends BaseRestController<SysUser, UserModel, I
         UserInfo userInfo = WrapperUtil.transformInstance(user, UserInfo.class);
         userInfo.setRoles(userRolesByUserId);
         userInfo.setPerms(userAllPermsByUserId);
-        // 获得密码强度
-        userInfo.setPasswordLevel(
-                CheckStrength.getPasswordLevel(user.getPassword()).getCode()
-        );
 
         // 判断是否是超级管理员
         if(StringUtils.equals(UserUtil.SUPER_ADMIN, user.getUsername())){