Merge pull request #235 from Senparc/Develop_PUT_and_DELETE

v2.0.5.4 添加 GetObject() 方法的 settings 参数
Senparc · Apr 1, 2022 · 2773202 · 2773202
2 parents 1e65654 + 577cb2e
commit 2773202
Show file tree

Hide file tree

Showing 2 changed files with 189 additions and 183 deletions.
diff --git a/src/Senparc.CO2NET/Helpers/Serializers/SerializerHelper.cs b/src/Senparc.CO2NET/Helpers/Serializers/SerializerHelper.cs
@@ -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 参数
+
 ----------------------------------------------------------------*/
 
 
@@ -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);
@@ -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[]