不公开GetService扩展，以免与DI扩展冲突

Author: xljiulang

WebApiClientCore/Attributes/ParameterAttributes/HeadersAttribute.cs

@@ -25,11 +25,10 @@ public override Task OnRequestAsync(ApiParameterContext context)
         {
             foreach (var item in context.SerializeToKeyValues())
             {
-                var value = item.Value;
-                if (string.IsNullOrEmpty(value) == false)
+                if (string.IsNullOrEmpty(item.Value) == false)
                 {
                     var name = this.UnderlineToMinus ? item.Key.Replace("_", "-") : item.Key;
-                    context.HttpContext.RequestMessage.Headers.TryAddWithoutValidation(name, value);
+                    context.HttpContext.RequestMessage.Headers.TryAddWithoutValidation(name, item.Value);
                 }
             }
             return Task.CompletedTask;

WebApiClientCore/BuildinExtensions/CollectionExtensions.cs

@@ -17,28 +17,15 @@ static class CollectionExtensions
         /// <returns></returns>
         public static IEnumerable<KeyValue> CollectAs(this IEnumerable<KeyValue> collection, CollectionFormat format)
         {
-            if (format == CollectionFormat.Multi)
+            return format switch
             {
-                return collection;
-            }
-
-            switch (format)
-            {
-                case CollectionFormat.Csv:
-                    return collection.CollectAs(@",");
-
-                case CollectionFormat.Ssv:
-                    return collection.CollectAs(@" ");
-
-                case CollectionFormat.Tsv:
-                    return collection.CollectAs(@"\");
-
-                case CollectionFormat.Pipes:
-                    return collection.CollectAs(@"|");
-
-                default:
-                    throw new NotImplementedException(format.ToString());
-            }
+                CollectionFormat.Multi => collection,
+                CollectionFormat.Csv => collection.CollectAs(@","),
+                CollectionFormat.Ssv => collection.CollectAs(@" "),
+                CollectionFormat.Tsv => collection.CollectAs(@"\"),
+                CollectionFormat.Pipes => collection.CollectAs(@"|"),
+                _ => throw new NotImplementedException(format.ToString()),
+            };
         }
 
         /// <summary>

WebApiClientCore/ServiceProviderExtensions.cs

@@ -13,23 +13,11 @@ public static class ServiceProviderExtensions
         private static readonly JsonSerializer jsonSerializer = new JsonSerializer();
         private static readonly KeyValueSerializer keyValueSerializer = new KeyValueSerializer();
 
-        /// <summary>
-        /// 获取服务
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="provider"></param>
-        /// <returns></returns>
-        [return: MaybeNull]
-        public static T GetService<T>(this IServiceProvider provider)
-        {
-            return (T)provider.GetService(typeof(T));
-        }
-
         /// <summary>
         /// 尝试获取IXmlSerializer
         /// 获取不到则使用默认实例
         /// </summary>
-        /// <param name="provider"></param>
+        /// <param name="provider">服务提供者</param>
         /// <returns></returns>
         public static IXmlSerializer GetXmlSerializer(this IServiceProvider provider)
         {
@@ -40,7 +28,7 @@ public static IXmlSerializer GetXmlSerializer(this IServiceProvider provider)
         /// 尝试获取IJsonSerializer
         /// 获取不到则使用默认实例
         /// </summary>
-        /// <param name="provider"></param>
+        /// <param name="provider">服务提供者</param>
         /// <returns></returns>
         public static IJsonSerializer GetJsonSerializer(this IServiceProvider provider)
         {
@@ -51,11 +39,23 @@ public static IJsonSerializer GetJsonSerializer(this IServiceProvider provider)
         /// 尝试获取IKeyValueSerializer
         /// 获取不到则使用默认实例
         /// </summary>
-        /// <param name="provider"></param>
+        /// <param name="provider">服务提供者</param>
         /// <returns></returns>
         public static IKeyValueSerializer GetKeyValueSerializer(this IServiceProvider provider)
         {
             return provider.GetService<IKeyValueSerializer>() ?? keyValueSerializer;
         }
+
+        /// <summary>
+        /// 获取服务
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="provider">服务提供者</param>
+        /// <returns></returns>
+        [return: MaybeNull]
+        internal static T GetService<T>(this IServiceProvider provider)
+        {
+            return (T)provider.GetService(typeof(T));
+        }
     }
 }

WebApiClientCore/System.Net.Http/HttpContentExtensions.cs

@@ -12,6 +12,7 @@ public static class HttpContentExtensions
         /// 读取为二进制数组并转换为utf8编码
         /// </summary>
         /// <param name="httpContent"></param>
+        /// <exception cref="ArgumentException"></exception>
         /// <returns></returns>
         public static Task<byte[]> ReadAsUtf8ByteArrayAsync(this HttpContent httpContent)
         {
@@ -23,12 +24,13 @@ public static Task<byte[]> ReadAsUtf8ByteArrayAsync(this HttpContent httpContent
         /// </summary>
         /// <param name="httpContent"></param>
         /// <param name="dstEncoding">目标编码</param>
+        /// <exception cref="ArgumentException"></exception>
         /// <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);
+            var encoding = string.IsNullOrEmpty(charSet) ? Encoding.UTF8 : Encoding.GetEncoding(charSet);
 
             return encoding.Equals(dstEncoding)
                 ? byteArray