From aaf255802c0c95b05576b33ab40cd98c4abfc946 Mon Sep 17 00:00:00 2001
From: dyy <807692433@qq.com>
Date: Wed, 15 May 2024 15:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=AF=86=E7=A0=81=E7=99=BB=E5=BD=95=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Learun.Application.Web/Controllers/LoginController.cs    | 4 ++--
 .../Learun.Application.Web/Views/Home/AdminDefault/index.js  | 5 +----
 .../Learun.Application.Web/Views/Home/ChangePwd.cshtml       | 2 +-
 .../Learun.Application.Web/Views/Login/Default/Index.js      | 3 ---
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs
index d312ca97f..74ab086d2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs	
@@ -635,14 +635,14 @@ namespace Learun.Application.Web.Controllers
                 {
                     if (password == Md5Helper.Encrypt(Config.GetValue("pwdprex") + "123456", 32) || password == Md5Helper.Encrypt(Config.GetValue("pwdprex") + "2020", 32) || password == Md5Helper.Encrypt(Config.GetValue("defaultpwd"), 32))
                     {
-                        succresult.defaultPwdTip = true;
+                        succresult.pwd = true;
                     }
                 }
                 else
                 {
                     if (password == Md5Helper.Encrypt(Config.GetValue("pwdprex") + userEntity.F_IdentityCardNo.Substring(userEntity.F_IdentityCardNo.Length - 6, 6), 32) || password == Md5Helper.Encrypt(Config.GetValue("pwdprex") + "2020", 32) || password == Md5Helper.Encrypt(Config.GetValue("defaultpwd"), 32))
                     {
-                        succresult.defaultPwdTip = true;
+                        succresult.pwd = true;
                     }
                 }
                 
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js
index 503787816..f4a72e5d0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault/index.js	
@@ -199,10 +199,7 @@ var bootstrap = function ($, learun) {
             //    });
             //}
 
-            //初始密码进行提示
-            if (sessionStorage.getItem("df0fjl") == "hm") {
-                layer.alert("您当前密码为初始密码，请尽快修改！", { icon: 7, title: "提示", closeBtn: false, yes: function (index) { sessionStorage.removeItem("df0fjl"); layer.close(index); } });
-            }
+            
             if (pwd == "true" || sessionStorage.getItem("pase_29d") == "hm") {
                 top.layer.open({
                     id: 'pwdform',
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.cshtml
index 7b9e7b530..f643ff42e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/ChangePwd.cshtml	
@@ -17,7 +17,7 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="ChangePwd">
         <div class="lr-form-item-title"></div>
-        您的密码不满足强度要求，请您先修改密码后再执行系统其他操作！
+        您的密码不满足强度要求或是初始密码，请您先修改密码后再执行系统其他操作！
         新密码必须8-20位同时包含1.[大小写字母]、2[数字]、3[特殊符号!@@#$%^&*]
     </div>
 </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js
index 3d696a04a..793a7b84a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js	
@@ -169,9 +169,6 @@
                             if (res.data.pwdtip == true) {
                                 sessionStorage.setItem("pt580", "hm");
                             }
-                            if (res.data.defaultPwdTip == true) {
-                                sessionStorage.setItem("df0fjl", "hm");
-                            }
                             window.location.href = "/Home/Index";
                         }
                     }