From 2a9583fd376451ca77a0400af7f3a02d1b80e7f5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期二, 24 六月 2025 18:04:34 +0800
Subject: [PATCH] 2025-06-24

---
 ltkj-framework/src/main/java/com/ltkj/framework/aspectj/DataSourceAspect.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/aspectj/DataSourceAspect.java b/ltkj-framework/src/main/java/com/ltkj/framework/aspectj/DataSourceAspect.java
index 1dccc09..08102c4 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/aspectj/DataSourceAspect.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/aspectj/DataSourceAspect.java
@@ -2,6 +2,7 @@
 
 import java.util.Objects;
 
+import com.ltkj.db.DataSourceContextHolder;
 import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -35,17 +36,29 @@
 
     @Around("dsPointCut()")
     public Object around(ProceedingJoinPoint point) throws Throwable {
+        String key = DataSourceContextHolder.getDataSourceKey();
+        logger.info("鎵ц涔嬪墠");
+        logger.info("DataSourceContextHolder ->{}",key);
+        logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
         DataSource dataSource = getDataSource(point);
 
         if (StringUtils.isNotNull(dataSource)) {
             DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
+            DataSourceContextHolder.setDataSourceKey(dataSource.value().name());
         }
 
         try {
             return point.proceed();
         } finally {
+            logger.info("鎵ц涔嬪悗");
+            logger.info("DataSourceContextHolder ->{}",key);
+            logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
             // 閿�姣佹暟鎹簮 鍦ㄦ墽琛屾柟娉曚箣鍚�
-            DynamicDataSourceContextHolder.clearDataSourceType();
+            DataSourceContextHolder.setDataSourceKey(key);
+            DynamicDataSourceContextHolder.setDataSourceType(key);
+            logger.info("鎵ц涔嬪悗 clear涔嬪悗");
+            logger.info("DataSourceContextHolder ->{}",key);
+            logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
         }
     }
 

--
Gitblit v1.8.0