合并冲突

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
         /// 网上办事大厅拖拽版-未登录页面
         /// </summary>
         /// <returns></returns>
-        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");
         }
 
         /// <summary>
@@ -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();

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -23,7 +23,7 @@
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
     <UseGlobalApplicationHostFile />
-    <Use64BitIISExpress>false</Use64BitIISExpress>
+    <Use64BitIISExpress />
     <SccProjectName>
     </SccProjectName>
     <SccLocalPath>
@@ -7409,6 +7409,7 @@
     <Content Include="Areas\LR_SystemModule\Views\Log\IndexDAM.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ClassPlan\Form.cshtml" />
     <Content Include="Areas\EducationalAdministration\Views\ClassPlan\Index.cshtml" />
+    <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
     <Content Include="Views\Login\Default-beifen.cshtml" />
     <None Include="Properties\PublishProfiles\FolderProfile1.pubxml" />
@@ -7497,6 +7498,10 @@
     <Content Include="wsbsdt\layui\font\iconfont.eot" />
     <Content Include="wsbsdt\layui\font\iconfont.ttf" />
     <Content Include="wsbsdt\layui\font\iconfont.woff" />
+    <None Include="Properties\PublishProfiles\FolderProfile2.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile3.pubxml" />
+    <None Include="Properties\PublishProfiles\FolderProfile4.pubxml" />
+    <None Include="Properties\PublishProfiles\learunadms6.1.pubxml" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminAccordion.cshtml

@@ -9,10 +9,10 @@
 </div>
 <div class="lr-frame-menu-btn" id="lr_frame_menu_btn"><i class="fa fa-fw fa-dedent"></i></div>
 
-<div class="lr-lg-setting" id="lr_lg_setting">
+@*<div class="lr-lg-setting" id="lr_lg_setting">
     <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
     <ul class="dropdown-menu"></ul>
-</div>
+</div>*@
 
 <div class="lr-im-bell" title="消息中心">
     <span class="point" style="display:none;"></span>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefault.cshtml

@@ -19,10 +19,10 @@
         <iframe style="position: absolute; top: 18px; right: 150px; height: 25px;" id="fancybox-frame" name="fancybox-frame1591155087436" frameborder="0" scrolling="no" hspace="0" src="http://i.tianqi.com/index.php?c=code&a=getcode&id=34&h=25&w=280"></iframe>
     </div>
 </div>
-<div class="lr-lg-setting" id="lr_lg_setting">
+@*<div class="lr-lg-setting" id="lr_lg_setting">
     <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
     <ul class="dropdown-menu"></ul>
-</div>
+</div>*@
 
 
 @*<div class="lr-lzc-user"><a class="lr-lzca-user" href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown">在线人数 @ViewBag.OnlineUserNum 人</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminDefaultForDC.cshtml

@@ -19,10 +19,10 @@
         <iframe style="position: absolute; top: 18px; right: 150px; height: 25px;" id="fancybox-frame" name="fancybox-frame1591155087436" frameborder="0" scrolling="no" hspace="0" src="http://i.tianqi.com/index.php?c=code&a=getcode&id=34&h=25&w=280"></iframe>
     </div>
 </div>
-<div class="lr-lg-setting" id="lr_lg_setting">
+@*<div class="lr-lg-setting" id="lr_lg_setting">
     <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
     <ul class="dropdown-menu"></ul>
-</div>
+</div>*@
 
 
 @*<div class="lr-lzc-user"><a class="lr-lzca-user" href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown">在线人数 @ViewBag.OnlineUserNum 人</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminNavigation.cshtml

@@ -17,10 +17,10 @@
     </div>
     <div><iframe style="position: absolute; top: 18px; right: 150px; height: 25px;" id="fancybox-frame" name="fancybox-frame1591155087436" frameborder="0" scrolling="no" hspace="0" src="http://i.tianqi.com/index.php?c=code&a=getcode&id=34&h=25&w=280"></iframe></div>
 </div>
-<div class="lr-lg-setting" id="lr_lg_setting">
+@*<div class="lr-lg-setting" id="lr_lg_setting">
     <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
     <ul class="dropdown-menu"></ul>
-</div>
+</div>*@
 
 
 @*<div class="lr-lzc-user"><a class="lr-lzca-user" href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown">在线人数 @ViewBag.OnlineUserNum 人</a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTheme5.cshtml

@@ -9,10 +9,10 @@
         <img src="~/LR_SystemModule/LogoImg/GetImg?code=accordion" />
     </div>
 </div>
-<div class="lr-lg-setting" id="lr_lg_setting">
+@*<div class="lr-lg-setting" id="lr_lg_setting">
     <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
     <ul class="dropdown-menu"></ul>
-</div>
+</div>*@
 @* 即时通讯窗体 *@
 <div class="lr-im-bell" title="消息中心">
     <span class="point" style="display:none;"></span>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminTop.cshtml

@@ -10,10 +10,10 @@
 </div>
 <div class="lr-frame-menu-btn" id="lr_frame_menu_btn"><i class="fa fa-fw fa-dedent"></i></div>
 <div class="lr-second-menu-wrap"><div id="lr_second_menu_wrap"></div></div>
-<div class="lr-lg-setting" id="lr_lg_setting">
+@*<div class="lr-lg-setting" id="lr_lg_setting">
     <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
     <ul class="dropdown-menu"></ul>
-</div>
+</div>*@
 
 <div class="lr-im-bell" title="消息中心">
     <span class="point"></span>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Home/AdminWindos.cshtml

@@ -24,10 +24,10 @@
     </div>
 </div>
 
-<div class="lr-lg-setting" id="lr_lg_setting">
+@*<div class="lr-lg-setting" id="lr_lg_setting">
     <a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false">[<span></span>]</a>
     <ul class="dropdown-menu"></ul>
-</div>
+</div>*@
 
 <div class="lr-im-body">
     <div class="lr-im-title">

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml

@@ -100,8 +100,8 @@
             }
             @if (loginInfo == null)
             {
-                @*<a href="/Login/Index?source=DragNoLogin" class="headLogin">登录</a>*@
-                <a href="/SSOSystem/DragNoLogin" class="headLogin">登录</a>
+                @*<a href="/Login/Index?source=NoLogin" class="headLogin">登录</a>*@
+                <a href="/SSOSystem/NoLogin" class="headLogin">登录</a>
             }
             else
             {
@@ -1033,7 +1033,7 @@
                             </div>
                             @if (ViewBag.WeixinLoginSwitch)
                             {
-                                <a class="wx" href="/Login/LoginForWeixin?login=one&source=DragNoLogin">
+                                <a class="wx" href="/Login/LoginForWeixin?login=one&source=NoLogin">
                                     <img src="/Content/images/DragSSO/weixin.png" alt="" />
                                     <span>微信登录</span>
                                 </a>

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml

@@ -97,8 +97,8 @@
             }
             @if (loginInfo == null)
             {
-                @*<a href="/Login/Index?source=DragNoLogin" class="headLogin">登录</a>*@
-                <a href="/SSOSystem/DragNoLogin" class="headLogin">登录</a>
+                @*<a href="/Login/Index?source=NoLogin" class="headLogin">登录</a>*@
+                <a href="/SSOSystem/NoLogin" class="headLogin">登录</a>
             }
             else
             {