密码校验

common/src/main/java/com/diagbot/util/RegexValidateUtil.java

@@ -56,7 +56,7 @@ public class RegexValidateUtil {
     public static boolean checkPassWord(String password) {
         boolean flag = false;
         try {
-            Pattern regex = Pattern.compile("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$");
+            Pattern regex = Pattern.compile("^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z\\W_]{6,16}$");
             Matcher matcher = regex.matcher(password);
             flag = matcher.matches();
         } catch (Exception e) {

user-service/src/main/java/com/diagbot/vo/UserAndOrganizationVO.java

@@ -25,7 +25,7 @@ public class UserAndOrganizationVO {
     /**
      * 用户密码
      */
-    @Pattern(regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$", message = "密码必须数字和字母组成，并且要同时含有数字和字母，且长度要在6-16位之间")
+    @Pattern(regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z\\W_]{6,16}$", message = "密码必须数字和字母组成，并且要同时含有数字和字母，且长度要在6-16位之间")
     private String passWord;
 
     /**

user-service/src/main/java/com/diagbot/vo/UserInfoVO.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.Pattern;
 public class UserInfoVO {
 
     @NotBlank(message = "请输入密码")
-    @Pattern(regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$", message = "密码必须数字和字母组成，并且要同时含有数字和字母，且长度要在6-16位之间")
+    @Pattern(regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z\\W_]{6,16}$", message = "密码必须数字和字母组成，并且要同时含有数字和字母，且长度要在6-16位之间")
     private String password;
     @NotBlank(message = "请输入手机号")
     private String username;

user-service/src/main/java/com/diagbot/vo/UserSaveVO.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.Pattern;
 public class UserSaveVO {
 
     @NotBlank(message = "请输入密码")
-    @Pattern(regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$", message = "密码必须数字和字母组成，并且要同时含有数字和字母，且长度要在6-16位之间")
+    @Pattern(regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z\\W_]{6,16}$", message = "密码必须数字和字母组成，并且要同时含有数字和字母，且长度要在6-16位之间")
     private String password;
     @NotBlank(message = "请输入手机号")
     private String username;