正则统一化

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

@@ -0,0 +1,9 @@
+package com.glxp.sale.admin.constant;
+
+public class Constant {
+
+
+    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/sale/admin/controller/auth/AuthAdminController.java

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.controller.auth;
 
 import com.github.pagehelper.PageInfo;
 import com.glxp.sale.admin.annotation.AuthRuleAnnotation;
+import com.glxp.sale.admin.constant.Constant;
 import com.glxp.sale.admin.entity.auth.AuthAdmin;
 import com.glxp.sale.admin.entity.auth.AuthRole;
 import com.glxp.sale.admin.entity.auth.AuthRoleAdmin;
@@ -273,7 +274,7 @@ 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位");
             }

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

@@ -231,7 +231,7 @@ public class RegisterController {
         if (!phoneNum.equals(userRegisterEntity.getMobile())) {
             return ResultVOUtils.error(500, "手机号与获取验证码不一致");
         }
-        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());
+        boolean matches = Pattern.matches(com.glxp.sale.admin.constant.Constant.passwordReg, userRegisterEntity.getPassword());
         if(!matches){
             return ResultVOUtils.error(500, "密码需要包含大写字母、小写字符、数字、特殊字符(含_.*%@!)其中任意三种,长度8-20位");
         }

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

@@ -1,5 +1,6 @@
 package com.glxp.sale.admin.req.auth;
 
+import com.glxp.sale.admin.constant.Constant;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
@@ -9,13 +10,13 @@ import javax.validation.constraints.Pattern;
 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}$"
+    @Pattern(regexp = Constant.passwordReg
             , 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}$"
+    @Pattern(regexp = Constant.passwordReg
             , message = "密码需要包含大写字母、小写字符、数字、特殊字符(含_.*%@!)其中任意三种,长度8-20位")
     private String confirmPassword;
     @NotEmpty(message = "验证码不能为空")

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

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