1、Api优化

Former-commit-id: 9176d4b0118f29c9949e8e68652a5b569654ac09

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

@@ -20,6 +20,13 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+/**
+ * ApiTest - 测试用例
+ *
+ * @author ${author?default("")}
+ * @version 0.0.1
+ * @since ${.now?string["yyyy-MM-dd"]}
+ */
 public class ApiClient {
     private static ApiClient ourInstance = null;
 

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

@@ -1,5 +1,8 @@
 package ${domain};
 
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 import ${domain}.frame.ApiRequest;
 import ${domain}.frame.ApiResponse;
 import ${domain}.frame.MapperUtil;
@@ -9,9 +12,8 @@ import ${domain}.module.${module}.req.${item.request};
 <#list apiList as item>
 import ${domain}.module.${module}.rsp.${item.response};
 </#list>
-import org.junit.Assert;
+import ${domain}.module.system.req.UserLoginRequest;
-import org.junit.Before;
+import ${domain}.module.system.rsp.UserLoginResponse;
-import org.junit.Test;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -19,9 +21,9 @@ import java.util.Date;
 /**
  * ApiTest - 测试用例
  *
- * @author author
+ * @author ${author?default("")}
  * @version 0.0.1
- * @since 2019-06-11
+ * @since ${.now?string["yyyy-MM-dd"]}
  */
 public class ${className} {
 
@@ -52,6 +54,11 @@ public class ${className} {
             }
         });
 
+        UserLoginRequest request = new UserLoginRequest();
+        request.setUsername("test");
+        request.setPassword("test123");
+        UserLoginResponse response = apiClient.execute(request);
+        apiClient.setToken(response.getToken());
     }
 <#list apiList as item>
 

src/main/resources/modules/SpringBoot/java/action/api/system/DeptApi.java

@@ -1,33 +0,0 @@
-package ${basePackage}.action.api.system;
-
-import ${basePackage}.frame.auth.LocalData;
-import ${basePackage}.module.system.mgr.DeptManager;
-import ${basePackage}.module.system.req.*;
-import ${basePackage}.module.system.rsp.*;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class DeptApi{
-
-    @Autowired
-    private DeptManager deptManager;
-
-    public DeptCreateResponse create(DeptCreateRequest request) {
-        return deptManager.create(request, LocalData.getToken());
-    }
-
-    public DeptDeleteResponse delete(DeptDeleteRequest request) {
-        return deptManager.delete(request, LocalData.getToken());
-    }
-
-    public DeptUpdateResponse update(DeptUpdateRequest request) {
-        return deptManager.update(request, LocalData.getToken());
-    }
-
-    public DeptFindResponse find(DeptFindRequest request) {
-        return deptManager.find(request, LocalData.getToken());
-    }
-
-    public DeptGetResponse get(DeptGetRequest request) {
-        return deptManager.get(request, LocalData.getToken());
-    }
-}

src/main/resources/modules/SpringBoot/java/action/api/system/DictApi.java

@@ -3,10 +3,8 @@ package ${basePackage}.action.api.system;
 import ${basePackage}.frame.auth.LocalData;
 import ${basePackage}.module.system.mgr.DictManager;
 import ${basePackage}.module.system.req.DictFindRequest;
-import ${basePackage}.module.system.req.DictGetRequest;
 import ${basePackage}.module.system.req.DictLoadRequest;
 import ${basePackage}.module.system.rsp.DictFindResponse;
-import ${basePackage}.module.system.rsp.DictGetResponse;
 import ${basePackage}.module.system.rsp.DictLoadResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -19,10 +17,6 @@ public class DictApi {
         return dictManager.find(request, LocalData.getToken());
     }
 
-    public DictGetResponse get(DictGetRequest request) {
-        return dictManager.get(request, LocalData.getToken());
-    }
-
     public DictLoadResponse load(DictLoadRequest request) {
         return dictManager.load(request, LocalData.getToken());
     }

src/main/resources/modules/SpringBoot/java/action/api/system/DictItemApi.java

