From e16385ddd23ed6bdb0c45b49ec44c4e1eb9a09be Mon Sep 17 00:00:00 2001
From: Argo Windows <argo@163.com>
Date: Mon, 28 Oct 2019 22:59:32 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=90=8E=E5=8F=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A6=96=E9=A1=B5=E5=A2=9E=E5=8A=A0=E5=8C=BF=E5=90=8D?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AdminController.cs            | 42 +++++++++----------
 .../Controllers/HomeController.cs             |  8 ++--
 .../Bootstrap.DataAccess.csproj               |  2 +-
 .../Bootstrap.Client.DataAccess.csproj        |  2 +-
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Controllers/AdminController.cs b/src/admin/Bootstrap.Admin/Controllers/AdminController.cs
index b9654db8..2e690f9e 100644
--- a/src/admin/Bootstrap.Admin/Controllers/AdminController.cs
+++ b/src/admin/Bootstrap.Admin/Controllers/AdminController.cs
@@ -7,85 +7,85 @@ using System;
 namespace Bootstrap.Admin.Controllers
 {
     /// <summary>
-    /// 
+    /// 后台管理控制器
     /// </summary>
     [Authorize]
     public class AdminController : Controller
     {
         /// <summary>
-        /// 
+        /// 后台管理首页
         /// </summary>
         /// <returns></returns>
         public ActionResult Index() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 用户维护
         /// </summary>
         /// <returns></returns>
         public ActionResult Users() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 部门维护
         /// </summary>
         /// <returns></returns>
         public ActionResult Groups() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 字典表维护
         /// </summary>
         /// <returns></returns>
         public ActionResult Dicts() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 角色维护
         /// </summary>
         /// <returns></returns>
         public ActionResult Roles() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 菜单维护
         /// </summary>
         /// <returns></returns>
         public ActionResult Menus() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 操作日志
         /// </summary>
         /// <returns></returns>
         public ActionResult Logs() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 脚本日志
         /// </summary>
         /// <returns></returns>
         public ActionResult SQL() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 访问日志
         /// </summary>
         /// <returns></returns>
         public ActionResult Traces() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 登录日志
         /// </summary>
         /// <returns></returns>
         public ActionResult Logins() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// FA 图标页面
         /// </summary>
         /// <returns></returns>
         public ActionResult FAIcon() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 健康检查
         /// </summary>
         /// <returns></returns>
         public ActionResult Healths() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 图标视图
         /// </summary>
         /// <returns></returns>
         [AllowAnonymous]
@@ -93,44 +93,44 @@ namespace Bootstrap.Admin.Controllers
         public PartialViewResult IconView() => PartialView("IconView");
 
         /// <summary>
-        /// 
+        /// 网站设置
         /// </summary>
         /// <returns></returns>
         public ActionResult Settings() => View(new SettingsModel(this));
 
         /// <summary>
-        /// 
+        /// 通知管理
         /// </summary>
         /// <returns></returns>
         public ActionResult Notifications() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 个人中心
         /// </summary>
         /// <param name="host"></param>
         /// <returns></returns>
         public ActionResult Profiles([FromServices]IWebHostEnvironment host) => View(new ProfilesModel(this, host));
 
         /// <summary>
-        /// 
+        /// 程序异常
         /// </summary>
         /// <returns></returns>
         public ActionResult Exceptions() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 消息通知
         /// </summary>
         /// <returns></returns>
         public ActionResult Messages() => View(new NavigatorBarModel(this));
 
         /// <summary>
-        /// 
+        /// 任务管理
         /// </summary>
         /// <returns></returns>
         public ActionResult Tasks() => View(new TaskModel(this));
 
         /// <summary>
-        /// 
+        /// 客户端测试页面
         /// </summary>
         /// <returns></returns>
         public ActionResult Mobile() => View(new NavigatorBarModel(this));
diff --git a/src/admin/Bootstrap.Admin/Controllers/HomeController.cs b/src/admin/Bootstrap.Admin/Controllers/HomeController.cs
index 719657b2..8b2796bc 100644
--- a/src/admin/Bootstrap.Admin/Controllers/HomeController.cs
+++ b/src/admin/Bootstrap.Admin/Controllers/HomeController.cs
@@ -9,7 +9,7 @@ namespace Bootstrap.Admin.Controllers
     /// <summary>
     /// Home Controller
     /// </summary>
-    [Authorize]
+    [AllowAnonymous]
     public class HomeController : Controller
     {
         /// <summary>
@@ -18,7 +18,10 @@ namespace Bootstrap.Admin.Controllers
         /// <returns></returns>
         public IActionResult Index()
         {
-            var model = new HeaderBarModel(User.Identity.Name);
+            var userName = User.Identity.Name;
+            if (string.IsNullOrEmpty(userName)) return Redirect(Request.PathBase + CookieAuthenticationDefaults.LoginPath);
+
+            var model = new HeaderBarModel(userName);
             if (string.IsNullOrEmpty(model.UserName)) return Redirect(Request.PathBase + CookieAuthenticationDefaults.LogoutPath);
 
             var homeUrl = DictHelper.RetrieveHomeUrl(model.AppId);
@@ -30,7 +33,6 @@ namespace Bootstrap.Admin.Controllers
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [AllowAnonymous]
         public IActionResult Error(int id)
         {
             var model = ErrorModel.CreateById(id);
diff --git a/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
index 7c36e9e2..491e3bd0 100644
--- a/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
+++ b/src/admin/Bootstrap.DataAccess/Bootstrap.DataAccess.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bootstrap.Security.DataAccess" Version="3.0.1-beta1" />
+    <PackageReference Include="Bootstrap.Security.DataAccess" Version="3.0.1-beta2" />
     <PackageReference Include="Longbow" Version="3.0.0" />
     <PackageReference Include="Longbow.Cache" Version="3.0.0" />
     <PackageReference Include="Longbow.Configuration" Version="3.0.0" />
diff --git a/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj b/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
index ec7779b5..f0b91a96 100644
--- a/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
+++ b/src/client/Bootstrap.Client.DataAccess/Bootstrap.Client.DataAccess.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bootstrap.Security.DataAccess" Version="3.0.1-beta1" />
+    <PackageReference Include="Bootstrap.Security.DataAccess" Version="3.0.1-beta2" />
     <PackageReference Include="Longbow" Version="3.0.0" />
     <PackageReference Include="Longbow.Cache" Version="3.0.0" />
     <PackageReference Include="Longbow.Configuration" Version="3.0.0" />