From 1a480933035af924000cd3ed8cd6e8ceb5b1ed4c Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 30 Nov 2021 17:11:27 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9E=E4=BA=8B?=
=?UTF-8?q?=E5=A4=A7=E5=8E=85=E6=8B=96=E6=8B=BD=E7=89=88=E5=9C=B0=E5=9D=80?=
=?UTF-8?q?=20=20DragNoLogin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/SSOSystemController.cs | 46 +++++++++----------
.../Learun.Application.Web.csproj | 18 +++++---
.../Views/SSOSystem/DragNoLogin.cshtml | 6 +--
.../Views/SSOSystem/DragNoWxLogin.cshtml | 4 +-
4 files changed, 40 insertions(+), 34 deletions(-)
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 e6dd2a1b3..0685d5bdc 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs
@@ -235,24 +235,24 @@ namespace Learun.Application.Web.Controllers
return View();
}
- public ActionResult NoLogin()
- {
- var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
- var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
- var allCount = 0;
- foreach (var flow in flowType)
- {
- var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
- flow.FlowCount = count;
- allCount += count;
-
- }
-
- ViewBag.AllCount = allCount;
- ViewBag.FlowType = flowType;
- ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
- return View();
- }
+ //public ActionResult NoLogin()
+ //{
+ // var flowType = dataItemIBLL.GetDetailList("FlowSort", "");
+ // var flowList = wfSchemeIBLL.GetWfSchemeStart().ToList();
+ // var allCount = 0;
+ // foreach (var flow in flowType)
+ // {
+ // var count = flowList.Count(a => a.F_Category == flow.F_ItemName);
+ // flow.FlowCount = count;
+ // allCount += count;
+
+ // }
+
+ // ViewBag.AllCount = allCount;
+ // ViewBag.FlowType = flowType;
+ // ViewBag.FlowList = JsonConvert.SerializeObject(flowList);
+ // return View();
+ //}
private UserService userService = new UserService();
@@ -863,7 +863,7 @@ namespace Learun.Application.Web.Controllers
/// 网上办事大厅拖拽版-未登录页面
///
///
- public ActionResult DragNoLogin()
+ public ActionResult NoLogin()
{
//获取错误次数
ViewBag.errornum = OperatorHelper.Instance.GetCurrentErrorNum();
@@ -884,7 +884,7 @@ namespace Learun.Application.Web.Controllers
ViewBag.WeixinLoginSwitch = result4;
- return View();
+ return View("DragNoLogin");
}
///
@@ -932,7 +932,7 @@ namespace Learun.Application.Web.Controllers
var result = helper.IsOnLine(account);
if (result.stateCode != 1)
{
- return Redirect("DragNoLogin");
+ return Redirect("NoLogin");
}
//登录用户
var userInfo = LoginUserInfo.Get();
@@ -1253,7 +1253,7 @@ namespace Learun.Application.Web.Controllers
var result = helper.IsOnLine(account);
if (result.stateCode != 1)
{
- return Redirect("DragNoLogin");
+ return Redirect("NoLogin");
}
//登录用户
var userInfo = LoginUserInfo.Get();
@@ -1582,7 +1582,7 @@ namespace Learun.Application.Web.Controllers
var result = helper.IsOnLine(account);
if (result.stateCode != 1)
{
- return Redirect("DragNoLogin");
+ return Redirect("NoLogin");
}
//登录用户
var userInfo = LoginUserInfo.Get();
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 74f2e04ed..7a706a7f4 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
@@ -1,4 +1,4 @@
-
+
@@ -7404,6 +7404,8 @@
+
+
@@ -7492,6 +7494,10 @@
+
+
+
+
@@ -7521,11 +7527,11 @@
- False
- True
- 20472
- /
- http://localhost:20873/
+ False
+ True
+ 20472
+ /
+ http://localhost:20873/
False
False
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 560890c46..68a323aa5 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
@@ -100,8 +100,8 @@
}
@if (loginInfo == null)
{
- @*登录*@
- 登录
+ @*登录*@
+ 登录
}
else
{
@@ -1033,7 +1033,7 @@
@if (ViewBag.WeixinLoginSwitch)
{
-
+
微信登录
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 daecc1bfc..ba78744ca 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
@@ -97,8 +97,8 @@
}
@if (loginInfo == null)
{
- @*
登录*@
-
登录
+ @*
登录*@
+
登录
}
else
{
From f4d3e3b95600a9981e8a6696a852a8794d3ac982 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Tue, 30 Nov 2021 17:49:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=AF=AF=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Learun.Application.Web/Learun.Application.Web.csproj | 1 -
1 file changed, 1 deletion(-)
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 7a706a7f4..344680b0b 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
@@ -7404,7 +7404,6 @@
-