@@ -1,23 +0,0 @@
-package ${basePackage}.action.api.system;
-
-import ${basePackage}.frame.auth.LocalData;
-import ${basePackage}.module.system.mgr.DictItemManager;
-import ${basePackage}.module.system.req.DictItemFindRequest;
-import ${basePackage}.module.system.req.DictItemGetRequest;
-import ${basePackage}.module.system.rsp.DictItemFindResponse;
-import ${basePackage}.module.system.rsp.DictItemGetResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class DictItemApi {
-
-    @Autowired
-    private DictItemManager dictItemManager;
-
-    public DictItemFindResponse find(DictItemFindRequest request) {
-        return dictItemManager.find(request, LocalData.getToken());
-    }
-
-    public DictItemGetResponse get(DictItemGetRequest request) {
-        return dictItemManager.get(request, LocalData.getToken());
-    }
-}

src/main/resources/modules/SpringBoot/java/action/api/system/FileApi.java

@@ -1,33 +1,23 @@
 package ${basePackage}.action.api.system;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import ${basePackage}.frame.auth.LocalData;
 import ${basePackage}.frame.base.ErrorType;
-import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.Base64Util;
+import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.module.system.mgr.FileManager;
-import ${basePackage}.module.system.req.FileCreateRequest;
+import ${basePackage}.module.system.req.FileDownloadRequest;
 import ${basePackage}.module.system.req.FileGetRequest;
 import ${basePackage}.module.system.req.FileUploadRequest;
-import ${basePackage}.module.system.req.FileDownloadRequest;
+import ${basePackage}.module.system.rsp.FileDownloadResponse;
-import ${basePackage}.module.system.rsp.FileCreateResponse;
 import ${basePackage}.module.system.rsp.FileGetResponse;
 import ${basePackage}.module.system.rsp.FileUploadResponse;
