From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js b/management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js
index 258a7df..ec823ce 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/user/user_info.js
@@ -34,10 +34,10 @@
field: 'rePassword',
message: '两次密码不一致'
},
- regexp: {
- regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
- message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
- },
+ // regexp: {
+ // regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
+ // message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
+ // },
}
},
rePassword: {
@@ -49,10 +49,10 @@
field: 'password',
message: '两次密码不一致'
},
- regexp: {
- regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
- message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
- },
+ // regexp: {
+ // regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
+ // message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
+ // },
}
}
}
@@ -298,11 +298,11 @@
Feng.error("新密码不能和原始密码相同");
return
}
- let patt = /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/;
- if(!patt.test(newPwd)){
- Feng.error("密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符");
- return
- }
+ // let patt = /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/;
+ // if(!patt.test(newPwd)){
+ // Feng.error("密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符");
+ // return
+ // }
var ajax = new $ax(Feng.ctxPath + "/mgr/changePwd", function (data) {
Feng.success("修改成功!");
}, function (data) {
--
Gitblit v1.7.1