HttpClientContext增加OptionsName属性

Author: xljiulang

WebApiClientCore.Extensions.NewtonsoftJson/Attributes/JsonNetContentAttribute.cs

@@ -38,7 +38,7 @@ public string CharSet
         /// <returns></returns>
         protected override Task SetHttpContentAsync(ApiParameterContext context)
         {
-            var name = HttpApi.GetName(context.ApiAction.InterfaceType);
+            var name = context.HttpContext.OptionsName;
             var options = context.HttpContext.ServiceProvider.GetService<IOptionsMonitor<JsonNetSerializerOptions>>().Get(name);
             var json = context.ParameterValue == null
                 ? string.Empty

WebApiClientCore.Extensions.NewtonsoftJson/Attributes/JsonNetReturnAttribute.cs

@@ -45,7 +45,8 @@ public override async Task SetResultAsync(ApiResponseContext context)
             {
                 var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
                 var resultType = context.ApiAction.Return.DataType.Type;
-                var name = HttpApi.GetName(context.ApiAction.InterfaceType);
+
+                var name = context.HttpContext.OptionsName;
                 var options = context.HttpContext.ServiceProvider.GetService<IOptionsMonitor<JsonNetSerializerOptions>>().Get(name);
 
                 context.Result = JsonConvert.DeserializeObject(json, resultType, options.JsonDeserializeOptions);

WebApiClientCore.Test/TestRequestContext.cs

@@ -32,7 +32,9 @@ private static HttpContext GetHttpContext()
 
             var requestServices = services.BuildServiceProvider();
             var options = new HttpApiOptions() { HttpHost = new Uri("http://www.webapi.com/") };
-            return new HttpContext(new HttpClient(), requestServices, options);
+
+            var httpClientContext = new HttpClientContext(new HttpClient(), requestServices, options);
+            return new HttpContext(httpClientContext);
         }
     }
 }

WebApiClientCore/HttpApi.cs

@@ -8,10 +8,10 @@ namespace WebApiClientCore
     /// 提供创建THttpApi的代理实例
     /// </summary>
     public static class HttpApi
-    {      
+    {
         /// <summary>
-        /// 获取接口的命名
-        /// 该命名用于接口对应的Options名称
+        /// 获取接口的别名
+        /// 该别名可用于接口对应的OptionsName
         /// </summary>
         /// <param name="httpApiType">接口类型</param>
         /// <returns></returns>

WebApiClientCore/HttpClientContext.cs

@@ -23,6 +23,11 @@ public class HttpClientContext
         /// </summary>
         public IServiceProvider ServiceProvider { get; }
 
+        /// <summary>
+        /// 获取选项名称 
+        /// </summary>
+        public string OptionsName { get; }
+
         /// <summary>
         /// HttpClient上下文
         /// </summary>
@@ -31,10 +36,37 @@ public class HttpClientContext
         /// <param name="httpApiOptions">Api配置选项</param>
         /// <exception cref="ArgumentNullException"></exception>
         public HttpClientContext(HttpClient httpClient, IServiceProvider serviceProvider, HttpApiOptions httpApiOptions)
+            : this(httpClient, serviceProvider, httpApiOptions, string.Empty)
+        {
+        }
+
+        /// <summary>
+        /// HttpClient上下文
+        /// </summary>
+        /// <param name="httpClient">httpClient实例</param>
+        /// <param name="serviceProvider">服务提供者</param>
+        /// <param name="httpApiOptions">Api配置选项</param>
+        /// <param name="optionsName">选项名称</param>
+        /// <exception cref="ArgumentNullException"></exception>
+        public HttpClientContext(HttpClient httpClient, IServiceProvider serviceProvider, HttpApiOptions httpApiOptions, string optionsName)
         {
             this.HttpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient));
             this.ServiceProvider = serviceProvider ?? throw new ArgumentNullException(nameof(serviceProvider));
             this.HttpApiOptions = httpApiOptions ?? throw new ArgumentNullException(nameof(httpApiOptions));
+            this.OptionsName = optionsName ?? string.Empty;
+        }
+
+        /// <summary>
+        /// 转换为字符串
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            if (string.IsNullOrEmpty(this.OptionsName))
+            {
+                return base.ToString();
+            }
+            return this.OptionsName;
         }
     }
 }

WebApiClientCore/HttpContext.cs

@@ -31,22 +31,10 @@ public class HttpContext : HttpClientContext, IDisposable
         /// <param name="context">服务上下文</param>
         /// <exception cref="ArgumentNullException"></exception>
         public HttpContext(HttpClientContext context)
-            : this(context.HttpClient, context.ServiceProvider, context.HttpApiOptions)
+            : base(context.HttpClient, context.ServiceProvider, context.HttpApiOptions, context.OptionsName)
         {
-        }
-
-        /// <summary>
-        /// http上下文
-        /// </summary>
-        /// <param name="httpClient">httpClient实例</param>
-        /// <param name="serviceProvider">服务提供者</param>
-        /// <param name="httpApiOptions">Api配置选项</param>
-        /// <exception cref="ArgumentNullException"></exception>
-        public HttpContext(HttpClient httpClient, IServiceProvider serviceProvider, HttpApiOptions httpApiOptions)
-            : base(httpClient, serviceProvider, httpApiOptions)
-        {
-            var requiredUri = httpApiOptions.HttpHost ?? httpClient.BaseAddress;
-            this.RequestMessage = new HttpApiRequestMessage(requiredUri, httpApiOptions.UseDefaultUserAgent);
+            var requiredUri = context.HttpApiOptions.HttpHost ?? context.HttpClient.BaseAddress;
+            this.RequestMessage = new HttpApiRequestMessage(requiredUri, context.HttpApiOptions.UseDefaultUserAgent);
             this.CancellationTokens = new List<CancellationToken>();
         }
 

WebApiClientCore/Microsoft.Extensions/DependencyInjection/HttpApiExtensions.cs

@@ -35,8 +35,10 @@ public static IHttpClientBuilder AddHttpApi<THttpApi>(this IServiceCollection se
             {
                 var httpClient = serviceProvider.GetRequiredService<IHttpClientFactory>().CreateClient(name);
                 var httpApiOptions = serviceProvider.GetRequiredService<IOptionsMonitor<HttpApiOptions>>().Get(name);
-                return HttpApi.Create<THttpApi>(httpClient, serviceProvider, httpApiOptions);
+                var httpClientContext = new HttpClientContext(httpClient, serviceProvider, httpApiOptions, name);
+                return HttpApi.Create<THttpApi>(httpClientContext);
             });
+
             return services.AddHttpClient(name);
         }