From 20e1449578ac0e558dc038e302001d3a6819ab2c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 18 十二月 2020 11:52:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/controller/LoginController.java | 2 ++
src/main/java/com/nanometer/smartlab/controller/UserMngController.java | 1 +
src/main/webapp/index.xhtml | 24 ++++++++----------------
3 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/LoginController.java b/src/main/java/com/nanometer/smartlab/controller/LoginController.java
index f53d7f5..5b8f383 100644
--- a/src/main/java/com/nanometer/smartlab/controller/LoginController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/LoginController.java
@@ -53,6 +53,8 @@
String PW_PATTERN = "(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*[~!@#$%^&*_.]).{8,}";
if (!loginPwd.matches(PW_PATTERN)) {
ischange = 1;
+ }else {
+ ischange = 0;
}
this.menuController.initPage();
diff --git a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
index 988713e..53a987a 100644
--- a/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/UserMngController.java
@@ -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;
}
diff --git a/src/main/webapp/index.xhtml b/src/main/webapp/index.xhtml
index 215e753..406de33 100644
--- a/src/main/webapp/index.xhtml
+++ b/src/main/webapp/index.xhtml
@@ -39,15 +39,11 @@
resizable="false" width="420">
<h:form id="dialogFormPassword">
<p:panelGrid columns="1" styleClass="content">
- <p:outputLabel value="账号"></p:outputLabel>
- <p:inputText value="#{userMngController.username}" maxlength="100"
- required="true" requiredMessage="请输入原密码"></p:inputText>
-
<p:outputLabel value="原密码"></p:outputLabel>
<p:password value="#{userMngController.oriPassword}" maxlength="100"
required="true" requiredMessage="请输入原密码"></p:password>
- <p:outputLabel value="新密码"></p:outputLabel>
+ <p:outputLabel value="新密码(必须是8位以上且包含大小写和特殊字符)"></p:outputLabel>
<p:password value="#{userMngController.newPassword}" maxlength="100"
required="true" requiredMessage="请输入新密码"></p:password>
@@ -70,15 +66,11 @@
closable="false">
<h:form id="changeFormPassword">
<p:panelGrid columns="1" styleClass="content">
- <p:outputLabel value="账号"></p:outputLabel>
- <p:inputText value="#{menuController.userName}" maxlength="100"
- readonly="true"></p:inputText>
-
<p:outputLabel value="原密码"></p:outputLabel>
<p:password value="#{userMngController.oriPassword}" maxlength="100"
required="true" requiredMessage="请输入原密码"></p:password>
- <p:outputLabel value="新密码"></p:outputLabel>
+ <p:outputLabel value="新密码(必须是8位以上且包含大小写和特殊字符)"></p:outputLabel>
<p:password value="#{userMngController.newPassword}" maxlength="100"
required="true" requiredMessage="请输入新密码"></p:password>
@@ -95,12 +87,12 @@
</h:form>
</p:dialog>
<script>
- console.log($('#northForm\\:ischange').val())
- if($('#northForm\\:ischange').val() == 0){
- $("#changePassword").hide();
- }else {
- $("#changePassword").show();
- }
+ // console.log($('#northForm\\:ischange').val())
+ // if($('#northForm\\:ischange').val() == 0){
+ // $("#changePassword").hide();
+ // }else {
+ // $("#changePassword").show();
+ // }
</script>
</ui:define>
--
Gitblit v1.9.2