From 396d1634dd2e6fd6f92cdf252fd2094287930d5c Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Tue, 4 Mar 2025 15:09:03 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=BC=82=E6=AD=A5?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E5=88=87=E6=8D=A2=E7=A7=9F=E6=88=B7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1369543832731648]异步线程切换租户数据库异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1369543832731648
---
 .../thread/NeatLogicThread.java               | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java b/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java
index 6949863d1..22e9bacb9 100644
--- a/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java
+++ b/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java
@@ -17,18 +17,21 @@ package neatlogic.framework.asynchronization.thread;
 
 import neatlogic.framework.asynchronization.threadlocal.*;
 import neatlogic.framework.cache.threadlocal.CacheContext;
+import neatlogic.framework.dto.module.ModuleVo;
 import neatlogic.framework.exception.core.ApiRuntimeException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
 
 public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicThread> {
     private static final Logger logger = LoggerFactory.getLogger(NeatLogicThread.class);
     protected UserContext userContext;
-    protected TenantContext tenantContext;
+    private String tenantUuid;
+    private List<ModuleVo> activeModuleList;
     protected InputFromContext inputFromContext;
     protected RequestContext requestContext;
     private String threadName;
@@ -82,14 +85,16 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
 
     public NeatLogicThread(UserContext _userContext, TenantContext _tenantContext) {
         userContext = _userContext;
-        tenantContext = _tenantContext;
+        tenantUuid = _tenantContext.getTenantUuid();
+        activeModuleList = _tenantContext.getActiveModuleList();
         inputFromContext = InputFromContext.get();
     }
 
 
     public NeatLogicThread(String _threadName) {
         userContext = UserContext.get();
-        tenantContext = TenantContext.get();
+        tenantUuid = TenantContext.get().getTenantUuid();
+        activeModuleList = TenantContext.get().getActiveModuleList();
         inputFromContext = InputFromContext.get();
         requestContext = RequestContext.get();
         this.threadName = _threadName;
@@ -97,7 +102,8 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
 
     public NeatLogicThread(String _threadName, int priority) {
         userContext = UserContext.get();
-        tenantContext = TenantContext.get();
+        tenantUuid = TenantContext.get().getTenantUuid();
+        activeModuleList = TenantContext.get().getActiveModuleList();
         inputFromContext = InputFromContext.get();
         requestContext = RequestContext.get();
         this.threadName = _threadName;
@@ -106,7 +112,8 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
 
     public NeatLogicThread(String _threadName, boolean _isUnique) {
         userContext = UserContext.get();
-        tenantContext = TenantContext.get();
+        tenantUuid = TenantContext.get().getTenantUuid();
+        activeModuleList = TenantContext.get().getActiveModuleList();
         inputFromContext = InputFromContext.get();
         requestContext = RequestContext.get();
         this.threadName = _threadName;
@@ -115,7 +122,8 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
 
     @Override
     public final void run() {
-        TenantContext.init(tenantContext);
+        TenantContext tenantContext = TenantContext.init(tenantUuid);
+        tenantContext.setActiveModuleList(activeModuleList);
         UserContext.init(userContext);
         InputFromContext.init(inputFromContext);
         RequestContext.init(requestContext);
-- 
Gitee