正则统一化

api-admin/src/main/java/com/glxp/api/admin/constant/Constant.java

@@ -41,4 +41,6 @@ public class Constant {
     public static final int CHECK_NULL = 3;     //校驗失敗，不存在
 
 
+    public static final String passwordReg = "^(?![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}$";
+
 }

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

@@ -2,6 +2,7 @@ package com.glxp.api.admin.controller.auth;
 
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.admin.annotation.AuthRuleAnnotation;
+import com.glxp.api.admin.constant.Constant;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.auth.AuthRole;
 import com.glxp.api.admin.entity.auth.AuthRoleAdmin;
@@ -190,9 +191,9 @@ public class AuthAdminController {
         AuthAdmin authAdmin = new AuthAdmin();
         BeanUtils.copyProperties(authAdminSaveRequest, authAdmin);
         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());
+            boolean matches = Pattern.matches(Constant.passwordReg, 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/api/admin/req/auth/UpdatePasswordRequest.java

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.req.auth;
 
+import com.glxp.api.admin.constant.Constant;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -19,8 +20,8 @@ public class UpdatePasswordRequest {
     private String oldPassword;
 
     @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位")
+    @Pattern(regexp = Constant.passwordReg
+            , message = "密码需要包含大写字母、小写字符、数字、特殊字符(含_.*%@!)其中任意三种,长度8-20位")
     private String newPassword;
 
 }