From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js | 26 ++++----------------------
1 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js b/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js
index 21e9c30..c81798b 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/user/user_info.js
@@ -29,30 +29,22 @@
password: {
validators: {
notEmpty: {
- message: language==1?'密码不能为空':(language==2?"The password cannot be empty.":"Kata sandi tidak bisa kosong.")
- },
- identical: {
- field: 'rePassword',
- message: language==1?'两次密码不一致':(language==2?"The password entered twice are inconsistent.":"Kata sandi yang dimasukkan dua kali tidak konsisten.")
+ message: '密码不能为空'
},
regexp: {
regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
- message: language==1?'密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符':(language==2?"The name cannot be empty. The password must contain letters, numbers, and special characters. At least 8 characters and at most 30 characters.":"Namanya tidak bisa kosong. Kata sandi harus mengandung huruf, nomor, dan karakter khusus. Setidaknya 8 karakter dan paling tidak 30 karakter.")
+ message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
},
}
},
rePassword: {
validators: {
notEmpty: {
- message: language==1?'密码不能为空':(language==2?"The password cannot be empty.":"Kata sandi tidak bisa kosong.")
- },
- identical: {
- field: 'password',
- message: language==1?'两次密码不一致':(language==2?"The password entered twice are inconsistent.":"Kata sandi yang dimasukkan dua kali tidak konsisten.")
+ message: '密码不能为空'
},
regexp: {
regexp: /(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[^a-zA-Z0-9]).{8,30}/,
- message: language==1?'密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符':(language==2?"The name cannot be empty. The password must contain letters, numbers, and special characters. At least 8 characters and at most 30 characters.":"Namanya tidak bisa kosong. Kata sandi harus mengandung huruf, nomor, dan karakter khusus. Setidaknya 8 karakter dan paling tidak 30 karakter.")
+ message: '密码中必须包含大小字母、数字、特称字符，至少8个字符，最多30个字符'
},
}
}
@@ -214,17 +206,7 @@
return;
}
- if (!this.validatePwd()) {
- if(language==1){
- Feng.error("两次密码输入不一致");
- }else if(language==2){
- Feng.error("The two password entries are inconsistent");
- }else {
- Feng.error("Dua entri kata sandi tidak konsisten");
- }
- return;
- }
var birthday = $("#birthday").val();
if ("" == birthday){
--
Gitblit v1.7.1