diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/tool/JavaClassReader.java b/src/main/java/xyz/wbsite/dbtool/javafx/tool/JavaClassReader.java index d17612c6..67f67150 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/tool/JavaClassReader.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/tool/JavaClassReader.java @@ -128,6 +128,12 @@ public class JavaClassReader { break; } } + if ("".equals(body.get(0))){ + body.remove(0); + } + if ("".equals(body.get(body.size()-1))){ + body.remove(body.size()-1); + } bufferedReader.close(); } diff --git a/src/main/resources/modules/Java_api/ApiClient.ftl b/src/main/resources/modules/Java_api/ApiClient.ftl index 4fbf6f4f..971ed703 100644 --- a/src/main/resources/modules/Java_api/ApiClient.ftl +++ b/src/main/resources/modules/Java_api/ApiClient.ftl @@ -5,8 +5,6 @@ import okhttp3.*; import java.io.*; import java.net.ConnectException; import java.net.SocketTimeoutException; -import java.text.SimpleDateFormat; -import java.util.Date; import java.util.concurrent.TimeUnit; import java.security.PublicKey; diff --git a/src/main/resources/modules/Java_api/module/request/request.ftl b/src/main/resources/modules/Java_api/module/request/request.ftl index ed2d8dfe..d2e3ec48 100644 --- a/src/main/resources/modules/Java_api/module/request/request.ftl +++ b/src/main/resources/modules/Java_api/module/request/request.ftl @@ -18,6 +18,7 @@ import ${domain}.ApiSearchRequest; ${i} public class ${className}Request <#if findOrSearchflag == '0'>implements ApiRequest<#elseif findOrSearchflag=='1'>extends ApiFindRequest<#elseif findOrSearchflag=='2'>extends ApiSearchRequest<${className}Response> { + <#list body as i> <#if !i?contains("@")> ${i} diff --git a/src/main/resources/modules/Java_api/module/response/response.ftl b/src/main/resources/modules/Java_api/module/response/response.ftl index d34fde97..debaa0f4 100644 --- a/src/main/resources/modules/Java_api/module/response/response.ftl +++ b/src/main/resources/modules/Java_api/module/response/response.ftl @@ -12,7 +12,8 @@ import ${domain}.ApiResponse; <#list annotation as i> ${i} -public class ${className}Response extends<#if hasList> ApiFindResponse<${Tclass}> <#else> ApiResponse{ +public class ${className}Response extends<#if hasList> ApiFindResponse<${Tclass}><#else> ApiResponse { + <#list body as i> ${i} diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl b/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl index 42b177ca..4db44bec 100644 --- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl +++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.ftl @@ -29,6 +29,20 @@ import org.springframework.beans.factory.annotation.Value; import java.util.regex.Matcher; import java.util.regex.Pattern; +/** + * 全局请求Controller,如果无特殊请求,则不需再增加其他Controller + * 全局htm后缀入口{@link GlobalController#hold} + * 全局异常捕捉{@link GlobalController#excepitonHandler} + * 全局上传接口{@link GlobalController#upload} + * 全局下载接口{@link GlobalController#download} + *

+ * 说明Request命名规则,驼峰式命名 + * Api#Example#Request ==> 目标#动作#Request + * + * @author author + * @version 0.0.1 + * @since 2019-06-16 + */ @Controller @ControllerAdvice public class GlobalController implements ErrorController { diff --git a/src/main/resources/modules/SpringBoot/java/config/ActionConfig.java b/src/main/resources/modules/SpringBoot/java/config/ActionConfig.java index 6a5b3778..a96c4041 100644 --- a/src/main/resources/modules/SpringBoot/java/config/ActionConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/ActionConfig.java @@ -16,6 +16,16 @@ import org.springframework.core.type.filter.TypeFilter; import java.io.IOException; +/** + * 请求处理器配置类,Screen及Control + *

+ * 注册扫描Screen处理器 {@link ActionConfig#registryScreen} + * 注册扫描Control处理器 {@link ActionConfig#registryControl} + * + * @author wangbing + * @version 0.0.1 + * @since 2017-01-01 + */ @Configuration public class ActionConfig implements BeanDefinitionRegistryPostProcessor { public static final String SCREEN_PREFIX = "screen"; diff --git a/src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java b/src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java index d2ab832a..aeaf2c57 100644 --- a/src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java +++ b/src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java @@ -4,9 +4,9 @@ import ${basePackage}.frame.base.BaseRequest; /** * ApiExampleRequest - Api示例请求 - * + *

* 说明Request命名规则,驼峰式命名 - * {Api}{Example}{Request} ==> {目标}{动作}{Request} + * Api#Example#Request ==> 目标#动作#Request * * @author ${author?default("")} * @version 0.0.1 diff --git a/src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java b/src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java index f2b37832..59cb4ba3 100644 --- a/src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java +++ b/src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java @@ -4,9 +4,10 @@ import ${basePackage}.frame.base.BaseResponse; /** * ApiExampleResponse - Api示例响应 - * + *

* 说明Response命名规则,驼峰式命名 - * {Api}{Example}{Response} ==> {目标}{动作}{Response} + * Api#Example#Response ==> 目标#动作#Response + * * @author ${author?default("")} * @version 0.0.1 * @since ${date?string("yyyy-MM-dd")} diff --git a/src/main/resources/modules/SpringBoot/resources/table.ftl b/src/main/resources/modules/SpringBoot/resources/table.ftl index 19dd058b..9ddc7a3a 100644 --- a/src/main/resources/modules/SpringBoot/resources/table.ftl +++ b/src/main/resources/modules/SpringBoot/resources/table.ftl @@ -33,8 +33,10 @@ Date: ${date?string("yyyy-MM-dd")} CREATE TABLE `${module.modulePrefix?default("")}${table.tableName}` ( <#list table.fields as field> - ${dBmapper.getFieldSql(field)}, + ${dBmapper.getFieldSql(field)}<#if field_has_next||module.hasSysFields>, +<#if module.hasSysFields> PRIMARY KEY (`ID`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='${table.tableComment?default("")}'; \ No newline at end of file diff --git a/src/main/resources/modules/SpringBoot/resources/tableAll.ftl b/src/main/resources/modules/SpringBoot/resources/tableAll.ftl index 9f31b754..88f44f19 100644 --- a/src/main/resources/modules/SpringBoot/resources/tableAll.ftl +++ b/src/main/resources/modules/SpringBoot/resources/tableAll.ftl @@ -23,9 +23,11 @@ COMMENT ON COLUMN "${module.modulePrefix?default("")}${table.tableName}"."${fiel -- ---------------------------- CREATE TABLE `${module.modulePrefix?default("")}${table.tableName}` ( <#list table.fields as field> - ${dBmapper.getFieldSql(field)}, + ${dBmapper.getFieldSql(field)}<#if field_has_next||module.hasSysFields>, +<#if module.hasSysFields> PRIMARY KEY (`ID`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='${table.tableComment?default("")}'; diff --git a/src/main/resources/modules/SpringBoot/test/test.ftl b/src/main/resources/modules/SpringBoot/test/test.ftl index c2746f9a..703958af 100644 --- a/src/main/resources/modules/SpringBoot/test/test.ftl +++ b/src/main/resources/modules/SpringBoot/test/test.ftl @@ -125,7 +125,7 @@ public class ${table.getCName()}Test { assertTrue(!response.hasError()); } -<#if table.getGet()> +<#if table.getGet() && module.hasSysFields> @Test public void testGet() {