Merge pull request #244 from EternityTeam/master

Json扩展支持JsonSerializerSettings
This commit is contained in:
2881099 2020-03-21 11:25:13 +08:00 committed by GitHub
commit 386354db16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -15,16 +15,21 @@ namespace FreeSql.Extensions
static object _isAopedLock = new object();
static ConcurrentDictionary<Type, bool> _dicTypes = new ConcurrentDictionary<Type, bool>();
static MethodInfo MethodJsonConvertDeserializeObject = typeof(JsonConvert).GetMethod("DeserializeObject", new[] { typeof(string), typeof(Type) });
static MethodInfo MethodJsonConvertSerializeObject = typeof(JsonConvert).GetMethod("SerializeObject", new[] { typeof(object) });
static MethodInfo MethodJsonConvertSerializeObject = typeof(JsonConvert).GetMethod("SerializeObject", new[] { typeof(object), typeof(JsonSerializerSettings) });
/// <summary>
/// 当实体类属性为【对象】时,并且标记特性 [JsonMap] 时该属性将以JSON形式映射存储
/// </summary>
/// <returns></returns>
public static void UseJsonMap(this IFreeSql that)
{
UseJsonMap(that, null);
}
public static void UseJsonMap(this IFreeSql that, JsonSerializerSettings settings)
{
if (_isAoped == false)
lock(_isAopedLock)
lock (_isAopedLock)
if (_isAoped == false)
{
_isAoped = true;
@ -46,7 +51,7 @@ namespace FreeSql.Extensions
{
return Expression.IfThenElse(
Expression.TypeEqual(valueExp, e.Property.PropertyType),
Expression.Return(returnTarget, Expression.Call(MethodJsonConvertSerializeObject, Expression.Convert(valueExp, typeof(object))), typeof(object)),
Expression.Return(returnTarget, Expression.Call(MethodJsonConvertSerializeObject, Expression.Convert(valueExp, typeof(object)), Expression.Constant(settings)), typeof(object)),
elseExp);
});
}
@ -54,5 +59,6 @@ namespace FreeSql.Extensions
});
}
}
}
}