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

fix: 修复编译错误

This commit is contained in:
Argo-Tianyi 2022-01-15 00:35:32 +08:00
parent c19cd5ca85
commit 22f5907bc4
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/blazor/admin/BootstrapAdmin.Caching/Services/DefaultCacheManager.cs
View File

@ -27,11 +27,10 @@ class DefaultCacheManager : ICacheManager
/// <typeparam name="T"></typeparam>
/// <param name="key"></param>
/// <param name="factory"></param>
/// <param name="token"></param>
/// <returns></returns>
public T GetOrAdd<T>(string key, Func<ICacheEntry, T> factory, IChangeToken? token = null) => Cache.GetOrCreate(key, entry =>
public T GetOrAdd<T>(string key, Func<ICacheEntry, T> factory) => Cache.GetOrCreate(key, entry =>
{
HandlerEntry(key, entry, token);
HandlerEntry(key, entry);
return factory(entry);
});

21
src/blazor/admin/BootstrapAdmin.DataAccess.PetaPoco/Services/RoleService.cs
View File

@ -1,4 +1,5 @@
using BootstrapAdmin.DataAccess.Models;
using BootstrapAdmin.Caching;
using BootstrapAdmin.DataAccess.Models;
using BootstrapAdmin.Web.Core;
using PetaPoco;
@ -6,6 +7,16 @@ namespace BootstrapAdmin.DataAccess.PetaPoco.Services;
class RoleService : IRole
{
private const string RoleServiceGetAllCacheKey = "RoleService-GetAll";
private const string RoleServiceGetRolesByUserIdCacheKey = "RoleService-GetRolesByUserId";
private const string RoleServiceGetRolesByGroupIdCacheKey = "RoleService-GetRolesByGroupId";
private CancellationTokenSource? GetRolesByUserIdCancellationTokenSource { get; set; }
private CancellationTokenSource? GetRolesByGroupIdCancellationTokenSource { get; set; }
private IDatabase Database { get; }
/// <summary>
@ -18,14 +29,14 @@ class RoleService : IRole
///
/// </summary>
/// <returns></returns>
public List<Role> GetAll() => Database.Fetch<Role>();
public List<Role> GetAll() => CacheManager.GetOrAdd(RoleServiceGetAllCacheKey, entry => Database.Fetch<Role>());
/// <summary>
///
/// </summary>
/// <param name="groupId"></param>
/// <returns></returns>
public List<string> GetRolesByGroupId(string? groupId) => Database.Fetch<string>("select RoleID from RoleGroup where GroupID = @0", groupId);
public List<string> GetRolesByGroupId(string? groupId) => CacheManager.GetOrAdd($"{RoleServiceGetRolesByGroupIdCacheKey}-{groupId}", entry => Database.Fetch<string>("select RoleID from RoleGroup where GroupID = @0", groupId));
/// <summary>
///
@ -57,7 +68,7 @@ class RoleService : IRole
/// </summary>
/// <param name="userId"></param>
/// <returns></returns>
public List<string> GetRolesByUserId(string? userId) => Database.Fetch<string>("select RoleID from UserRole where UserID = @0", userId);
public List<string> GetRolesByUserId(string? userId) => CacheManager.GetOrAdd($"{RoleServiceGetRolesByUserIdCacheKey}-{userId}", entry => Database.Fetch<string>("select RoleID from UserRole where UserID = @0", userId));
/// <summary>
///
@ -84,7 +95,7 @@ class RoleService : IRole
return ret;
}
public List<string> GetRolesByMenuId(string? menuId) => Database.Fetch<string>("select RoleID from NavigationRole where NavigationID = @0", menuId);
public List<string> GetRolesByMenuId(string? menuId) => CacheManager.GetOrAdd($"{RoleServiceGetRolesByUserIdCacheKey}-{menuId}", entry => Database.Fetch<string>("select RoleID from NavigationRole where NavigationID = @0", menuId));
public bool SaveRolesByMenuId(string? menuId, IEnumerable<string> roleIds)
{

3
src/blazor/admin/BootstrapAdmin.Web/Extensions/ServiceCollectionExtensions.cs
View File

@ -28,9 +28,6 @@ namespace Microsoft.Extensions.DependencyInjection
services.AddTaskServices();
services.AddHostedService<AdminTaskService>();
// 增加 缓存管理服务
services.AddCacheManager();
// 增加 健康检查服务
services.AddAdminHealthChecks();