From 3bed9510466f4e6b0ed4c707c699bdf7f3a86b2b Mon Sep 17 00:00:00 2001 From: Argo Zhang Date: Thu, 20 Jun 2019 08:23:22 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bootstrap.Admin/Controllers/Api/InterfaceController.cs | 4 ++-- Bootstrap.Admin/Startup.cs | 2 +- Bootstrap.DataAccess.MongoDB/App.cs | 2 +- Bootstrap.DataAccess.MongoDB/Role.cs | 4 ++-- Bootstrap.DataAccess/Helper/RoleHelper.cs | 8 ++++---- Bootstrap.DataAccess/Role.cs | 4 ++-- UnitTest/Bootstrap.DataAccess/RolesTest.cs | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Bootstrap.Admin/Controllers/Api/InterfaceController.cs b/Bootstrap.Admin/Controllers/Api/InterfaceController.cs index 586ef354..3ea2f63a 100644 --- a/Bootstrap.Admin/Controllers/Api/InterfaceController.cs +++ b/Bootstrap.Admin/Controllers/Api/InterfaceController.cs @@ -30,7 +30,7 @@ namespace Bootstrap.Admin.Controllers [HttpPost] public IEnumerable RetrieveRolesByUrl([FromBody]string url) { - return RoleHelper.RetrieveRolesByUrl(url); + return RoleHelper.RetrievesByUrl(url); } /// /// @@ -39,7 +39,7 @@ namespace Bootstrap.Admin.Controllers [HttpPost] public IEnumerable RetrieveRolesByUserName([FromBody]string userName) { - return RoleHelper.RetrieveRolesByUserName(userName); + return RoleHelper.RetrievesByUserName(userName); } /// /// diff --git a/Bootstrap.Admin/Startup.cs b/Bootstrap.Admin/Startup.cs index 7f8c5a88..55cfb62c 100644 --- a/Bootstrap.Admin/Startup.cs +++ b/Bootstrap.Admin/Startup.cs @@ -121,7 +121,7 @@ namespace Bootstrap.Admin app.UseHttpsRedirection(); app.UseResponseCompression(); app.UseStaticFiles(); - app.UseBootstrapAdminAuthentication(RoleHelper.RetrieveRolesByUserName, RoleHelper.RetrieveRolesByUrl, AppHelper.RetrievesByUserName); + app.UseBootstrapAdminAuthentication(RoleHelper.RetrievesByUserName, RoleHelper.RetrievesByUrl, AppHelper.RetrievesByUserName); app.UseOnlineUsers(callback: TraceHelper.Save); app.UseCacheManagerCorsHandler(); app.UseSignalR(routes => { routes.MapHub("/NotiHub"); }); diff --git a/Bootstrap.DataAccess.MongoDB/App.cs b/Bootstrap.DataAccess.MongoDB/App.cs index b95e95fe..4e0dd502 100644 --- a/Bootstrap.DataAccess.MongoDB/App.cs +++ b/Bootstrap.DataAccess.MongoDB/App.cs @@ -47,7 +47,7 @@ namespace Bootstrap.DataAccess.MongoDB public override IEnumerable RetrievesByUserName(string userName) { var ret = new List(); - var roles = RoleHelper.RetrieveRolesByUserName(userName); + var roles = RoleHelper.RetrievesByUserName(userName); if (roles.Contains("Administrators", StringComparer.OrdinalIgnoreCase)) { ret.AddRange(DictHelper.RetrieveApps().Select(kv => kv.Key)); diff --git a/Bootstrap.DataAccess.MongoDB/Role.cs b/Bootstrap.DataAccess.MongoDB/Role.cs index 5bda69ec..d730fbf5 100644 --- a/Bootstrap.DataAccess.MongoDB/Role.cs +++ b/Bootstrap.DataAccess.MongoDB/Role.cs @@ -75,7 +75,7 @@ namespace Bootstrap.DataAccess.MongoDB /// /// /// - public override IEnumerable RetrieveRolesByUserName(string userName) + public override IEnumerable RetrievesByUserName(string userName) { var roles = new List(); var user = UserHelper.Retrieves().Cast().FirstOrDefault(u => u.UserName.ToLowerInvariant() == userName.ToLowerInvariant()); @@ -185,7 +185,7 @@ namespace Bootstrap.DataAccess.MongoDB /// /// /// - public override IEnumerable RetrieveRolesByUrl(string url) + public override IEnumerable RetrievesByUrl(string url) { var menu = DbManager.Menus.Find(md => md.Url.StartsWith(url)).FirstOrDefault(); var ret = RoleHelper.Retrieves().Cast().Where(md => md.Menus != null && md.Menus.Contains(menu.Id)).Select(m => m.RoleName).ToList(); diff --git a/Bootstrap.DataAccess/Helper/RoleHelper.cs b/Bootstrap.DataAccess/Helper/RoleHelper.cs index 0b466a08..d2845c1c 100644 --- a/Bootstrap.DataAccess/Helper/RoleHelper.cs +++ b/Bootstrap.DataAccess/Helper/RoleHelper.cs @@ -1,4 +1,4 @@ -using Longbow.Cache; +using Longbow.Cache; using Longbow.Data; using System; using System.Collections.Generic; @@ -119,13 +119,13 @@ namespace Bootstrap.DataAccess /// /// /// - public static IEnumerable RetrieveRolesByUserName(string userName) => CacheManager.GetOrAdd(string.Format("{0}-{1}", RetrieveRolesByUserNameDataKey, userName), key => DbContextManager.Create().RetrieveRolesByUserName(userName), RetrieveRolesByUserNameDataKey); + public static IEnumerable RetrievesByUserName(string userName) => CacheManager.GetOrAdd(string.Format("{0}-{1}", RetrieveRolesByUserNameDataKey, userName), key => DbContextManager.Create().RetrievesByUserName(userName), RetrieveRolesByUserNameDataKey); /// /// /// /// /// - public static IEnumerable RetrieveRolesByUrl(string url) => CacheManager.GetOrAdd(string.Format("{0}-{1}", RetrieveRolesByUrlDataKey, url), key => DbContextManager.Create().RetrieveRolesByUrl(url), RetrieveRolesByUrlDataKey); + public static IEnumerable RetrievesByUrl(string url) => CacheManager.GetOrAdd(string.Format("{0}-{1}", RetrieveRolesByUrlDataKey, url), key => DbContextManager.Create().RetrievesByUrl(url), RetrieveRolesByUrlDataKey); } -} \ No newline at end of file +} diff --git a/Bootstrap.DataAccess/Role.cs b/Bootstrap.DataAccess/Role.cs index de22ab53..8d1c4894 100644 --- a/Bootstrap.DataAccess/Role.cs +++ b/Bootstrap.DataAccess/Role.cs @@ -187,7 +187,7 @@ namespace Bootstrap.DataAccess /// /// /// - public virtual IEnumerable RetrieveRolesByUserName(string userName) => DbHelper.RetrieveRolesByUserName(userName); + public virtual IEnumerable RetrievesByUserName(string userName) => DbHelper.RetrieveRolesByUserName(userName); /// /// 根据菜单url查询某个所拥有的角色 @@ -195,6 +195,6 @@ namespace Bootstrap.DataAccess /// 从Navigators-〉GroupNavigatorRole-〉Role查查询某个用户所拥有的角色 /// /// - public virtual IEnumerable RetrieveRolesByUrl(string url) => DbHelper.RetrieveRolesByUrl(url); + public virtual IEnumerable RetrievesByUrl(string url) => DbHelper.RetrieveRolesByUrl(url); } } diff --git a/UnitTest/Bootstrap.DataAccess/RolesTest.cs b/UnitTest/Bootstrap.DataAccess/RolesTest.cs index 41fd2554..2edb50a2 100644 --- a/UnitTest/Bootstrap.DataAccess/RolesTest.cs +++ b/UnitTest/Bootstrap.DataAccess/RolesTest.cs @@ -80,13 +80,13 @@ namespace Bootstrap.DataAccess.SqlServer { var id = RoleHelper.Retrieves().FirstOrDefault(r => r.RoleName == "Administrators").Id; UserHelper.SaveByRoleId(id, UserHelper.Retrieves().Select(u => u.Id)); - Assert.NotEmpty(RoleHelper.RetrieveRolesByUserName("Admin")); + Assert.NotEmpty(RoleHelper.RetrievesByUserName("Admin")); } [Fact] public void RetrieveRolesByUrl_Ok() { - Assert.NotEmpty(RoleHelper.RetrieveRolesByUrl("~/Home/Index")); + Assert.NotEmpty(RoleHelper.RetrievesByUrl("~/Home/Index")); } [Fact]