From 87712e2b498437829b935987b3c2f28f711f0340 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Wed, 2 Dec 2015 10:06:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.Mvc/Controllers/BaseController.cs    | 41 ++++++++++++-------
 OpenAuth.Mvc/Controllers/ErrorController.cs   | 17 ++++++++
 .../Controllers/OrgManagerController.cs       |  2 +-
 OpenAuth.Mvc/OpenAuth.Mvc.csproj              |  2 +
 OpenAuth.Mvc/Views/Error/NoAccess.cshtml      | 38 +++++++++++++++++
 OpenAuth.Mvc/Views/Home/Main.cshtml           |  3 --
 6 files changed, 85 insertions(+), 18 deletions(-)
 create mode 100644 OpenAuth.Mvc/Controllers/ErrorController.cs
 create mode 100644 OpenAuth.Mvc/Views/Error/NoAccess.cshtml

diff --git a/OpenAuth.Mvc/Controllers/BaseController.cs b/OpenAuth.Mvc/Controllers/BaseController.cs
index db161dac..e1b87e98 100644
--- a/OpenAuth.Mvc/Controllers/BaseController.cs
+++ b/OpenAuth.Mvc/Controllers/BaseController.cs
@@ -12,29 +12,42 @@
 // <summary>基础控制器，设置权限</summary>
 // ***********************************************************************
 
-using System.Web.Mvc;
+using System;
+using System.Linq;
 using Infrastructure.Helper;
 using OpenAuth.App.ViewModel;
-using OpenAuth.Domain;
 using OpenAuth.Mvc.Models;
+using System.Web.Mvc;
 
 namespace OpenAuth.Mvc.Controllers
 {
-	public class BaseController : Controller
-	{
+    public class BaseController : Controller
+    {
         protected BjuiResponse BjuiResponse = new BjuiResponse();
 
-       
-		protected override void OnActionExecuting(ActionExecutingContext filterContext)
-		{
-			base.OnActionExecuting(filterContext);
-
-            //#region 当Session过期自动跳出登录画面
-            if (SessionHelper.GetSessionUser<LoginUserVM>() == null)
+        protected override void OnActionExecuting(ActionExecutingContext filterContext)
+        {
+            var loginUser = SessionHelper.GetSessionUser<LoginUserVM>();
+            if (loginUser == null)
             {
                 Response.Redirect("/Login/Index");
+                return;
             }
-            //#endregion
-		}
-	}
+
+            if (Request.Url != null)
+            {
+                string url = Request.Url.LocalPath;
+                if(url !="/"
+                    && !url.Contains("Main")
+                    && !url.Contains("Error")
+                    && !url.Contains("Git")
+                    && !loginUser.Modules.Any(u => url.Contains(u.Url)))
+                    {
+                        Response.Redirect("/Error/NoAccess");
+                        return;
+                    }
+            }
+            base.OnActionExecuting(filterContext);
+        }
+    }
 }
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Controllers/ErrorController.cs b/OpenAuth.Mvc/Controllers/ErrorController.cs
new file mode 100644
index 00000000..4433cc90
--- /dev/null
+++ b/OpenAuth.Mvc/Controllers/ErrorController.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace OpenAuth.Mvc.Controllers
+{
+    public class ErrorController : Controller
+    {
+        // GET: Error
+        public ActionResult NoAccess()
+        {
+            return View();
+        }
+    }
+}
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Controllers/OrgManagerController.cs b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
index 295eb6bd..a0e79b49 100644
--- a/OpenAuth.Mvc/Controllers/OrgManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
@@ -82,7 +82,7 @@ namespace OpenAuth.Mvc.Controllers
             {
                 Id = 0,
                 ParentId = -1,
-                Name = "全部机构",
+                Name = "根结点",
                 CascadeId = "0"
             });
             return JsonHelper.Instance.Serialize(orgs);
diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
index 4d44a962..074fb901 100644
--- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj
+++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
@@ -125,6 +125,7 @@
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="AutofacExt.cs" />
     <Compile Include="Controllers\BaseController.cs" />
+    <Compile Include="Controllers\ErrorController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\LoginController.cs" />
     <Compile Include="Controllers\ModuleManagerController.cs" />
@@ -552,6 +553,7 @@
     <Content Include="BJUI\themes\purple\zTreeStandard.png" />
     <Content Include="favicon.ico" />
     <Content Include="Global.asax" />
+    <None Include="Views\Error\NoAccess.cshtml" />
     <None Include="Views\Home\git.cshtml" />
     <Content Include="Web.config" />
     <Content Include="Web.Debug.config">
diff --git a/OpenAuth.Mvc/Views/Error/NoAccess.cshtml b/OpenAuth.Mvc/Views/Error/NoAccess.cshtml
new file mode 100644
index 00000000..3908a576
--- /dev/null
+++ b/OpenAuth.Mvc/Views/Error/NoAccess.cshtml
@@ -0,0 +1,38 @@
+@{
+    Layout = null;
+}
+
+<script type="text/javascript">
+
+</script>
+<div class="bjui-pageHeader" style="background:#FFF;">
+    <div style="padding: 0 15px;">
+        <h4 style="margin-bottom:20px;">
+            您无权访问该页面
+        </h4>
+
+     
+        <div class="row" style=" margin-top:10px;">
+            <div class="col-md-6" style="padding:5px;">
+                <div class="alert alert-info" role="alert" style="margin:0 0 5px; padding:5px 15px;">
+
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="bjui-pageContent">
+    <div style="margin-top:5px; margin-right:300px; overflow:hidden;">
+        <div class="row" style="padding: 0 8px;">
+            <div class="col-md-12">
+                <div class="panel panel-default">
+                    <div class="panel-heading"><h3 class="panel-title">OpenAuth.Net/GIT</h3></div>
+
+                    <div class="panel-body">
+                        <iframe width="100%" height="240" class="share_self" frameborder="0" scrolling="no" src="/Home/Git"></iframe>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/OpenAuth.Mvc/Views/Home/Main.cshtml b/OpenAuth.Mvc/Views/Home/Main.cshtml
index 1ecaa806..05e6782c 100644
--- a/OpenAuth.Mvc/Views/Home/Main.cshtml
+++ b/OpenAuth.Mvc/Views/Home/Main.cshtml
@@ -26,9 +26,6 @@
     </div>
 </div>
 <div class="bjui-pageContent">
-    <div style="position:absolute;top:15px;right:0;width:300px;">
-        <iframe width="100%" height="550" class="share_self" frameborder="0" scrolling="no" src="http://widget.weibo.com/weiboshow/index.php?language=&width=0&height=550&fansRow=2&ptype=1&speed=0&skin=1&isTitle=1&noborder=1&isWeibo=1&isFans=0&uid=2838273614&verifier=75a3b95b&dpc=1"></iframe>
-    </div>
     <div style="margin-top:5px; margin-right:300px; overflow:hidden;">
         <div class="row" style="padding: 0 8px;">
             <div class="col-md-12">