diff --git a/pom.xml b/pom.xml index cb8d7681278775e541e9133a311ea2be6176f15a..c05c02f016df356730c61284b21b25be60eec389 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.ibeetl beetl-framework-starter - 1.1.75.RELEASE + 1.2.3.RELEASE jar beetl-framework-starter ibeetl.com @@ -25,15 +25,16 @@ provided - com.ibeetl - beetlsql - 2.11.1 + com.ibeetl + beetl + 3.0.2.RELEASE - com.ibeetl - beetl - 2.9.8 + com.ibeetl + beetlsql + 2.12.3.RELEASE + org.springframework.boot spring-boot-starter-web diff --git a/src/main/java/com/ibeetl/starter/BeetlMapperMutipleScannerRegister.java b/src/main/java/com/ibeetl/starter/BeetlMapperMutipleScannerRegister.java index 83db7c4a9a68da0971488409e9bb387608fe78b4..b64dc5a739087427baced1d3f65975172b2af04f 100644 --- a/src/main/java/com/ibeetl/starter/BeetlMapperMutipleScannerRegister.java +++ b/src/main/java/com/ibeetl/starter/BeetlMapperMutipleScannerRegister.java @@ -2,7 +2,8 @@ package com.ibeetl.starter; import java.util.Properties; -import org.beetl.core.om.ObjectUtil; + +import org.beetl.core.fun.ObjectUtil; import org.beetl.sql.core.ClasspathLoader; import org.beetl.sql.core.Interceptor; import org.beetl.sql.core.NameConversion; @@ -92,7 +93,7 @@ public class BeetlMapperMutipleScannerRegister bdb.addPropertyValue("dbStyle", (DBStyle)ObjectUtil.tryInstance(beetlSqlProperties.getDbStyle(),classLoader)); bdb.addPropertyValue("interceptors", beetlSqlProperties.dev ? new Interceptor[] { new DebugInterceptor() } : new Interceptor[0]); bdb.addPropertyValue("sqlLoader", loader); - bdb.addPropertyValue("nc", (NameConversion)ObjectUtil.tryInstance(beetlSqlProperties.getNameConversion(),classLoader)); + bdb.addPropertyValue("nc", (NameConversion) ObjectUtil.tryInstance(beetlSqlProperties.getNameConversion(),classLoader)); bdb.addPropertyValue("extProperties", ps); // bdb.getBeanDefinition().set diff --git a/src/main/java/com/ibeetl/starter/BeetlSqlSingleConfig.java b/src/main/java/com/ibeetl/starter/BeetlSqlSingleConfig.java index 5555e453c0d0ebdaabaa627aae15ccd84615761e..4e282daf386bed9fcf3d4b012b3ee817df801a6b 100644 --- a/src/main/java/com/ibeetl/starter/BeetlSqlSingleConfig.java +++ b/src/main/java/com/ibeetl/starter/BeetlSqlSingleConfig.java @@ -6,7 +6,8 @@ import java.util.Properties; import javax.annotation.PostConstruct; import javax.sql.DataSource; -import org.beetl.core.om.ObjectUtil; + +import org.beetl.core.fun.ObjectUtil; import org.beetl.sql.core.ClasspathLoader; import org.beetl.sql.core.Interceptor; import org.beetl.sql.core.NameConversion; @@ -55,7 +56,7 @@ public class BeetlSqlSingleConfig { SqlManagerFactoryBean factory = new SqlManagerFactoryBean(); factory.setCs(source); - factory.setDbStyle((DBStyle)ObjectUtil.tryInstance(beetlSqlProperties.getDbStyle(),classLoader)); + factory.setDbStyle((DBStyle) ObjectUtil.tryInstance(beetlSqlProperties.getDbStyle(),classLoader)); factory.setInterceptors(beetlSqlProperties.dev ? new Interceptor[] { new DebugInterceptor() } : new Interceptor[0]); factory.setNc((NameConversion)ObjectUtil.tryInstance(beetlSqlProperties.getNameConversion(),classLoader)); ClasspathLoader loader = new ClasspathLoader(beetlSqlProperties.getSqlPath()); diff --git a/src/main/java/com/ibeetl/starter/BeetlTemplateConfig.java b/src/main/java/com/ibeetl/starter/BeetlTemplateConfig.java index 348fa5c1aee065e3d0f4b2090458cf22eeb62eb0..0b989b808895dccfbe61f38e370823b79cf9e28f 100644 --- a/src/main/java/com/ibeetl/starter/BeetlTemplateConfig.java +++ b/src/main/java/com/ibeetl/starter/BeetlTemplateConfig.java @@ -24,7 +24,7 @@ public class BeetlTemplateConfig { @Value("${beetl.suffix:btl}") String suffix;// 模板后缀 - @Value("${beetl-beetlsq.dev:true}") + @Value("${beetl-beetlsql.dev:true}") boolean dev; diff --git a/src/main/resources/META-INF/spring-configuration-metadata.json b/src/main/resources/META-INF/spring-configuration-metadata.json new file mode 100644 index 0000000000000000000000000000000000000000..28fd582410ec62e3985691e3adebfcfae40e7172 --- /dev/null +++ b/src/main/resources/META-INF/spring-configuration-metadata.json @@ -0,0 +1,108 @@ +{ + "groups": [ + { + "name": "beetl" + }, + { + "name": "beetlsql" + }, + { + "name": "beetlsql.ds",// 多数据源暂时不知道怎么做,可能要springspel有这种动态支持才行 + "description": "BeetlSQL 多数据源配置前缀,其中每个数据源单独配置与单一数据源一致(别忘了加数据源名字)" + } + ], + "properties": [ + { + "name": "beetl.enabled", + "type": "java.lang.Boolean", + "description": "是否启用Beetl" + }, + { + "name": "beetl.templatesPath", + "type": "java.lang.String", + "description": "Beetl 模板路径", + "defaultValue": "templates" + }, + { + "name": "beetl.suffix", + "type": "java.lang.String", + "description": "Beetl 模板后缀", + "defaultValue": "btl" + }, + + { + "name": "beetlsql.sqlPath", + "type": "java.lang.String", + "description": "BeetlSQL 存放SQL的markdown文件路径", + "defaultValue": "/sql" + }, + { + "name": "beetlsql.basePackage", + "type": "java.lang.String", + "description": "单一数据源的SQLManager对应的Mapper所在包", + "defaultValue": "com" + }, + { + "name": "beetlsql.nameConversion", + "type": "java.lang.String", + "description": "默认数据表字段名与实体字段名称的名称转换器", + "defaultValue": "org.beetl.sql.core.UnderlinedNameConversion" + }, + { + "name": "beetlsql.dbStyle", + "type": "java.lang.String", + "description": "数据库SQL语句风格", + "defaultValue": "org.beetl.sql.core.db.MySqlStyle" + }, + { + "name": "beetlsql.daoSuffix", + "type": "java.lang.String", + "description": "DAO持久类的后缀", + "defaultValue": "Dao" + }, + { + "name": "beetlsql.mutiple.datasource", + "type": "java.lang.String[]", + "description": "多数据源配置,数据源名称以逗号分隔" + }, + + { + "name": "beetl-beetlsql.dev", + "type": "java.lang.Boolean", + "description": "是否实时检查Beetl模板或者BeetlSQL的md文件的改动,以及是否开启BeetlSQL的debug输出SQL", + "defaultValue": true + } + ], + "hints": [ // 对每个配置项中的每个值详细说明,用providers提供 + { + "name": "beetl-beetlsql.dev", + "providers": [ + { + "name": "beetl-beetlsql.dev" + } + ] + }, + { + "name": "beetlsql.nameConversion", + "providers": [ + { + "name": "class-reference", + "parameters": { + "target": "org.beetl.sql.core.NameConversion" + } + } + ] + }, + { + "name": "beetlsql.dbStyle", + "providers": [ + { + "name": "class-reference", + "parameters": { + "target": "org.beetl.sql.core.db.AbstractDBStyle" + } + } + ] + } + ] +} \ No newline at end of file