😊 修复依赖注入模块通过 INamedServiceProvider<> 解析服务没有应用拦截器问题

MonkSoul · Aug 24, 2024 · 0277177 · 0277177
1 parent efc3404
commit 0277177
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 18 deletions.
diff --git a/...ion.Extras.DependencyModel.CodeAnalysis/Furion.Extras.DependencyModel.CodeAnalysis.csproj b/...ion.Extras.DependencyModel.CodeAnalysis/Furion.Extras.DependencyModel.CodeAnalysis.csproj
@@ -35,7 +35,7 @@
 	<ItemGroup>
 		<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.33" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 	</ItemGroup>
 

diff --git a/...xtras.DependencyModel.CodeAnalysis/Furion.Pure.Extras.DependencyModel.CodeAnalysis.csproj b/...xtras.DependencyModel.CodeAnalysis/Furion.Pure.Extras.DependencyModel.CodeAnalysis.csproj
@@ -31,7 +31,7 @@
 	<ItemGroup>
 		<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
 		<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.33" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
 		<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
 	</ItemGroup>
 

diff --git a/...ion.Pure/DependencyInjection/Extensions/DependencyInjectionServiceCollectionExtensions.cs b/...ion.Pure/DependencyInjection/Extensions/DependencyInjectionServiceCollectionExtensions.cs
@@ -265,6 +265,8 @@ private static void RegisterNamedService<TDependency>(IServiceCollection service
             object ResolveService(string named, TDependency _)
             {
                 var isRegister = TypeNamedCollection.TryGetValue(named, out var serviceType);
+
+                // 暂不支持 AOP
                 return isRegister ? provider.GetService(serviceType) : null;
             }
             return (Func<string, TDependency, object>)ResolveService;

diff --git a/framework/Furion.Pure/DependencyInjection/Providers/NamedServiceProvider.cs b/framework/Furion.Pure/DependencyInjection/Providers/NamedServiceProvider.cs
@@ -23,6 +23,7 @@
 // 请访问 https://gitee.com/dotnetchina/Furion 获取更多关于 Furion 项目的许可证和版权信息。
 // ------------------------------------------------------------------------
 
+using Furion.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using System.Reflection;
 
@@ -56,10 +57,16 @@ public NamedServiceProvider(IServiceProvider serviceProvider)
     /// <returns></returns>
     public TService GetService(string serviceName)
     {
-        // 解析所有实现
-        return _serviceProvider.GetServices<TService>()
-            .Where(u => ResovleServiceName(u.GetType()) == serviceName)
-            .FirstOrDefault();
+        var services = _serviceProvider.GetServices<TService>();
+
+        if (services
+            .OfType<AspectDispatchProxy>()
+            .FirstOrDefault(u => ResovleServiceName(((dynamic)u).Target.GetType()) == serviceName) is not TService service)
+        {
+            service = services.FirstOrDefault(u => ResovleServiceName(u.GetType()) == serviceName);
+        }
+
+        return service;
     }
 
     /// <summary>
@@ -83,9 +90,14 @@ public TService GetService<ILifetime>(string serviceName)
     public TService GetRequiredService(string serviceName)
     {
         // 解析所有实现
-        var service = _serviceProvider.GetServices<TService>()
-            .Where(u => ResovleServiceName(u.GetType()) == serviceName)
-            .FirstOrDefault();
+        var services = _serviceProvider.GetServices<TService>();
+
+        if (services
+            .OfType<AspectDispatchProxy>()
+            .FirstOrDefault(u => ResovleServiceName(((dynamic)u).Target.GetType()) == serviceName) is not TService service)
+        {
+            service = services.FirstOrDefault(u => ResovleServiceName(u.GetType()) == serviceName);
+        }
 
         // 如果服务不存在，抛出异常
         return service ?? throw new InvalidOperationException($"Named service `{serviceName}` is not registered in container.");

diff --git a/...k/Furion/DependencyInjection/Extensions/DependencyInjectionServiceCollectionExtensions.cs b/...k/Furion/DependencyInjection/Extensions/DependencyInjectionServiceCollectionExtensions.cs
@@ -265,6 +265,8 @@ private static void RegisterNamedService<TDependency>(IServiceCollection service
             object ResolveService(string named, TDependency _)
             {
                 var isRegister = TypeNamedCollection.TryGetValue(named, out var serviceType);
+
+                // 暂不支持 AOP
                 return isRegister ? provider.GetService(serviceType) : null;
             }
             return (Func<string, TDependency, object>)ResolveService;

diff --git a/framework/Furion/DependencyInjection/Providers/NamedServiceProvider.cs b/framework/Furion/DependencyInjection/Providers/NamedServiceProvider.cs
@@ -23,6 +23,7 @@
 // 请访问 https://gitee.com/dotnetchina/Furion 获取更多关于 Furion 项目的许可证和版权信息。
 // ------------------------------------------------------------------------
 
+using Furion.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using System.Reflection;
 
@@ -56,10 +57,16 @@ public NamedServiceProvider(IServiceProvider serviceProvider)
     /// <returns></returns>
     public TService GetService(string serviceName)
     {
-        // 解析所有实现
-        return _serviceProvider.GetServices<TService>()
-            .Where(u => ResovleServiceName(u.GetType()) == serviceName)
-            .FirstOrDefault();
+        var services = _serviceProvider.GetServices<TService>();
+
+        if (services
+            .OfType<AspectDispatchProxy>()
+            .FirstOrDefault(u => ResovleServiceName(((dynamic)u).Target.GetType()) == serviceName) is not TService service)
+        {
+            service = services.FirstOrDefault(u => ResovleServiceName(u.GetType()) == serviceName);
+        }
+
+        return service;
     }
 
     /// <summary>
@@ -83,9 +90,14 @@ public TService GetService<ILifetime>(string serviceName)
     public TService GetRequiredService(string serviceName)
     {
         // 解析所有实现
-        var service = _serviceProvider.GetServices<TService>()
-            .Where(u => ResovleServiceName(u.GetType()) == serviceName)
-            .FirstOrDefault();
+        var services = _serviceProvider.GetServices<TService>();
+
+        if (services
+            .OfType<AspectDispatchProxy>()
+            .FirstOrDefault(u => ResovleServiceName(((dynamic)u).Target.GetType()) == serviceName) is not TService service)
+        {
+            service = services.FirstOrDefault(u => ResovleServiceName(u.GetType()) == serviceName);
+        }
 
         // 如果服务不存在，抛出异常
         return service ?? throw new InvalidOperationException($"Named service `{serviceName}` is not registered in container.");

diff --git a/tests/Furion.IntegrationTests/Furion.IntegrationTests.csproj b/tests/Furion.IntegrationTests/Furion.IntegrationTests.csproj
@@ -8,7 +8,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
 		<PackageReference Include="System.Text.Json" Version="8.0.4" />
 		<PackageReference Include="xunit" Version="2.9.0" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">

diff --git a/tests/Furion.UnitTests/Furion.UnitTests.csproj b/tests/Furion.UnitTests/Furion.UnitTests.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
 		<PackageReference Include="xunit" Version="2.9.0" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>