Feature: more detailed Datasouce routing support

dynamic-datasource-spring-boot-common/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceProperties.java

@@ -125,4 +125,5 @@ public class DynamicDataSourceProperties {
      */
     @NestedConfigurationProperty
     private DynamicDatasourceAopProperties aop = new DynamicDatasourceAopProperties();
+
 }

dynamic-datasource-spring-boot-common/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDatasourceAopProperties.java

@@ -18,6 +18,9 @@
 import lombok.Data;
 import org.springframework.core.Ordered;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 多数据源aop相关配置
  *
@@ -38,4 +41,14 @@ public class DynamicDatasourceAopProperties {
      * aop allowedPublicOnly
      */
     private Boolean allowedPublicOnly = true;
+
+    /**
+     * aop scanPackagePatterns
+     */
+    private List<String> scanPackagePatterns;
+
+    /**
+     * dynamic datasource routes
+     */
+    private Map<String, String> dsRoutes;
 }

dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAopConfiguration.java

@@ -18,9 +18,7 @@
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.dynamic.datasource.aop.DynamicDataSourceAnnotationAdvisor;
-import com.baomidou.dynamic.datasource.aop.DynamicDataSourceAnnotationInterceptor;
-import com.baomidou.dynamic.datasource.aop.DynamicLocalTransactionInterceptor;
+import com.baomidou.dynamic.datasource.aop.*;
 import com.baomidou.dynamic.datasource.processor.DsJakartaHeaderProcessor;
 import com.baomidou.dynamic.datasource.processor.DsJakartaSessionProcessor;
 import com.baomidou.dynamic.datasource.processor.DsProcessor;
@@ -87,6 +85,18 @@ public Advisor dynamicDatasourceAnnotationAdvisor(DsProcessor dsProcessor) {
         return advisor;
     }
 
+    @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
+    @Bean
+    @ConditionalOnProperty(prefix = DynamicDataSourceProperties.PREFIX + ".aop", name = "enabled", havingValue = "true", matchIfMissing = true)
+    public Advisor dynamicDataSourceNamedAdvisor(DsProcessor dsProcessor) {
+        DynamicDatasourceAopProperties aopProperties = properties.getAop();
+        DynamicDataSourceNamedInterceptor interceptor = new DynamicDataSourceNamedInterceptor(dsProcessor);
+        interceptor.addPatternMap(aopProperties.getDsRoutes());
+        DynamicDataSourceNamedAdvisor advisor = new DynamicDataSourceNamedAdvisor(interceptor, aopProperties.getScanPackagePatterns());
+        advisor.setOrder(aopProperties.getOrder() + 1);
+        return advisor;
+    }
+
     @Role(BeanDefinition.ROLE_INFRASTRUCTURE)
     @Bean
     @ConditionalOnProperty(prefix = DynamicDataSourceProperties.PREFIX, name = "seata", havingValue = "false", matchIfMissing = true)

dynamic-datasource-spring-boot3-starter/src/main/java/com/baomidou/dynamic/datasource/spring/boot/autoconfigure/DynamicDataSourceAutoConfiguration.java

@@ -46,7 +46,8 @@
                 "com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure",
                 "com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure"
         })
-@Import({DruidDynamicDataSourceConfiguration.class, DynamicDataSourceCreatorAutoConfiguration.class, DynamicDataSourceAopConfiguration.class, DynamicDataSourceAssistConfiguration.class})
+@Import({DruidDynamicDataSourceConfiguration.class, DynamicDataSourceCreatorAutoConfiguration.class,
+        DynamicDataSourceAopConfiguration.class, DynamicDataSourceAssistConfiguration.class})
 @ConditionalOnProperty(prefix = DynamicDataSourceProperties.PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true)
 public class DynamicDataSourceAutoConfiguration implements InitializingBean {
 

dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/aop/DynamicDataSourceNamedAdvisor.java

@@ -0,0 +1,74 @@
+package com.baomidou.dynamic.datasource.aop;
+
+import org.aopalliance.aop.Advice;
+import org.springframework.aop.ClassFilter;
+import org.springframework.aop.MethodMatcher;
+import org.springframework.aop.Pointcut;
+import org.springframework.aop.support.AbstractPointcutAdvisor;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.PatternMatchUtils;
+
+import java.util.List;
+
+/**
+ * @author yuhuangbin
+ */
+public class DynamicDataSourceNamedAdvisor extends AbstractPointcutAdvisor implements BeanFactoryAware {
+
+    /**
+     * the advice
+     */
+    private final Advice advice;
+    /**
+     * the pointcut
+     */
+    private final Pointcut pointcut;
+
+
+    public DynamicDataSourceNamedAdvisor(Advice advice, List<String> scanPackages) {
+        this.advice = advice;
+        this.pointcut = new ClassPackageNamedPointCut(scanPackages);
+    }
+
+    @Override
+    public Pointcut getPointcut() {
+        return pointcut;
+    }
+
+    @Override
+    public Advice getAdvice() {
+        return advice;
+    }
+
+    @Override
+    public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
+        if (this.advice instanceof BeanFactoryAware) {
+            ((BeanFactoryAware) this.advice).setBeanFactory(beanFactory);
+        }
+    }
+
+    public static class ClassPackageNamedPointCut implements Pointcut {
+
+        private final ClassFilter classFilter;
+
+        public ClassPackageNamedPointCut(List<String> packagePatterns) {
+            this.classFilter = clazz -> !CollectionUtils.isEmpty(packagePatterns)
+                    && PatternMatchUtils.simpleMatch(packagePatterns.toArray(new String[0]), ClassUtils.getPackageName(clazz));
+        }
+
+        @Override
+        public ClassFilter getClassFilter() {
+            return classFilter;
+        }
+
+        @Override
+        public MethodMatcher getMethodMatcher() {
+            return MethodMatcher.TRUE;
+        }
+    }
+
+}

dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/aop/DynamicDatasourceNamedInterceptor.java → dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/aop/DynamicDataSourceNamedInterceptor.java

@@ -39,7 +39,7 @@
  * @since 3.4.0
  */
 @Slf4j
-public class DynamicDatasourceNamedInterceptor implements MethodInterceptor {
+public class DynamicDataSourceNamedInterceptor implements MethodInterceptor {
 
     private static final String DYNAMIC_PREFIX = "#";
     private final Map<String, String> nameMap = new HashMap<>();
@@ -50,7 +50,7 @@ public class DynamicDatasourceNamedInterceptor implements MethodInterceptor {
      *
      * @param dsProcessor dsProcessor
      */
-    public DynamicDatasourceNamedInterceptor(DsProcessor dsProcessor) {
+    public DynamicDataSourceNamedInterceptor(DsProcessor dsProcessor) {
         this.dsProcessor = dsProcessor;
     }
 
@@ -126,7 +126,7 @@ private String findDsKey(MethodInvocation invocation) {
         }
 
         // Look for direct name match.
-        String methodName = method.getName();
+        String methodName = ClassUtils.getQualifiedMethodName(method);
         String dsKey = this.nameMap.get(methodName);
 
         if (dsKey == null) {