From d153e0f3677ed9725e13648b39d6d710ac4bdbe4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 23 六月 2022 17:52:02 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_test

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java
index 2b90bdc..c93a671 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/ChangePasswordVO.java
@@ -24,7 +24,7 @@
 
     @ApiModelProperty("新密码")
     @NotBlank(message = "新密码不能为空")
-    @Pattern(message = "密码格式为6-16个字符,英文,数字,且必须包含英文和数字", regexp = "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")
+    @Pattern(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 newPassword;
 
     @ApiModelProperty(hidden = true, value = "当前登录用户id")

--
Gitblit v1.7.1