解决GlobalConfig在ConfigurationCustomizer不生效的问题.

usgate · Nov 30, 2019 · e36a385 · e36a385
1 parent c127d67
commit e36a385
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/...er/src/main/java/com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.java b/...er/src/main/java/com/baomidou/mybatisplus/autoconfigure/MybatisPlusAutoConfiguration.java
@@ -198,7 +198,8 @@ public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Excepti
             factory.setTypeEnumsPackage(this.properties.getTypeEnumsPackage());
         }
         // TODO 此处必为非 NULL
-        GlobalConfig globalConfig = this.properties.getGlobalConfig();
+        // config的优先级要大于properties
+        GlobalConfig globalConfig = factory.getConfiguration().hasGlobalConfig() ? factory.getConfiguration().getGlobalConfig() : this.properties.getGlobalConfig();
         // TODO 注入填充器
         if (this.applicationContext.getBeanNamesForType(MetaObjectHandler.class,
             false, false).length > 0) {

diff --git a/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisConfiguration.java b/mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisConfiguration.java
@@ -21,7 +21,6 @@
 import com.baomidou.mybatisplus.core.executor.MybatisReuseExecutor;
 import com.baomidou.mybatisplus.core.executor.MybatisSimpleExecutor;
 import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils;
-import lombok.Getter;
 import lombok.Setter;
 import org.apache.ibatis.binding.MapperRegistry;
 import org.apache.ibatis.executor.Executor;
@@ -60,7 +59,7 @@ public GlobalConfig getGlobalConfig(){
         return globalConfig;
     }
 
-    public boolean hasGlobalConfig(){
+    public boolean hasGlobalConfig() {
         return globalConfig != null;
     }
 

diff --git a/...src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisSqlSessionFactoryBean.java b/...src/main/java/com/baomidou/mybatisplus/extension/spring/MybatisSqlSessionFactoryBean.java
@@ -323,6 +323,10 @@ public void setConfiguration(MybatisConfiguration configuration) {
         this.configuration = configuration;
     }
 
+    public MybatisConfiguration getConfiguration(){
+        return this.configuration;
+    }
+
     /**
      * Set locations of MyBatis mapper files that are going to be merged into the {@code SqlSessionFactory} configuration
      * at runtime.