From 72813ab944a2cff3431a633ea1459f27c71cc18b Mon Sep 17 00:00:00 2001
From: liangkun <liangkun7173@hotmail.com>
Date: Tue, 7 Mar 2023 12:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E5=A4=A7=E5=8E=85=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC=E5=88=B0=E5=8A=9E?=
 =?UTF-8?q?=E4=BA=8B=E5=A4=A7=E5=8E=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/LoginController.cs              |  1 +
 .../Controllers/SSOSystemController.cs          |  6 +++---
 .../Learun.Application.Web.csproj               |  1 +
 .../Views/Home/AdminDefault.cshtml              | 17 +++++++++++++++++
 .../Views/Login/LoginForWeixin.cshtml           | 13 +++++++++++++
 .../Views/SSOSystem/DragNoLogin.cshtml          | 15 +++++++++------
 .../Views/SSOSystem/DragNoWxLogin.cshtml        | 15 +++++++++------
 7 files changed, 53 insertions(+), 15 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 5238fbc2c..ab794d3fb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs	
@@ -927,6 +927,7 @@ namespace Learun.Application.Web.Controllers
             //微信appid
             string appid = weichatdevelop.APPId;
             string secret = weichatdevelop.secret;
+            ViewBag.source = Request.QueryString["source"];
             ViewBag.login = Request.QueryString["login"];
             ViewBag.CODE = Request.QueryString["CODE"];
             if (!string.IsNullOrEmpty(ViewBag.login))
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs
index 414447cd0..3ad33a16c 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs	
@@ -69,15 +69,15 @@ namespace Learun.Application.Web.Controllers
             string appkey = Request.QueryString["appkey"];
             if (string.IsNullOrEmpty(appid))
             {
-                return Fail("参数:appid不能为空");
+                return Fail("参数:appid 不能为空");
             }
             if (string.IsNullOrEmpty(secret))
             {
-                return Fail("参数:secret不能为空");
+                return Fail("参数:secret 不能为空");
             }
             if (string.IsNullOrEmpty(appkey))
             {
-                return Fail("参数:appkey不能为空");
+                return Fail("参数:appkey 不能为空");
             }
             var application = perm_FunctionIBLL.GetPerm_FunctionEntity(appid);
             if (application != null)
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj
index 3b06e5129..8935a1a08 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj	
@@ -2398,6 +2398,7 @@
     <Content Include="Content\images\SsoSystem\noLogin.png" />
     <Content Include="Content\images\SsoSystem\search.png" />
     <Content Include="Content\images\SsoSystem\user.jpg" />
+    <Content Include="Content\images\wsbsdt.png" />
     <Content Include="Content\jquery\plugin\jqprint\jqprint.css" />
     <Content Include="Content\jquery\plugin\jqprint\jQuery.print.js" />
     <Content Include="Content\jquery\plugin\jSignature.min.js" />
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml
index be143f306..9a911d711 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml	
@@ -3,6 +3,20 @@
     Layout = "~/Views/Shared/_Admin.cshtml";
 }
 @Html.AppendCssFile("/Views/Home/AdminDefault/index.css")
+<style>
+    .lr-im-bell2 {
+        width: 80px;
+        right: 123px;
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+    }
+
+    .lr-im-bell2 .point {
+        left: 23px;
+        right: auto;
+    }
+</style>
 <script>
     function request(d) { for (var c = location.search.slice(1).split("&"), a = 0; a < c.length; a++) { var b = c[a].split("="); if (b[0] == d) if ("undefined" == unescape(b[1])) break; else return unescape(b[1]) } return "" };
 </script>
@@ -43,6 +57,9 @@
             <li><a href="javascript:void(0);" id="btn_gongwen3"><i class="fa fa-balance-scale"></i>备课任务 0 条</a></li>*@
         <li>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;共 @ViewBag.UnreadNum 条</li>
     </ul>
+    <div style="display: inline-block; line-height: 18px; position: relative; top: -3px;" title="网上办事大厅">
+        <a href="/SSOSystem/DragModelOne" class="down downsso"><img src="~/Content/images/wsbsdt.png" /></a>
+    </div>
 </div>
 
 @* 即时通讯窗体 *@
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/LoginForWeixin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/LoginForWeixin.cshtml
index b06c62419..962b91852 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/LoginForWeixin.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/LoginForWeixin.cshtml	
@@ -15,6 +15,7 @@
 <script src="~/Content/jquery/jquery-1.10.2.min.js"></script>
 <script type="text/javascript">
     var code = "@ViewBag.CODE";
