xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/abp' into digital-collectibles

Browse Source
This commit is contained in:
橙子
2024-12-10 00:06:14 +08:00
parent 365ae8ef0a 6be5398114
commit 81138fcaef
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Yi.Abp.Net8/module/audit-logging/Yi.Framework.AuditLogging.Domain/AuditingStore.cs
View File

@@ -53,7 +53,7 @@ public class AuditingStore : IAuditingStore, ITransientDependency
protected virtual async Task SaveLogAsync(AuditLogInfo auditInfo) protected virtual async Task SaveLogAsync(AuditLogInfo auditInfo)
{ {
Logger.LogDebug("Yi-请求追踪:" + JsonHelper.ObjToStr(auditInfo, "yyyy-MM-dd HH:mm:ss")); Logger.LogDebug("Yi-请求追踪:" + JsonHelper.ObjToStr(auditInfo, "yyyy-MM-dd HH:mm:ss"));
using (var uow = UnitOfWorkManager.Begin(true,isTransactional:false)) using (var uow = UnitOfWorkManager.Begin())
{ {
await AuditLogRepository.InsertAsync(await Converter.ConvertAsync(auditInfo)); await AuditLogRepository.InsertAsync(await Converter.ConvertAsync(auditInfo));
await uow.CompleteAsync(); await uow.CompleteAsync();

4
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Analyses/BbsUserAnalyseService.cs
View File

@@ -116,7 +116,9 @@ namespace Yi.Framework.Bbs.Application.Services.Analyses
) )
.ToPageListAsync(pageIndex, input.MaxResultCount, total); .ToPageListAsync(pageIndex, input.MaxResultCount, total);
output.ForEach(x => { x.LevelName = _bbsUserManager._levelCacheDic[x.Level].Name; }); var levelCache = await _bbsUserManager.GetLevelCacheMapAsync();
output.ForEach(x => { x.LevelName = levelCache[x.Level].Name; });
return new PagedResultDto<MoneyTopUserDto> return new PagedResultDto<MoneyTopUserDto>
{ {
Items = output, Items = output,

6
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Application/Services/Forum/DiscussService.cs
View File

@@ -158,10 +158,11 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
//查询完主题之后，要过滤一下私有的主题信息 //查询完主题之后，要过滤一下私有的主题信息
items.ApplyPermissionTypeFilter(CurrentUser.Id ?? Guid.Empty); items.ApplyPermissionTypeFilter(CurrentUser.Id ?? Guid.Empty);
var levelCacheDic= await _bbsUserManager.GetLevelCacheMapAsync();
//等级、是否点赞赋值 //等级、是否点赞赋值
items?.ForEach(x => items?.ForEach(x =>
{ {
x.User.LevelName = _bbsUserManager._levelCacheDic[x.User.Level].Name; x.User.LevelName = levelCacheDic[x.User.Level].Name;
if (CurrentUser.Id is not null) if (CurrentUser.Id is not null)
{ {
//默认fasle //默认fasle
@@ -212,7 +213,8 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
} }
}, true) }, true)
.ToListAsync(); .ToListAsync();
output?.ForEach(x => x.User.LevelName = _bbsUserManager._levelCacheDic[x.User.Level].Name); var levelCacheDic= await _bbsUserManager.GetLevelCacheMapAsync();
output?.ForEach(x => x.User.LevelName = levelCacheDic[x.User.Level].Name);
return output; return output;
} }

16
Yi.Abp.Net8/module/bbs/Yi.Framework.Bbs.Domain/Managers/BbsUserManager.cs
View File

@@ -14,7 +14,8 @@ namespace Yi.Framework.Bbs.Domain.Managers
{ {
public ISqlSugarRepository<UserAggregateRoot> _userRepository; public ISqlSugarRepository<UserAggregateRoot> _userRepository;
public ISqlSugarRepository<BbsUserExtraInfoEntity> _bbsUserInfoRepository; public ISqlSugarRepository<BbsUserExtraInfoEntity> _bbsUserInfoRepository;
public Dictionary<int, LevelCacheItem> _levelCacheDic; // public Dictionary<int, LevelCacheItem> _levelCacheDic;
private LevelManager _levelManager;
public BbsUserManager(ISqlSugarRepository<UserAggregateRoot> userRepository, public BbsUserManager(ISqlSugarRepository<UserAggregateRoot> userRepository,
ISqlSugarRepository<BbsUserExtraInfoEntity> bbsUserInfoRepository, ISqlSugarRepository<BbsUserExtraInfoEntity> bbsUserInfoRepository,
@@ -23,7 +24,12 @@ namespace Yi.Framework.Bbs.Domain.Managers
{ {
_userRepository = userRepository; _userRepository = userRepository;
_bbsUserInfoRepository = bbsUserInfoRepository; _bbsUserInfoRepository = bbsUserInfoRepository;
_levelCacheDic = levelManager.GetCacheMapAsync().Result; _levelManager = levelManager;
}
public async Task<Dictionary<int, LevelCacheItem>> GetLevelCacheMapAsync()
{
return await _levelManager.GetCacheMapAsync();
} }
public async Task<BbsUserInfoDto?> GetBbsUserInfoAsync(Guid userId) public async Task<BbsUserInfoDto?> GetBbsUserInfoAsync(Guid userId)
@@ -44,7 +50,8 @@ namespace Yi.Framework.Bbs.Domain.Managers
}, true) }, true)
.FirstAsync(user => user.Id == userId); .FirstAsync(user => user.Id == userId);
userInfo.LevelName = _levelCacheDic[userInfo.Level].Name; var levelCacheDic= await GetLevelCacheMapAsync();
userInfo.LevelName = levelCacheDic[userInfo.Level].Name;
return userInfo; return userInfo;
} }
@@ -66,7 +73,8 @@ namespace Yi.Framework.Bbs.Domain.Managers
DiscussNumber = info.DiscussNumber DiscussNumber = info.DiscussNumber
}, true) }, true)
.ToListAsync(); .ToListAsync();
userInfos?.ForEach(userInfo => userInfo.LevelName = _levelCacheDic[userInfo.Level].Name); var levelCacheDic= await GetLevelCacheMapAsync();
userInfos?.ForEach(userInfo => userInfo.LevelName =levelCacheDic[userInfo.Level].Name);
return userInfos ?? new List<BbsUserInfoDto>(); return userInfos ?? new List<BbsUserInfoDto>();
} }