From c21731c6641205ce10454edfb485becf7f2ef303 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 22 Dec 2020 09:26:03 +0800
Subject: [PATCH] 删除多余
---
src/main/java/com/nanometer/smartlab/controller/UserMngController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
index d7aefe8..53a987a 100644
--- a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -99,8 +99,7 @@
}
public void updatePassword() {
- this.username = getUser().getName();
- this.sysUser = getUser();
+ this.username = getUser().getName();
}
@@ -190,7 +189,7 @@
sysUser.setName(valuesList.get(3));//姓名
sysUser.setAccount(valuesList.get(4));//账号
- 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 (!valuesList.get(5).matches(PW_PATTERN)){
errorMsg += "第"+i+"行,密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上";
}
@@ -267,6 +266,8 @@
public String updatePasswordAction() throws NoSuchAlgorithmException, CharacterCodingException
{
+ this.sysUser = getUser();
+
if(!this.sysUser.getPassword().equals(MD5Utils.encode(this.oriPassword)))
{
FacesUtils.warn("原密码错误，请重新输入！");
@@ -278,13 +279,13 @@
return null;
}
- 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 (!this.newPassword.matches(PW_PATTERN)){
FacesUtils.warn("密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上");
return null;
}
- this.sysUser.setName(username);
+// this.sysUser.setName(username);
this.sysUser.setPassword(MD5Utils.encode(this.newPassword));
this.sysUserService.updateSysUser(sysUser);
this.newPassword = null;
@@ -292,6 +293,7 @@
this.newPasswordSecond = null;
FacesUtils.info("修改成功，请重新登录！");
RequestContext.getCurrentInstance().execute("PF('dialogPassword').hide()");
+ RequestContext.getCurrentInstance().execute("PF('changePassword').hide()");
this.getSubject().logout();
return Constants.PAGE_LOGIN + Constants.REDIRECT;
}
@@ -342,7 +344,7 @@
sysUser.setProjectId(null);
}
- 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 (!sysUser.getPassword().matches(PW_PATTERN)){
FacesUtils.warn("密码必须8位以上,并且包含大小写字母、数字、特殊符号三种以上");
return;
--
Gitblit v1.9.2