-import ${basePackage}.module.system.rsp.FileDownloadResponse;
-import org.springframework.beans.factory.annotation.Autowired;
 
 public class FileApi {
 
     @Autowired
     private FileManager fileManager;
 
-    public FileCreateResponse create(FileCreateRequest request) {
-        return fileManager.create(request, LocalData.getToken());
-    }
-
-    public FileGetResponse get(FileGetRequest request) {
-        return fileManager.get(request, LocalData.getToken());
-    }
-
     public FileUploadResponse upload(FileUploadRequest request) {
         FileUploadResponse fileUploadResponse = new FileUploadResponse();
         String fileName = request.getFileName();

src/main/resources/modules/SpringBoot/java/action/api/system/ResApi.java

@@ -1,47 +0,0 @@
-package ${basePackage}.action.api.system;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import ${basePackage}.frame.auth.LocalData;
-import ${basePackage}.module.system.mgr.ResManager;
-import ${basePackage}.module.system.req.ResCreateRequest;
-import ${basePackage}.module.system.req.ResDeleteRequest;
-import ${basePackage}.module.system.req.ResFindRequest;
-import ${basePackage}.module.system.req.ResGetRequest;
-import ${basePackage}.module.system.req.ResTreeRequest;
-import ${basePackage}.module.system.req.ResUpdateRequest;
-import ${basePackage}.module.system.rsp.ResCreateResponse;
-import ${basePackage}.module.system.rsp.ResDeleteResponse;
-import ${basePackage}.module.system.rsp.ResFindResponse;
-import ${basePackage}.module.system.rsp.ResGetResponse;
-import ${basePackage}.module.system.rsp.ResTreeResponse;
-import ${basePackage}.module.system.rsp.ResUpdateResponse;
-
-public class ResApi {
-
-    @Autowired
-    private ResManager resManager;
-
-    public ResCreateResponse create(ResCreateRequest request) {
-        return resManager.create(request, LocalData.getToken());
-    }
-
-    public ResDeleteResponse delete(ResDeleteRequest request) {
-        return resManager.delete(request, LocalData.getToken());
-    }
-
-    public ResUpdateResponse update(ResUpdateRequest request) {
-        return resManager.update(request, LocalData.getToken());
-    }
-
-    public ResFindResponse find(ResFindRequest request) {
-        return resManager.find(request, LocalData.getToken());
-    }
-
-    public ResGetResponse get(ResGetRequest request) {
-        return resManager.get(request, LocalData.getToken());
-    }
-
-    public ResTreeResponse tree(ResTreeRequest request) {
-        return resManager.tree(request, LocalData.getToken());
-    }
-}

src/main/resources/modules/SpringBoot/java/action/api/system/RoleApi.java

@@ -1,33 +0,0 @@
-package ${basePackage}.action.api.system;
-
-import ${basePackage}.frame.auth.LocalData;
-import ${basePackage}.module.system.mgr.RoleManager;
-import ${basePackage}.module.system.req.*;
-import ${basePackage}.module.system.rsp.*;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class RoleApi{
-
-    @Autowired
-    private RoleManager roleManager;
-
-    public RoleCreateResponse create(RoleCreateRequest request) {
-        return roleManager.create(request, LocalData.getToken());
-    }
-
-    public RoleDeleteResponse delete(RoleDeleteRequest request) {
-        return roleManager.delete(request, LocalData.getToken());
-    }
-
-    public RoleUpdateResponse update(RoleUpdateRequest request) {
-        return roleManager.update(request, LocalData.getToken());
-    }
-
-    public RoleFindResponse find(RoleFindRequest request) {
-        return roleManager.find(request, LocalData.getToken());
-    }
-
-    public RoleGetResponse get(RoleGetRequest request) {
-        return roleManager.get(request, LocalData.getToken());
-    }
-}

src/main/resources/modules/SpringBoot/java/action/api/system/RoleResApi.java

@@ -1,41 +0,0 @@
-package ${basePackage}.action.ajax.system;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import ${basePackage}.frame.auth.LocalData;
-import ${basePackage}.module.system.mgr.RoleResManager;
-import ${basePackage}.module.system.req.RoleResCreateRequest;
-import ${basePackage}.module.system.req.RoleResDeleteRequest;
-import ${basePackage}.module.system.req.RoleResFindRequest;
-import ${basePackage}.module.system.req.RoleResGetRequest;
-import ${basePackage}.module.system.req.RoleResUpdateRequest;
-import ${basePackage}.module.system.rsp.RoleResCreateResponse;
-import ${basePackage}.module.system.rsp.RoleResDeleteResponse;
-import ${basePackage}.module.system.rsp.RoleResFindResponse;
-import ${basePackage}.module.system.rsp.RoleResGetResponse;
-import ${basePackage}.module.system.rsp.RoleResUpdateResponse;
-
-public class RoleResApi{
-
-    @Autowired
-    private RoleResManager roleResManager;
-
-    public RoleResCreateResponse create(RoleResCreateRequest request) {
-        return roleResManager.create(request, LocalData.getToken());
-    }
-
-    public RoleResDeleteResponse delete(RoleResDeleteRequest request) {
-        return roleResManager.delete(request, LocalData.getToken());
-    }
-
-    public RoleResUpdateResponse update(RoleResUpdateRequest request) {
-        return roleResManager.update(request, LocalData.getToken());
-    }
-
-    public RoleResFindResponse find(RoleResFindRequest request) {
-        return roleResManager.find(request, LocalData.getToken());
-    }
-
-    public RoleResGetResponse get(RoleResGetRequest request) {
-        return roleResManager.get(request, LocalData.getToken());
-    }
-}

src/main/resources/modules/SpringBoot/java/action/api/system/TokensApi.java

@@ -1,33 +0,0 @@
-package ${basePackage}.action.api.system;
-
-import ${basePackage}.frame.auth.LocalData;
-import ${basePackage}.module.system.mgr.TokensManager;
-import ${basePackage}.module.system.req.*;
-import ${basePackage}.module.system.rsp.*;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class TokensApi{
-
-    @Autowired
-    private TokensManager tokensManager;
-
-    public TokensCreateResponse create(TokensCreateRequest request) {
-        return tokensManager.create(request, LocalData.getToken());
-    }
-
-    public TokensDeleteResponse delete(TokensDeleteRequest request) {
-        return tokensManager.delete(request, LocalData.getToken());
-    }
-
-    public TokensUpdateResponse update(TokensUpdateRequest request) {
-        return tokensManager.update(request, LocalData.getToken());
-    }
-
-    public TokensFindResponse find(TokensFindRequest request) {
-        return tokensManager.find(request, LocalData.getToken());
-    }
-
-    public TokensGetResponse get(TokensGetRequest request) {
-        return tokensManager.get(request, LocalData.getToken());
-    }
-}

src/main/resources/modules/SpringBoot/java/action/api/system/UserApi.java

@@ -36,26 +36,6 @@ public class UserApi{
     @Autowired
     private UserManager userManager;
 
-    public UserCreateResponse create(UserCreateRequest request) {
-        return userManager.create(request, LocalData.getToken());
-    }
-
-    public UserDeleteResponse delete(UserDeleteRequest request) {
-        return userManager.delete(request, LocalData.getToken());
-    }
-
-    public UserUpdateResponse update(UserUpdateRequest request) {
-        return userManager.update(request, LocalData.getToken());
-    }
-
-    public UserFindResponse find(UserFindRequest request) {
-        return userManager.find(request, LocalData.getToken());
-    }
-
-    public UserGetResponse get(UserGetRequest request) {
-        return userManager.get(request, LocalData.getToken());
-    }
-
     public UserLoginResponse login(UserLoginRequest request, HttpServletRequest httpServletRequest) {
         UserLoginResponse response = new UserLoginResponse();
 

src/main/resources/modules/SpringBoot/java/action/api/system/UserRoleApi.java

@@ -1,33 +0,0 @@
-package ${basePackage}.action.api.system;
-
-import ${basePackage}.frame.auth.LocalData;
-import ${basePackage}.module.system.mgr.UserRoleManager;
-import ${basePackage}.module.system.req.*;
-import ${basePackage}.module.system.rsp.*;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class UserRoleApi{
-
-    @Autowired
-    private UserRoleManager userRoleManager;
-
-    public UserRoleCreateResponse create(UserRoleCreateRequest request) {
-        return userRoleManager.create(request, LocalData.getToken());
-    }
-
-    public UserRoleDeleteResponse delete(UserRoleDeleteRequest request) {
-        return userRoleManager.delete(request, LocalData.getToken());
-    }
-
-    public UserRoleUpdateResponse update(UserRoleUpdateRequest request) {
-        return userRoleManager.update(request, LocalData.getToken());
-    }
-
-    public UserRoleFindResponse find(UserRoleFindRequest request) {
-        return userRoleManager.find(request, LocalData.getToken());
-    }
-
-    public UserRoleGetResponse get(UserRoleGetRequest request) {
-        return userRoleManager.get(request, LocalData.getToken());
-    }
-}

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

@@ -28,7 +28,7 @@ public class FileUploadRequest extends BaseRequest {
     /**
      * 文件体(字节数组)
      */
-    private byte dataBytes;
+    private byte[] dataBytes;
 
     public String getFileName() {
         return fileName;
@@ -46,11 +46,11 @@ public class FileUploadRequest extends BaseRequest {
         this.dataBase64 = dataBase64;
     }
 
-    public byte getDataBytes() {
+    public byte[] getDataBytes() {
         return dataBytes;
     }
 
-    public void setDataBytes(byte dataBytes) {
+    public void setDataBytes(byte[] dataBytes) {
         this.dataBytes = dataBytes;
     }
 }

src/main/resources/modules/SpringBoot/test/DataInit.java

@@ -293,7 +293,12 @@ public class DataInit {
 
     </#list>
 </#list>
-<#if project.isNeedAsync()>
+<#if project.isNeedApi()>
+                forMgr.add(createRes("API_SYS_USER_LOGIN", "用户登录", "请求", "/api/system/User/login"));
+                forMgr.add(createRes("API_SYS_DICT_FIND", "字典查询", "请求", "/api/system/Dict/find"));
+                forMgr.add(createRes("API_SYS_DICT_LOAD", "加载字典", "请求", "/api/system/Dict/load"));
+                forMgr.add(createRes("API_SYS_FILE_UPLOAD", "文件上传", "请求", "/api/system/File/upload"));
+                forMgr.add(createRes("API_SYS_FILE_DOWNLOAD", "文件下载", "请求", "/api/system/File/download"));
 <#list project.modules as module>
     <#list module.tables as table>
         <#if table.create>