浏览代码

生成spring-autoconfigure-metadata.properties,修复additional-spring-configuration-metadata.json合并问题.

聂秋秋 6 年之前
父节点
当前提交
11d4c4924c

+ 4 - 0
mybatis-plus-boot-starter/build.gradle

@@ -5,7 +5,11 @@ dependencies {
     api project(":mybatis-plus")
     api project(":mybatis-plus")
     implementation(enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}" as String))
     implementation(enforcedPlatform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}" as String))
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
+    annotationProcessor "org.springframework.boot:spring-boot-autoconfigure-processor:${springBootVersion}"
     api 'org.springframework.boot:spring-boot-autoconfigure'
     api 'org.springframework.boot:spring-boot-autoconfigure'
     api 'org.springframework.boot:spring-boot-starter-jdbc'
     api 'org.springframework.boot:spring-boot-starter-jdbc'
     implementation 'org.springframework.boot:spring-boot-configuration-processor'
     implementation 'org.springframework.boot:spring-boot-configuration-processor'
+    implementation 'org.springframework.boot:spring-boot-autoconfigure-processor'
 }
 }
+
+compileJava.dependsOn(processResources)

+ 2 - 2
mybatis-plus-boot-starter/src/main/java/com/baomidou/mybatisplus/autoconfigure/MybatisPlusProperties.java

@@ -54,7 +54,7 @@ public class MybatisPlusProperties {
     private String typeHandlersPackage;
     private String typeHandlersPackage;
 
 
     /**
     /**
-     * TODO 枚举包
+     * 枚举包扫描
      */
      */
     private String typeEnumsPackage;
     private String typeEnumsPackage;
 
 
@@ -81,7 +81,7 @@ public class MybatisPlusProperties {
     private MybatisConfiguration configuration;
     private MybatisConfiguration configuration;
 
 
     /**
     /**
-     * TODO 全局枚举
+     * 全局配置
      */
      */
     @NestedConfigurationProperty
     @NestedConfigurationProperty
     private GlobalConfig globalConfig = GlobalConfigUtils.defaults();
     private GlobalConfig globalConfig = GlobalConfigUtils.defaults();

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

@@ -48,6 +48,20 @@
                 "level": "error",
                 "level": "error",
                 "reason": "3.0开始废除此属性,请使用@Bean的方式注入至Spring容器."
                 "reason": "3.0开始废除此属性,请使用@Bean的方式注入至Spring容器."
             }
             }
+        },
+        {
+            "sourceType": "org.apache.ibatis.session.Configuration",
+            "defaultValue": "org.apache.ibatis.scripting.xmltags.XMLLanguageDriver",
+            "name": "mybatis-plus.configuration.default-scripting-language",
+            "description": "A default LanguageDriver class.",
+            "type": "java.lang.Class<? extends org.apache.ibatis.scripting.LanguageDriver>"
+        },
+        {
+            "sourceType": "com.baomidou.mybatisplus.core.MybatisConfiguration",
+            "defaultValue": "org.apache.ibatis.type.EnumTypeHandler",
+            "name": "mybatis-plus.configuration.default-enum-type-handler",
+            "description": "A default TypeHandler class for Enum.",
+            "type": "java.lang.Class<? extends org.apache.ibatis.type.TypeHandler>"
         }
         }
     ]
     ]
 }
 }