Skip to content

v2.0.5.4 添加 GetObject() 方法的 settings 参数 #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 1, 2022
Merged

v2.0.5.4 添加 GetObject() 方法的 settings 参数 #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions src/Senparc.CO2NET/Helpers/Serializers/SerializerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ and limitations under the License.
修改标识：Senparc - 20180526
修改描述：v0.2.9 添加 SerializerHelper.GetObject(this string jsonString, Type type) 方法

修改标识：Senparc - 20220331
修改描述：v2.0.5.4 添加 GetObject() 方法的 settings 参数

----------------------------------------------------------------*/


Expand Down Expand Up @@ -87,10 +90,11 @@ public static string GetJsonString(object data, JsonSetting jsonSetting = null)
/// </summary>
/// <typeparam name="T">反序列化对象类型</typeparam>
/// <param name="jsonString">JSON字符串</param>
/// <param name="settings">JsonSerializerSettings</param>
/// <returns></returns>
public static T GetObject<T>(this string jsonString)
public static T GetObject<T>(this string jsonString, Newtonsoft.Json.JsonSerializerSettings settings = null)
{
return (T)Newtonsoft.Json.JsonConvert.DeserializeObject(jsonString, typeof(T));
return (T)Newtonsoft.Json.JsonConvert.DeserializeObject(jsonString, typeof(T), settings);
//#if NET451
// JavaScriptSerializer jsSerializer = new JavaScriptSerializer();
// return jsSerializer.Deserialize<T>(jsonString);
Expand All @@ -104,10 +108,11 @@ public static T GetObject<T>(this string jsonString)
/// </summary>
/// <param name="jsonString">JSON字符串</param>
/// <param name="type">反序列化类型</param>
/// <param name="settings">JsonSerializerSettings</param>
/// <returns></returns>
public static object GetObject(this string jsonString, Type type)
public static object GetObject(this string jsonString, Type type, Newtonsoft.Json.JsonSerializerSettings settings = null)
{
return Newtonsoft.Json.JsonConvert.DeserializeObject(jsonString, type);
return Newtonsoft.Json.JsonConvert.DeserializeObject(jsonString, type, settings);
}

// #region 序列化对象 - byte[]
Expand Down
Loading