提示调整

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java

@@ -275,7 +275,7 @@ public class AuthAdminController {
         if (authAdmin.getPassWord() != null) {
             boolean matches = Pattern.matches("^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\\\W_.*%@!]+$)(?![a-z0-9]+$)(?![a-z\\\\W_.;*%@!]+$)(?![0-9\\\\W_.;*%@!]+$)[a-zA-Z0-9\\\\W_.;*%@!]{8,20}$", authAdmin.getPassWord());
             if(!matches){
-                return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "密码需要包含大写字母、小写字符、数字、特殊字符(含_.%@!)其中任意三种,长度8-20位");
+                return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "密码需要包含大写字母、小写字符、数字、特殊字符(含_.*%@!)其中任意三种,长度8-20位");
             }
             authAdmin.setPassWord(PasswordUtils.authAdminPwd(authAdmin.getPassWord()));
             authAdmin.setLastUpdatePwdTime(new Date());

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java

@@ -233,7 +233,7 @@ public class RegisterController {
         }
         boolean matches = Pattern.matches("^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\\\W_.*%@!]+$)(?![a-z0-9]+$)(?![a-z\\\\W_.;*%@!]+$)(?![0-9\\\\W_.;*%@!]+$)[a-zA-Z0-9\\\\W_.;*%@!]{8,20}$", userRegisterEntity.getPassword());
         if(!matches){
-            return ResultVOUtils.error(500, "密码需要包含大写字母、小写字符、数字、特殊字符(含_.%@!)其中任意三种,长度8-20位");
+            return ResultVOUtils.error(500, "密码需要包含大写字母、小写字符、数字、特殊字符(含_.*%@!)其中任意三种,长度8-20位");
         }
         boolean isExitPhone = userRegisterService.isExit(userRegisterEntity.getMobile());
         if (isExitPhone) {

api-admin/src/main/java/com/glxp/sale/admin/req/auth/ResetPasswdRequest.java

@@ -10,13 +10,13 @@ public class ResetPasswdRequest {
 
     @NotEmpty(message = "密码不能为空")
     @Pattern(regexp = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\\\W_.*%@!]+$)(?![a-z0-9]+$)(?![a-z\\\\W_.;*%@!]+$)(?![0-9\\\\W_.;*%@!]+$)[a-zA-Z0-9\\\\W_.;*%@!]{8,20}$"
-            , message = "密码需要包含大写字母、小写字符、数字、特殊字符(含_.%@!)其中任意三种,长度8-20位")
+            , message = "密码需要包含大写字母、小写字符、数字、特殊字符(含_.*%@!)其中任意三种,长度8-20位")
     private String password;
     @NotEmpty(message = "手机号不能为空")
     private String mobile;
     @NotEmpty(message = "确认密码不能为空")
     @Pattern(regexp = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\\\W_.*%@!]+$)(?![a-z0-9]+$)(?![a-z\\\\W_.;*%@!]+$)(?![0-9\\\\W_.;*%@!]+$)[a-zA-Z0-9\\\\W_.;*%@!]{8,20}$"
-            , message = "密码需要包含大写字母、小写字符、数字、特殊字符(含_.%@!)其中任意三种,长度8-20位")
+            , message = "密码需要包含大写字母、小写字符、数字、特殊字符(含_.*%@!)其中任意三种,长度8-20位")
     private String confirmPassword;
     @NotEmpty(message = "验证码不能为空")
     private int checkCode;

api-admin/src/main/java/com/glxp/sale/admin/req/auth/UpdatePasswordRequest.java

@@ -20,7 +20,7 @@ public class UpdatePasswordRequest {
 
     @NotEmpty(message = "请输入新密码")
     @Pattern(regexp = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\\\W_.*%@!]+$)(?![a-z0-9]+$)(?![a-z\\\\W_.;*%@!]+$)(?![0-9\\\\W_.;*%@!]+$)[a-zA-Z0-9\\\\W_.;*%@!]{8,20}$"
-            , message = "密码需要包含大写字母、小写字符、数字、特殊字符(含_.%@!)其中任意三种,长度8-20位")
+            , message = "密码需要包含大写字母、小写字符、数字、特殊字符(含_.*%@!)其中任意三种,长度8-20位")
     private String newPassword;
 
 }