nieqiuqiu 5 lat temu
rodzic
commit
c127d67e98

+ 12 - 2
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/MybatisConfiguration.java

@@ -51,8 +51,18 @@ public class MybatisConfiguration extends Configuration {
 
     // TODO 自己的 GlobalConfig
     @Setter
-    @Getter
-    private GlobalConfig globalConfig = GlobalConfigUtils.defaults();
+    private GlobalConfig globalConfig;
+
+    public GlobalConfig getGlobalConfig(){
+        if(globalConfig == null){
+            globalConfig = GlobalConfigUtils.defaults();
+        }
+        return globalConfig;
+    }
+
+    public boolean hasGlobalConfig(){
+        return globalConfig != null;
+    }
 
     public MybatisConfiguration(Environment environment) {
         this();

+ 1 - 1
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/idgenerator/IdGeneratorConfig.java

@@ -38,7 +38,7 @@ public class IdGeneratorConfig {
     public GlobalConfig globalConfiguration() {
         GlobalConfig conf = new GlobalConfig();
         //自定义Id生成器
-        conf.registerIdGenerator(IdType.ASSIGN_UUID, new CustomUUIDGenerator()).registerIdGenerator(IdType.ASSIGN_ID, new CustomIdGenerator());
+        conf.registerIdGenerator(IdType.UUID, new CustomUUIDGenerator()).registerIdGenerator(IdType.ASSIGN_ID, new CustomIdGenerator());
         return conf;
     }