切换数据源 可以在类上注解了

hsweb-web-datasource/src/main/java/org/hsweb/web/datasource/dynamic/DynamicDataSourceAutoConfiguration.java

@@ -24,14 +24,15 @@ import com.atomikos.jdbc.AtomikosDataSourceBean;
 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.hsweb.commons.ClassUtils;
 import org.hsweb.commons.StringUtils;
 import org.hsweb.web.core.datasource.DataSourceHolder;
 import org.hsweb.web.core.datasource.DynamicDataSource;
-import org.hsweb.web.core.exception.AuthorizeForbiddenException;
+import org.hsweb.web.core.utils.AopUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.jta.atomikos.AtomikosProperties;
 import org.springframework.cache.annotation.Cacheable;
@@ -43,6 +44,7 @@ import org.springframework.transaction.jta.JtaTransactionManager;
 
 import javax.sql.DataSource;
 import javax.transaction.SystemException;
+import java.lang.annotation.Annotation;
 import java.util.Properties;
 
 @Configuration
@@ -123,23 +125,40 @@ public class DynamicDataSourceAutoConfiguration {
 
     @Aspect
     public static class AnnotationDataSourceChangeConfiguration {
-        @Around(value = "@annotation(dataSource)")
-        public Object useDatasource(ProceedingJoinPoint pjp, UseDataSource dataSource) throws Throwable {
+
+        private <T extends Annotation> T getAnn(ProceedingJoinPoint pjp, Class<T> annClass) {
+            MethodSignature signature = (MethodSignature) pjp.getSignature();
+            T ann = ClassUtils.getAnnotation(signature.getMethod(), annClass);
+            if (null == ann)
+                ann = ClassUtils.getAnnotation(pjp.getTarget().getClass(), annClass);
+            return ann;
+        }
+
+        @Around(value = "within(@org.hsweb.web.datasource.dynamic.UseDataSource *)||@annotation(org.hsweb.web.datasource.dynamic.UseDataSource)")
+        public Object useDatasource(ProceedingJoinPoint pjp) throws Throwable {
+            UseDataSource ann = getAnn(pjp, UseDataSource.class);
             try {
-                DynamicDataSource.use(dataSource.value());
+                if (null != ann) {
+                    DynamicDataSource.use(ann.value());
+                }
                 return pjp.proceed();
             } finally {
-                DynamicDataSource.useDefault(false);
+                if (null != ann) {
+                    DynamicDataSource.useDefault(false);
+                }
             }
         }
 
-        @Around(value = "@annotation(dataSource)")
-        public Object useDefaultDatasource(ProceedingJoinPoint pjp, UseDefaultDataSource dataSource) throws Throwable {
+        @Around(value = "within(@org.hsweb.web.datasource.dynamic.UseDefaultDataSource *)||@annotation(org.hsweb.web.datasource.dynamic.UseDataSource)")
+        public Object useDefaultDatasource(ProceedingJoinPoint pjp) throws Throwable {
+            UseDefaultDataSource ann = getAnn(pjp, UseDefaultDataSource.class);
             try {
-                DynamicDataSource.useDefault(dataSource.value());
+                if (null != ann) {
+                    DynamicDataSource.useDefault(ann.value());
+                }
                 return pjp.proceed();
             } finally {
-                if (dataSource.value())
+                if (ann != null && ann.value())
                     DynamicDataSource.useLast();
             }
         }