Merge pull request #44 from softlgl/dev

优化代码

Author: softlgl

src/DotNetCoreRpc.Client/ClientOptions.cs

@@ -3,6 +3,7 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Net.Http;
 using System.Text;
 
@@ -30,13 +31,14 @@ public ClientOptions(IServiceCollection services, string serviceName)
 
         public ClientOptions AddRpcClient<T>() where T : class
         {
-            Services.TryAddScoped(provider => AddRpcClient(provider));
+            Services.TryAddScoped(provider => CreateRpcClient(provider));
 
-            T AddRpcClient(IServiceProvider serviceProvider)
+            T CreateRpcClient(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>();
             }

src/DotNetCoreRpc.Client/RpcClient.cs

@@ -22,13 +22,12 @@ public RpcClient(ClientOptions clientOptions, HttpClient httpClient, ProxyGenera
 
         internal T CreateClient<T>() where T : class
         {
-            InitalHttpClient();
+            InitialHttpClient();
 
-            HttpRequestInterceptor httpRequestInterceptor = new HttpRequestInterceptor(_httpClient);
-            return _proxyGenerator.CreateInterfaceProxyWithoutTarget<T>(httpRequestInterceptor);
+            return _proxyGenerator.CreateInterfaceProxyWithoutTarget<T>(new HttpRequestInterceptor(_httpClient));
         }
 
-        private void InitalHttpClient()
+        private void InitialHttpClient()
         {
             _httpClient.DefaultRequestHeaders.Add("req-source", "dncrpc");
             if (!string.IsNullOrWhiteSpace(_path))

src/DotNetCoreRpc.Server/RpcBuilder/RpcFilterUtils.cs

@@ -19,15 +19,18 @@ public static class RpcFilterUtils
         /// <returns></returns>
         public static List<RpcFilterAttribute> GetFilterAttributes(RpcContext aspectContext, IServiceProvider serviceProvider, IEnumerable<Type> filterTypes)
         {
-            var methondInfo = aspectContext.Method;
+            var methodInfo = aspectContext.Method;
+            var reflectedTypeHandle = methodInfo.ReflectedType!.TypeHandle.Value;
+            var methodHandle = methodInfo.MethodHandle.Value;
+            var methodKey = $"{reflectedTypeHandle}_{methodHandle}";
 
-            var methondInterceptorAttributes = _methodFilters.GetOrAdd($"{methondInfo.DeclaringType.FullName}#{methondInfo.Name}",
+            var methondInterceptorAttributes = _methodFilters.GetOrAdd(methodKey,
                 key =>
                 {
-                    var methondAttributes = methondInfo.GetCustomAttributes(true)
+                    var methondAttributes = methodInfo.GetCustomAttributes(true)
                                    .Where(i => typeof(RpcFilterAttribute).IsAssignableFrom(i.GetType()))
                                    .Cast<RpcFilterAttribute>().ToList();
-                    var classAttributes = methondInfo.DeclaringType.GetCustomAttributes(true)
+                    var classAttributes = methodInfo.DeclaringType.GetCustomAttributes(true)
                         .Where(i => typeof(RpcFilterAttribute).IsAssignableFrom(i.GetType()))
                         .Cast<RpcFilterAttribute>();
                     //获取方法filter
@@ -68,7 +71,7 @@ private static void PropertiesInject(IServiceProvider serviceProvider, IEnumerab
 
         private static void PropertieInject(IServiceProvider serviceProvider, RpcFilterAttribute rpcFilterAttribute)
         {
-            var properties = _filterFromServices.GetOrAdd($"{rpcFilterAttribute.GetType().FullName}", key => rpcFilterAttribute.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic).Where(i => i.GetCustomAttribute<FromServicesAttribute>() != null));
+            var properties = _filterFromServices.GetOrAdd($"{rpcFilterAttribute.GetType().TypeHandle.Value}", key => rpcFilterAttribute.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic).Where(i => i.GetCustomAttribute<FromServicesAttribute>() != null));
             if (properties.Any())
             {
                 foreach (var propertyInfo in properties)