diff --git a/src/main/java/neatlogic/framework/applicationlistener/core/ModuleInitializedListenerBase.java b/src/main/java/neatlogic/framework/applicationlistener/core/ModuleInitializedListenerBase.java
index 081f33d653f2a8c72c87b969df6997a894ad1f27..f4bce033da916f689483f8c7df9655e318a7872f 100644
--- a/src/main/java/neatlogic/framework/applicationlistener/core/ModuleInitializedListenerBase.java
+++ b/src/main/java/neatlogic/framework/applicationlistener/core/ModuleInitializedListenerBase.java
@@ -27,11 +27,7 @@ public abstract class ModuleInitializedListenerBase implements ApplicationListen
 
     @PostConstruct
     public final void init() {
-        //初始化TenantContext，避免子类使用TenantContext时出现空指针
-        TenantContext.init();
-        //TenantContext tenantContext = TenantContext.get();
-        //String tenant = tenantContext.getTenantUuid();
-        //tenantContext.switchTenant(tenant);
+        TenantContext.get().setUseMasterDatabase(true);
         myInit();
     }
 
@@ -39,6 +35,7 @@ public abstract class ModuleInitializedListenerBase implements ApplicationListen
     public final void onApplicationEvent(ContextRefreshedEvent event) {
         ApplicationContext c = event.getApplicationContext();
         if (c instanceof NeatLogicWebApplicationContext) {
+            TenantContext.get().setUseMasterDatabase(true);
             onInitialized((NeatLogicWebApplicationContext) c);
         }
     }
diff --git a/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java b/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java
index aab6658195ff06a87b60b457c1f319283f125de5..be5147f30121f72dde44a9d4e91df235604d2ad6 100644
--- a/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java
+++ b/src/main/java/neatlogic/framework/asynchronization/thread/NeatLogicThread.java
@@ -17,13 +17,11 @@ 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;
 
@@ -32,7 +30,6 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
     protected UserContext userContext;
     protected MongodbSessionContext mongodbSessionContext;
     private final String tenantUuid;
-    private final List<ModuleVo> activeModuleList;
     protected InputFromContext inputFromContext;
     protected RequestContext requestContext;
     private String threadName;
@@ -100,7 +97,6 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
             userContext = tmp.copy();
         }
         tenantUuid = TenantContext.get().getTenantUuid();
-        activeModuleList = TenantContext.get().getActiveModuleList();
         inputFromContext = InputFromContext.get();
         requestContext = RequestContext.get();
         mongodbSessionContext = MongodbSessionContext.get();
@@ -113,7 +109,6 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
             userContext = tmp.copy();
         }
         tenantUuid = TenantContext.get().getTenantUuid();
-        activeModuleList = TenantContext.get().getActiveModuleList();
         inputFromContext = InputFromContext.get();
         requestContext = RequestContext.get();
         mongodbSessionContext = MongodbSessionContext.get();
