From 7da9aaaa63a7cd314c5e1843c20ca5d4f5ebda01 Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Mon, 24 Apr 2023 18:00:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20MybatisAdapterFlex=20?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=97=B6=EF=BC=8C=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=20globalConfig::sqlSessionFactory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../solon/integration/MybatisAdapterFlex.java   | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/MybatisAdapterFlex.java b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/MybatisAdapterFlex.java
index 1afb8c5b..7ba7a787 100644
--- a/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/MybatisAdapterFlex.java
+++ b/mybatis-flex-solon-plugin/src/main/java/com/mybatisflex/solon/integration/MybatisAdapterFlex.java
@@ -33,7 +33,7 @@ public class MybatisAdapterFlex extends MybatisAdapterDefault {
             factoryBuilderPlus = bean;
         });
 
-        globalConfig.setSqlSessionFactory(getFactory());
+        initAfter(dsWrap);
     }
 
     protected MybatisAdapterFlex(BeanWrap dsWrap, Props dsProps) {
@@ -44,6 +44,16 @@ public class MybatisAdapterFlex extends MybatisAdapterDefault {
         dsWrap.context().getBeanAsync(FlexSqlSessionFactoryBuilder.class, bean -> {
             factoryBuilderPlus = bean;
         });
+
+        initAfter(dsWrap);
+    }
+
+    protected void initAfter(BeanWrap dsWrap) {
+        globalConfig.setSqlSessionFactory(getFactory());
+
+        if (dsWrap.typed()) {
+            FlexGlobalConfig.setDefaultConfig(globalConfig);
+        }
     }
 
     @Override
@@ -53,8 +63,6 @@ public class MybatisAdapterFlex extends MybatisAdapterDefault {
 
     @Override
     protected void initConfiguration(Environment environment) {
-
-
         //for configuration section
         config = new FlexConfiguration(environment);
 
@@ -74,7 +82,8 @@ public class MybatisAdapterFlex extends MybatisAdapterDefault {
             Utils.injectProperties(globalConfig, globalProps);
         }
         globalConfig.setConfiguration(config);
-        FlexGlobalConfig.setConfig(environment.getId(), globalConfig);
+
+        FlexGlobalConfig.setConfig(environment.getId(), globalConfig, false);
     }
 
     /**