From d698714e61e1b322ef12d65a52089ceff8a63703 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期二, 20 九月 2022 16:58:00 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
index 3da0347..bb98286 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/AdministratorsUserVO.java
@@ -29,8 +29,8 @@
     private String account;
 
     @ApiModelProperty("密码")
-    @Pattern(groups = {AddGroup.class}, message = "【密码】格式为6-16个字符,英文,数字,且必须包含英文和数字",
-        regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
+    @Pattern(groups = {AddGroup.class}, message = "密码强度过低,请将密码长度设置为8-16位,且包含字母、数字、字符。",
+        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,16}$")
     private String password;
 
     @ApiModelProperty("用户名称")

--
Gitblit v1.7.1