Przeglądaj źródła

代码生成器兼容,修复单元测试.

nieqiuqiu 5 lat temu
rodzic
commit
b7740c1946

+ 7 - 0
mybatis-plus-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -75,6 +75,13 @@
             "defaultValue": "org.apache.ibatis.type.EnumTypeHandler",
             "description": "A default TypeHandler class for Enum.",
             "type": "java.lang.Class<? extends org.apache.ibatis.type.TypeHandler>"
+        },
+        {
+            "sourceType": "com.baomidou.mybatisplus.core.config.GlobalConfig",
+            "name": "mybatis-plus.global-config.id-generator",
+            "deprecation": {
+                "level": "error"
+            }
         }
     ]
 }

+ 2 - 1
mybatis-plus-boot-starter/src/test/java/com/baomidou/mybatisplus/starter/MetadataTest.java

@@ -16,6 +16,7 @@
 package com.baomidou.mybatisplus.starter;
 
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusLanguageDriverAutoConfiguration;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
 import com.baomidou.mybatisplus.core.MybatisConfiguration;
 import com.baomidou.mybatisplus.core.config.GlobalConfig;
@@ -57,7 +58,7 @@ class MetadataTest {
     void checkSpringAutoconfigureMetadataProperties() throws IOException {
         Properties properties = new Properties();
         properties.load(new FileSystemResource("build/classes/java/main/META-INF/spring-autoconfigure-metadata.properties").getInputStream());
-        Assertions.assertEquals(DataSourceAutoConfiguration.class.getName(), properties.getProperty(MybatisPlusAutoConfiguration.class.getName() + ".AutoConfigureAfter"));
+        Assertions.assertEquals(DataSourceAutoConfiguration.class.getName() + "," + MybatisPlusLanguageDriverAutoConfiguration.class.getName(), properties.getProperty(MybatisPlusAutoConfiguration.class.getName() + ".AutoConfigureAfter"));
         Assertions.assertEquals(DataSource.class.getName(), properties.getProperty(MybatisPlusAutoConfiguration.class.getName() + ".ConditionalOnSingleCandidate"));
         Assertions.assertEquals(SqlSessionFactory.class.getName() + "," + SqlSessionFactoryBean.class.getName(), properties.getProperty(MybatisPlusAutoConfiguration.class.getName() + ".ConditionalOnClass"));
     }

+ 4 - 0
mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/StrategyConfig.java

@@ -277,6 +277,10 @@ public class StrategyConfig {
         this.superControllerClass = clazz.getName();
     }
 
+    public void setSuperControllerClass(String superControllerClass) {
+        this.superControllerClass = superControllerClass;
+    }
+
     /**
      * <p>
      * 父类 Class 反射属性转换为公共字段