Преглед на файлове

将Newtonsoft.Json改为Text.Json,删除无用的package

felix преди 2 години
родител
ревизия
589da7f479

BIN
Vinno.FIS.Sonopost/Features/Dicom/VinnoExtendedDataGenerator.cs


+ 31 - 3
Vinno.FIS.Sonopost/Helpers/JsonHelper.cs

@@ -1,4 +1,6 @@
-using System.Text.Json;
+using System;
+using System.Text.Json;
+using Vinno.IUS.Common.Log;
 
 namespace Vinno.FIS.Sonopost.Helpers
 {
@@ -16,8 +18,9 @@ namespace Vinno.FIS.Sonopost.Helpers
             {
                 return JsonSerializer.Serialize(obj, options);
             }
-            catch
+            catch (Exception ex)
             {
+                Logger.WriteLineError($"JsonHelper To Json {obj} Error:{ex}");
                 return string.Empty;
             }
         }
@@ -39,8 +42,33 @@ namespace Vinno.FIS.Sonopost.Helpers
             {
                 return JsonSerializer.Deserialize<T>(jsonStr, options);
             }
-            catch
+            catch (Exception ex)
             {
+                Logger.WriteLineError($"JsonHelper JsonToObj {jsonStr} Error:{ex}");
+                return default;
+            }
+        }
+
+        /// <summary>
+        /// convert json to object
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="jsonStr"></param>
+        /// <param name="options"></param>
+        /// <returns></returns>
+        public static object JsonToObj(string jsonStr, Type type, JsonSerializerOptions options = null)
+        {
+            if (string.IsNullOrWhiteSpace(jsonStr))
+            {
+                return default;
+            }
+            try
+            {
+                return JsonSerializer.Deserialize(jsonStr, type, options);
+            }
+            catch (Exception ex)
+            {
+                Logger.WriteLineError($"JsonHelper JsonToObj {jsonStr} Error:{ex}");
                 return default;
             }
         }

BIN
Vinno.FIS.Sonopost/Managers/TestManager.cs


BIN
Vinno.FIS.Sonopost/WebApi/Models/Result.cs


BIN
Vinno.FIS.Sonopost/WebApi/WebApiEngine.cs


BIN
Vinno.vCloud.Common.FIS/vCloudTerminalV2.cs


BIN
packages/RasonicSignalDetection/RasonicSignalDetectionCSLib.dll


BIN
packages/RasonicSignalDetection/RasonicSignalDetectionCore.dll


BIN
packages/RasonicSignalDetection/opencv_world320.dll


BIN
packages/SkiaSharp.QrCode.0.3.1/.signature.p7s


BIN
packages/SkiaSharp.QrCode.0.3.1/SkiaSharp.QrCode.0.3.1.nupkg


BIN
packages/SkiaSharp.QrCode.0.3.1/lib/netstandard2.0/SkiaSharp.QrCode.dll