Merge pull request #28 from softlgl/dev

重构代码

Author: softlgl

src/DotNetCoreRpc.Core/RpcFilterUtils.cs

@@ -11,20 +11,59 @@ namespace DotNetCoreRpc.Core
     public static class RpcFilterUtils
     {
         private static readonly ConcurrentDictionary<string, IEnumerable<PropertyInfo>> _filterFromServices = new ConcurrentDictionary<string, IEnumerable<PropertyInfo>>();
-        public static RpcFilterAttribute GetInstance(IServiceProvider serviceProvider,Type filterType)
+        private static readonly ConcurrentDictionary<string, List<RpcFilterAttribute>> _methodFilters = new ConcurrentDictionary<string, List<RpcFilterAttribute>>();
+
+        /// <summary>
+        /// 获取方法filters
+        /// </summary>
+        /// <returns></returns>
+        public static List<RpcFilterAttribute> GetFilterAttributes(RpcContext aspectContext, IEnumerable<Type> filterTypes)
         {
-            return ActivatorUtilities.CreateInstance(serviceProvider, filterType) as RpcFilterAttribute;
+            var methondInfo = aspectContext.Method;
+
+            var methondInterceptorAttributes = _methodFilters.GetOrAdd($"{methondInfo.DeclaringType.FullName}#{methondInfo.Name}",
+                key => {
+                    var methondAttributes = methondInfo.GetCustomAttributes(true)
+                                   .Where(i => typeof(RpcFilterAttribute).IsAssignableFrom(i.GetType()))
+                                   .Cast<RpcFilterAttribute>().ToList();
+                    var classAttributes = methondInfo.DeclaringType.GetCustomAttributes(true)
+                        .Where(i => typeof(RpcFilterAttribute).IsAssignableFrom(i.GetType()))
+                        .Cast<RpcFilterAttribute>();
+                    //获取方法filter
+                    methondAttributes.AddRange(classAttributes);
+                    //获取全局filter
+                    var glableInterceptorAttribute = GetInstances(aspectContext.HttpContext.RequestServices, filterTypes);
+                    methondAttributes.AddRange(glableInterceptorAttribute);
+                    return methondAttributes;
+                });
+
+            //filter属性注入
+            PropertiesInject(aspectContext.HttpContext.RequestServices, methondInterceptorAttributes);
+            return methondInterceptorAttributes;
         }
 
-        public static IEnumerable<RpcFilterAttribute> GetInstances(IServiceProvider serviceProvider, IEnumerable<Type> filterTypes)
+        private static IEnumerable<RpcFilterAttribute> GetInstances(IServiceProvider serviceProvider, IEnumerable<Type> filterTypes)
         {
             foreach (var filterType in filterTypes)
             {
                 yield return GetInstance(serviceProvider, filterType);
             }
         }
 
-        public static void PropertieInject(IServiceProvider serviceProvider, RpcFilterAttribute rpcFilterAttribute)
+        private static RpcFilterAttribute GetInstance(IServiceProvider serviceProvider, Type filterType)
+        {
+            return ActivatorUtilities.CreateInstance(serviceProvider, filterType) as RpcFilterAttribute;
+        }
+
+        private static void PropertiesInject(IServiceProvider serviceProvider, IEnumerable<RpcFilterAttribute> rpcFilterAttributes)
+        {
+            foreach (var fitler in rpcFilterAttributes)
+            {
+                PropertieInject(serviceProvider, fitler);
+            }
+        }
+
+        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));
             if (properties.Any())
@@ -35,13 +74,5 @@ public static void PropertieInject(IServiceProvider serviceProvider, RpcFilterAt
                 }
             }
         }
-
-        public static void PropertiesInject(IServiceProvider serviceProvider, IEnumerable<RpcFilterAttribute> rpcFilterAttributes)
-        {
-            foreach (var fitler in rpcFilterAttributes)
-            {
-                PropertieInject(serviceProvider, fitler);
-            }
-        }
     }
 }

src/DotNetCoreRpc.Server/DotNetCoreRpcMiddleware.cs

@@ -18,7 +18,6 @@ public class DotNetCoreRpcMiddleware
     {
         private readonly IDictionary<string, Type> _serviceTypes;
         private readonly IEnumerable<Type> _filterTypes;
-        private readonly ConcurrentDictionary<string, List<RpcFilterAttribute>> _methodFilters = new ConcurrentDictionary<string, List<RpcFilterAttribute>>();
 
         public DotNetCoreRpcMiddleware(RequestDelegate next, RpcServerOptions rpcServerOptions)
         {
@@ -111,7 +110,7 @@ private AspectPiplineBuilder CreatPipleline(RpcContext aspectContext)
                 await aspectContext.HttpContext.Response.WriteAsync(responseModel.ToJson());
             });
 
-            List<RpcFilterAttribute> interceptorAttributes = GetFilterAttributes(aspectContext);
+            List<RpcFilterAttribute> interceptorAttributes = RpcFilterUtils.GetFilterAttributes(aspectContext, _filterTypes);
             if (interceptorAttributes.Any())
             {
                 foreach (var item in interceptorAttributes)
@@ -166,29 +165,5 @@ private static RpcRequestDelegate PiplineEndPoint(object instance, RpcContext as
                 return;
             };
         }
-
-        /// <summary>
-        /// 获取Attribute
-        /// </summary>
-        /// <returns></returns>
-        private List<RpcFilterAttribute> GetFilterAttributes(RpcContext aspectContext)
-        {
-            var methondInfo = aspectContext.Method;
-            var methondInterceptorAttributes = _methodFilters.GetOrAdd($"{methondInfo.DeclaringType.FullName}#{methondInfo.Name}",
-                key=>{
-                    var methondAttributes = methondInfo.GetCustomAttributes(true)
-                                   .Where(i => typeof(RpcFilterAttribute).IsAssignableFrom(i.GetType()))
-                                   .Cast<RpcFilterAttribute>().ToList();
-                    var classAttributes = methondInfo.DeclaringType.GetCustomAttributes(true)
-                        .Where(i => typeof(RpcFilterAttribute).IsAssignableFrom(i.GetType()))
-                        .Cast<RpcFilterAttribute>();
-                    methondAttributes.AddRange(classAttributes);
-                    var glableInterceptorAttribute = RpcFilterUtils.GetInstances(aspectContext.HttpContext.RequestServices, _filterTypes);
-                    methondAttributes.AddRange(glableInterceptorAttribute);
-                    return methondAttributes;
-                });
-            RpcFilterUtils.PropertiesInject(aspectContext.HttpContext.RequestServices, methondInterceptorAttributes);
-            return methondInterceptorAttributes;
-        }
     }
 }