From acad8d1eb79b6825e3b6d7a3c7d630ded83ab6b0 Mon Sep 17 00:00:00 2001 From: wangbing Date: Wed, 11 Mar 2020 16:45:14 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81home=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: bb017234969343265ab1a50fc8383181ff2a15b8 --- .../java/action/GlobalController.java | 8 +++ .../SpringBoot/java/action/ajax/Ajax.java | 3 +- .../java/action/ajax/system/DeptAjax.java | 32 +++++----- .../java/action/ajax/system/DictAjax.java | 32 +++++----- .../java/action/ajax/system/DictItemAjax.java | 28 ++++----- .../java/action/ajax/system/FileAjax.java | 26 ++++---- .../java/action/ajax/system/LogErrAjax.java | 28 ++++----- .../java/action/ajax/system/ResAjax.java | 32 +++++----- .../java/action/ajax/system/RoleAjax.java | 28 ++++----- .../java/action/ajax/system/RoleResAjax.java | 26 ++++---- .../java/action/ajax/system/TokensAjax.java | 32 +++++----- .../java/action/ajax/system/UserAjax.java | 35 +++++------ .../java/action/ajax/system/UserRoleAjax.java | 22 +++---- .../module/system/mgr/TokensManagerImpl.java | 2 +- .../resources/templates/screen/home.ftl | 63 ++++++++++--------- 15 files changed, 196 insertions(+), 201 deletions(-) diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java index d6d04a4d..64613a3d 100644 --- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java +++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java @@ -286,6 +286,10 @@ public class GlobalController implements ErrorController { arg[i] = file; } else if (BaseRequest.class.isAssignableFrom(parameter.getType())) { arg[i] = MapperUtil.toJava(data, parameter.getType()); + } else if (parameter.getType() == Token.class) { + arg[i] = LocalData.getToken(); + } else { + arg[i] = null; } } return methodC.invoke(ajax, arg); @@ -395,6 +399,10 @@ public class GlobalController implements ErrorController { arg[i] = MapperUtil.toJava(data, parameter.getType()); } else if (parameter.getType() == TreeNode.class) { arg[i] = MapperUtil.toTree(data); + } else if (parameter.getType() == Token.class) { + arg[i] = LocalData.getToken(); + } else { + arg[i] = null; } } response = (BaseResponse) methodC.invoke(ajax, arg); diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java index 09c7d3de..c87a1cc8 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java @@ -75,8 +75,7 @@ public class ${table.getCName()}Ajax{ return ResponseUtil.apply(new WExcel<>(${table.getCName()}.class)); } - public Object exports(TreeNode jsonParam) { - ${table.getCName()}FindRequest request = MapperUtil.toJava(jsonParam, ${table.getCName()}FindRequest.class); + public Object exports(${table.getCName()}FindRequest request) { ${table.getCName()}FindResponse response = ${table.getFName()}Manager.find(request, LocalData.getToken()); if (response.hasError()) { return response; diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/DeptAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/DeptAjax.java index a77e2d0a..a3bb9df7 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/DeptAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/DeptAjax.java @@ -1,9 +1,8 @@ package ${basePackage}.action.ajax.system; -import com.fasterxml.jackson.core.TreeNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; -import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.excel.WExcel; @@ -36,37 +35,36 @@ public class DeptAjax { @Autowired private DeptManager deptManager; - public DeptCreateResponse create(DeptCreateRequest request) { - return deptManager.create(request, LocalData.getToken()); + public DeptCreateResponse create(DeptCreateRequest request, Token token) { + return deptManager.create(request, token); } - public DeptDeleteResponse delete(DeptDeleteRequest request) { - return deptManager.delete(request, LocalData.getToken()); + public DeptDeleteResponse delete(DeptDeleteRequest request, Token token) { + return deptManager.delete(request, token); } - public DeptUpdateResponse update(DeptUpdateRequest request) { - return deptManager.update(request, LocalData.getToken()); + public DeptUpdateResponse update(DeptUpdateRequest request, Token token) { + return deptManager.update(request, token); } - public DeptFindResponse find(DeptFindRequest request) { - return deptManager.find(request, LocalData.getToken()); + public DeptFindResponse find(DeptFindRequest request, Token token) { + return deptManager.find(request, token); } - public DeptGetResponse get(DeptGetRequest request) { - return deptManager.get(request, LocalData.getToken()); + public DeptGetResponse get(DeptGetRequest request, Token token) { + return deptManager.get(request, token); } - public DeptTreeResponse tree(DeptTreeRequest request) { - return deptManager.tree(request, LocalData.getToken()); + public DeptTreeResponse tree(DeptTreeRequest request, Token token) { + return deptManager.tree(request, token); } public Object template() { return ResponseUtil.apply(new WExcel<>(Dept.class)); } - public Object exports(TreeNode jsonParam) { - DeptFindRequest request = MapperUtil.toJava(jsonParam, DeptFindRequest.class); - DeptFindResponse response = deptManager.find(request, LocalData.getToken()); + public Object exports(DeptFindRequest request, Token token) { + DeptFindResponse response = deptManager.find(request, token); if (response.hasError()) { return response; } else if (response.getTotalCount() == 0) { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/DictAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/DictAjax.java index 0b265da9..1dbbbc4c 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/DictAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/DictAjax.java @@ -1,9 +1,8 @@ package ${basePackage}.action.ajax.system; -import com.fasterxml.jackson.core.TreeNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; -import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.excel.WExcel; @@ -36,37 +35,36 @@ public class DictAjax { @Autowired private DictManager dictManager; - public DictCreateResponse create(DictCreateRequest request) { - return dictManager.create(request, LocalData.getToken()); + public DictCreateResponse create(DictCreateRequest request, Token token) { + return dictManager.create(request, token); } - public DictDeleteResponse delete(DictDeleteRequest request) { - return dictManager.delete(request, LocalData.getToken()); + public DictDeleteResponse delete(DictDeleteRequest request, Token token) { + return dictManager.delete(request, token); } - public DictUpdateResponse update(DictUpdateRequest request) { - return dictManager.update(request, LocalData.getToken()); + public DictUpdateResponse update(DictUpdateRequest request, Token token) { + return dictManager.update(request, token); } - public DictFindResponse find(DictFindRequest request) { - return dictManager.find(request, LocalData.getToken()); + public DictFindResponse find(DictFindRequest request, Token token) { + return dictManager.find(request, token); } - public DictGetResponse get(DictGetRequest request) { - return dictManager.get(request, LocalData.getToken()); + public DictGetResponse get(DictGetRequest request, Token token) { + return dictManager.get(request, token); } - public DictLoadResponse load(DictLoadRequest request) { - return dictManager.load(request, LocalData.getToken()); + public DictLoadResponse load(DictLoadRequest request, Token token) { + return dictManager.load(request, token); } public Object template() { return ResponseUtil.apply(new WExcel<>(Dict.class)); } - public Object exports(TreeNode jsonParam) { - DictFindRequest request = MapperUtil.toJava(jsonParam, DictFindRequest.class); - DictFindResponse response = dictManager.find(request, LocalData.getToken()); + public Object exports(DictFindRequest request, Token token) { + DictFindResponse response = dictManager.find(request, token); if (response.hasError()) { return response; } else if (response.getTotalCount() == 0) { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/DictItemAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/DictItemAjax.java index cc7193e4..c39a0683 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/DictItemAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/DictItemAjax.java @@ -1,9 +1,8 @@ package ${basePackage}.action.ajax.system; -import com.fasterxml.jackson.core.TreeNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; -import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.excel.WExcel; @@ -34,33 +33,32 @@ public class DictItemAjax { @Autowired private DictItemManager dictItemManager; - public DictItemCreateResponse create(DictItemCreateRequest request) { - return dictItemManager.create(request, LocalData.getToken()); + public DictItemCreateResponse create(DictItemCreateRequest request, Token token) { + return dictItemManager.create(request, token); } - public DictItemDeleteResponse delete(DictItemDeleteRequest request) { - return dictItemManager.delete(request, LocalData.getToken()); + public DictItemDeleteResponse delete(DictItemDeleteRequest request, Token token) { + return dictItemManager.delete(request, token); } - public DictItemUpdateResponse update(DictItemUpdateRequest request) { - return dictItemManager.update(request, LocalData.getToken()); + public DictItemUpdateResponse update(DictItemUpdateRequest request, Token token) { + return dictItemManager.update(request, token); } - public DictItemFindResponse find(DictItemFindRequest request) { - return dictItemManager.find(request, LocalData.getToken()); + public DictItemFindResponse find(DictItemFindRequest request, Token token) { + return dictItemManager.find(request, token); } - public DictItemGetResponse get(DictItemGetRequest request) { - return dictItemManager.get(request, LocalData.getToken()); + public DictItemGetResponse get(DictItemGetRequest request, Token token) { + return dictItemManager.get(request, token); } public Object template() { return ResponseUtil.apply(new WExcel<>(DictItem.class)); } - public Object exports(TreeNode jsonParam) { - DictItemFindRequest request = MapperUtil.toJava(jsonParam, DictItemFindRequest.class); - DictItemFindResponse response = dictItemManager.find(request, LocalData.getToken()); + public Object exports(DictItemFindRequest request, Token token) { + DictItemFindResponse response = dictItemManager.find(request, token); if (response.hasError()) { return response; } else if (response.getTotalCount() == 0) { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/FileAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/FileAjax.java index 27a158a8..60fb445b 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/FileAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/FileAjax.java @@ -1,13 +1,12 @@ package ${basePackage}.action.ajax.system; -import com.fasterxml.jackson.core.TreeNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; -import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.excel.WExcel; @@ -38,29 +37,28 @@ public class FileAjax { @Autowired private FileManager fileManager; - public FileCreateResponse create(FileCreateRequest request) { - return fileManager.create(request, LocalData.getToken()); + public FileCreateResponse create(FileCreateRequest request, Token token) { + return fileManager.create(request, token); } - public FileDeleteResponse delete(FileDeleteRequest request) { - return fileManager.delete(request, LocalData.getToken()); + public FileDeleteResponse delete(FileDeleteRequest request, Token token) { + return fileManager.delete(request, token); } - public FileFindResponse find(FileFindRequest request) { - return fileManager.find(request, LocalData.getToken()); + public FileFindResponse find(FileFindRequest request, Token token) { + return fileManager.find(request, token); } - public FileGetResponse get(FileGetRequest request) { - return fileManager.get(request, LocalData.getToken()); + public FileGetResponse get(FileGetRequest request, Token token) { + return fileManager.get(request, token); } public Object template() { return ResponseUtil.apply(new WExcel<>(File.class)); } - public Object exports(TreeNode jsonParam) { - FileFindRequest request = MapperUtil.toJava(jsonParam, FileFindRequest.class); - FileFindResponse response = fileManager.find(request, LocalData.getToken()); + public Object exports(FileFindRequest request, Token token) { + FileFindResponse response = fileManager.find(request, token); if (response.hasError()) { return response; } else if (response.getTotalCount() == 0) { @@ -116,7 +114,7 @@ public class FileAjax { return fileUploadResponse; } - public Object download(TreeNode jsonParam) { + public Object download() { try { //======== // todo 下载示例 diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/LogErrAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/LogErrAjax.java index 3a4b08ed..469923d7 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/LogErrAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/LogErrAjax.java @@ -1,9 +1,8 @@ package ${basePackage}.action.ajax.system; -import com.fasterxml.jackson.core.TreeNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; -import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.excel.WExcel; @@ -34,33 +33,32 @@ public class LogErrAjax { @Autowired private LogErrManager logErrManager; - public LogErrCreateResponse create(LogErrCreateRequest request) { - return logErrManager.create(request, LocalData.getToken()); + public LogErrCreateResponse create(LogErrCreateRequest request, Token token) { + return logErrManager.create(request, token); } - public LogErrDeleteResponse delete(LogErrDeleteRequest request) { - return logErrManager.delete(request, LocalData.getToken()); + public LogErrDeleteResponse delete(LogErrDeleteRequest request, Token token) { + return logErrManager.delete(request, token); } - public LogErrUpdateResponse update(LogErrUpdateRequest request) { - return logErrManager.update(request, LocalData.getToken()); + public LogErrUpdateResponse update(LogErrUpdateRequest request, Token token) { + return logErrManager.update(request, token); } - public LogErrFindResponse find(LogErrFindRequest request) { - return logErrManager.find(request, LocalData.getToken()); + public LogErrFindResponse find(LogErrFindRequest request, Token token) { + return logErrManager.find(request, token); } - public LogErrGetResponse get(LogErrGetRequest request) { - return logErrManager.get(request, LocalData.getToken()); + public LogErrGetResponse get(LogErrGetRequest request, Token token) { + return logErrManager.get(request, token); } public Object template(){ return ResponseUtil.apply(new WExcel<>(LogErr.class)); } - public Object exports(TreeNode jsonParam) { - LogErrFindRequest request = MapperUtil.toJava(jsonParam, LogErrFindRequest.class); - LogErrFindResponse response = logErrManager.find(request, LocalData.getToken()); + public Object exports(LogErrFindRequest request, Token token) { + LogErrFindResponse response = logErrManager.find(request, token); if (response.hasError()) { return response; } else if (response.getTotalCount() == 0) { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/ResAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/ResAjax.java index edde1e96..4405dabe 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/ResAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/ResAjax.java @@ -1,9 +1,8 @@ package ${basePackage}.action.ajax.system; -import com.fasterxml.jackson.core.TreeNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; -import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.excel.WExcel; @@ -36,37 +35,36 @@ public class ResAjax { @Autowired private ResManager resManager; - public ResCreateResponse create(ResCreateRequest request) { - return resManager.create(request, LocalData.getToken()); + public ResCreateResponse create(ResCreateRequest request, Token token) { + return resManager.create(request, token); } - public ResDeleteResponse delete(ResDeleteRequest request) { - return resManager.delete(request, LocalData.getToken()); + public ResDeleteResponse delete(ResDeleteRequest request, Token token) { + return resManager.delete(request, token); } - public ResUpdateResponse update(ResUpdateRequest request) { - return resManager.update(request, LocalData.getToken()); + public ResUpdateResponse update(ResUpdateRequest request, Token token) { + return resManager.update(request, token); } - public ResFindResponse find(ResFindRequest request) { - return resManager.find(request, LocalData.getToken()); + public ResFindResponse find(ResFindRequest request, Token token) { + return resManager.find(request, token); } - public ResGetResponse get(ResGetRequest request) { - return resManager.get(request, LocalData.getToken()); + public ResGetResponse get(ResGetRequest request, Token token) { + return resManager.get(request, token); } - public ResTreeResponse tree(ResTreeRequest request) { - return resManager.tree(request, LocalData.getToken()); + public ResTreeResponse tree(ResTreeRequest request, Token token) { + return resManager.tree(request, token); } public Object template() { return ResponseUtil.apply(new WExcel<>(Res.class)); } - public Object exports(TreeNode jsonParam) { - ResFindRequest request = MapperUtil.toJava(jsonParam, ResFindRequest.class); - ResFindResponse response = resManager.find(request, LocalData.getToken()); + public Object exports(ResFindRequest request, Token token) { + ResFindResponse response = resManager.find(request, token); if (response.hasError()) { return response; } else if (response.getTotalCount() == 0) { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/RoleAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/RoleAjax.java index f9d8baf8..1723ed03 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/RoleAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/RoleAjax.java @@ -1,9 +1,8 @@ package ${basePackage}.action.ajax.system; -import com.fasterxml.jackson.core.TreeNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; -import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.excel.WExcel; @@ -34,33 +33,32 @@ public class RoleAjax { @Autowired private RoleManager roleManager; - public RoleCreateResponse create(RoleCreateRequest request) { - return roleManager.create(request, LocalData.getToken()); + public RoleCreateResponse create(RoleCreateRequest request, Token token) { + return roleManager.create(request, token); } - public RoleDeleteResponse delete(RoleDeleteRequest request) { - return roleManager.delete(request, LocalData.getToken()); + public RoleDeleteResponse delete(RoleDeleteRequest request, Token token) { + return roleManager.delete(request, token); } - public RoleUpdateResponse update(RoleUpdateRequest request) { - return roleManager.update(request, LocalData.getToken()); + public RoleUpdateResponse update(RoleUpdateRequest request, Token token) { + return roleManager.update(request, token); } - public RoleFindResponse find(RoleFindRequest request) { - return roleManager.find(request, LocalData.getToken()); + public RoleFindResponse find(RoleFindRequest request, Token token) { + return roleManager.find(request, token); } - public RoleGetResponse get(RoleGetRequest request) { - return roleManager.get(request, LocalData.getToken()); + public RoleGetResponse get(RoleGetRequest request, Token token) { + return roleManager.get(request, token); } public Object template() { return ResponseUtil.apply(new WExcel<>(Role.class)); } - public Object exports(TreeNode jsonParam) { - RoleFindRequest request = MapperUtil.toJava(jsonParam, RoleFindRequest.class); - RoleFindResponse response = roleManager.find(request, LocalData.getToken()); + public Object exports(RoleFindRequest request, Token token) { + RoleFindResponse response = roleManager.find(request, token); if (response.hasError()) { return response; } else if (response.getTotalCount() == 0) { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/RoleResAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/RoleResAjax.java index 91ffb0be..758b7d87 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/RoleResAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/RoleResAjax.java @@ -1,7 +1,7 @@ package ${basePackage}.action.ajax.system; import org.springframework.beans.factory.annotation.Autowired; -import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.RoleResManager; import ${basePackage}.module.system.req.RoleResCheckRequest; import ${basePackage}.module.system.req.RoleResCreateRequest; @@ -21,27 +21,27 @@ public class RoleResAjax { @Autowired private RoleResManager roleResManager; - public RoleResCreateResponse create(RoleResCreateRequest request) { - return roleResManager.create(request, LocalData.getToken()); + public RoleResCreateResponse create(RoleResCreateRequest request, Token token) { + return roleResManager.create(request, token); } - public RoleResDeleteResponse delete(RoleResDeleteRequest request) { - return roleResManager.delete(request, LocalData.getToken()); + public RoleResDeleteResponse delete(RoleResDeleteRequest request, Token token) { + return roleResManager.delete(request, token); } - public RoleResUpdateResponse update(RoleResUpdateRequest request) { - return roleResManager.update(request, LocalData.getToken()); + public RoleResUpdateResponse update(RoleResUpdateRequest request, Token token) { + return roleResManager.update(request, token); } - public RoleResFindResponse find(RoleResFindRequest request) { - return roleResManager.find(request, LocalData.getToken()); + public RoleResFindResponse find(RoleResFindRequest request, Token token) { + return roleResManager.find(request, token); } - public RoleResGetResponse get(RoleResGetRequest request) { - return roleResManager.get(request, LocalData.getToken()); + public RoleResGetResponse get(RoleResGetRequest request, Token token) { + return roleResManager.get(request, token); } - public RoleResCheckResponse check(RoleResCheckRequest request) { - return roleResManager.check(request, LocalData.getToken()); + public RoleResCheckResponse check(RoleResCheckRequest request, Token token) { + return roleResManager.check(request, token); } } diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/TokensAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/TokensAjax.java index 3e2f8039..ad4895e9 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/TokensAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/TokensAjax.java @@ -1,9 +1,8 @@ package ${basePackage}.action.ajax.system; -import com.fasterxml.jackson.core.TreeNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; -import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.excel.WExcel; @@ -36,37 +35,36 @@ public class TokensAjax { @Autowired private TokensManager tokensManager; - public TokensCreateResponse create(TokensCreateRequest request) { - return tokensManager.create(request, LocalData.getToken()); + public TokensCreateResponse create(TokensCreateRequest request, Token token) { + return tokensManager.create(request, token); } - public TokensDeleteResponse delete(TokensDeleteRequest request) { - return tokensManager.delete(request, LocalData.getToken()); + public TokensDeleteResponse delete(TokensDeleteRequest request, Token token) { + return tokensManager.delete(request, token); } - public TokensUpdateResponse update(TokensUpdateRequest request) { - return tokensManager.update(request, LocalData.getToken()); + public TokensUpdateResponse update(TokensUpdateRequest request, Token token) { + return tokensManager.update(request, token); } - public TokensFindResponse find(TokensFindRequest request) { - return tokensManager.find(request, LocalData.getToken()); + public TokensFindResponse find(TokensFindRequest request, Token token) { + return tokensManager.find(request, token); } - public TokensGetResponse get(TokensGetRequest request) { - return tokensManager.get(request, LocalData.getToken()); + public TokensGetResponse get(TokensGetRequest request, Token token) { + return tokensManager.get(request, token); } - public TokensLogoutResponse logout(TokensLogoutRequest request) { - return tokensManager.logout(request, LocalData.getToken()); + public TokensLogoutResponse logout(TokensLogoutRequest request, Token token) { + return tokensManager.logout(request, token); } public Object template() { return ResponseUtil.apply(new WExcel<>(Tokens.class)); } - public Object exports(TreeNode jsonParam) { - TokensFindRequest request = MapperUtil.toJava(jsonParam, TokensFindRequest.class); - TokensFindResponse response = tokensManager.find(request, LocalData.getToken()); + public Object exports(TokensFindRequest request, Token token) { + TokensFindResponse response = tokensManager.find(request, token); if (response.hasError()) { return response; } else if (response.getTotalCount() == 0) { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/UserAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/UserAjax.java index fccfb030..12265806 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/UserAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/UserAjax.java @@ -1,10 +1,10 @@ package ${basePackage}.action.ajax.system; -import com.fasterxml.jackson.core.TreeNode; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.multipart.MultipartFile; import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.excel.WExcel; @@ -59,27 +59,27 @@ public class UserAjax { @Autowired private UserManager userManager; - public UserCreateResponse create(UserCreateRequest request) { - return userManager.create(request, LocalData.getToken()); + public UserCreateResponse create(UserCreateRequest request, Token token) { + return userManager.create(request, token); } - public UserDeleteResponse delete(UserDeleteRequest request) { - return userManager.delete(request, LocalData.getToken()); + public UserDeleteResponse delete(UserDeleteRequest request, Token token) { + return userManager.delete(request, token); } - public UserUpdateResponse update(UserUpdateRequest request) { - return userManager.update(request, LocalData.getToken()); + public UserUpdateResponse update(UserUpdateRequest request, Token token) { + return userManager.update(request, token); } - public UserFindResponse find(UserFindRequest request) { - return userManager.find(request, LocalData.getToken()); + public UserFindResponse find(UserFindRequest request, Token token) { + return userManager.find(request, token); } - public UserGetResponse get(UserGetRequest request) { - return userManager.get(request, LocalData.getToken()); + public UserGetResponse get(UserGetRequest request, Token token) { + return userManager.get(request, token); } - public UserLoginResponse login(UserLoginRequest request, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { + public UserLoginResponse login(UserLoginRequest request, Token token, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) { UserLoginResponse response = new UserLoginResponse(); ValidationUtil.validate(request, response); @@ -177,12 +177,12 @@ public class UserAjax { return response; } - public UserLogoutResponse logout(UserLogoutRequest request) { + public UserLogoutResponse logout(UserLogoutRequest request, Token token) { UserLogoutResponse response = new UserLogoutResponse(); - if (LocalData.getToken() != null) { + if (token != null) { TokensLogoutRequest tokensLogoutRequest = new TokensLogoutRequest(); - tokensLogoutRequest.setToken(LocalData.getToken().getToken()); + tokensLogoutRequest.setToken(token.getToken()); TokensLogoutResponse tokensLogoutResponse = tokensManager.logout(tokensLogoutRequest, LocalData.getSysToken()); if (tokensLogoutResponse.hasError()) { response.addErrors(tokensLogoutResponse.getErrors()); @@ -197,9 +197,8 @@ public class UserAjax { return ResponseUtil.apply(new WExcel<>(User.class)); } - public Object exports(TreeNode jsonParam) { - UserFindRequest request = MapperUtil.toJava(jsonParam, UserFindRequest.class); - UserFindResponse response = userManager.find(request, LocalData.getToken()); + public Object exports(UserFindRequest request, Token token) { + UserFindResponse response = userManager.find(request, token); if (response.hasError()) { return response; } else if (response.getTotalCount() == 0) { diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/UserRoleAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/UserRoleAjax.java index d2d02a44..b399ce30 100644 --- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/UserRoleAjax.java +++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/UserRoleAjax.java @@ -1,7 +1,7 @@ package ${basePackage}.action.ajax.system; import org.springframework.beans.factory.annotation.Autowired; -import ${basePackage}.frame.auth.LocalData; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.UserRoleManager; import ${basePackage}.module.system.req.UserRoleCreateRequest; import ${basePackage}.module.system.req.UserRoleDeleteRequest; @@ -19,23 +19,23 @@ public class UserRoleAjax { @Autowired private UserRoleManager userRoleManager; - public UserRoleCreateResponse create(UserRoleCreateRequest request) { - return userRoleManager.create(request, LocalData.getToken()); + public UserRoleCreateResponse create(UserRoleCreateRequest request, Token token) { + return userRoleManager.create(request, token); } - public UserRoleDeleteResponse delete(UserRoleDeleteRequest request) { - return userRoleManager.delete(request, LocalData.getToken()); + public UserRoleDeleteResponse delete(UserRoleDeleteRequest request, Token token) { + return userRoleManager.delete(request, token); } - public UserRoleUpdateResponse update(UserRoleUpdateRequest request) { - return userRoleManager.update(request, LocalData.getToken()); + public UserRoleUpdateResponse update(UserRoleUpdateRequest request, Token token) { + return userRoleManager.update(request, token); } - public UserRoleFindResponse find(UserRoleFindRequest request) { - return userRoleManager.find(request, LocalData.getToken()); + public UserRoleFindResponse find(UserRoleFindRequest request, Token token) { + return userRoleManager.find(request, token); } - public UserRoleGetResponse get(UserRoleGetRequest request) { - return userRoleManager.get(request, LocalData.getToken()); + public UserRoleGetResponse get(UserRoleGetRequest request, Token token) { + return userRoleManager.get(request, token); } } diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java index 54d55a5e..1c833112 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManagerImpl.java @@ -10,9 +10,9 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${basePackage}.config.CacheConfig; -import ${basePackage}.frame.auth.LocalData; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.auth.Token; +import ${basePackage}.frame.base.SortType; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl index a62c0e4e..68bb4fcb 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/home.ftl @@ -217,21 +217,21 @@ - 普通消息 - 错误消息 - 成功消息 - 警告消息 + 普通消息 + 错误消息 + 成功消息 + 警告消息 - 加载提示框 - 关闭提示框 + 加载提示框 + 关闭提示框 - 加载提示条 - 成功 - 失败 + 加载提示条 + 成功 + 失败 @@ -315,10 +315,10 @@ - + - + @@ -326,23 +326,23 @@ - - - - + - + @@ -350,29 +350,30 @@ - + - + + v-model="form.field9" + size="mini"> - + - 立即创建 - 重置 + 立即创建 + 重置 @@ -1028,17 +1029,21 @@ }, methods: { doAjax: function () { - this.$ajax.login({}).then(function (response) { - if (response.errors.length > 0) { - nav.e(response.errors[0].message); - } else { - nav.i("Ajax调用成功!"); - } - }.bind(this)) + new Ajax() + .module("system") + .target("user") + .data({}) + .find(function (response) { + if (response.errors.length > 0) { + nav.e(response.errors[0].message); + } else { + nav.i("Ajax调用成功!"); + } + }.bind(this)) }, doPush: function () { if (window.EventSource) { - window.evtSource = new EventSource('http://localhost:8080/sse/1'); + window.evtSource = new EventSource('http://localhost:8080' + nav.context + '/sse/1'); window.evtSource.addEventListener('message', function (e) { this.$notify.info({ title: '消息',