fix #38

yuzd · Jan 4, 2024 · 4185c0d · 4185c0d
1 parent 0cf175a
commit 4185c0d
Show file tree

Hide file tree

Showing 7 changed files with 372 additions and 31 deletions.
diff --git a/src/Autofac.Annotation.csproj b/src/Autofac.Annotation.csproj
@@ -28,10 +28,10 @@
         <RootNamespace>Autofac.Annotation</RootNamespace>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-        <Version>4.4.3</Version>
-        <AssemblyVersion>4.4.3.0</AssemblyVersion>
+        <Version>4.4.4</Version>
+        <AssemblyVersion>4.4.4.0</AssemblyVersion>
         <Authors>zdyu</Authors>
-        <PackageVersion>4.4.3</PackageVersion>
+        <PackageVersion>4.4.4</PackageVersion>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
 

diff --git a/src/AutofacAnnotationModule.cs b/src/AutofacAnnotationModule.cs
@@ -727,7 +727,7 @@ private bool NeedWarpForPointcut(ComponentModel component, PointCutConfiguration
                     if (aspectClass.Pointcut.IsVaild(aspectClass, method, pointCutClassInjectAnotation,
                             out var pointCutMethodInjectAnotation))
                     {
-                        if (component.isDynamicGeneric || isgeneric)
+                        if (component.isDynamicGeneric || isgeneric || method.IsGenericMethod)
                         {
                             var uniqKey = method.GetMethodInfoUniqueName();
                             if (pointCutCfg.DynamicPointcutTargetInfoList.ContainsKey(uniqKey))

diff --git a/src/Intercepter/AspectIntercepter/Advice/ApsectAdviceMethodInvokeCache.cs b/src/Intercepter/AspectIntercepter/Advice/ApsectAdviceMethodInvokeCache.cs
@@ -216,7 +216,7 @@ private void AddCacheInter(ComponentModel aspectClass, bool isGeneric = false)
 
                 aspectAttributeInfo.AdviceMethod = aspectAttributeInfo.AdviceMethod.OrderBy(r => r.OrderIndex).ToList();
 
-                if (aspectClass.isDynamicGeneric || isGeneric)
+                if (aspectClass.isDynamicGeneric || isGeneric || method.IsGenericMethod)
                 {
                     DynamicCacheList.TryAdd(method.GetMethodInfoUniqueName(), aspectAttributeInfo);
                     continue;

diff --git a/src/Intercepter/AspectIntercepter/AdviceIntercept.cs b/src/Intercepter/AspectIntercepter/AdviceIntercept.cs
@@ -41,11 +41,11 @@ internal void InterceptInternal(IInvocation invocation)
 
             if (!_cache.CacheList.TryGetValue(invocation.Method, out var attribute))
             {
-                if (!_cache.CacheList.TryGetValue(invocation.MethodInvocationTarget, out var attributeInherited))
+                if (invocation.Method == invocation.MethodInvocationTarget ||
+                    !_cache.CacheList.TryGetValue(invocation.MethodInvocationTarget, out var attributeInherited))
                 {
                     //动态泛型类
-                    if (!invocation.MethodInvocationTarget.DeclaringType.GetTypeInfo().IsGenericType ||
-                        !_cache.DynamicCacheList.TryGetValue(
+                    if (!_cache.DynamicCacheList.TryGetValue(
                             invocation.MethodInvocationTarget.GetMethodInfoUniqueName(),
                             out var AttributesDynamic))
                     {
@@ -106,11 +106,11 @@ internal async ValueTask InterceptInternalAsync(IAsyncInvocation invocation)
 
             if (!_cache.CacheList.TryGetValue(invocation.Method, out var attribute))
             {
-                if (!_cache.CacheList.TryGetValue(invocation.TargetMethod, out var attributeInherited))
+                if (invocation.Method == invocation.TargetMethod ||
+                    !_cache.CacheList.TryGetValue(invocation.TargetMethod, out var attributeInherited))
                 {
                     //动态泛型类
-                    if (!invocation.TargetMethod.DeclaringType.GetTypeInfo().IsGenericType ||
-                        !_cache.DynamicCacheList.TryGetValue(invocation.TargetMethod.GetMethodInfoUniqueName(),
+                    if (!_cache.DynamicCacheList.TryGetValue(invocation.TargetMethod.GetMethodInfoUniqueName(),
                             out var AttributesDynamic))
                     {
                         await invocation.ProceedAsync();

diff --git a/src/Intercepter/AspectIntercepter/PointcutIntercept.cs b/src/Intercepter/AspectIntercepter/PointcutIntercept.cs
@@ -39,8 +39,7 @@ protected override void Intercept(IInvocation invocation)
             {
                 if (!_configuration.CacheList.TryGetValue(new ObjectKey(invocation.TargetType, invocation.MethodInvocationTarget), out var pointCutInherited))
                 {
-                    if (!invocation.MethodInvocationTarget.DeclaringType.GetTypeInfo().IsGenericType ||
-                        !_configuration.DynamicCacheList.TryGetValue(invocation.MethodInvocationTarget.GetMethodInfoUniqueName(),
+                    if (!_configuration.DynamicCacheList.TryGetValue(invocation.MethodInvocationTarget.GetMethodInfoUniqueName(),
                             out var pointCutDynamic))
                     {
                         //该方法不需要拦截
@@ -96,8 +95,7 @@ protected override async ValueTask InterceptAsync(IAsyncInvocation invocation)
             {
                 if (!_configuration.CacheList.TryGetValue(new ObjectKey(invocation.TargetType, invocation.TargetMethod), out var pointCutInherited))
                 {
-                    if (!invocation.TargetMethod.DeclaringType.GetTypeInfo().IsGenericType ||
-                        !_configuration.DynamicCacheList.TryGetValue(invocation.TargetMethod.GetMethodInfoUniqueName(),
+                    if (!_configuration.DynamicCacheList.TryGetValue(invocation.TargetMethod.GetMethodInfoUniqueName(),
                             out var pointCutDynamic))
                     {
                         //该方法不需要拦截

diff --git a/src/Util/ReflectionExtensions.cs b/src/Util/ReflectionExtensions.cs
@@ -132,22 +132,23 @@ public static bool IsAssignableFromInterfaceMethod(this MethodInfo mi, MethodInf
         /// <returns></returns>
         public static string GetMethodInfoUniqueName(this MethodInfo mi)
         {
-            var signatureString = string.Join(",", mi.GetParameters().Select(p => p.ParameterType.Name).ToArray());
-            var returnTypeName = mi.ReturnType.Name;
-
-            if (mi.IsGenericMethod)
-            {
-                var typeParamsString = string.Join(",",
-                    mi.GetGenericArguments().Select(g => g.AssemblyQualifiedName).ToArray());
-
-
-                // returns a string like this: "Assembly.YourSolution.YourProject.YourClass:YourMethod(Param1TypeName,...,ParamNTypeName):ReturnTypeName
-                return
-                    $"{mi.DeclaringType.Namespace+"," + mi.DeclaringType.Name}:{mi.Name}<{typeParamsString}>({signatureString}):{returnTypeName}";
-            }
-
-            return
-                $"{mi.DeclaringType.Namespace +","+ mi.DeclaringType.Name}:{mi.Name}({signatureString}):{returnTypeName}";
+            return mi.Module.Name + "-" + mi.MetadataToken;
+            // var signatureString = string.Join(",", mi.GetParameters().Select(p => p.ParameterType.Name).ToArray());
+            // var returnTypeName = mi.ReturnType.Name;
+            //
+            // if (mi.IsGenericMethod)
+            // {
+            //     var typeParamsString = string.Join(",",
+            //         mi.GetGenericArguments().Select(g => g.AssemblyQualifiedName).ToArray());
+            //
+            //
+            //     // returns a string like this: "Assembly.YourSolution.YourProject.YourClass:YourMethod(Param1TypeName,...,ParamNTypeName):ReturnTypeName
+            //     return
+            //         $"{mi.DeclaringType.Namespace+"," + mi.DeclaringType.Name}:{mi.Name}<{typeParamsString}>({signatureString}):{returnTypeName}";
+            // }
+            //
+            // return
+            //     $"{mi.DeclaringType.Namespace +","+ mi.DeclaringType.Name}:{mi.Name}({signatureString}):{returnTypeName}";
         }
 
         /// <summary>