diff --git a/src/main/resources/vm/common/sha1.vm b/src/main/resources/vm/common/sha1.vm index 7e2cb74cd..d10fa9f44 100644 --- a/src/main/resources/vm/common/sha1.vm +++ b/src/main/resources/vm/common/sha1.vm @@ -1,11 +1,6 @@ \ No newline at end of file diff --git a/src/main/resources/vm/index.vm b/src/main/resources/vm/index.vm index 22dc2549f..78d873fce 100644 --- a/src/main/resources/vm/index.vm +++ b/src/main/resources/vm/index.vm @@ -300,6 +300,13 @@ if (!checkPwd(data.field.confirmPwd)) { return; } + ## 密码强度 + #if($user.isSystemUser()) + if (!checkPasswordStrong(data.field.userPwd)) { + layer.msg("系统管理员密码强度太低"); + return false; + } + #end var sendData = formatPwd(data.field, "oldPwd"); sendData = formatPwd(data.field, "newPwd"); sendData = formatPwd(data.field, "confirmPwd") diff --git a/src/main/resources/vm/install.vm b/src/main/resources/vm/install.vm index 91ca23411..bbd335bc6 100644 --- a/src/main/resources/vm/install.vm +++ b/src/main/resources/vm/install.vm @@ -67,7 +67,12 @@ // form.on('submit(from_login)', function (data) { if (!checkPwd(data.field.userPwd)) { - return; + return false; + } + // 密码强度 + if (!checkPasswordStrong(data.field.userPwd)) { + layer.msg("系统管理员密码强度太低"); + return false; } var sendData = formatPwd(data.field, "userPwd"); $.ajax({ diff --git a/src/main/resources/vm/welcome.vm b/src/main/resources/vm/welcome.vm index 764e75dc5..50e5a79af 100644 --- a/src/main/resources/vm/welcome.vm +++ b/src/main/resources/vm/welcome.vm @@ -51,7 +51,7 @@ width: 100%; } - +