将Newtonsoft.Json库替换为System.Text.Json库。

aaasoft · aaasoft · commit 39aa77c97724 · 2023-12-04T09:58:09.000+08:00
diff --git a/QpTestClient/ConnectForm.cs b/QpTestClient/ConnectForm.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+﻿using System.Text.Json;
 using Quick.Protocol;
 using Quick.Protocol.Utils;
 using Quick.Xml;
@@ -58,8 +58,8 @@ private void cbConnectType_SelectedIndexChanged(object sender, EventArgs e)
             QpClientOptions options = null;
             if (ConnectionInfo != null && qpClientTypeInfo.QpClientType.FullName == ConnectionInfo.QpClientTypeName)
             {
-                options = (QpClientOptions)JsonConvert.DeserializeObject(
-                    JsonConvert.SerializeObject(ConnectionInfo.QpClientOptions),
+                options = (QpClientOptions)JsonSerializer.Deserialize(
+                    JsonSerializer.Serialize(ConnectionInfo.QpClientOptions),
                     qpClientTypeInfo.QpClientOptionsType);
             }
             else
diff --git a/Quick.Protocol.Tcp/QpTcpServerOptions.cs b/Quick.Protocol.Tcp/QpTcpServerOptions.cs
@@ -1,8 +1,6 @@
-﻿using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
+﻿using System;
 using System.Net;
-using System.Text;
+using System.Text.Json.Serialization;
 
 namespace Quick.Protocol.Tcp
 {
diff --git a/Quick.Protocol.WebSocket.Server.AspNetCore/QpWebSocketServerOptions.cs b/Quick.Protocol.WebSocket.Server.AspNetCore/QpWebSocketServerOptions.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+﻿using System.Text.Json;
 using System;
 using System.Collections.Generic;
 using System.Net;
diff --git a/Quick.Protocol.WebSocket.Server.AspNetCore/QuickProtocolMiddlewareExtensions.cs b/Quick.Protocol.WebSocket.Server.AspNetCore/QuickProtocolMiddlewareExtensions.cs
@@ -1,5 +1,5 @@
 ﻿using Microsoft.AspNetCore.Http;
-using Newtonsoft.Json;
+using System.Text.Json;
 using Quick.Protocol;
 using Quick.Protocol.WebSocket.Server.AspNetCore;
 using System;
diff --git a/Quick.Protocol/Commands/Authenticate/Request.cs b/Quick.Protocol/Commands/Authenticate/Request.cs
@@ -1,7 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Text;
+﻿using System.ComponentModel;
 
 namespace Quick.Protocol.Commands.Authenticate
 {
diff --git a/Quick.Protocol/QpChannel.cs b/Quick.Protocol/QpChannel.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+﻿using System.Text.Json;
 using Quick.Protocol.Exceptions;
 using Quick.Protocol.Utils;
 using System;
@@ -507,7 +507,7 @@ public Task SendNoticePackage(string noticePackageTypeName, string noticePackage
         /// </summary>
         public Task SendNoticePackage(object package)
         {
-            return SendNoticePackage(package.GetType().FullName, JsonConvert.SerializeObject(package));
+            return SendNoticePackage(package.GetType().FullName, JsonSerializer.Serialize(package));
         }
 
         /// <summary>
@@ -519,7 +519,7 @@ public async Task SendCommandRequest(object request)
         {
             var requestType = request.GetType();
             var typeName = requestType.FullName;
-            var requestContent = JsonConvert.SerializeObject(request);
+            var requestContent = JsonSerializer.Serialize(request);
             await SendCommandRequestPackage(CommandContext.GenerateNewId(), typeName, requestContent).ConfigureAwait(false);
         }
 
@@ -840,7 +840,7 @@ protected void OnRawNoticePackageReceived(string typeName, string content)
             //如果在字典中未找到此类型名称，则直接返回
             if (!noticeTypeDict.ContainsKey(typeName))
                 return;
-            var contentModel = JsonConvert.DeserializeObject(content, noticeTypeDict[typeName]);
+            var contentModel = JsonSerializer.Deserialize(content, noticeTypeDict[typeName]);
 
             //处理通知
             var hasNoticeHandler = false;
@@ -895,7 +895,7 @@ private void OnCommandRequestReceived(string commandId, string typeName, string
                 var cmdRequestType = commandRequestTypeDict[typeName];
                 var cmdResponseType = commandRequestTypeResponseTypeDict[cmdRequestType];
 
-                var contentModel = JsonConvert.DeserializeObject(content, cmdRequestType);
+                var contentModel = JsonSerializer.Deserialize(content, cmdRequestType);
                 CommandRequestPackageReceived?.Invoke(this, new CommandRequestPackageReceivedEventArgs()
                 {
                     CommandId = commandId,
@@ -911,7 +911,7 @@ private void OnCommandRequestReceived(string commandId, string typeName, string
                         {
                             hasCommandExecuter = true;
                             var responseModel = commandExecuterManager.ExecuteCommand(this, typeName, contentModel);
-                            SendCommandResponsePackage(commandId, 0, null, cmdResponseType.FullName, JsonConvert.SerializeObject(responseModel));
+                            SendCommandResponsePackage(commandId, 0, null, cmdResponseType.FullName, JsonSerializer.Serialize(responseModel));
                             break;
                         }
                     }
@@ -1157,7 +1157,7 @@ public async Task<TCmdResponse> SendCommand<TCmdResponse>(IQpCommandRequest<TCmd
         {
             var requestType = request.GetType();
             var typeName = requestType.FullName;
-            var requestContent = JsonConvert.SerializeObject(request);
+            var requestContent = JsonSerializer.Serialize(request, requestType);
 
             var commandContext = new CommandContext(typeName);
             commandDict.TryAdd(commandContext.Id, commandContext);
@@ -1192,7 +1192,7 @@ await Task.Run(() => SendCommandRequestPackage(commandContext.Id, typeName, requ
                     .WaitAsync(TimeSpan.FromMilliseconds(timeout))
                     .ConfigureAwait(false);
             }
-            return JsonConvert.DeserializeObject<TCmdResponse>(ret.Content);
+            return JsonSerializer.Deserialize<TCmdResponse>(ret.Content);
         }
     }
 }
diff --git a/Quick.Protocol/QpChannelOptions.cs b/Quick.Protocol/QpChannelOptions.cs
@@ -1,9 +1,8 @@
-﻿using Newtonsoft.Json;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using System.Text;
+using System.Text.Json.Serialization;
 
 namespace Quick.Protocol
 {
diff --git a/Quick.Protocol/QpClientOptions.cs b/Quick.Protocol/QpClientOptions.cs
@@ -1,9 +1,9 @@
-﻿using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
+﻿using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
+using System.Text.Json;
+using System.Text.Json.Nodes;
 
 namespace Quick.Protocol
 {
@@ -71,12 +71,43 @@ protected virtual void LoadFromUri(Uri uri)
             if (string.IsNullOrEmpty(uri.Query))
                 return;
             var queryString = System.Web.HttpUtility.ParseQueryString(uri.Query);
-            JObject jObj = new JObject();
+            var type = this.GetType();
             foreach (var key in queryString.AllKeys)
             {
-                jObj.Add(key, queryString[key]);
+                var pi = type.GetProperty(key);
+                if (pi == null)
+                    continue;
+                var propertyType = pi.PropertyType;
+                var stringValue = queryString[key];
+                object propertyValue = stringValue;
+                if (propertyType == typeof(bool))
+                    propertyValue = Convert.ToBoolean(stringValue);
+                else if (propertyType == typeof(byte))
+                    propertyValue = Convert.ToByte(stringValue);
+                else if (propertyType == typeof(sbyte))
+                    propertyValue = Convert.ToSByte(stringValue);
+                else if (propertyType == typeof(short))
+                    propertyValue = Convert.ToInt16(stringValue);
+                else if (propertyType == typeof(ushort))
+                    propertyValue = Convert.ToUInt16(stringValue);
+                else if (propertyType == typeof(int))
+                    propertyValue = Convert.ToInt32(stringValue);
+                else if (propertyType == typeof(uint))
+                    propertyValue = Convert.ToUInt32(stringValue);
+                else if (propertyType == typeof(long))
+                    propertyValue = Convert.ToInt64(stringValue);
+                else if (propertyType == typeof(ulong))
+                    propertyValue = Convert.ToUInt64(stringValue);
+                else if (propertyType == typeof(float))
+                    propertyValue = Convert.ToSingle(stringValue);
+                else if (propertyType == typeof(double))
+                    propertyValue = Convert.ToDouble(stringValue);
+                else if (propertyType == typeof(decimal))
+                    propertyValue = Convert.ToDecimal(stringValue);
+                else if (propertyType == typeof(DateTime))
+                    propertyValue = Convert.ToDateTime(stringValue);
+                pi.SetValue(this, propertyValue);
             }
-            JsonConvert.PopulateObject(jObj.ToString(), this);
         }
 
         protected abstract string ToUriBasic(HashSet<string> ignorePropertyNames);
@@ -93,26 +124,25 @@ public Uri ToUri(bool includePassword = false, bool includeOtherProperty = false
             {
                 StringBuilder sb = new StringBuilder(baseUrl);
                 int currentIndex = 0;
-
-                var jObj = JObject.FromObject(this);
-                foreach (var property in jObj.Properties())
+                var jObj = JsonNode.Parse(JsonSerializer.Serialize(this)).AsObject();
+                foreach (var property in jObj)
                 {
-                    var key = property.Name;
+                    var key = property.Key;
                     if (ignorePropertyNames.Contains(key))
                         continue;
-                    if (!includeOtherProperty && key!=nameof(Password))
+                    if (!includeOtherProperty && key != nameof(Password))
                         continue;
-                    if (currentIndex==0)
+                    if (currentIndex == 0)
                         sb.Append("?");
-                    if (currentIndex>0)
+                    if (currentIndex > 0)
                         sb.Append("&");
                     currentIndex++;
 
                     var value = property.Value.ToString();
-                    value=System.Web.HttpUtility.UrlEncode(value);
+                    value = System.Web.HttpUtility.UrlEncode(value);
                     sb.Append($"{key}={value}");
                 }
-                baseUrl=sb.ToString();
+                baseUrl = sb.ToString();
             }
             Uri uri = new Uri(baseUrl);
             return uri;
diff --git a/Quick.Protocol/QpCommandInfo.cs b/Quick.Protocol/QpCommandInfo.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+﻿using System.Text.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -63,11 +63,11 @@ public QpCommandInfo(string name, string description,
 
             this.requestType = requestType;
             RequestTypeName = requestType.FullName;
-            RequestTypeSchemaSample = JsonConvert.SerializeObject(defaultRequestTypeInstance, Formatting.Indented);
+            RequestTypeSchemaSample = JsonSerializer.Serialize(defaultRequestTypeInstance, new JsonSerializerOptions() { WriteIndented = true });
 
             this.responseType = responseType;
             ResponseTypeName = responseType.FullName;
-            ResponseTypeSchemaSample = JsonConvert.SerializeObject(defaultResponseTypeInstance, Formatting.Indented);
+            ResponseTypeSchemaSample = JsonSerializer.Serialize(defaultResponseTypeInstance, new JsonSerializerOptions() { WriteIndented = true });
         }
 
         /// <summary>
diff --git a/Quick.Protocol/QpInstruction.cs b/Quick.Protocol/QpInstruction.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+﻿using System.Text.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/Quick.Protocol/QpNoticeInfo.cs b/Quick.Protocol/QpNoticeInfo.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+﻿using System.Text.Json;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -40,7 +40,7 @@ public QpNoticeInfo(string name, string description, Type noticeType, object def
             Description = description;
             this.noticeType = noticeType;
             NoticeTypeName = noticeType.FullName;
-            NoticeTypeSchemaSample = JsonConvert.SerializeObject(defaultNoticeTypeInstance, Formatting.Indented);
+            NoticeTypeSchemaSample = JsonSerializer.Serialize(defaultNoticeTypeInstance, new JsonSerializerOptions() { WriteIndented = true });
         }
 
         /// <summary>
diff --git a/Quick.Protocol/QpServerChannel.cs b/Quick.Protocol/QpServerChannel.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/Quick.Protocol/QpServerOptions.cs b/Quick.Protocol/QpServerOptions.cs
@@ -1,8 +1,7 @@
-﻿using Newtonsoft.Json;
+﻿using System.Text.Json;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Text;
+using System.Text.Json.Serialization;
 
 namespace Quick.Protocol
 {
@@ -38,7 +37,7 @@ public virtual QpServer CreateServer()
 
         public virtual QpServerOptions Clone()
         {
-            var ret = JsonConvert.DeserializeObject<QpServerOptions>(JsonConvert.SerializeObject(this));
+            var ret = JsonSerializer.Deserialize<QpServerOptions>(JsonSerializer.Serialize(this));
             ret.InstructionSet = InstructionSet;
             ret.CommandExecuterManagerList = CommandExecuterManagerList;
             ret.NoticeHandlerManagerList = NoticeHandlerManagerList;
diff --git a/Quick.Protocol/Quick.Protocol.csproj b/Quick.Protocol/Quick.Protocol.csproj
@@ -21,8 +21,4 @@
 		</None>
 	</ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-	</ItemGroup>
-
 </Project>
diff --git a/Test/Pipeline/PipelineClient/Program.cs b/Test/Pipeline/PipelineClient/Program.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+﻿using System.Text.Json;
 using System;
 
 namespace PipelineClient
@@ -48,7 +48,7 @@ static void Main(string[] args)
                             Action = "Echo",
                             Content = DateTime.Now.ToString()
                         });
-                    Console.WriteLine("SendCommand Success.Rep:" + JsonConvert.SerializeObject(rep));
+                    Console.WriteLine("SendCommand Success.Rep:" + JsonSerializer.Serialize(rep));
                 }
                 catch (Exception ex)
                 {
diff --git a/Test/Pipeline/PipelineServer/Program.cs b/Test/Pipeline/PipelineServer/Program.cs
@@ -1,4 +1,4 @@
-﻿using Newtonsoft.Json;
+﻿using System.Text.Json;
 using Quick.Protocol;
 using System;
 
@@ -28,7 +28,7 @@ static void Main(string[] args)
             noticeHandlerManager.Register<Quick.Protocol.Notices.PrivateNotice>(
                 (handler, notice) =>
                 {
-                    Console.WriteLine($"收到PrivateNotice: {JsonConvert.SerializeObject(notice)}");
+                    Console.WriteLine($"收到PrivateNotice: {JsonSerializer.Serialize(notice)}");
                 });
             var serverOptions = new Quick.Protocol.Pipeline.QpPipelineServerOptions()
             {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Newtonsoft.Json;`
	`1`	`+using System.Text.Json;`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Net;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.ComponentModel;`
`4`		`-using System.Text;`
	`1`	`+using System.ComponentModel;`
`5`	`2`
`6`	`3`	`namespace Quick.Protocol.Commands.Authenticate`
`7`	`4`	`{`