Merge pull request #46 from softlgl/dev

优化序列化反序列化调用

Author: softlgl

src/DotNetCoreRpc.Client/RequestHandler.cs

@@ -105,7 +105,7 @@ private async Task<byte[]> SendRequest(MethodInfo methodInfo, params object[] ar
                 Paramters = arguments
             };
 
-            HttpContent httpContent = new StringContent(requestModel.ToJson());
+            HttpContent httpContent = new ByteArrayContent(requestModel.ToUtf8Bytes());
             httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
 
             string path = string.IsNullOrWhiteSpace(_httpClient.BaseAddress.PathAndQuery) || _httpClient.BaseAddress.PathAndQuery == "/" 

src/DotNetCoreRpc.Core/JsonExtensions.cs

@@ -1,7 +1,9 @@
 using System;
+using System.IO;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Threading.Tasks;
 
 namespace DotNetCoreRpc.Core
 {
@@ -18,24 +20,29 @@ public static string ToJson<T>(this T data, JsonSerializerOptions options = defa
             return JsonSerializer.Serialize(data, options ?? serializerOptions);
         }
 
-        public static T FromJson<T>(this string json, JsonSerializerOptions options = default) where T : class, new()
+        public static byte[] ToUtf8Bytes<T>(this T data, JsonSerializerOptions options = default) where T : class, new()
         {
-            return JsonSerializer.Deserialize<T>(json, options ?? serializerOptions);
+            return JsonSerializer.SerializeToUtf8Bytes(data, options ?? serializerOptions);
         }
 
-        public static object FromJson(this string json, Type type, JsonSerializerOptions options = default)
+        public static Task WriteToStream<T>(this T data, Stream utf8Json, JsonSerializerOptions options = default) where T : class, new()
         {
-            return JsonSerializer.Deserialize(json, type, options ?? serializerOptions);
+            return JsonSerializer.SerializeAsync(utf8Json, data, options ?? serializerOptions);
+        }
+
+        public static T FromJson<T>(this string json, JsonSerializerOptions options = default) where T : class, new()
+        {
+            return JsonSerializer.Deserialize<T>(json, options ?? serializerOptions);
         }
 
         public static T FromJson<T>(this byte[] utf8Json, JsonSerializerOptions options = default) where T : class, new()
         {
             return JsonSerializer.Deserialize<T>(utf8Json, options ?? serializerOptions);
         }
 
-        public static object FromJson(this byte[] utf8Json, Type type, JsonSerializerOptions options = default)
+        public static ValueTask<T> FromStream<T>(this Stream utf8Json, JsonSerializerOptions options = default) where T : class, new()
         {
-            return JsonSerializer.Deserialize(utf8Json, type, options ?? serializerOptions);
+            return JsonSerializer.DeserializeAsync<T>(utf8Json, options ?? serializerOptions);
         }
 
         public static T FromJson<T>(this JsonElement jsonElement, JsonSerializerOptions options = default) where T : class, new()

src/DotNetCoreRpc.Server/DotNetCoreRpcMiddleware.cs

@@ -28,20 +28,13 @@ public DotNetCoreRpcMiddleware(RequestDelegate _, RpcServerOptions rpcServerOpti
 
         public async Task InvokeAsync(HttpContext context)
         {
-            var requestContent = await context.Request.ReadStringAsync();
-            ResponseModel responseModel = new ResponseModel { Code = (int)HttpStatusCode.InternalServerError };
-            if (string.IsNullOrEmpty(requestContent))
-            {
-                responseModel.Message = "未读取到请求信息";
-                await context.Response.WriteAsync(responseModel.ToJson());
-                return;
-            }
+            context.Request.EnableBuffering();
 
-            RequestModel requestModel = requestContent.FromJson<RequestModel>();
+            RequestModel requestModel = await context.Request.Body.FromStream<RequestModel>();
             if (requestModel == null)
             {
-                responseModel.Message = "读取请求数据失败";
-                await context.Response.WriteAsync(responseModel.ToJson());
+                ResponseModel responseModel = new ResponseModel { Code = (int)HttpStatusCode.InternalServerError, Message = "读取请求数据失败" };
+                await responseModel.WriteToStream(context.Response.Body);
                 return;
             }
 
@@ -110,7 +103,7 @@ private AspectPiplineBuilder CreatPipleline(RpcContext aspectContext)
                     responseModel = returnValue;
                 }
 
-                await aspectContext.HttpContext.Response.WriteAsync(responseModel.ToJson());
+                await responseModel.WriteToStream(rpcContext.HttpContext.Response.Body);
             });
 
             List<RpcFilterAttribute> interceptorAttributes = RpcFilterUtils.GetFilterAttributes(aspectContext, _serviceProvider, _rpcServerOptions.GetFilterTypes());