@@ -124,7 +119,6 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
     public NeatLogicThread(String _threadName, boolean _isUnique) {
         userContext = UserContext.get();
         tenantUuid = TenantContext.get().getTenantUuid();
-        activeModuleList = TenantContext.get().getActiveModuleList();
         inputFromContext = InputFromContext.get();
         requestContext = RequestContext.get();
         mongodbSessionContext = MongodbSessionContext.get();
@@ -134,8 +128,7 @@ public abstract class NeatLogicThread implements Runnable, Comparable<NeatLogicT
 
     @Override
     public final void run() {
-        TenantContext tenantContext = TenantContext.init(tenantUuid);
-        tenantContext.setActiveModuleList(activeModuleList);
+        TenantContext.init(tenantUuid);
         UserContext.init(userContext);
         InputFromContext.init(inputFromContext);
         RequestContext.init(requestContext);
diff --git a/src/main/java/neatlogic/framework/asynchronization/threadlocal/TenantContext.java b/src/main/java/neatlogic/framework/asynchronization/threadlocal/TenantContext.java
index f791882030ce08d900acb5e07238260ade62ccb3..2c729157e9c4d311976f37e1013675224fe2d765 100644
--- a/src/main/java/neatlogic/framework/asynchronization/threadlocal/TenantContext.java
+++ b/src/main/java/neatlogic/framework/asynchronization/threadlocal/TenantContext.java
@@ -20,6 +20,7 @@ import neatlogic.framework.common.util.ModuleUtil;
 import neatlogic.framework.dao.mapper.ModuleMapper;
 import neatlogic.framework.dto.module.ModuleGroupVo;
 import neatlogic.framework.dto.module.ModuleVo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,16 +30,15 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 @RootConfiguration
 public class TenantContext implements Serializable {
     private static final long serialVersionUID = -5977938340288247600L;
     private static final ThreadLocal<TenantContext> instance = new ThreadLocal<>();
+    private static final ConcurrentHashMap<String, List<String>> tenantModuleGroupListMap = new ConcurrentHashMap<>();
     private String tenantUuid;
     private Boolean useDefaultDatasource = false;
-    private List<ModuleVo> activeModuleList;
-    private List<ModuleGroupVo> activeModuleGroupList;
-    private Map<String, ModuleVo> activeModuleMap;
     private Boolean isData = false;
     private final String dataDbName = "";
 
@@ -59,7 +59,6 @@ public class TenantContext implements Serializable {
         TenantContext context = new TenantContext();
         if (_tenantContext != null) {
             context.setTenantUuid(_tenantContext.getTenantUuid());
-            context.setActiveModuleList(_tenantContext.getActiveModuleList());
             MDC.put("tenant", _tenantContext.getTenantUuid());
         }
         instance.set(context);
@@ -117,35 +116,32 @@ public class TenantContext implements Serializable {
     public TenantContext switchTenant(String tenantUuid) {
         if (StringUtils.isNotBlank(tenantUuid)) {
             this.tenantUuid = tenantUuid;
-            // 使用master库
-            this.setUseMasterDatabase(true);
-            //防止 ArrayList HashMap 对象在存入 ehcache 之前迭代序列化时，另一个线程对这个 list、map 进行了修改操作
-            List<String> tenantModuleGroupList = new ArrayList<>(moduleMapper.getModuleGroupListByTenantUuid(tenantUuid));
-            this.activeModuleList = ModuleUtil.getTenantActiveModuleList(tenantModuleGroupList);
-            this.activeModuleGroupList = new ArrayList<>();
-            for (String group : tenantModuleGroupList) {
-                ModuleGroupVo groupVo = ModuleUtil.getModuleGroup(group);
-                if (groupVo != null) {
-                    this.activeModuleGroupList.add(groupVo);
-                }
-            }
-            // 还原回租户库
             this.setUseMasterDatabase(false);
-            activeModuleMap = new HashMap<>();
-            if (activeModuleList != null && activeModuleList.size() > 0) {
-                for (ModuleVo module : activeModuleList) {
-                    activeModuleMap.put(module.getId(), module);
-                }
-            }
             MDC.put("tenant", tenantUuid);
         }
         return this;
     }
 
     public static TenantContext get() {
+        if (instance.get() == null) {
+            init();
+        }
         return instance.get();
     }
 
+    private List<String> searchModuleGroupList(String tenantUuid) {
+        List<String> moduleGroupList = tenantModuleGroupListMap.get(tenantUuid);
+        if (moduleGroupList == null) {
+            // 使用master库
+            this.setUseMasterDatabase(true);
+            List<String> tenantModuleGroupList = moduleMapper.getModuleGroupListByTenantUuid(tenantUuid);
+            // 还原回租户库
+            this.setUseMasterDatabase(false);
+            tenantModuleGroupListMap.put(tenantUuid, tenantModuleGroupList);
+        }
+        return tenantModuleGroupListMap.get(tenantUuid);
+    }
+
     public void release() {
         MDC.remove("tenant");
         instance.remove();
@@ -165,28 +161,35 @@ public class TenantContext implements Serializable {
     }
 
     public List<ModuleVo> getActiveModuleList() {
-        return activeModuleList;
+        List<String> tenantModuleGroupList = searchModuleGroupList(this.tenantUuid);
+        return ModuleUtil.getTenantActiveModuleList(tenantModuleGroupList);
     }
 
     public List<ModuleGroupVo> getActiveModuleGroupList() {
+        List<String> tenantModuleGroupList = searchModuleGroupList(this.tenantUuid);
+        List<ModuleGroupVo> activeModuleGroupList = new ArrayList<>();
+        for (String group : tenantModuleGroupList) {
+            ModuleGroupVo groupVo = ModuleUtil.getModuleGroup(group);
+            if (groupVo != null) {
+                activeModuleGroupList.add(groupVo);
+            }
+        }
         return activeModuleGroupList;
     }
 
-    public void setActiveModuleList(List<ModuleVo> activeModuleList) {
-        this.activeModuleList = activeModuleList;
-        activeModuleMap = new HashMap<>();
-        if (activeModuleList != null && activeModuleList.size() > 0) {
+    public Map<String, ModuleVo> getActiveModuleMap() {
+        List<String> tenantModuleGroupList = searchModuleGroupList(this.tenantUuid);
+        List<ModuleVo> activeModuleList = ModuleUtil.getTenantActiveModuleList(tenantModuleGroupList);
+        Map<String, ModuleVo> activeModuleMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(activeModuleList)) {
             for (ModuleVo module : activeModuleList) {
                 activeModuleMap.put(module.getId(), module);
             }
         }
-    }
-
-    public Map<String, ModuleVo> getActiveModuleMap() {
         return activeModuleMap;
     }
 
     public boolean containsModule(String moduleId) {
-        return activeModuleMap.containsKey(moduleId);
+        return getActiveModuleMap().containsKey(moduleId);
     }
 }