From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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..0b1c898 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
@@ -1,8 +1,8 @@
package com.ruoyi.framework.aspectj;
-import cn.hutool.core.lang.Validator;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.utils.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
@@ -17,15 +17,17 @@
/**
* 澶氭暟鎹簮澶勭悊
*
- * @author ruoyi
+ * @author Lion Li
+ * @deprecated 3.6.0 绉婚櫎 浣跨敤鍘熺敓鏂规硶澶勭悊 鍔熻兘鏇村叏
*/
@Aspect
-@Order(1)
+@Order(-500)
@Component
+@Deprecated
public class DataSourceAspect {
@Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"
- + "|| @within(com.ruoyi.common.annotation.DataSource)")
+ + "|| @within(com.ruoyi.common.annotation.DataSource)")
public void dsPointCut() {
}
@@ -33,8 +35,10 @@
public Object around(ProceedingJoinPoint point) throws Throwable {
DataSource dataSource = getDataSource(point);
- if (Validator.isNotNull(dataSource)) {
- DynamicDataSourceContextHolder.push(dataSource.value().name());
+ if (StringUtils.isNotNull(dataSource)) {
+ DynamicDataSourceContextHolder.poll();
+ String source = dataSource.value().getSource();
+ DynamicDataSourceContextHolder.push(source);
}
try {
@@ -57,4 +61,5 @@
return AnnotationUtils.findAnnotation(signature.getDeclaringType(), DataSource.class);
}
+
}
--
Gitblit v1.9.3