2025-01-04 18:41:51

yingzhuo · Jan 4, 2025 · f204f29 · f204f29
1 parent d7ca043
commit f204f29
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 16 deletions.
diff --git a/spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/DataSourceSwitch.java b/spring-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/DataSourceSwitch.java
@@ -10,7 +10,7 @@
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
+@Target({ElementType.METHOD, ElementType.TYPE})
 public @interface DataSourceSwitch {
 
     /**

diff --git a/...g-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/DataSourceSwitchAdvice.java b/...g-turbo-module-jdbc/src/main/java/spring/turbo/module/jdbc/ds/DataSourceSwitchAdvice.java
@@ -3,31 +3,44 @@
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.core.Ordered;
+import spring.turbo.core.AspectUtils;
 
 /**
  * @author 应卓
  * @see DataSourceSwitch
  * @since 3.4.1
  */
 @Aspect
-public record DataSourceSwitchAdvice(int order) implements Ordered {
+public class DataSourceSwitchAdvice implements Ordered {
+
+    private final int order;
+
+    public DataSourceSwitchAdvice() {
+        this(HIGHEST_PRECEDENCE);
+    }
+
+    public DataSourceSwitchAdvice(int order) {
+        this.order = order;
+    }
 
     @Around("@annotation(spring.turbo.module.jdbc.ds.DataSourceSwitch)")
     public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
-        var signature = joinPoint.getSignature();
-        if (signature instanceof MethodSignature methodSignature) {
-            var annotation = methodSignature.getMethod().getAnnotation(DataSourceSwitch.class);
-            var dataSourceName = annotation.value();
-            RoutingDataSourceLookup.set(dataSourceName);
-            try {
-                return joinPoint.proceed();
-            } finally {
-                RoutingDataSourceLookup.remove();
-            }
-        } else {
+        var annotation = AspectUtils.getMethodAnnotation(joinPoint, DataSourceSwitch.class);
+
+        if (annotation == null) {
+            annotation = AspectUtils.getObjectTypeAnnotation(joinPoint, DataSourceSwitch.class);
+        }
+
+        if (annotation == null) {
+            return joinPoint.proceed();
+        }
+
+        try {
+            RoutingDataSourceLookup.set(annotation.value());
             return joinPoint.proceed();
+        } finally {
+            RoutingDataSourceLookup.remove();
         }
     }
 

diff --git a/...-module-redis/src/main/java/spring/turbo/module/redis/aspect/AvoidRepeatedInvocation.java b/...-module-redis/src/main/java/spring/turbo/module/redis/aspect/AvoidRepeatedInvocation.java
@@ -13,7 +13,7 @@
 @Inherited
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
+@Target({ElementType.METHOD, ElementType.TYPE})
 public @interface AvoidRepeatedInvocation {
 
     /**

diff --git a/...e-redis/src/main/java/spring/turbo/module/redis/aspect/AvoidRepeatedInvocationAdvice.java b/...e-redis/src/main/java/spring/turbo/module/redis/aspect/AvoidRepeatedInvocationAdvice.java
@@ -52,11 +52,16 @@ public AvoidRepeatedInvocationAdvice(RedisOperations<String, String> redisOperat
     @Around("@annotation(spring.turbo.module.redis.aspect.AvoidRepeatedInvocation)")
     public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
         var annotation = AspectUtils.getMethodAnnotation(joinPoint, AvoidRepeatedInvocation.class);
+
+        if (annotation == null) {
+            annotation = AspectUtils.getObjectTypeAnnotation(joinPoint, AvoidRepeatedInvocation.class);
+        }
+
         if (annotation == null) {
             return joinPoint.proceed();
         }
 
-        var redisKey = AspectSpELTemplate.<String>newInstance(annotation.value(), joinPoint)
+        var redisKey = AspectSpELTemplate.newInstance(annotation.value(), joinPoint)
                 .setRootObject(null)
                 .getValue();