From 53db9d59566fca3783d0df9ec6242a76100ac548 Mon Sep 17 00:00:00 2001
From: zhengwunong <704199387@qq.com>
Date: Wed, 15 Jan 2025 01:40:02 +0000
Subject: [PATCH] =?UTF-8?q?update=20easy-trans-service/src/main/java/org/d?=
 =?UTF-8?q?romara/trans/service/impl/ITransTypeService.java.=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=A4=9A=E6=95=B0=E6=8D=AE=E6=BA=90=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0finally=20=E6=B8=85=E9=99=A4=20=20finally?=
 =?UTF-8?q?=20{=20=20=20=20=20=20=20=20=20=20=20=20=20=09=20TransConfig.da?=
 =?UTF-8?q?taSourceSetter.clear(dataSourceName);=20}?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 if (!StringUtil.isEmpty(dataSourceName)) {
                    TransConfig.dataSourceSetter.setDataSource(dataSourceName);
                    TransConfig.dataSourceSetter.setContext(context);
                }
修改，if判断由业务判断处理
 TransConfig.dataSourceSetter.setDataSource(dataSourceName);
                    TransConfig.dataSourceSetter.setContext(context);

Signed-off-by: zhengwunong <704199387@qq.com>
---
 .../trans/service/impl/ITransTypeService.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java
index 5576baa..95652b0 100644
--- a/easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java
+++ b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java
@@ -293,13 +293,13 @@ public interface ITransTypeService {
         }
         CompletableFuture<List<? extends VO>> cf = CompletableFuture.supplyAsync(() -> {
             try {
-                if (!StringUtil.isEmpty(dataSourceName)) {
-                    TransConfig.dataSourceSetter.setDataSource(dataSourceName);
-                }
+                TransConfig.dataSourceSetter.setDataSource(dataSourceName);
                 return callable.call();
             } catch (Exception e) {
                 Logger.error("", e);
-            }
+            } finally {
+            	 TransConfig.dataSourceSetter.clear(dataSourceName);
+			}
             return null;
         });
         try {
@@ -331,14 +331,14 @@ public interface ITransTypeService {
         Map<Object,Object>  context = TransConfig.dataSourceSetter.getContext();
         CompletableFuture<VO> cf = CompletableFuture.supplyAsync(() -> {
             try {
-                if (!StringUtil.isEmpty(dataSourceName)) {
                     TransConfig.dataSourceSetter.setDataSource(dataSourceName);
                     TransConfig.dataSourceSetter.setContext(context);
-                }
                 return callable.call();
             } catch (Exception e) {
                 Logger.error("", e);
-            }
+            } finally {
+            	 TransConfig.dataSourceSetter.clear(dataSourceName);
+			}
             return null;
         });
         try {
-- 
Gitee