From d7427ab305dc17af447f5832903691eee329850c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Fri, 29 Jan 2021 09:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yufei' into yufei
---
src/main/java/com/nanometer/smartlab/controller/LoginController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LoginController.java b/src/main/java/com/nanometer/smartlab/controller/LoginController.java
index 0882071..5b8f383 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LoginController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LoginController.java
@@ -50,9 +50,11 @@
SysUser user = this.sysUserService.getSysUserByAccount(loginAcct);
currentUser.getSession(true).setAttribute(Constants.SESSION_USER, user);
- String PW_PATTERN = "^(?![A-Za-z0-9]+$)(?![a-z0-9\\W]+$)(?![A-Za-z\\W]+$)(?![A-Z0-9\\W]+$)[a-zA-Z0-9\\W]{8,}$";
+ String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
if (!loginPwd.matches(PW_PATTERN)) {
ischange = 1;
+ }else {
+ ischange = 0;
}
this.menuController.initPage();
--
Gitblit v1.9.2