Merge pull request #43 from softlgl/dev

修改服务端过滤器属性注入

Author: softlgl

src/DotNetCoreRpc.Server/DotNetCoreRpcMiddleware.cs

@@ -18,10 +18,12 @@ namespace DotNetCoreRpc.Server
     public class DotNetCoreRpcMiddleware
     {
         private readonly RpcServerOptions _rpcServerOptions;
+        private readonly IServiceProvider _serviceProvider;
 
-        public DotNetCoreRpcMiddleware(RequestDelegate next, RpcServerOptions rpcServerOptions)
+        public DotNetCoreRpcMiddleware(RequestDelegate _, RpcServerOptions rpcServerOptions, IServiceProvider serviceProvider)
         {
             _rpcServerOptions = rpcServerOptions;
+            _serviceProvider = serviceProvider;
         }
 
         public async Task InvokeAsync(HttpContext context)
@@ -111,7 +113,7 @@ private AspectPiplineBuilder CreatPipleline(RpcContext aspectContext)
                 await aspectContext.HttpContext.Response.WriteAsync(responseModel.ToJson());
             });
 
-            List<RpcFilterAttribute> interceptorAttributes = RpcFilterUtils.GetFilterAttributes(aspectContext, _rpcServerOptions.GetFilterTypes());
+            List<RpcFilterAttribute> interceptorAttributes = RpcFilterUtils.GetFilterAttributes(aspectContext, _serviceProvider, _rpcServerOptions.GetFilterTypes());
             if (interceptorAttributes.Any())
             {
                 foreach (var item in interceptorAttributes)

src/DotNetCoreRpc.Server/RpcBuilder/RpcFilterUtils.cs

@@ -17,7 +17,7 @@ public static class RpcFilterUtils
         /// 获取方法filters
         /// </summary>
         /// <returns></returns>
-        public static List<RpcFilterAttribute> GetFilterAttributes(RpcContext aspectContext, IEnumerable<Type> filterTypes)
+        public static List<RpcFilterAttribute> GetFilterAttributes(RpcContext aspectContext, IServiceProvider serviceProvider, IEnumerable<Type> filterTypes)
         {
             var methondInfo = aspectContext.Method;
 
@@ -33,13 +33,15 @@ public static List<RpcFilterAttribute> GetFilterAttributes(RpcContext aspectCont
                     //获取方法filter
                     methondAttributes.AddRange(classAttributes);
                     //获取全局filter
-                    var glableInterceptorAttribute = GetInstances(aspectContext.HttpContext.RequestServices, filterTypes);
+                    var glableInterceptorAttribute = GetInstances(serviceProvider, filterTypes);
                     methondAttributes.AddRange(glableInterceptorAttribute);
+
+                    //filter属性注入
+                    PropertiesInject(aspectContext.HttpContext.RequestServices, methondAttributes);
+
                     return methondAttributes;
                 });
 
-            //filter属性注入
-            PropertiesInject(aspectContext.HttpContext.RequestServices, methondInterceptorAttributes);
             return methondInterceptorAttributes;
         }