1、API

Former-commit-id: 8cd30b00ee62a1bf67af3b37e24733aeab9c64e9

src/main/java/xyz/wbsite/dbtool/javafx/ctrl/OptionDocController.java

@@ -152,9 +152,11 @@ public class OptionDocController {
                 String module = file.getName();
                 for (File tar : file.listFiles()) {
                     try {
-                        String target = tar.getName().replaceAll("Ajax$", "").replaceAll(".java", "");
+                        String target = tar.getName().replaceAll("\\.java$", "");
+                        if (target.endsWith("Ajax")) {
+                            target = target.replaceAll("Ajax$", "");
+                        }
                         DocClassReader docClassReader = new DocClassReader(tar);
-
                         for (ApiMethod apiMethod : docClassReader.getMethodList()) {
                             Doc doc = new Doc();
                             doc.setType("ajax");
@@ -171,6 +173,7 @@ public class OptionDocController {
                                 doc.setError(doc.getError() + "找到多个请求");
                             } else {
                                 DocRequestReader docRequestReader = new DocRequestReader(reqFiles.get(0));
+                                doc.setFind("1".equals(docRequestReader.getFindOrSearchflag()));
                                 doc.setTitle(docRequestReader.getClassNote());
                                 doc.setReqParams(docRequestReader.getFieldDocList());
                             }
@@ -199,9 +202,11 @@ public class OptionDocController {
                 String module = file.getName();
                 for (File tar : file.listFiles()) {
                     try {
-                        String target = tar.getName().replaceAll("Api$", "").replaceAll(".java", "");
+                        String target = tar.getName().replaceAll("\\.java$", "");
+                        if (target.endsWith("Api$")) {
+                            target = target.replaceAll("Api$", "");
+                        }
                         DocClassReader docClassReader = new DocClassReader(tar);
-
                         for (ApiMethod apiMethod : docClassReader.getMethodList()) {
                             Doc doc = new Doc();
                             doc.setType("api");
@@ -218,6 +223,7 @@ public class OptionDocController {
                                 doc.setError(doc.getError() + "找到多个请求");
                             } else {
                                 DocRequestReader docRequestReader = new DocRequestReader(reqFiles.get(0));
+                                doc.setFind("1".equals(docRequestReader.getFindOrSearchflag()));
                                 doc.setTitle(docRequestReader.getClassNote());
                                 doc.setReqParams(docRequestReader.getFieldDocList());
                             }
@@ -285,7 +291,7 @@ public class OptionDocController {
                     @Override
                     public ObservableValue<Boolean> call(Integer param) {
                         super.call(param);
-                        if (data.get(param).isCheck()) {
+                        if (data.get(param).getCheck()) {
                             return new SimpleBooleanProperty(true);
                         } else {
                             return new SimpleBooleanProperty(false);

src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/ApiCallable.java

@@ -28,7 +28,7 @@ public class ApiCallable implements Callable {
     private Tool tool = new Tool();
     File apiDomain;
     File apiModule;
-    File apiFrame;
+    File frame;
     File testApiDomain;
     private FreeMarkerManager freeMarkerManager;
 
@@ -66,7 +66,7 @@ public class ApiCallable implements Callable {
 
         apiDomain = Tool.createPath(sbmain.toString());
         apiModule = Tool.createPath(sbmain.toString(), "module");
-        apiFrame = Tool.createPath(sbmain.toString(), "frame");
+        frame = Tool.createPath(sbmain.toString(), "frame");
         testApiDomain = Tool.createPath(sbtest.toString());
 
         for (Api api : apiList) {
@@ -96,14 +96,25 @@ public class ApiCallable implements Callable {
         }
 
         {
-            System.out.println("生成基础类");
+            File base = Tool.createPath(frame, "base");
+            File utils = Tool.createPath(frame, "utils");
+            File okhttp3 = Tool.createPath(frame, "okhttp3");
+
             HashMap<String, Object> ctx = new HashMap<String, Object>();
             ctx.put("domain", String.join(".", domainList));
-            for (String name : ResourceUtil.getResourceFiles("/modules/Java_api/frame/")) {
+            for (String name : ResourceUtil.getResourceFiles("/modules/Java_api/frame/base/")) {
+                freeMarkerManager.outputTemp(Tool.createFile(base, name), "Java_api/frame/base/" + name, ctx);
+            }
+
+            for (String name : ResourceUtil.getResourceFiles("/modules/Java_api/frame/utils/")) {
                 if (name.equals("ValidationUtil.java")){//去掉验证 减少体积
                     continue;
                 }
-                freeMarkerManager.outputTemp(Tool.createFile(apiFrame.getAbsolutePath(), name), "Java_api/frame/" + name, ctx);
+                freeMarkerManager.outputTemp(Tool.createFile(utils, name), "Java_api/frame/utils/" + name, ctx);
+            }
+
+            for (String name : ResourceUtil.getResourceFiles("/modules/Java_api/frame/okhttp3/")) {
+                freeMarkerManager.outputTemp(Tool.createFile(okhttp3, name), "Java_api/frame/okhttp3/" + name, ctx);
             }
         }
 

src/main/java/xyz/wbsite/dbtool/javafx/po/Doc.java

@@ -1,12 +1,29 @@
 package xyz.wbsite.dbtool.javafx.po;
 
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 public class Doc {
-    private boolean check;
+    private final BooleanProperty check = new SimpleBooleanProperty();
+
+    public BooleanProperty checkProperty() {
+        return check;
+    }
+
+    public boolean getCheck() {
+        return check.get();
+    }
+
+    public void setCheck(boolean check) {
+        this.check.set(check);
+    }
+
+
     //目标请求对象
     private String request;
     //目标请求响应
@@ -16,21 +33,14 @@ public class Doc {
     private String module;
     private String target;
     private String method;
-
     private String title;
     private List<DocParam> reqParams = new ArrayList<>();
     private List<DocParam> rspParams = new ArrayList<>();
     private Map<String, DocEnt> entParams = new HashMap<>();
 
-    private String error = "";
+    private boolean isFind = false;
-
-    public boolean isCheck() {
-        return check;
-    }
 
-    public void setCheck(boolean check) {
+    private String error = "";
-        this.check = check;
-    }
 
     public String getRequest() {
         return request;
@@ -119,4 +129,12 @@ public class Doc {
     public void setTitle(String title) {
         this.title = title;
     }
+
+    public boolean isFind() {
+        return isFind;
+    }
+
+    public void setFind(boolean find) {
+        isFind = find;
+    }
 }

src/main/java/xyz/wbsite/dbtool/javafx/tool/Dialog.java

@@ -39,6 +39,7 @@ import xyz.wbsite.dbtool.javafx.manger.ProjectManager;
 import xyz.wbsite.dbtool.javafx.po.AndroidOption;
 import xyz.wbsite.dbtool.javafx.po.Api;
 import xyz.wbsite.dbtool.javafx.po.DictItem;
+import xyz.wbsite.dbtool.javafx.po.Doc;
 import xyz.wbsite.dbtool.javafx.po.Field;
 import xyz.wbsite.dbtool.javafx.po.Module;
 import xyz.wbsite.dbtool.javafx.po.VueOption;
@@ -593,6 +594,30 @@ public class Dialog {
                 }
             });
 
+            controller.getAjaxDoc().setOnAction(new EventHandler<ActionEvent>() {
+                @Override
+                public void handle(ActionEvent event) {
+                    List<Doc> data = controller.getData();
+                    for (Doc datum : data) {
+                        if ("ajax".equals(datum.getType())) {
+                            datum.setCheck(controller.getAjaxDoc().isSelected());
+                        }
+                    }
+                }
+            });
+
+            controller.getApiDoc().setOnAction(new EventHandler<ActionEvent>() {
+                @Override
+                public void handle(ActionEvent event) {
+                    List<Doc> data = controller.getData();
+                    for (Doc datum : data) {
+                        if ("api".equals(datum.getType())) {
+                            datum.setCheck(controller.getApiDoc().isSelected());
+                        }
+                    }
+                }
+            });
+
             docPath.requestFocus();
             modulePath.textProperty().addListener(new ChangeListener<String>() {
                 @Override

src/main/resources/modules/Doc/css/index.css

@@ -33,6 +33,7 @@ html, body, #app {
 .search p{
     text-align: center;
     color: #757575;
+    font-size: 14px;
     transform: scale(0.8);
 }
 .search p input{

src/main/resources/modules/Doc/index.html

@@ -97,6 +97,17 @@
                 <pre>}.bind(this))</pre>
             </div>
 
+            <div class="wrapper" v-if="select.type == 'api'">
+                <pre>ApiClient client = ApiClient.getInstance();</pre>
+                <pre>DictFindRequest request = new DictFindRequest();</pre>
+                <pre v-if="select.method.indexOf('find') !== -1">request.setPageNumber(1);</pre>
+                <pre v-if="select.method.indexOf('find') !== -1">request.setPageSize(10);</pre>
+                <pre v-if="select.method.indexOf('find') !== -1">request.setSortKey("CREATE_TIME");</pre>
+                <pre v-if="select.method.indexOf('find') !== -1">request.setSortType(SortType.DESC);</pre>
+                <pre>DictFindResponse response = client.execute(request);</pre>
+                <pre>Assert.assertTrue(!response.hasError());</pre>
+            </div>
+
             <h5 id="User">附录参数(<span class="object">User</span>)</h5>
 
             <div class="wrapper">

src/main/resources/modules/Java_api/ApiClient.java

@@ -1,12 +1,12 @@
 package ${domain};
 
-import ${domain}.frame.AESUtil;
+import ${domain}.frame.utils.AESUtil;
-import ${domain}.frame.ApiRequest;
+import ${domain}.frame.base.ApiRequest;
-import ${domain}.frame.ApiResponse;
+import ${domain}.frame.base.ApiResponse;
-import ${domain}.frame.ErrorType;
+import ${domain}.frame.base.ErrorType;
-import ${domain}.frame.MD5Util;
+import ${domain}.frame.utils.MD5Util;
-import ${domain}.frame.MapperUtil;
+import ${domain}.frame.utils.MapperUtil;
-import ${domain}.frame.ProgressRequestBody;
+import ${domain}.frame.okhttp3.ProgressRequestBody;
 import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;

src/main/resources/modules/Java_api/frame/ApiRequest.java

@@ -1,17 +0,0 @@
-package ${domain}.frame;
-
-/**
- * ApiRequest - 基类
- *
- * @author wangbing
- * @version 0.0.1
- * @since 2017-01-01
- */
-public interface ApiRequest<T extends ApiResponse> {
-
-    void check();
-
-    String path();
-
-    Class<T> responseClass();
-}

src/main/resources/modules/Java_api/frame/Main.java

@@ -1,87 +0,0 @@
-package ${domain}.frame;
-
-import com.alibaba.fastjson.JSON;
-import com.wb.api.auth.request.LoginRequest;
-import com.wb.api.auth.response.LoginResponse;
-
-import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-public class Main {
-
-    public static void main(String[] args) throws ClassNotFoundException {
-
-        //实例化API请求客户端
-        DefaultApiClient defaultApiClient = new DefaultApiClient("http://localhost:8080/api", "qwe", "asd");
-        //设置发送网络请求前的统一操作
-        defaultApiClient.setBefore(new DefaultApiClient.Before() {
-            public void call(ApiRequest request) {
-                System.out.println("请求参数" + JSON.toJSONString(request));
-                System.out.println("请求方法" + request.apiMethod());
-            }
-        });
-        //设置网络请求完成后的统一操作
-        defaultApiClient.setAfter(new DefaultApiClient.After() {
-            public void call(ApiRequest request, ApiResponse response) {
-                System.out.println("响应参数" + JSON.toJSONString(response));
-            }
-        });
-        final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
-
-        {
-            //同步接口请求实例
-            System.out.println("--------------------同步接口请求实例-------------------");
-            Date start = new Date();
-            System.out.println(simpleDateFormat.format(start));
-            LoginRequest loginRequest = new LoginRequest();
-            loginRequest.setUserName("admin");
-            loginRequest.setPassword("123456");
-            LoginResponse execute = defaultApiClient.execute(loginRequest);
-            Date end = new Date();
-            System.out.println(simpleDateFormat.format(end));
-            System.out.println("共用" + (end.getTime() - start.getTime()) + "毫秒");
-            System.out.println("--------------------同步接口请求实例-------------------");
-        }
-
-
-        {
-            //文件上传接口请求实例
-            System.out.println("--------------------文件上传接口请求实例-------------------");
-            Date start = new Date();
-            System.out.println(simpleDateFormat.format(start));
-            FileUploadRequest fileUploadRequest = new FileUploadRequest();
-            fileUploadRequest.setFile(new File("E:\\doc\\pic\\QQ截图20160918164514.jpg"));
-            defaultApiClient.fileUpload(fileUploadRequest, new ApiClient.Callback<FileUploadResponse>() {
-                public void call(FileUploadResponse response) {
-                    System.out.println("文件上传接口请求实例" + JSON.toJSONString(response));
-                    Date end = new Date();
-                    System.out.println(simpleDateFormat.format(end));
-                    System.out.println("共用" + (end.getTime() - start.getTime()) + "毫秒");
-                    System.out.println("--------------------文件上传接口请求实例-------------------");
-                }
-            });
-        }
-
-        {
-            //异步接口请求实例
-            System.out.println("--------------------异步接口请求实例-------------------");
-            final Date start = new Date();
-            System.out.println(simpleDateFormat.format(start));
-            LoginRequest loginRequest = new LoginRequest();
-            loginRequest.setUserName("admin");
-            loginRequest.setPassword("123456");
-            defaultApiClient.asyncExecute(loginRequest, 1L, new ApiClient.Callback<LoginResponse>() {
-                public void call(LoginResponse response) {
-                    System.out.println("异步接口请求响应" + JSON.toJSONString(response));
-
-                    Date end = new Date();
-                    System.out.println(simpleDateFormat.format(end));
-                    System.out.println("共用" + (end.getTime() - start.getTime()) + "毫秒");
-                    System.out.println("--------------------异步接口请求实例-------------------");
-                }
-            });
-        }
-
-    }
-}

src/main/resources/modules/Java_api/frame/base/BaseEntity.java

@@ -1,5 +1,6 @@
-package ${domain}.frame;
+package ${domain}.frame.base;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -9,10 +10,16 @@ import java.util.Date;
  * @version 0.0.1
  * @since 2017-01-01
  */
-public class ApiEntity {
+public class BaseEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
 
     /**
-     * 行版号
+     * 主键
+     */
+    private long id;
+
+    /**
+     * 行版本
      */
     private long rowVersion;
 
@@ -41,14 +48,6 @@ public class ApiEntity {
      */
     private boolean isDeleted;
 
-    public boolean isDeleted() {
-        return isDeleted;
-    }
-
-    public void setIsDeleted(boolean isDeleted) {
-        this.isDeleted = isDeleted;
-    }
-
     public long getRowVersion() {
         return rowVersion;
     }
@@ -57,20 +56,20 @@ public class ApiEntity {
         this.rowVersion = rowVersion;
     }
 
-    public long getCreateBy() {
+    public long getId() {
-        return createBy;
+        return id;
     }
 
-    public void setCreateBy(long createBy) {
+    public void setId(long id) {
-        this.createBy = createBy;
+        this.id = id;
     }
 
-    public long getLastUpdateBy() {
+    public long getCreateBy() {
-        return lastUpdateBy;
+        return createBy;
     }
 
-    public void setLastUpdateBy(long lastUpdateBy) {
+    public void setCreateBy(long createBy) {
-        this.lastUpdateBy = lastUpdateBy;
+        this.createBy = createBy;
     }
 
     public Date getCreateTime() {
@@ -81,6 +80,14 @@ public class ApiEntity {
         this.createTime = createTime;
     }
 
+    public long getLastUpdateBy() {
+        return lastUpdateBy;
+    }
+
+    public void setLastUpdateBy(long lastUpdateBy) {
+        this.lastUpdateBy = lastUpdateBy;
+    }
+
     public Date getLastUpdateTime() {
         return lastUpdateTime;
     }
@@ -88,4 +95,12 @@ public class ApiEntity {
     public void setLastUpdateTime(Date lastUpdateTime) {
         this.lastUpdateTime = lastUpdateTime;
     }
+
+    public boolean getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(boolean deleted) {
+        isDeleted = deleted;
+    }
 }

src/main/resources/modules/Java_api/frame/base/BaseFindRequest.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.base;
 
 /**
  * ApiFindRequest - 基类
@@ -7,11 +7,14 @@ package ${domain}.frame;
  * @version 0.0.1
  * @since 2017-01-01
  */
-public abstract class ApiFindRequest {
+public abstract class BaseFindRequest extends BaseRequest{
 
     private long pageNumber = 1L;
+
     private long pageSize = 10L;
+
     private String sortKey;
+
     private SortType sortType;
 
     public String getSortKey() {

src/main/resources/modules/Java_api/frame/base/BaseFindResponse.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.base;
 
 import java.util.List;
 
@@ -9,7 +9,7 @@ import java.util.List;
  * @version 0.0.1
  * @since 2017-01-01
  */
-public class ApiFindResponse<T> extends ApiResponse<T>{
+public class BaseFindResponse<T> extends BaseResponse<T>{
 
     private List<T> result;
 

src/main/resources/modules/Java_api/frame/base/BaseRequest.java

@@ -0,0 +1,23 @@
+package ${domain}.frame.base;
+
+/**
+ * ApiRequest - 基类
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+public class BaseRequest<T extends BaseResponse> {
+
+    void check() {
+
+    }
+
+    String path() {
+        return "";
+    }
+
+    Class<T> responseClass() {
+        return null;
+    }
+}

src/main/resources/modules/Java_api/frame/base/BaseResponse.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.base;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -11,7 +11,7 @@ import java.util.List;
  * @version 0.0.1
  * @since 2017-01-01
  */
-public class ApiResponse<T> implements Serializable {
+public class BaseResponse<T> implements Serializable {
     private static final long serialVersionUID = 1L;
 
     private List<Error> errors = new ArrayList();

src/main/resources/modules/Java_api/frame/base/BaseSearchRequest.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.base;
 
 /**
  * ApiSearchRequest - 基类
@@ -7,7 +7,7 @@ package ${domain}.frame;
  * @version 0.0.1
  * @since 2017-01-01
  */
-public abstract class ApiSearchRequest {
+public abstract class BaseSearchRequest extends BaseFindRequest{
 
     /**
     * 关键字

src/main/resources/modules/Java_api/frame/base/BaseUpdateRequest.java

@@ -0,0 +1,24 @@
+package ${domain}.frame.base;
+
+/**
+ * BaseUpdateRequest - 基类
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2017-01-01
+ */
+public class BaseUpdateRequest extends BaseRequest{
+
+    /**
+    * 版本戳
+    */
+    private long rowVersion;
+
+    public long getRowVersion() {
+        return rowVersion;
+    }
+
+    public void setRowVersion(long rowVersion) {
+        this.rowVersion = rowVersion;
+    }
+}

src/main/resources/modules/Java_api/frame/base/Error.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.base;
 
 public class Error {
     private ErrorType type;

src/main/resources/modules/Java_api/frame/base/ErrorType.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.base;
 
 public enum ErrorType {
     BUSINESS_ERROR,

src/main/resources/modules/Java_api/frame/base/SortType.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.base;
 
 /**
  * SortType - 排序方式

src/main/resources/modules/Java_api/frame/okhttp3/ProgressRequestBody.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.okhttp3;
 
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;

src/main/resources/modules/Java_api/frame/utils/AESUtil.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.utils;
 
 import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;

src/main/resources/modules/Java_api/frame/utils/Base64Util.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.utils;
 
 import java.util.Arrays;
 

src/main/resources/modules/Java_api/frame/utils/BytesUtil.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.utils;
 
 /**
  * BytesUtil - 字节数组工具类

src/main/resources/modules/Java_api/frame/utils/DownloadUtil.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.utils;
 
 import okhttp3.*;
 

src/main/resources/modules/Java_api/frame/utils/MD5Util.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.utils;
 
 import com.fasterxml.jackson.core.TreeNode;
 import java.security.MessageDigest;

src/main/resources/modules/Java_api/frame/utils/MapperUtil.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.utils;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;

src/main/resources/modules/Java_api/frame/utils/RSAUtil.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.utils;
 
 import javax.crypto.Cipher;
 import java.io.ByteArrayOutputStream;

src/main/resources/modules/Java_api/frame/utils/StringUtils.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.utils;
 
 public class StringUtils {
     private StringUtils() {

src/main/resources/modules/Java_api/frame/utils/ValidationUtil.java

@@ -1,4 +1,4 @@
-package ${domain}.frame;
+package ${domain}.frame.utils;
 
 import javax.validation.ConstraintViolation;
 import javax.validation.Validation;

src/main/resources/modules/Java_api/module/ent/entity.java

@@ -3,12 +3,12 @@ package ${domain}.module.${module}.ent;
 <#list importList as i>
 ${i}
 </#list>
-import ${domain}.frame.ApiEntity;
+import ${domain}.frame.base.BaseEntity;
 
 <#list annotation as i>
 ${i}
 </#list>
-public class ${className} extends ApiEntity{
+public class ${className} extends BaseEntity{
 <#list body as i>
 ${i}
 </#list>

src/main/resources/modules/Java_api/module/req/request.java

@@ -9,28 +9,28 @@ import ${domain}.module.${module}.ent.${entName};
 <#if !isTempReq>
 import ${domain}.module.${module}.rsp.${rspClassName};
 </#if>
-import ${domain}.frame.ApiRequest;
+import ${domain}.frame.base.BaseRequest;
 <#if findOrSearchflag=='1'>
-import ${domain}.frame.ApiFindRequest;
+import ${domain}.frame.base.BaseFindRequest;
 <#elseif findOrSearchflag=='2'>
-import ${domain}.frame.ApiSearchRequest;
+import ${domain}.frame.base.BaseSearchRequest;
 </#if>
 
 <#list annotation as i>
 ${i}
 </#list>
 <#if findOrSearchflag=='1' && !isTempReq>
-public class ${className} extends ApiFindRequest implements ApiRequest<${rspClassName}> {
+public class ${className} extends BaseFindRequest<${rspClassName}> {
 <#elseif findOrSearchflag=='1' && isTempReq>
-public class ${className} extends ApiFindRequest implements ApiRequest {
+public class ${className} extends BaseFindRequest<${rspClassName}> {
 <#elseif findOrSearchflag=='2' && !isTempReq>
-public class ${className} extends ApiSearchRequest implements ApiRequest<${rspClassName}> {
+public class ${className} extends BaseSearchRequest<${rspClassName}>{
 <#elseif findOrSearchflag=='2' && isTempReq>
-public class ${className} extends ApiSearchRequest implements ApiRequest {
+public class ${className} extends BaseSearchRequest<${rspClassName}> {
 <#elseif !isTempReq>
-public class ${className} implements ApiRequest<${rspClassName}> {
+public class ${className} extends BaseRequest<${rspClassName}> {
 <#elseif isTempReq>
-public class ${className} implements ApiRequest {
+public class ${className} extends BaseRequest {
 </#if>
 
 <#list body as i>

src/main/resources/modules/Java_api/module/rsp/response.java

@@ -7,15 +7,15 @@ ${i}
 import ${domain}.module.${module}.ent.${entName};
 </#list>
 <#if hasList>
-import ${domain}.frame.ApiFindResponse;
+import ${domain}.frame.base.BaseFindResponse;
 <#else>
-import ${domain}.frame.ApiResponse;
+import ${domain}.frame.base.BaseResponse;
 </#if>
 
 <#list annotation as i>
 ${i}
 </#list>
-public class ${className} extends<#if hasList> ApiFindResponse<${Tclass}><#else> ApiResponse</#if> {
+public class ${className} extends<#if hasList> BaseFindResponse<${Tclass}><#else> BaseResponse</#if> {
 
 <#list body as i>
 ${i}

src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl

@@ -9,7 +9,7 @@ import ${basePackage}.frame.validation.Dict;
 </#if>
 
 /**
- * ${table.getCName()}Request - ${table.tableComment}查询
+ * ${table.getCName()}FindRequest - ${table.tableComment}查询
  *
  * @author ${author?default("")}
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/DeptFindRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 
 /**
- * DeptRequest -  部门查询
+ * DeptFindRequest -  部门查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/DictFindRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 
 /**
- * DictRequest -  字典查询
+ * DictFindRequest -  字典查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/DictItemFindRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 
 /**
- * DictItemRequest -  字典项查询
+ * DictItemFindRequest -  字典项查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/FileFindRequest.java

@@ -4,7 +4,7 @@ import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
 /**
- * FileRequest -  文件查询
+ * FileFindRequest -  文件查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/LogErrFindRequest.java

@@ -4,7 +4,7 @@ import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
 /**
- * LogErrRequest - 错误日志查询
+ * LogErrFindRequest - 错误日志查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/ProfilesFindRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 
 /**
- * ProfilesRequest - 系统配置查询
+ * ProfilesFindRequest - 系统配置查询
  *
  * @author author
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/ResFindRequest.java

@@ -4,7 +4,7 @@ import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
 /**
- * ResRequest -  资源查询
+ * ResFindRequest -  资源查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/RoleFindRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 
 /**
- * RoleRequest -  角色查询
+ * RoleFindRequest -  角色查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/RoleResFindRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 
 /**
- * RoleResRequest -  角色资源关系查询
+ * RoleResFindRequest -  角色资源关系查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/ScheduleFindRequest.java

@@ -4,7 +4,7 @@ import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
 /**
- * TaskSqlRequest - SQL任务查询
+ * TaskSqlFindRequest - SQL任务查询
  *
  * @author author
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/TaskSqlFindRequest.java

@@ -4,7 +4,7 @@ import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
 /**
- * TaskSqlRequest - SQL任务查询
+ * TaskSqlFindRequest - SQL任务查询
  *
  * @author author
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/TokensFindRequest.java

@@ -5,7 +5,7 @@ import java.util.Date;
 import ${basePackage}.frame.validation.Dict;
 
 /**
- * TokensRequest -  通行证查询
+ * TokensFindRequest -  通行证查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/UserFindRequest.java

@@ -4,7 +4,7 @@ import ${basePackage}.frame.base.BaseFindRequest;
 import ${basePackage}.frame.validation.Dict;
 
 /**
- * UserRequest -  用户查询
+ * UserFindRequest -  用户查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/req/UserRoleFindRequest.java

@@ -3,7 +3,7 @@ package ${basePackage}.module.system.req;
 import ${basePackage}.frame.base.BaseFindRequest;
 
 /**
- * UserRoleRequest -  用户角色授权查询
+ * UserRoleFindRequest -  用户角色授权查询
  *
  * @author wangbing
  * @version 0.0.1

src/main/resources/modules/SpringBoot/java/module/system/rsp/FileUploadResponse.java

@@ -16,11 +16,11 @@ public class FileUploadResponse extends BaseResponse {
      */
     private Long id;
     /**
-     * 文件访问URL
+     * 文件访问地址
      */
     private String url;
     /**
-     * 文件ID
+     * 文件下载地址
      */
     private String urlDownload;