From aaa740bfa08994a0377ad12721679b178a87a88b Mon Sep 17 00:00:00 2001
From: wj <1285151836@qq.com>
Date: Tue, 30 May 2023 18:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/sale/admin/controller/auth/AuthAdminController.java  | 2 +-
 .../glxp/sale/admin/controller/auth/RegisterController.java   | 2 +-
 .../java/com/glxp/sale/admin/req/auth/ResetPasswdRequest.java | 4 ++--
 .../com/glxp/sale/admin/req/auth/UpdatePasswordRequest.java   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java
index 8fb7d02..21bf97e 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/AuthAdminController.java
+++ b/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());
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java
index bd7d29c..9fc1516 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java
+++ b/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) {
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/ResetPasswdRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/ResetPasswdRequest.java
index c3795a0..e1785a1 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/ResetPasswdRequest.java
+++ b/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;
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/UpdatePasswordRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/auth/UpdatePasswordRequest.java
index b3c6bdb..ad5a35b 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/auth/UpdatePasswordRequest.java
+++ b/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;
 
 }