修复当响应的json使用非utf8编码时反序列化的问题

Author: xljiulang

WebApiClientCore.Benchmarks/Requests/GetBenchmark.cs

@@ -24,7 +24,7 @@ public async Task<Model> HttpClient_GetAsync()
             var id = "id";
             var request = new HttpRequestMessage(HttpMethod.Get, $"http://webapiclient.com/{id}");
             var response = await httpClient.SendAsync(request);
-            var json = await response.Content.ReadAsByteArrayAsync();
+            var json = await response.Content.ReadAsUtf8ByteArrayAsync();
             return JsonSerializer.Deserialize<Model>(json);
         }
 

WebApiClientCore.Benchmarks/Requests/PostJsonBenchmark.cs

@@ -29,7 +29,7 @@ public async Task<Model> HttpClient_PostJsonAsync()
             };
 
             var response = await httpClient.SendAsync(request);
-            json = await response.Content.ReadAsByteArrayAsync();
+            json = await response.Content.ReadAsUtf8ByteArrayAsync();
             return JsonSerializer.Deserialize<Model>(json);
         }
 

WebApiClientCore.Test/Attributes/ParameterAttributes/JsonContentAttributeTest.cs

@@ -1,5 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
-using System;
+using System;
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -24,10 +23,10 @@ public async Task BeforeRequestAsyncTest()
             context.HttpContext.RequestMessage.RequestUri = new Uri("http://www.webapi.com/");
             context.HttpContext.RequestMessage.Method = HttpMethod.Post;
 
-            var attr = new JsonContentAttribute();
+            var attr = new JsonContentAttribute() { CharSet = "utf-16" };
             await attr.OnRequestAsync(new ApiParameterContext(context, 0));
 
-            var body = await context.HttpContext.RequestMessage.Content.ReadAsByteArrayAsync();
+            var body = await context.HttpContext.RequestMessage.Content.ReadAsUtf8ByteArrayAsync();
 
             var options = context.HttpContext.HttpApiOptions.JsonSerializeOptions;
             using var buffer = new BufferWriter<byte>();

WebApiClientCore/ApiResponseContext.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Net.Http;
 using System.Threading.Tasks;
 
 namespace WebApiClientCore
@@ -71,9 +72,9 @@ public ApiResponseContext(ApiRequestContext context)
             }
 
             var serializer = this.HttpContext.ServiceProvider.GetJsonSerializer();
-            var json = await this.HttpContext.ResponseMessage.Content.ReadAsByteArrayAsync().ConfigureAwait(false);
+            var utf8Json = await this.HttpContext.ResponseMessage.Content.ReadAsUtf8ByteArrayAsync().ConfigureAwait(false);
             var options = this.HttpContext.HttpApiOptions.JsonDeserializeOptions;
-            return serializer.Deserialize(json, objType, options);
+            return serializer.Deserialize(utf8Json, objType, options);
         }
 
         /// <summary>

WebApiClientCore/System.Net.Http/HttpContentExtensions.cs

@@ -0,0 +1,38 @@
+using System.Text;
+using System.Threading.Tasks;
+
+namespace System.Net.Http
+{
+    /// <summary>
+    /// HttpContent扩展
+    /// </summary>
+    public static class HttpContentExtensions
+    {
+        /// <summary>
+        /// 读取为二进制数组并转换为utf8编码
+        /// </summary>
+        /// <param name="httpContent"></param>
+        /// <returns></returns>
+        public static Task<byte[]> ReadAsUtf8ByteArrayAsync(this HttpContent httpContent)
+        {
+            return httpContent.ReadAsByteArrayAsync(Encoding.UTF8);
+        }
+
+        /// <summary>
+        /// 读取为二进制数组并转换为指定的编码
+        /// </summary>
+        /// <param name="httpContent"></param>
+        /// <param name="dstEncoding">目标编码</param>
+        /// <returns></returns>
+        public static async Task<byte[]> ReadAsByteArrayAsync(this HttpContent httpContent, Encoding dstEncoding)
+        {
+            var byteArray = await httpContent.ReadAsByteArrayAsync().ConfigureAwait(false);
+            var charSet = httpContent.Headers.ContentType?.CharSet;
+            var encoding = charSet == null ? Encoding.UTF8 : Encoding.GetEncoding(charSet);
+
+            return encoding.Equals(dstEncoding)
+                ? byteArray
+                : Encoding.Convert(encoding, dstEncoding, byteArray);
+        }
+    }
+}