@@ -36,6 +36,9 @@ and limitations under the License.
3636 修改标识:Senparc - 20180526
3737 修改描述:v0.2.9 添加 SerializerHelper.GetObject(this string jsonString, Type type) 方法
3838
39+ 修改标识:Senparc - 20220331
40+ 修改描述:v2.0.5.4 添加 GetObject() 方法的 settings 参数
41+
3942----------------------------------------------------------------*/
4043
4144
@@ -87,10 +90,11 @@ public static string GetJsonString(object data, JsonSetting jsonSetting = null)
8790 /// </summary>
8891 /// <typeparam name="T">反序列化对象类型</typeparam>
8992 /// <param name="jsonString">JSON字符串</param>
93+ /// <param name="settings">JsonSerializerSettings</param>
9094 /// <returns></returns>
91- public static T GetObject < T > ( this string jsonString )
95+ public static T GetObject < T > ( this string jsonString , Newtonsoft . Json . JsonSerializerSettings settings = null )
9296 {
93- return ( T ) Newtonsoft . Json . JsonConvert . DeserializeObject ( jsonString , typeof ( T ) ) ;
97+ return ( T ) Newtonsoft . Json . JsonConvert . DeserializeObject ( jsonString , typeof ( T ) , settings ) ;
9498 //#if NET451
9599 // JavaScriptSerializer jsSerializer = new JavaScriptSerializer();
96100 // return jsSerializer.Deserialize<T>(jsonString);
@@ -104,10 +108,11 @@ public static T GetObject<T>(this string jsonString)
104108 /// </summary>
105109 /// <param name="jsonString">JSON字符串</param>
106110 /// <param name="type">反序列化类型</param>
111+ /// <param name="settings">JsonSerializerSettings</param>
107112 /// <returns></returns>
108- public static object GetObject ( this string jsonString , Type type )
113+ public static object GetObject ( this string jsonString , Type type , Newtonsoft . Json . JsonSerializerSettings settings = null )
109114 {
110- return Newtonsoft . Json . JsonConvert . DeserializeObject ( jsonString , type ) ;
115+ return Newtonsoft . Json . JsonConvert . DeserializeObject ( jsonString , type , settings ) ;
111116 }
112117
113118 // #region 序列化对象 - byte[]
0 commit comments