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

fix: 修复pure若干问题

Browse Source
This commit is contained in:
橙子
2024-12-15 11:32:04 +08:00
parent 8408b39fbb
commit 8a26a4aeec
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Yi.Abp.Net8/module/rbac/Yi.Framework.Rbac.Domain/Operlog/OperLogGlobalAttribute.cs
View File

@@ -6,6 +6,7 @@ using Microsoft.Extensions.Logging;
using Newtonsoft.Json; using Newtonsoft.Json;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
using Volo.Abp.Uow;
using Volo.Abp.Users; using Volo.Abp.Users;
using Yi.Framework.Core.Extensions; using Yi.Framework.Core.Extensions;
using Yi.Framework.Core.Helper; using Yi.Framework.Core.Helper;
@@ -18,12 +19,15 @@ namespace Yi.Framework.Rbac.Domain.Operlog
private ILogger<OperLogGlobalAttribute> _logger; private ILogger<OperLogGlobalAttribute> _logger;
private IRepository<OperationLogEntity> _repository; private IRepository<OperationLogEntity> _repository;
private ICurrentUser _currentUser; private ICurrentUser _currentUser;
private IUnitOfWorkManager _unitOfWorkManager;
//注入一个日志服务 //注入一个日志服务
public OperLogGlobalAttribute(ILogger<OperLogGlobalAttribute> logger, IRepository<OperationLogEntity> repository, ICurrentUser currentUser) public OperLogGlobalAttribute(ILogger<OperLogGlobalAttribute> logger, IRepository<OperationLogEntity> repository, ICurrentUser currentUser, IUnitOfWorkManager unitOfWorkManager)
{ {
_logger = logger; _logger = logger;
_repository = repository; _repository = repository;
_currentUser = currentUser; _currentUser = currentUser;
_unitOfWorkManager = unitOfWorkManager;
} }
public override async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next) public override async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
@@ -35,8 +39,9 @@ namespace Yi.Framework.Rbac.Domain.Operlog
if (resultContext.ActionDescriptor is not ControllerActionDescriptor controllerActionDescriptor) return; if (resultContext.ActionDescriptor is not ControllerActionDescriptor controllerActionDescriptor) return;
//查找标签，获取标签对象 //查找标签，获取标签对象
OperLogAttribute? operLogAttribute = controllerActionDescriptor.MethodInfo.GetCustomAttributes(inherit: true) OperLogAttribute? operLogAttribute = controllerActionDescriptor.MethodInfo
.FirstOrDefault(a => a.GetType().Equals(typeof(OperLogAttribute))) as OperLogAttribute; .GetCustomAttributes(inherit: true)
.FirstOrDefault(a => a.GetType().Equals(typeof(OperLogAttribute))) as OperLogAttribute;
//空对象直接返回 //空对象直接返回
if (operLogAttribute is null) return; if (operLogAttribute is null) return;
@@ -48,7 +53,7 @@ namespace Yi.Framework.Rbac.Domain.Operlog
//获取Ip //获取Ip
string ip = resultContext.HttpContext.GetClientIp(); string ip = resultContext.HttpContext.GetClientIp();
//根据ip获取地址 //根据ip获取地址
string location = ""; string location = "";
try try
{ {
@@ -78,6 +83,7 @@ namespace Yi.Framework.Rbac.Domain.Operlog
{ {
logEntity.RequestResult = result.Content?.Replace("\r\n", "").Trim(); logEntity.RequestResult = result.Content?.Replace("\r\n", "").Trim();
} }
if (resultContext.Result is JsonResult result2) if (resultContext.Result is JsonResult result2)
{ {
logEntity.RequestResult = result2.Value?.ToString(); logEntity.RequestResult = result2.Value?.ToString();
@@ -92,14 +98,13 @@ namespace Yi.Framework.Rbac.Domain.Operlog
if (operLogAttribute.IsSaveRequestData) if (operLogAttribute.IsSaveRequestData)
{ {
//不建议保存，吃性能
//保存请求参数
logEntity.RequestParam = JsonConvert.SerializeObject(context.ActionArguments); logEntity.RequestParam = JsonConvert.SerializeObject(context.ActionArguments);
} }
await _repository.InsertAsync(logEntity); using (var uow = _unitOfWorkManager.Begin())
{
await _repository.InsertAsync(logEntity);
}
} }
} }