Browse Source

Move GetSharedAuditingContractResolver to the JsonNetAuditSerializer class.

pull/1505/head
maliming 7 years ago
parent
commit
29ac532cb5
  1. 9
      framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingContractResolver.cs
  2. 23
      framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/JsonNetAuditSerializer.cs

9
framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/AuditingContractResolver.cs

@ -1,5 +1,4 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Reflection;
using Newtonsoft.Json;
@ -36,13 +35,5 @@ namespace Volo.Abp.Auditing
return property;
}
private static readonly ConcurrentDictionary<List<Type>, AuditingContractResolver> AuditingContractResolverdDictionary = new ConcurrentDictionary<List<Type>, AuditingContractResolver>();
public static AuditingContractResolver GetSharedAuditingContractResolver(List<Type> ignoredTypes)
{
return AuditingContractResolverdDictionary.GetOrAdd(ignoredTypes,
x => new AuditingContractResolver(ignoredTypes));
}
}
}

23
framework/src/Volo.Abp.Auditing/Volo/Abp/Auditing/JsonNetAuditSerializer.cs

@ -1,3 +1,5 @@
using System;
using System.Collections.Generic;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;
using Volo.Abp.DependencyInjection;
@ -18,10 +20,29 @@ namespace Volo.Abp.Auditing
{
var options = new JsonSerializerSettings
{
ContractResolver = AuditingContractResolver.GetSharedAuditingContractResolver(Options.IgnoredTypes)
ContractResolver = GetSharedAuditingContractResolver(Options.IgnoredTypes)
};
return JsonConvert.SerializeObject(obj, options);
}
private static readonly object SyncObj = new object();
private static AuditingContractResolver _sharedAuditingContractResolver;
public static AuditingContractResolver GetSharedAuditingContractResolver(List<Type> ignoredTypes)
{
if (_sharedAuditingContractResolver == null)
{
lock (SyncObj)
{
if (_sharedAuditingContractResolver == null)
{
_sharedAuditingContractResolver = new AuditingContractResolver(ignoredTypes);
}
}
}
return _sharedAuditingContractResolver;
}
}
}
Loading…
Cancel
Save