From 79766fa8c2571affbd86bd4f8871d0db6bd52e08 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 七月 2021 10:18:05 +0800
Subject: [PATCH] update springboot 2.4.9 => 2.5.3 update hutool 5.7.5 => 5.7.6 update redisson 3.16.0 => 3.16.1 update datasource 3.4.0 => 3.4.1
---
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