diff --git a/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NewtonsoftJsonSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NewtonsoftJsonSetup.cs index 2cc7bc03e..50b64c1b5 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NewtonsoftJsonSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NewtonsoftJsonSetup.cs @@ -1,6 +1,7 @@  using Microsoft.Extensions.DependencyInjection; using Newtonsoft.Json; +using System; namespace IRaCIS.Core.API { @@ -40,7 +41,19 @@ namespace IRaCIS.Core.API //}; }); - + + + Newtonsoft.Json.JsonSerializerSettings setting = new Newtonsoft.Json.JsonSerializerSettings(); + JsonConvert.DefaultSettings = new Func(() => + { + //日期类型默认格式化处理 + setting.DateFormatString = "yyyy-MM-dd HH:mm:ss"; + setting.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; + + return setting; + }); + + } } } diff --git a/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs b/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs index 9115908f6..39e359524 100644 --- a/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs +++ b/IRaCIS.Core.Application/BusinessFilter/ProjectExceptionFilter.cs @@ -36,11 +36,11 @@ namespace IRaCIS.Core.Application.Filter else { context.Result = new JsonResult(ResponseOutput.NotOk(" Program exception, please contact the developer! " + (context.Exception.InnerException is null ? (context.Exception.Message /*+ context.Exception.StackTrace*/) - : (context.Exception.InnerException?.Message /*+ context.Exception.InnerException?.StackTrace*/)) ), ApiResponseCodeEnum.ProgramException); + : (context.Exception.InnerException?.Message /*+ context.Exception.InnerException?.StackTrace*/)), ApiResponseCodeEnum.ProgramException)); } - _logger.LogError(context.Exception.InnerException is null ? (context.Exception.Message +context.Exception.StackTrace): (context.Exception.InnerException?.Message+ context.Exception.InnerException?.StackTrace)); + _logger.LogError(context.Exception.InnerException is null ? (context.Exception.Message + context.Exception.StackTrace) : (context.Exception.InnerException?.Message + context.Exception.InnerException?.StackTrace)); } diff --git a/IRaCIS.Core.Domain/Common/JsonConvert.cs b/IRaCIS.Core.Domain/Common/JsonConvert.cs index b2cbfcaf9..6d0d0cadd 100644 --- a/IRaCIS.Core.Domain/Common/JsonConvert.cs +++ b/IRaCIS.Core.Domain/Common/JsonConvert.cs @@ -17,12 +17,13 @@ namespace IRaCIS.Core.Domain.Common /// public static string ToJcJson(this object obj) { - JsonSerializerSettings settings = new JsonSerializerSettings(); - settings.PreserveReferencesHandling = PreserveReferencesHandling.Objects; - settings.ReferenceLoopHandling = ReferenceLoopHandling.Serialize; - return JsonConvert.SerializeObject(obj, settings); + //JsonSerializerSettings settings = new JsonSerializerSettings(); + //settings.PreserveReferencesHandling = PreserveReferencesHandling.Objects; + //settings.ReferenceLoopHandling = ReferenceLoopHandling.Serialize; + //return JsonConvert.SerializeObject(obj, settings); - //return JsonSerializer.Serialize(obj); + + return JsonConvert.SerializeObject(obj); } } } diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 9f469cf9a..4cdec6e2b 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -295,8 +295,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common var entity = data.Entity as T; inspection = f(entity); } - inspection.Identification = $"{GetRequestUrl()}/{ data.Entity.GetType().ToString().Substring(data.Entity.GetType().ToString().LastIndexOf('.') + 1)}/{type}"; - var originaldata = data.OriginalValues as T; + inspection.Identification = $"{_userInfo.RequestUrl}/{ data.Entity.GetType().Name}/{type}"; + var originaldata = data.OriginalValues.ToObject(); if (originaldata != null) { inspection.LastJsonDetail = originaldata.ToJcJson(); diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index bfc9e94fb..5aa1a4ede 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -356,7 +356,7 @@ namespace IRaCIS.Core.Infra.EFCore public override int SaveChanges() { //UpdateAuditInfo().GetAwaiter(); - AddAudit().GetAwaiter(); + AddAudit().GetAwaiter(); return base.SaveChanges(); }