diff --git a/Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs b/Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs index a8630d74..efac4d3f 100644 --- a/Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs +++ b/Extensions/FreeSql.Extensions.JsonMap/JsonMapCore.cs @@ -15,16 +15,21 @@ namespace FreeSql.Extensions static object _isAopedLock = new object(); static ConcurrentDictionary _dicTypes = new ConcurrentDictionary(); 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) }); /// /// 当实体类属性为【对象】时,并且标记特性 [JsonMap] 时,该属性将以JSON形式映射存储 /// /// 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 }); } } + } }