feat: 优化代码

Author: gmf520

src/OSharp.Utils/Http/HttpExtensions.cs

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 //  <copyright file="HttpClientExtensions.cs" company="OSharp开源团队">
 //      Copyright (c) 2014-2017 OSharp. All rights reserved.
 //  </copyright>
@@ -13,10 +13,9 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 
-using Newtonsoft.Json;
-
 using OSharp.Extensions;
 
 
@@ -38,7 +37,7 @@ public static async Task<TResult> GetAsync<TResult>(this HttpClient client, stri
             {
                 return json as TResult;
             }
-            return JsonConvert.DeserializeObject<TResult>(json);
+            return JsonSerializer.Deserialize<TResult>(json);
         }
 
         /// <summary>
@@ -66,14 +65,15 @@ public static async Task<TResult> PostAsync<TResult>(this HttpClient client, str
             HttpResponseMessage response = await client.PostAsync(url, data);
             if (!response.IsSuccessStatusCode)
             {
-                return default(TResult);
+                return null;
             }
             string json = await response.Content.ReadAsStringAsync();
             if (typeof(TResult) == typeof(string))
             {
                 return json as TResult;
             }
-            return JsonConvert.DeserializeObject<TResult>(json);
+
+            return JsonSerializer.Deserialize<TResult>(json);
         }
 
         /// <summary>
@@ -213,4 +213,4 @@ public static string GetHostUrl(this Uri uri)
             return $"{uri.Scheme}://{uri.Host}/";
         }
     }
-}
+}

src/OSharp.Utils/Http/JsonContent.cs

@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
 //  <copyright file="JsonContent.cs" company="OSharp开源团队">
 //      Copyright (c) 2014-2019 OSharp. All rights reserved.
 //  </copyright>
@@ -9,8 +9,7 @@
 
 using System.Net.Http;
 using System.Text;
-
-using Newtonsoft.Json;
+using System.Text.Json;
 
 
 namespace OSharp.Http
@@ -24,7 +23,7 @@ public class JsonContent : StringContent
         /// 初始化一个<see cref="JsonContent"/>类型的新实例
         /// </summary>
         public JsonContent(object obj)
-            : base(JsonConvert.SerializeObject(obj), Encoding.UTF8, "application/json")
+            : base(JsonSerializer.Serialize(obj), Encoding.UTF8, "application/json")
         { }
     }
-}
+}

src/OSharp.Wpf/Hubs/HubClientBase.cs

@@ -161,8 +161,11 @@ protected virtual async Task OnClosed(Exception error)
     {
         int delay = Random.Next(0, 5);
         await Output.StatusBarCountdown("{0}秒后重试连接通信服务器", delay);
-        await HubConnection.StartAsync();
-        Output.StatusBar($"通信服务器连接{(HubConnection.State == HubConnectionState.Connected ? "成功" : "失败")}");
+        if (HubConnection.State == HubConnectionState.Disconnected)
+        {
+            await HubConnection.StartAsync();
+            Output.StatusBar($"通信服务器连接{(HubConnection.State == HubConnectionState.Connected ? "成功" : "失败")}");
+        }
     }
 
     /// <summary>