修重构客户端注册方式

Author: liguoliang

src/DotNetCoreRpc.Client/ClientOptions.cs

@@ -0,0 +1,33 @@
+using Castle.DynamicProxy;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Text;
+
+namespace DotNetCoreRpc.Client
+{
+    public class ClientOptions
+    {
+        private IServiceCollection _services;
+        private readonly string _serviceName;
+
+        public ClientOptions(IServiceCollection services, string serviceName)
+        {
+            _services = services;
+            _serviceName = serviceName;
+        }
+
+        public ClientOptions AddRpcClient<T>() where T : class
+        {
+            _services.TryAddScoped(provider => {
+                var httpClientFactory = provider.GetRequiredService<IHttpClientFactory>();
+                var proxyGenerator = provider.GetRequiredService<ProxyGenerator>();
+                RpcClient rpcClient = new RpcClient(httpClientFactory.CreateClient(_serviceName), proxyGenerator);
+                return rpcClient.CreateClient<T>();
+            });
+            return this;
+        }
+    }
+}

src/DotNetCoreRpc.Client/RequestHandler.cs

@@ -71,7 +71,7 @@ private async Task<T> TaskResultHandle<T>(MethodInfo methodInfo, params object[]
                 ResponseModel responseModel = result.FromJson<ResponseModel>();
                 if (responseModel.Code != (int)HttpStatusCode.OK)
                 {
-                    throw new Exception($"请求出错,返回内容:{Encoding.UTF8.GetString(result)}");
+                    throw new Exception($"请求出错,返回内容:{responseModel.Message}");
                 }
 
                 TypeInfo methodReturnType = methodInfo.ReturnType.GetTypeInfo();

src/DotNetCoreRpc.Client/RpcClient.cs

@@ -1,30 +1,26 @@
-using System;
+using Castle.DynamicProxy;
+using System;
+using System.Collections.Generic;
 using System.Net.Http;
-using Castle.DynamicProxy;
-using System.Collections.Concurrent;
+using System.Text;
 
 namespace DotNetCoreRpc.Client
 {
-    public class RpcClient
+    internal class RpcClient
     {
-        private readonly ProxyGenerator _proxyGenerator;
-        private readonly IHttpClientFactory _httpClientFactory;
+        private HttpClient _httpClient;
+        private ProxyGenerator _proxyGenerator;
 
-        public RpcClient(ProxyGenerator proxyGenerator, IHttpClientFactory httpClientFactory)
+        public RpcClient(HttpClient httpClient, ProxyGenerator proxyGenerator)
         {
+            _httpClient = httpClient;
+            _httpClient.DefaultRequestHeaders.Add("req-source", "dncrpc");
             _proxyGenerator = proxyGenerator;
-            _httpClientFactory = httpClientFactory;
         }
 
-        public T CreateClient<T>(string serviceName) where T : class
+        internal T CreateClient<T>() where T : class
         {
-            return CreateClient<T>(_httpClientFactory.CreateClient(serviceName));
-        }
-
-        public T CreateClient<T>(HttpClient httpClient) where T : class
-        {
-            httpClient.DefaultRequestHeaders.Add("req-source", "dncrpc");
-            HttpRequestInterceptor httpRequestInterceptor = new HttpRequestInterceptor(httpClient);
+            HttpRequestInterceptor httpRequestInterceptor = new HttpRequestInterceptor(_httpClient);
             return _proxyGenerator.CreateInterfaceProxyWithoutTarget<T>(httpRequestInterceptor);
         }
     }

src/DotNetCoreRpc.Client/ServiceCollectionExtensions.cs

@@ -1,16 +1,20 @@
 using System;
 using Castle.DynamicProxy;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace DotNetCoreRpc.Client
 {
     public static class ServiceCollectionExtensions
     {
-        public static IServiceCollection AddDotNetCoreRpcClient(this IServiceCollection services)
+        public static IHttpClientBuilder AddDotNetCoreRpcClient(this IHttpClientBuilder httpClientBuilder, Action<ClientOptions> options)
         {
-            services.AddSingleton<ProxyGenerator>();
-            services.AddSingleton<RpcClient>();
-            return services;
+            httpClientBuilder.Services.TryAddSingleton<ProxyGenerator>();
+
+            ClientOptions clientOptions = new ClientOptions(httpClientBuilder.Services, httpClientBuilder.Name);
+            options.Invoke(clientOptions);
+
+            return httpClientBuilder;
         }
     }
 }