将 Newtonsoft.Json 更换为 System.Text.Json

ojdev · Dec 14, 2022 · 4d89965 · 4d89965
1 parent 84a50de
commit 4d89965
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/RabbitMQ.EventBus.AspNetCore.Sample/Controllers/ValuesController.cs b/RabbitMQ.EventBus.AspNetCore.Sample/Controllers/ValuesController.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
 using System;
 using System.Threading.Tasks;
 

diff --git a/src/RabbitMQ.EventBus.AspNetCore/Extensions/DynamicExtensions.cs b/src/RabbitMQ.EventBus.AspNetCore/Extensions/DynamicExtensions.cs
@@ -11,10 +11,12 @@ internal static class DynamicExtensions
     /// <typeparam name="TMessage"></typeparam>
     /// <param name="message"></param>
     /// <returns></returns>
-    public static string Serialize<TMessage>(this TMessage message)
+    public static string Serialize<TMessage>(this TMessage message) => JsonSerializer.Serialize(message, new JsonSerializerOptions
     {
-        return JsonConvert.SerializeObject(message);
-    }
+        PropertyNameCaseInsensitive = true,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        NumberHandling = JsonNumberHandling.AllowReadingFromString
+    });
     /// <summary>
     /// 
     /// </summary>
@@ -36,7 +38,12 @@ public static TResponse Deserialize<TResponse>(this string message)
         {
             try
             {
-                return JsonConvert.DeserializeObject<TResponse>(message);
+                return JsonSerializer.Deserialize<TResponse>(message, new JsonSerializerOptions
+                {
+                    PropertyNameCaseInsensitive = true,
+                    Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+                    NumberHandling = JsonNumberHandling.AllowReadingFromString
+                });
             }
             catch
             {

diff --git a/src/RabbitMQ.EventBus.AspNetCore/GlobalUsings.cs b/src/RabbitMQ.EventBus.AspNetCore/GlobalUsings.cs
@@ -1,7 +1,6 @@
 global using Microsoft.Extensions.DependencyInjection;
 global using Microsoft.Extensions.DependencyInjection.Extensions;
 global using Microsoft.Extensions.Logging;
-global using Newtonsoft.Json;
 global using Polly;
 global using Polly.Retry;
 global using RabbitMQ.Client;
@@ -21,6 +20,8 @@
 global using System.Linq;
 global using System.Net.Sockets;
 global using System.Text;
+global using System.Text.Encodings.Web;
+global using System.Text.Json;
+global using System.Text.Json.Serialization;
 global using System.Threading;
 global using System.Threading.Tasks;
-
diff --git a/src/RabbitMQ.EventBus.AspNetCore/RabbitMQ.EventBus.AspNetCore.csproj b/src/RabbitMQ.EventBus.AspNetCore/RabbitMQ.EventBus.AspNetCore.csproj
@@ -26,7 +26,6 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Polly" Version="7.2.3" />
     <PackageReference Include="RabbitMQ.Client" Version="6.4.0" />
   </ItemGroup>