From 9f0a2abe27085bd8c7edf8a43a24f375f17fc43c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 18 十二月 2020 14:11:48 +0800
Subject: [PATCH] 模块：api接口 新增：根据7位货柜条码获取所属课题下的所有人员否则部门寻找 提出：秦老师
---
src/main/java/com/nanometer/smartlab/controller/UserMngController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
index 5620c15..53a987a 100644
--- a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -189,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位以上,并且包含大小写字母、数字、特殊符号三种以上";
}
@@ -279,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;
@@ -293,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;
}
@@ -343,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