From 9da00bcffcf3363437738868212f01b57988baa1 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Wed, 15 May 2024 09:27:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=B8=AA?=
=?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83-=E4=BF=AE=E6=94=B9=E5=AF=86?=
=?UTF-8?q?=E7=A0=81=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=BC=BA=E5=AF=86=E7=A0=81?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Views/LR_Content/script/lr-validator-helper.js | 5 ++++-
.../Views/UserCenter/PassWordForm.cshtml | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js
index dcac566ad..5f2876c05 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-validator-helper.js
@@ -152,7 +152,10 @@
return learun.validator.validRegOrNull(obj, /^\d{15}(\d{2}[A-Za-z0-9;])?$/, '必须为身份证格式或空');
},
isStrongPwd: function (obj) {//判断是否为数字、大小写字母、特殊字符组成的密码
- return learun.validator.validRegOrNull(obj, /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/, '8-20位必须同时包含大小写字母、数字、特殊符号');
+ return learun.validator.validReg(obj, /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/, '8-20位必须同时包含大小写字母、数字、特殊符号');
+ },
+ isStrongPwdOrNull: function (obj) {//判断是否为数字、大小写字母、特殊字符组成的密码或者null,空
+ return learun.validator.validRegOrNull(obj, /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/, '8-20位必须同时包含大小写字母、数字、特殊符号或空');
},
isIP: function (obj) {//判断是否为IP地址格式
var res = { code: true, msg: '' };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/PassWordForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/PassWordForm.cshtml
index 79235f1ec..748e2d0d9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/PassWordForm.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/PassWordForm.cshtml
@@ -14,7 +14,7 @@