From 1488a09b8ee6a4f4980a25dada3425f9894d8327 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期三, 23 六月 2021 18:08:17 +0800 Subject: [PATCH] Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus --- ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java index 3167934..f82b2ae 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java @@ -20,7 +20,7 @@ * @author ruoyi */ @Aspect -@Order(1) +@Order(-500) @Component public class DataSourceAspect { @@ -34,7 +34,9 @@ DataSource dataSource = getDataSource(point); if (Validator.isNotNull(dataSource)) { - DynamicDataSourceContextHolder.push(dataSource.value().name()); + DynamicDataSourceContextHolder.poll(); + String source = dataSource.value().getSource(); + DynamicDataSourceContextHolder.push(source); } try { -- Gitblit v1.9.3