|
|
@@ -1,10 +1,13 @@
|
|
|
-using System.Linq;
|
|
|
+using System;
|
|
|
+using System.Linq;
|
|
|
using System.Diagnostics;
|
|
|
using System.Threading.Tasks;
|
|
|
+using Microsoft.AspNetCore.Mvc;
|
|
|
+using Microsoft.AspNetCore.Mvc.Filters;
|
|
|
+using Microsoft.Extensions.Logging;
|
|
|
using Admin.Core.Common.Output;
|
|
|
using Admin.Core.Service.Admin.OprationLog;
|
|
|
using Admin.Core.Service.Admin.OprationLog.Input;
|
|
|
-using Microsoft.AspNetCore.Mvc.Filters;
|
|
|
//using Newtonsoft.Json;
|
|
|
|
|
|
namespace Admin.Core.Logs
|
|
|
@@ -14,14 +17,17 @@ namespace Admin.Core.Logs
|
|
|
/// </summary>
|
|
|
public class LogHandler : ILogHandler
|
|
|
{
|
|
|
+ private readonly ILogger _logger;
|
|
|
private readonly ApiHelper _apiHelper;
|
|
|
private readonly IOprationLogService _oprationLogService;
|
|
|
|
|
|
public LogHandler(
|
|
|
+ ILogger<LogHandler> logger,
|
|
|
ApiHelper apiHelper,
|
|
|
IOprationLogService oprationLogService
|
|
|
)
|
|
|
{
|
|
|
+ _logger = logger;
|
|
|
_apiHelper = apiHelper;
|
|
|
_oprationLogService = oprationLogService;
|
|
|
}
|
|
|
@@ -30,7 +36,7 @@ namespace Admin.Core.Logs
|
|
|
{
|
|
|
var sw = new Stopwatch();
|
|
|
sw.Start();
|
|
|
- dynamic actionResult = (await next()).Result;
|
|
|
+ var actionExecutedContext = await next();
|
|
|
sw.Stop();
|
|
|
|
|
|
//操作参数
|
|
|
@@ -38,19 +44,29 @@ namespace Admin.Core.Logs
|
|
|
//操作结果
|
|
|
//var result = JsonConvert.SerializeObject(actionResult?.Value);
|
|
|
|
|
|
- var res = actionResult?.Value as IResponseOutput;
|
|
|
-
|
|
|
- var input = new OprationLogAddInput
|
|
|
+ try
|
|
|
{
|
|
|
- ApiMethod = context.HttpContext.Request.Method.ToLower(),
|
|
|
- ApiPath = context.ActionDescriptor.AttributeRouteInfo.Template.ToLower(),
|
|
|
- ElapsedMilliseconds = sw.ElapsedMilliseconds,
|
|
|
- Status = res?.Success,
|
|
|
- Msg = res?.Msg
|
|
|
- };
|
|
|
- input.ApiLabel = _apiHelper.GetApis().FirstOrDefault(a => a.Path == input.ApiPath)?.Label;
|
|
|
+ var input = new OprationLogAddInput
|
|
|
+ {
|
|
|
+ ApiMethod = context.HttpContext.Request.Method.ToLower(),
|
|
|
+ ApiPath = context.ActionDescriptor.AttributeRouteInfo.Template.ToLower(),
|
|
|
+ ElapsedMilliseconds = sw.ElapsedMilliseconds
|
|
|
+ };
|
|
|
|
|
|
- await _oprationLogService.AddAsync(input);
|
|
|
+ if (actionExecutedContext.Result is ObjectResult result && result.Value is IResponseOutput res)
|
|
|
+ {
|
|
|
+ input.Status = res.Success;
|
|
|
+ input.Msg = res.Msg;
|
|
|
+ }
|
|
|
+
|
|
|
+ input.ApiLabel = _apiHelper.GetApis().FirstOrDefault(a => a.Path == input.ApiPath)?.Label;
|
|
|
+
|
|
|
+ await _oprationLogService.AddAsync(input);
|
|
|
+ }
|
|
|
+ catch (Exception ex)
|
|
|
+ {
|
|
|
+ _logger.LogError("操作日志插入异常：{@ex}", ex);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
xiaoxue