diff --git a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs index aaf0de4..3c596c1 100644 --- a/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs +++ b/ZR.Admin.WebApi/Filters/ActionPermissionFilter.cs @@ -76,7 +76,7 @@ namespace ZR.Admin.WebApi.Filters Data = url }) { - ContentType = "text/json", + ContentType = "application/json", }; context.Result = result; } diff --git a/ZR.Admin.WebApi/Filters/LogActionFilter.cs b/ZR.Admin.WebApi/Filters/LogActionFilter.cs index 82f0931..1c52b59 100644 --- a/ZR.Admin.WebApi/Filters/LogActionFilter.cs +++ b/ZR.Admin.WebApi/Filters/LogActionFilter.cs @@ -1,10 +1,12 @@ using Infrastructure; using Infrastructure.Attribute; +using Infrastructure.Model; using IPTools.Core; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Controllers; using Microsoft.AspNetCore.Mvc.Filters; +using Newtonsoft.Json; using NLog; using System; using System.IO; @@ -41,11 +43,14 @@ namespace ZR.Admin.WebApi.Filters // 获取当前的用户 string userName = context.HttpContext.GetName(); string jsonResult = string.Empty; - if (context.Result is ContentResult result && result.ContentType == "application/json") { jsonResult = result.Content.Replace("\r\n", "").Trim(); } + if (context.Result is JsonResult result2) + { + jsonResult = result2.Value?.ToString(); + } //获取当前执行方法的类名 //string className = System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name; //获取当前成员的名称