From c958217d196106c47bfcb61c235eecf39fc26ec9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 13:08:19 +0800
Subject: [PATCH] update 修改 自动注入器 用户未登录异常拦截抛出警告 返回Null
---
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