+    var source = "@ViewBag.source";
     $(document).ready(function () {
         @if(string.IsNullOrEmpty(ViewBag.login))
         {
@@ -31,15 +32,27 @@
                         location.href = result.data.returnurl;
                     }
                     else {
+                        if (source) {
+                            location.href = "/SSOSystem/DragModelOne";
+                            return;
+                        }
                         location.href = "/Home/Index";
                     }
                 }
                 else
                 {
+                    if (source) {
+                        location.href = "/SSOSystem/DragModelOne";
+                        return;
+                    }
                     location.href = "/Home/Index";
                 }
             }
             else {
+                if (source) {
+                    location.href = "/SSOSystem/NoLogin";
+                    return;
+                }
                 location.href = "/Login/Index";
             }
         },
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml
index 68a323aa5..6af40f293 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml	
@@ -1062,7 +1062,6 @@
     <script src="~/Content/jquery/jquery.md5.min.js"></script>
     <script>
         $.lrToken = $('@Html.AntiForgeryToken()').val();
-        var DigitalschoolMisLoginurl = "@ViewBag.DigitalschoolMisLoginurl";
         var Returnurl = "@ViewBag.Returnurl";
         //判断是否有登录二维码：有，显示扫码登录；否，不显示；
         if ("@ViewBag.HasQRCode" == "True") {
@@ -1112,10 +1111,7 @@
         }
         // 登录按钮事件
         $("#lr_login_btn").on('click', function () {
-            layer.msg('登录中...', {
-                icon: 16
-                , shade: 0.01
-            });
+          
             var $username = $("#lr_username"), $password = $("#lr_password"), $verifycode = $("#lr_verifycode_input");
             var username = $.trim($username.val()), password = $.trim($password.val()), verifycode = $.trim($verifycode.val());
             if (username == "") {
@@ -1134,6 +1130,11 @@
                 return false;
             }
             password = $.md5(password);
+            layer.msg('登录中...', {
+                icon: 16
+                , shade: 0.01
+                ,time:-1
+            });
             $.ajax({
                 url: "/Login/CheckLogin",
                 headers: { __RequestVerificationToken: $.lrToken },
@@ -1142,7 +1143,7 @@
                 dataType: "json",
                 success: function (res) {
                     if (res.code == 200) {
-                        window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                        window.location.href ="/SSOSystem/DragModelOne";
                     }
                     else if (res.code == 400) {
                         tip(res.info, true);
@@ -1151,8 +1152,10 @@
                             $('.lr-login-reg').show();
                             $("#lr_verifycode_img").trigger('click');
                         }
+                        layer.closeAll();
                     }
                     else if (res.code == 500) {
+                        layer.closeAll();
                         tip('服务端异常，请联系管理员', true);
                     }
                 }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml
index ba78744ca..b7b75f570 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml	
@@ -1069,7 +1069,6 @@
     <script src="~/Content/jquery/jquery.md5.min.js"></script>
     <script>
         $.lrToken = $('@Html.AntiForgeryToken()').val();
-        var DigitalschoolMisLoginurl = "@ViewBag.DigitalschoolMisLoginurl";
         var Returnurl = "@ViewBag.Returnurl";
         //判断是否有登录二维码：有，显示扫码登录；否，不显示；
         if ("@ViewBag.HasQRCode" == "True") {
@@ -1119,10 +1118,7 @@
         }
         // 登录按钮事件
         $("#lr_login_btn").on('click', function () {
-            layer.msg('绑定中...', {
-                icon: 16
-                , shade: 0.01
-            });
+          
             var $username = $("#lr_username"), $password = $("#lr_password"), $verifycode = $("#lr_verifycode_input"), $WeixinOpenId = $("#WeixinOpenId");
             var username = $.trim($username.val()), password = $.trim($password.val()), verifycode = $.trim($verifycode.val()), WeixinOpenId = $.trim($WeixinOpenId.val());
             if (username == "") {
@@ -1141,6 +1137,11 @@
                 return false;
             }
             password = $.md5(password);
+            layer.msg('绑定中...', {
+                icon: 16
+                , shade: 0.01
+                , time: -1
+            });
             $.ajax({
                 url: "/Login/CheckLoginBind",
                 headers: { __RequestVerificationToken: $.lrToken },
@@ -1149,7 +1150,7 @@
                 dataType: "json",
                 success: function (res) {
                     if (res.code == 200) {
-                        window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                        window.location.href = "/SSOSystem/DragModelOne";
                     }
                     else if (res.code == 400) {
                         tip(res.info, true);
@@ -1158,8 +1159,10 @@
                             $('.lr-login-reg').show();
                             $("#lr_verifycode_img").trigger('click');
                         }
+                        layer.closeAll();
                     }
                     else if (res.code == 500) {
+                        layer.closeAll();
                         tip('服务端异常，请联系管理员', true);
                     }
                 }