1、注释

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();
     }

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;
 

src/main/resources/modules/Java_api/module/request/request.ftl

@@ -18,6 +18,7 @@ import ${domain}.ApiSearchRequest;
 ${i}
 </#list>
 public class ${className}Request <#if findOrSearchflag == '0'>implements ApiRequest<#elseif findOrSearchflag=='1'>extends ApiFindRequest<#elseif findOrSearchflag=='2'>extends ApiSearchRequest</#if><${className}Response> {
+
 <#list body as i>
 <#if !i?contains("@")>
 ${i}

src/main/resources/modules/Java_api/module/response/response.ftl

@@ -12,7 +12,8 @@ import ${domain}.ApiResponse;
 <#list annotation as i>
 ${i}
 </#list>
-public class ${className}Response extends<#if hasList> ApiFindResponse<${Tclass}> <#else> ApiResponse</#if>{
+public class ${className}Response extends<#if hasList> ApiFindResponse<${Tclass}><#else> ApiResponse</#if> {
+
 <#list body as i>
 ${i}
 </#list>

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}
+ * <p>
+ * 说明Request命名规则，驼峰式命名
+ * Api#Example#Request ==> 目标#动作#Request
+ *
+ * @author author
+ * @version 0.0.1
+ * @since 2019-06-16
+ */
 @Controller
 @ControllerAdvice
 public class GlobalController implements ErrorController {

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
+ * <p>
+ * 注册扫描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";

src/main/resources/modules/SpringBoot/java/req/ApiExampleRequest.java

@@ -4,9 +4,9 @@ import ${basePackage}.frame.base.BaseRequest;
 
 /**
  * ApiExampleRequest - Api示例请求
- *
+ * <p>
  * 说明Request命名规则，驼峰式命名
- * {Api}{Example}{Request} ==> {目标}{动作}{Request}
+ * Api#Example#Request ==> 目标#动作#Request
  *
  * @author ${author?default("")}
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/rsp/ApiExampleResponse.java

@@ -4,9 +4,10 @@ import ${basePackage}.frame.base.BaseResponse;
 
 /**
  * ApiExampleResponse - Api示例响应
- *
+ * <p>
  * 说明Response命名规则，驼峰式命名
- * {Api}{Example}{Response} ==> {目标}{动作}{Response}
+ * Api#Example#Response ==> 目标#动作#Response
+ *
  * @author ${author?default("")}
  * @version 0.0.1
  * @since ${date?string("yyyy-MM-dd")}

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>
     </#list>
+<#if module.hasSysFields>
 PRIMARY KEY (`ID`)
+</#if>
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='${table.tableComment?default("")}';
 </#if>

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>
 </#list>
+<#if module.hasSysFields>
 PRIMARY KEY (`ID`)
+</#if>
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='${table.tableComment?default("")}';
 
 </#list>

src/main/resources/modules/SpringBoot/test/test.ftl

@@ -125,7 +125,7 @@ public class ${table.getCName()}Test {
         assertTrue(!response.hasError());
     }
 </#if>
-<#if table.getGet()>
+<#if table.getGet() && module.hasSysFields>
 
     @Test
     public void testGet() {