From d9006551fff47c172ea6a0672af7dd21df34f28f Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期六, 15 二月 2025 15:05:45 +0800
Subject: [PATCH] 20250215

---
 ltkj-framework/src/main/java/com/ltkj/framework/aspectj/DataSourceAspect.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 e0014fd..71e06a4 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
@@ -36,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)) {
-            DataSourceContextHolder.setDataSourceKey(dataSource.value().name());
+            DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
         }
 
         try {
             return point.proceed();
         } finally {
+            logger.info("鎵ц涔嬪悗");
+            logger.info("DataSourceContextHolder ->{}",key);
+            logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
             // 閿�姣佹暟鎹簮 鍦ㄦ墽琛屾柟娉曚箣鍚�
-            DataSourceContextHolder.clear();
+            DynamicDataSourceContextHolder.clearDataSourceType();
+//            DataSourceContextHolder.setDataSourceKey(key);
+//            DynamicDataSourceContextHolder.setDataSourceType(key);
+            logger.info("鎵ц涔嬪悗 clear涔嬪悗");
+            logger.info("DataSourceContextHolder ->{}",key);
+            logger.info("DynamicDataSourceContextHolder ->{}",DynamicDataSourceContextHolder.getDataSourceType());
         }
     }
 

--
Gitblit v1.8.0