优化代码

Author: liguoliang

src/DotNetCoreRpc.Client/ClientOptions.cs

@@ -10,29 +10,37 @@ namespace DotNetCoreRpc.Client
 {
     public class ClientOptions
     {
-        private IServiceCollection _services;
-        private readonly string _serviceName;
-
         /// <summary>
         /// 服务请求路径
         /// </summary>
         public string Path { get; set; }
 
+        /// <summary>
+        /// 服务名称
+        /// </summary>
+        public string ServiceName { get; }
+
+        public IServiceCollection Services { get; }
+
         public ClientOptions(IServiceCollection services, string serviceName)
         {
-            _services = services;
-            _serviceName = 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>();
-                var httpClient = httpClientFactory.CreateClient(_serviceName);
-                RpcClient rpcClient = new RpcClient(httpClient, proxyGenerator, Path);
+            Services.TryAddScoped(provider => AddRpcClient(provider));
+
+            T AddRpcClient(IServiceProvider serviceProvider)
+            {
+                var httpClientFactory = serviceProvider.GetRequiredService<IHttpClientFactory>();
+                var proxyGenerator = serviceProvider.GetRequiredService<ProxyGenerator>();
+                var httpClient = httpClientFactory.CreateClient(ServiceName);
+                RpcClient rpcClient = new RpcClient(this, httpClient, proxyGenerator);
                 return rpcClient.CreateClient<T>();
-            });
+            }
+
             return this;
         }
     }

src/DotNetCoreRpc.Client/RpcClient.cs

@@ -13,11 +13,11 @@ internal class RpcClient
         private ProxyGenerator _proxyGenerator;
         private string _path;
 
-        public RpcClient(HttpClient httpClient, ProxyGenerator proxyGenerator, string path)
+        public RpcClient(ClientOptions clientOptions, HttpClient httpClient, ProxyGenerator proxyGenerator)
         {
+            _path = clientOptions.Path;
             _httpClient = httpClient;
             _proxyGenerator = proxyGenerator;
-            _path = path;
         }
 
         internal T CreateClient<T>() where T : class