From 4f2982131be016cf33efb4c7df33c5248927722c Mon Sep 17 00:00:00 2001 From: witt Date: Wed, 5 Jun 2024 17:18:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20#I9V9MB=20=E4=BF=AE=E5=A4=8D=E5=A4=9A?= =?UTF-8?q?=E4=B8=AASqlSessionFactory=E5=85=B1=E5=AD=98=E6=97=B6=EF=BC=8CF?= =?UTF-8?q?lexGlobalConfig=E8=A2=AB=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/mybatis/FlexSqlSessionFactoryBuilder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexSqlSessionFactoryBuilder.java b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexSqlSessionFactoryBuilder.java index ecfc4c82..86685128 100644 --- a/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexSqlSessionFactoryBuilder.java +++ b/mybatis-flex-core/src/main/java/com/mybatisflex/core/mybatis/FlexSqlSessionFactoryBuilder.java @@ -128,14 +128,17 @@ public class FlexSqlSessionFactoryBuilder extends SqlSessionFactoryBuilder { String environmentId = configuration.getEnvironment().getId(); FlexGlobalConfig globalConfig = FlexGlobalConfig.getConfig(environmentId); - if (globalConfig == null){ + boolean configUnInitialize = globalConfig == null; + if (configUnInitialize) { globalConfig = new FlexGlobalConfig(); } globalConfig.setSqlSessionFactory(sessionFactory); globalConfig.setConfiguration(configuration); - FlexGlobalConfig.setConfig(environmentId, globalConfig,true); + boolean isDefault = FlexGlobalConfig.getDefaultConfig() == globalConfig; + // #I9V9MB 多个SqlSessionFactory初始化时，被最后一个覆盖默认配置 + FlexGlobalConfig.setConfig(environmentId, globalConfig, configUnInitialize || isDefault); }