From d4f78ed3ba78ab14a29307ffa7ab9b343191e4c5 Mon Sep 17 00:00:00 2001 From: xiandafu Date: Sun, 26 May 2019 16:20:08 +0800 Subject: [PATCH 1/4] update --- pom.xml | 15 ++++++++------- .../BeetlMapperMutipleScannerRegister.java | 5 +++-- .../com/ibeetl/starter/BeetlSqlSingleConfig.java | 5 +++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index cb8d768..2e3d62a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.ibeetl beetl-framework-starter - 1.1.75.RELEASE + 1.2.0.M2 jar beetl-framework-starter ibeetl.com @@ -25,15 +25,16 @@ provided - com.ibeetl - beetlsql - 2.11.1 + com.ibeetl + beetl + 3.0.0.M2 - com.ibeetl - beetl - 2.9.8 + com.ibeetl + beetlsql + 2.12.0.M1 + 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 83db7c4..b64dc5a 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 5555e45..4e282da 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()); -- Gitee From 3f7774e94b8cbc303e54932f6d50f694c3ce9c47 Mon Sep 17 00:00:00 2001 From: xiandafu Date: Tue, 11 Jun 2019 00:50:04 +0800 Subject: [PATCH 2/4] use new vesion --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2e3d62a..49aecbe 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.ibeetl beetl-framework-starter - 1.2.0.M2 + 1.2.1.RELEASE jar beetl-framework-starter ibeetl.com @@ -27,12 +27,12 @@ com.ibeetl beetl - 3.0.0.M2 + 3.0.1.RELEASE com.ibeetl beetlsql - 2.12.0.M1 + 2.12.1.RELEASE -- Gitee From 2dbf373a8e866bd27b3d36a5f52f248ca076bb44 Mon Sep 17 00:00:00 2001 From: xiandafu Date: Thu, 13 Jun 2019 22:38:55 +0800 Subject: [PATCH 3/4] bug fix --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 49aecbe..c05c02f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.ibeetl beetl-framework-starter - 1.2.1.RELEASE + 1.2.3.RELEASE jar beetl-framework-starter ibeetl.com @@ -27,12 +27,12 @@ com.ibeetl beetl - 3.0.1.RELEASE + 3.0.2.RELEASE com.ibeetl beetlsql - 2.12.1.RELEASE + 2.12.3.RELEASE -- Gitee From 6619ff2167a73d449991c33b58214ec497baba03 Mon Sep 17 00:00:00 2001 From: zengchao <1012243881@qq.com> Date: Thu, 15 Aug 2019 18:09:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1=E3=80=81springboot=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E6=8F=90=E7=A4=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibeetl/starter/BeetlTemplateConfig.java | 2 +- .../spring-configuration-metadata.json | 108 ++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/META-INF/spring-configuration-metadata.json diff --git a/src/main/java/com/ibeetl/starter/BeetlTemplateConfig.java b/src/main/java/com/ibeetl/starter/BeetlTemplateConfig.java index 348fa5c..0b989b8 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 0000000..28fd582 --- /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 -- Gitee