orga0063
/
BootstrapAdmin11
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: 数据库健康检查使用当前登录用户

This commit is contained in:
Argo Zhang 2019-08-24 10:21:45 +08:00
parent 3a4b77e837
commit de37ea3c6b
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Bootstrap.Admin/HealthChecks/DBHealthCheck.cs
View File

@ -1,4 +1,5 @@
using Bootstrap.DataAccess; using Bootstrap.DataAccess;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Diagnostics.HealthChecks;
using System; using System;
@ -15,7 +16,8 @@ namespace Bootstrap.Admin.HealthChecks
/// </summary> /// </summary>
public class DBHealthCheck : IHealthCheck public class DBHealthCheck : IHealthCheck
{ {
private IConfiguration _configuration; private readonly IConfiguration _configuration;
private readonly IHttpContextAccessor _httpContextAccessor;
private static readonly Func<IConfiguration, string, string> ConnectionStringResolve = (c, name) => string.IsNullOrEmpty(name) private static readonly Func<IConfiguration, string, string> ConnectionStringResolve = (c, name) => string.IsNullOrEmpty(name)
? c.GetSection("ConnectionStrings").GetChildren().FirstOrDefault()?.Value ? c.GetSection("ConnectionStrings").GetChildren().FirstOrDefault()?.Value
: c.GetConnectionString(name); : c.GetConnectionString(name);
@ -24,9 +26,11 @@ namespace Bootstrap.Admin.HealthChecks
/// 构造函数 /// 构造函数
/// </summary> /// </summary>
/// <param name="configuration"></param> /// <param name="configuration"></param>
public DBHealthCheck(IConfiguration configuration) /// <param name="httpContextAccessor"></param>
public DBHealthCheck(IConfiguration configuration, IHttpContextAccessor httpContextAccessor)
{ {
_configuration = configuration; _configuration = configuration;
_httpContextAccessor = httpContextAccessor;
} }
/// <summary> /// <summary>
@ -46,10 +50,12 @@ namespace Bootstrap.Admin.HealthChecks
ConnectionString = ConnectionStringResolve(config.GetSection("ConnectionStrings").Exists() ? config : _configuration, string.Empty) ConnectionString = ConnectionStringResolve(config.GetSection("ConnectionStrings").Exists() ? config : _configuration, string.Empty)
}).FirstOrDefault(i => i.Enabled); }).FirstOrDefault(i => i.Enabled);
// 检查 Admin 账户权限 // 检查 当前用户 账户权限
var user = UserHelper.RetrieveUserByUserName("Admin"); var loginUser = _httpContextAccessor.HttpContext.User.Identity.Name;
var roles = RoleHelper.RetrievesByUserName("Admin"); var userName = loginUser ?? "Admin";
var menus = MenuHelper.RetrieveMenusByUserName("Admin"); var user = UserHelper.RetrieveUserByUserName(userName);
var roles = RoleHelper.RetrievesByUserName(userName);
var menus = MenuHelper.RetrieveMenusByUserName(userName);
var dicts = DictHelper.RetrieveDicts(); var dicts = DictHelper.RetrieveDicts();
var data = new Dictionary<string, object>() var data = new Dictionary<string, object>()
@ -58,9 +64,10 @@ namespace Bootstrap.Admin.HealthChecks
{ "Widget", db.Widget }, { "Widget", db.Widget },
{ "DbType", db.ProviderName }, { "DbType", db.ProviderName },
{ "Dicts", dicts.Count() }, { "Dicts", dicts.Count() },
{ "User(Admin)", user != null }, { "LoginName", loginUser },
{ "Roles(Admin)", string.Join(",", roles) }, { "DisplayName", user == null ? null : user.DisplayName },
{ "Navigations(Admin)", menus.Count() } { "Roles", string.Join(",", roles) },
{ "Navigations", menus.Count() }
}; };
var v = dicts.Any() && user != null && roles.Any() && menus.Any(); var v = dicts.Any() && user != null && roles.Any() && menus.Any();

2
Bootstrap.Admin/Startup.cs
View File

@ -109,8 +109,8 @@ namespace Bootstrap.Admin
app.UseHttpsRedirection(); app.UseHttpsRedirection();
app.UseResponseCompression(); app.UseResponseCompression();
app.UseStaticFiles(); app.UseStaticFiles();
app.UseBootstrapHealthChecks();
app.UseBootstrapAdminAuthentication(RoleHelper.RetrievesByUserName, RoleHelper.RetrievesByUrl, AppHelper.RetrievesByUserName); app.UseBootstrapAdminAuthentication(RoleHelper.RetrievesByUserName, RoleHelper.RetrievesByUrl, AppHelper.RetrievesByUserName);
app.UseBootstrapHealthChecks();
app.UseOnlineUsers(callback: TraceHelper.Save); app.UseOnlineUsers(callback: TraceHelper.Save);
app.UseCacheManager(); app.UseCacheManager();
app.UseSignalR(routes => app.UseSignalR(routes =>