From 3536e3d0bfc693366a0925451a1948562bd3a691 Mon Sep 17 00:00:00 2001 From: wangbing Date: Fri, 7 Feb 2020 00:30:36 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81VUE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: a4c344e0d06466a5fb0190ac33ca7ec01b4a2c2f --- .../java/action/AjaxController.java | 2 +- .../java/action/FeignController.java | 2 +- .../java/action/GlobalController.java | 2 +- .../java/config/SecurityConfig.java | 30 +---------------- .../SpringBoot/java/frame/auth/LocalData.java | 2 +- .../java/frame/{base => auth}/Token.java | 33 +++++++++++++++++-- .../SpringBoot/java/module/mgr/manager.ftl | 2 +- .../java/module/mgr/managerImpl.ftl | 2 +- .../SpringBoot/java/module/mpr/mapper.java | 2 +- .../java/module/system/mgr/DeptManager.java | 2 +- .../module/system/mgr/DeptManagerImpl.java | 2 +- .../module/system/mgr/DictItemManager.java | 2 +- .../system/mgr/DictItemManagerImpl.java | 2 +- .../java/module/system/mgr/DictManager.java | 2 +- .../module/system/mgr/DictManagerImpl.java | 2 +- .../java/module/system/mgr/FileManager.java | 2 +- .../module/system/mgr/FileManagerImpl.java | 2 +- .../java/module/system/mgr/LogErrManager.java | 2 +- .../module/system/mgr/LogErrManagerImpl.java | 2 +- .../java/module/system/mgr/ResManager.java | 2 +- .../module/system/mgr/ResManagerImpl.java | 2 +- .../java/module/system/mgr/RoleManager.java | 2 +- .../module/system/mgr/RoleManagerImpl.java | 2 +- .../module/system/mgr/RoleResManager.java | 2 +- .../module/system/mgr/RoleResManagerImpl.java | 2 +- .../java/module/system/mgr/TokensManager.java | 2 +- .../module/system/mgr/TokensManagerImpl.java | 2 +- .../java/module/system/mgr/UserManager.java | 2 +- .../module/system/mgr/UserManagerImpl.java | 2 +- .../module/system/mgr/UserRoleManager.java | 2 +- .../system/mgr/UserRoleManagerImpl.java | 2 +- .../java/module/system/mpr/DeptMapper.java | 2 +- .../module/system/mpr/DictItemMapper.java | 2 +- .../java/module/system/mpr/DictMapper.java | 2 +- .../java/module/system/mpr/FileMapper.java | 2 +- .../java/module/system/mpr/LogErrMapper.java | 2 +- .../java/module/system/mpr/ResMapper.java | 2 +- .../java/module/system/mpr/RoleMapper.java | 2 +- .../java/module/system/mpr/RoleResMapper.java | 2 +- .../java/module/system/mpr/TokensMapper.java | 2 +- .../java/module/system/mpr/UserMapper.java | 2 +- .../module/system/mpr/UserRoleMapper.java | 2 +- .../system/rsp/TokensBuildResponse.java | 2 +- .../system/rsp/TokensLogoutResponse.java | 2 +- .../templates/screen/module/system/dept.ftl | 15 ++------- .../templates/screen/module/system/res.ftl | 15 ++------- .../modules/SpringBoot/test/TestConfig.ftl | 2 +- .../SpringBoot/test/system/DeptTest.java | 2 +- .../SpringBoot/test/system/DictItemTest.java | 2 +- .../SpringBoot/test/system/DictTest.java | 2 +- .../SpringBoot/test/system/FileTest.java | 2 +- .../SpringBoot/test/system/LogErrTest.java | 2 +- .../SpringBoot/test/system/ResTest.java | 2 +- .../SpringBoot/test/system/RoleResTest.java | 2 +- .../SpringBoot/test/system/RoleTest.java | 2 +- .../SpringBoot/test/system/TokensTest.java | 2 +- .../SpringBoot/test/system/UserRoleTest.java | 2 +- .../SpringBoot/test/system/UserTest.java | 2 +- .../modules/SpringBoot/test/test.ftl | 2 +- 59 files changed, 90 insertions(+), 113 deletions(-) rename src/main/resources/modules/SpringBoot/java/frame/{base => auth}/Token.java (52%) diff --git a/src/main/resources/modules/SpringBoot/java/action/AjaxController.java b/src/main/resources/modules/SpringBoot/java/action/AjaxController.java index f9c889f5..e4ccafd6 100644 --- a/src/main/resources/modules/SpringBoot/java/action/AjaxController.java +++ b/src/main/resources/modules/SpringBoot/java/action/AjaxController.java @@ -18,7 +18,7 @@ import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.LogUtil; import ${basePackage}.frame.base.Error; diff --git a/src/main/resources/modules/SpringBoot/java/action/FeignController.java b/src/main/resources/modules/SpringBoot/java/action/FeignController.java index 86c8231e..dbd81a2e 100644 --- a/src/main/resources/modules/SpringBoot/java/action/FeignController.java +++ b/src/main/resources/modules/SpringBoot/java/action/FeignController.java @@ -18,7 +18,7 @@ import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.LogUtil; import ${basePackage}.frame.base.Error; import org.springframework.stereotype.Controller; diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java index 12cb70d6..c78d5178 100644 --- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java +++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java @@ -28,7 +28,7 @@ import ${basePackage}.frame.base.BaseRequest; import ${basePackage}.frame.base.BaseResponse; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.Screen; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.AESUtil; import ${basePackage}.frame.utils.LogUtil; import ${basePackage}.frame.utils.MD5Util; diff --git a/src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java b/src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java index 95feeb3b..ab15b95f 100644 --- a/src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java +++ b/src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java @@ -13,15 +13,10 @@ import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.core.Authentication; import org.springframework.security.web.access.intercept.FilterSecurityInterceptor; import ${basePackage}.frame.auth.LocalData; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.CookieUtil; -import ${basePackage}.frame.utils.IDgenerator; -import ${basePackage}.module.system.mgr.ResManager; import ${basePackage}.module.system.mgr.TokensManager; -import ${basePackage}.module.system.req.ResCreateRequest; -import ${basePackage}.module.system.req.ResFindRequest; import ${basePackage}.module.system.req.TokensBuildRequest; -import ${basePackage}.module.system.rsp.ResFindResponse; import ${basePackage}.module.system.rsp.TokensBuildResponse; import javax.servlet.Filter; @@ -130,29 +125,6 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { } String path = request.getServletPath(); - - String[] profiles = LocalData.getEnvironment().getActiveProfiles(); - for (String profile : profiles) { - if (profile.contains("dev")) {//测试环境捕获资源 - ResFindRequest resFindRequest = new ResFindRequest(); - resFindRequest.setPageSize(0); - resFindRequest.setResValue(request.getServletPath()); - ResManager resManager = LocalData.getBean(ResManager.class); - ResFindResponse resFindResponse = resManager.find(resFindRequest, LocalData.getSysToken()); - - if (resFindResponse.getResult().size() == 0) {//资源不存在，主动收集资源 - ResCreateRequest resCreateRequest = new ResCreateRequest(); - resCreateRequest.setResCode(IDgenerator.nextUUID()); - resCreateRequest.setResName("默认"); - resCreateRequest.setResValue(path); - resCreateRequest.setValid(true); - resCreateRequest.setResType(""); - resManager.create(resCreateRequest, LocalData.getSysToken()); - } - } - } - - // 授权 if (token_.hasRes(path)) { return true; } diff --git a/src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java b/src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java index be7fda1e..5315a27e 100644 --- a/src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java +++ b/src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java @@ -5,7 +5,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.core.env.Environment; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import xyz.wbsite.frame.base.Token; +import ${basePackage}.frame.auth.Token; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/src/main/resources/modules/SpringBoot/java/frame/base/Token.java b/src/main/resources/modules/SpringBoot/java/frame/auth/Token.java similarity index 52% rename from src/main/resources/modules/SpringBoot/java/frame/base/Token.java rename to src/main/resources/modules/SpringBoot/java/frame/auth/Token.java index 1df3db65..80263161 100644 --- a/src/main/resources/modules/SpringBoot/java/frame/base/Token.java +++ b/src/main/resources/modules/SpringBoot/java/frame/auth/Token.java @@ -1,6 +1,11 @@ -package ${basePackage}.frame.base; +package ${basePackage}.frame.auth; +import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.module.system.ent.Res; +import ${basePackage}.module.system.mgr.ResManager; +import ${basePackage}.module.system.req.ResCreateRequest; +import ${basePackage}.module.system.req.ResFindRequest; +import ${basePackage}.module.system.rsp.ResFindResponse; import java.io.Serializable; import java.util.HashSet; @@ -35,12 +40,34 @@ public class Token implements Serializable { private Set resSet = new HashSet<>(); - public boolean hasRes(String resource) { + public boolean hasRes(String res) { for (String s : resSet) { - if (resource.matches(s)) { + if (res.matches(s)) { return true; } } + + String[] profiles = LocalData.getEnvironment().getActiveProfiles(); + for (String profile : profiles) { + if (profile.contains("dev")) {//测试环境捕获资源 + ResFindRequest resFindRequest = new ResFindRequest(); + resFindRequest.setPageSize(0); + resFindRequest.setResValue(res); + ResManager resManager = LocalData.getBean(ResManager.class); + ResFindResponse resFindResponse = resManager.find(resFindRequest, LocalData.getSysToken()); + + if (resFindResponse.getResult().size() == 0) {//资源不存在，主动收集资源 + ResCreateRequest resCreateRequest = new ResCreateRequest(); + resCreateRequest.setResCode(IDgenerator.nextUUID()); + resCreateRequest.setResName("默认"); + resCreateRequest.setResValue(res); + resCreateRequest.setValid(true); + resCreateRequest.setResType(""); + resManager.create(resCreateRequest, LocalData.getSysToken()); + } + } + } + return false; } diff --git a/src/main/resources/modules/SpringBoot/java/module/mgr/manager.ftl b/src/main/resources/modules/SpringBoot/java/module/mgr/manager.ftl index 3f1514cd..19ecdece 100644 --- a/src/main/resources/modules/SpringBoot/java/module/mgr/manager.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/mgr/manager.ftl @@ -10,7 +10,7 @@ import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}DeleteResponse import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}FindResponse; import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}GetResponse; import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}UpdateResponse; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; /** * ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl b/src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl index 4f56c46a..ad36558b 100644 --- a/src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl @@ -3,7 +3,7 @@ package ${basePackage}.module.${moduleName}.mgr; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.Message; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.ValidationUtil; import ${basePackage}.module.${moduleName}.ent.${table.getCName()}; diff --git a/src/main/resources/modules/SpringBoot/java/module/mpr/mapper.java b/src/main/resources/modules/SpringBoot/java/module/mpr/mapper.java index df1f1458..59a9fe87 100644 --- a/src/main/resources/modules/SpringBoot/java/module/mpr/mapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/mpr/mapper.java @@ -11,7 +11,7 @@ import ${basePackage}.module.${moduleName}.req.${table.getCName()}DeleteRequest; import ${basePackage}.module.${moduleName}.req.${table.getCName()}FindRequest; import ${basePackage}.module.${moduleName}.req.${table.getCName()}GetRequest; import ${basePackage}.module.${moduleName}.req.${table.getCName()}UpdateRequest; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; /** * ${table.tableName} - ${table.tableComment} diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DeptManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DeptManager.java index d7ed4805..d7dabce5 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DeptManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DeptManager.java @@ -1,6 +1,6 @@ package ${basePackage}.module.system.mgr; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.DeptCreateRequest; import ${basePackage}.module.system.req.DeptDeleteRequest; import ${basePackage}.module.system.req.DeptFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DeptManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DeptManagerImpl.java index 4cf7388a..b57c2956 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DeptManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DeptManagerImpl.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${basePackage}.frame.base.ErrorType; import ${basePackage}.frame.base.SortType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictItemManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictItemManager.java index 2bd85c95..0cec5552 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictItemManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictItemManager.java @@ -1,6 +1,6 @@ package ${basePackage}.module.system.mgr; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.DictItemCreateRequest; import ${basePackage}.module.system.req.DictItemDeleteRequest; import ${basePackage}.module.system.req.DictItemFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictItemManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictItemManagerImpl.java index 2a85fc58..4dbd5b7a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictItemManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictItemManagerImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictManager.java index 9280a697..2086f032 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictManager.java @@ -1,6 +1,6 @@ package ${basePackage}.module.system.mgr; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.DictCreateRequest; import ${basePackage}.module.system.req.DictDeleteRequest; import ${basePackage}.module.system.req.DictFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictManagerImpl.java index 690709da..a2a8b107 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/DictManagerImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/FileManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/FileManager.java index 784209b7..2187f0b9 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/FileManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/FileManager.java @@ -1,6 +1,6 @@ package ${basePackage}.module.system.mgr; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.FileCreateRequest; import ${basePackage}.module.system.req.FileDeleteRequest; import ${basePackage}.module.system.req.FileFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/FileManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/FileManagerImpl.java index de2afb38..7952c658 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/FileManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/FileManagerImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManager.java index a0609b69..bec6c6f7 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManager.java @@ -1,6 +1,6 @@ package ${basePackage}.module.system.mgr; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.LogErrCreateRequest; import ${basePackage}.module.system.req.LogErrDeleteRequest; import ${basePackage}.module.system.req.LogErrFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManagerImpl.java index 11aac35c..3c59bf90 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/LogErrManagerImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManager.java index 38183181..9c5a4679 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManager.java @@ -12,7 +12,7 @@ import ${basePackage}.module.system.rsp.ResFindResponse; import ${basePackage}.module.system.rsp.ResGetResponse; import ${basePackage}.module.system.rsp.ResTreeResponse; import ${basePackage}.module.system.rsp.ResUpdateResponse; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; /** * 资源 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java index f50a0887..fd4a511a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/ResManagerImpl.java @@ -4,7 +4,7 @@ import ${basePackage}.frame.base.SortType; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.Message; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.ValidationUtil; import ${basePackage}.module.system.ent.Res; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleManager.java index 924c832d..161b6c08 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleManager.java @@ -1,6 +1,6 @@ package ${basePackage}.module.system.mgr; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.RoleCreateRequest; import ${basePackage}.module.system.req.RoleDeleteRequest; import ${basePackage}.module.system.req.RoleFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleManagerImpl.java index 192d354a..c9967e6f 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleManagerImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManager.java index 8243abc5..961958f3 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManager.java @@ -1,6 +1,6 @@ package ${basePackage}.module.system.mgr; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.RoleResCheckRequest; import ${basePackage}.module.system.req.RoleResCreateRequest; import ${basePackage}.module.system.req.RoleResDeleteRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManagerImpl.java index 00feef0a..aadae102 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/RoleResManagerImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManager.java index 08d231a0..a573ea62 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/TokensManager.java @@ -1,6 +1,6 @@ package ${basePackage}.module.system.mgr; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.TokensBuildRequest; import ${basePackage}.module.system.req.TokensCreateRequest; import ${basePackage}.module.system.req.TokensDeleteRequest; 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 c09e108e..ce254612 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 @@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional; import ${basePackage}.config.CacheConfig; import ${basePackage}.frame.auth.LocalData; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserManager.java index d53c3590..59dcd710 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserManager.java @@ -1,6 +1,6 @@ package ${basePackage}.module.system.mgr; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.UserCreateRequest; import ${basePackage}.module.system.req.UserDeleteRequest; import ${basePackage}.module.system.req.UserFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserManagerImpl.java index b2ecfdac..0f7cacad 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserManagerImpl.java @@ -8,7 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MD5Util; import ${basePackage}.frame.utils.MapperUtil; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserRoleManager.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserRoleManager.java index 43168602..2417746f 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserRoleManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserRoleManager.java @@ -1,6 +1,6 @@ package ${basePackage}.module.system.mgr; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.UserRoleCreateRequest; import ${basePackage}.module.system.req.UserRoleDeleteRequest; import ${basePackage}.module.system.req.UserRoleFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserRoleManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserRoleManagerImpl.java index 17960451..b15fc8fb 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserRoleManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mgr/UserRoleManagerImpl.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ${basePackage}.frame.base.ErrorType; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.Message; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DeptMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DeptMapper.java index d43b9b9b..889b03c9 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DeptMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DeptMapper.java @@ -11,7 +11,7 @@ import ${basePackage}.module.system.req.DeptDeleteRequest; import ${basePackage}.module.system.req.DeptFindRequest; import ${basePackage}.module.system.req.DeptGetRequest; import ${basePackage}.module.system.req.DeptUpdateRequest; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; /** * DEPT - 部门 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper.java index 68e65238..f9333065 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictItemMapper.java @@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.ent.DictItem; import ${basePackage}.module.system.req.DictItemDeleteRequest; import ${basePackage}.module.system.req.DictItemFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictMapper.java index 45f8c052..f6a3eb86 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/DictMapper.java @@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.ent.Dict; import ${basePackage}.module.system.req.DictDeleteRequest; import ${basePackage}.module.system.req.DictFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/FileMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/FileMapper.java index b9cee915..53b32c0f 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/FileMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/FileMapper.java @@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.ent.File; import ${basePackage}.module.system.req.FileDeleteRequest; import ${basePackage}.module.system.req.FileFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/LogErrMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/LogErrMapper.java index 28bacb7e..74bc745b 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/LogErrMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/LogErrMapper.java @@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.req.LogErrDeleteRequest; import ${basePackage}.module.system.req.LogErrFindRequest; import ${basePackage}.module.system.req.LogErrGetRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/ResMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/ResMapper.java index 17d4c73b..bbf9369b 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/ResMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/ResMapper.java @@ -11,7 +11,7 @@ import ${basePackage}.module.system.req.ResDeleteRequest; import ${basePackage}.module.system.req.ResFindRequest; import ${basePackage}.module.system.req.ResGetRequest; import ${basePackage}.module.system.req.ResUpdateRequest; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; /** * RES - 资源 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/RoleMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/RoleMapper.java index 07af1226..3162d15b 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/RoleMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/RoleMapper.java @@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.ent.Role; import ${basePackage}.module.system.req.RoleDeleteRequest; import ${basePackage}.module.system.req.RoleFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/RoleResMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/RoleResMapper.java index f0f07670..7ebeb1a6 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/RoleResMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/RoleResMapper.java @@ -11,7 +11,7 @@ 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}.frame.base.Token; +import ${basePackage}.frame.auth.Token; /** * ROLE_RES - 角色资源关系 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/TokensMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/TokensMapper.java index 491bedb1..0f4dab7d 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/TokensMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/TokensMapper.java @@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.ent.Tokens; import ${basePackage}.module.system.req.TokensDeleteRequest; import ${basePackage}.module.system.req.TokensFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/UserMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/UserMapper.java index d91da824..07501d3a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/UserMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/UserMapper.java @@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.ent.User; import ${basePackage}.module.system.req.UserDeleteRequest; import ${basePackage}.module.system.req.UserFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/UserRoleMapper.java b/src/main/resources/modules/SpringBoot/java/module/system/mpr/UserRoleMapper.java index 5b841b33..bc22f51a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/UserRoleMapper.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/UserRoleMapper.java @@ -2,7 +2,7 @@ package ${basePackage}.module.system.mpr; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.ent.UserRole; import ${basePackage}.module.system.req.UserRoleDeleteRequest; import ${basePackage}.module.system.req.UserRoleFindRequest; diff --git a/src/main/resources/modules/SpringBoot/java/module/system/rsp/TokensBuildResponse.java b/src/main/resources/modules/SpringBoot/java/module/system/rsp/TokensBuildResponse.java index 9198dae4..811f7e81 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/rsp/TokensBuildResponse.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/rsp/TokensBuildResponse.java @@ -1,7 +1,7 @@ package ${basePackage}.module.system.rsp; import ${basePackage}.frame.base.BaseResponse; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; /** * TokensGetResponse - 通行证 diff --git a/src/main/resources/modules/SpringBoot/java/module/system/rsp/TokensLogoutResponse.java b/src/main/resources/modules/SpringBoot/java/module/system/rsp/TokensLogoutResponse.java index 5abb4215..f42d4f85 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/rsp/TokensLogoutResponse.java +++ b/src/main/resources/modules/SpringBoot/java/module/system/rsp/TokensLogoutResponse.java @@ -1,7 +1,7 @@ package ${basePackage}.module.system.rsp; import ${basePackage}.frame.base.BaseResponse; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; /** * TokensGetResponse - 通行证 diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl index c424836e..0adec5b5 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/dept.ftl @@ -176,20 +176,9 @@ :filter-node-method="filterTree" :expand-on-click-node="false">
- {{ data.label }}[{{data.value}}] - - - - + + {{ data.label }}[{{data.value}}]
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl index 67df52a3..8cbd8198 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl @@ -170,20 +170,9 @@ :filter-node-method="filterTree" :expand-on-click-node="false">
- {{ data.resName }}[{{data.resCode}}] - - - - + + {{ data.resName }}[{{data.resCode}}]
diff --git a/src/main/resources/modules/SpringBoot/test/TestConfig.ftl b/src/main/resources/modules/SpringBoot/test/TestConfig.ftl index d5e1bab7..69fef189 100644 --- a/src/main/resources/modules/SpringBoot/test/TestConfig.ftl +++ b/src/main/resources/modules/SpringBoot/test/TestConfig.ftl @@ -1,6 +1,6 @@ package ${basePackage}.config; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration diff --git a/src/main/resources/modules/SpringBoot/test/system/DeptTest.java b/src/main/resources/modules/SpringBoot/test/system/DeptTest.java index 1c7db75d..533d1bd6 100644 --- a/src/main/resources/modules/SpringBoot/test/system/DeptTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/DeptTest.java @@ -7,7 +7,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.DeptManager; import ${basePackage}.module.system.req.DeptCreateRequest; import ${basePackage}.module.system.req.DeptDeleteRequest; diff --git a/src/main/resources/modules/SpringBoot/test/system/DictItemTest.java b/src/main/resources/modules/SpringBoot/test/system/DictItemTest.java index 6be31526..0bc804b5 100644 --- a/src/main/resources/modules/SpringBoot/test/system/DictItemTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/DictItemTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.DictItemManager; import ${basePackage}.module.system.req.DictItemCreateRequest; import ${basePackage}.module.system.req.DictItemDeleteRequest; diff --git a/src/main/resources/modules/SpringBoot/test/system/DictTest.java b/src/main/resources/modules/SpringBoot/test/system/DictTest.java index ec9dbb9a..756f863a 100644 --- a/src/main/resources/modules/SpringBoot/test/system/DictTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/DictTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.DictItemManager; import ${basePackage}.module.system.mgr.DictManager; import ${basePackage}.module.system.req.DictCreateRequest; diff --git a/src/main/resources/modules/SpringBoot/test/system/FileTest.java b/src/main/resources/modules/SpringBoot/test/system/FileTest.java index cd5aa668..239c769e 100644 --- a/src/main/resources/modules/SpringBoot/test/system/FileTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/FileTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.FileManager; import ${basePackage}.module.system.req.FileCreateRequest; import ${basePackage}.module.system.req.FileDeleteRequest; diff --git a/src/main/resources/modules/SpringBoot/test/system/LogErrTest.java b/src/main/resources/modules/SpringBoot/test/system/LogErrTest.java index 8b16c0a6..858aa56b 100644 --- a/src/main/resources/modules/SpringBoot/test/system/LogErrTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/LogErrTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.LogErrManager; import ${basePackage}.module.system.req.LogErrCreateRequest; import ${basePackage}.module.system.req.LogErrDeleteRequest; diff --git a/src/main/resources/modules/SpringBoot/test/system/ResTest.java b/src/main/resources/modules/SpringBoot/test/system/ResTest.java index b02a8c42..c82b5d5c 100644 --- a/src/main/resources/modules/SpringBoot/test/system/ResTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/ResTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.ResManager; import ${basePackage}.module.system.req.ResCreateRequest; import ${basePackage}.module.system.req.ResDeleteRequest; diff --git a/src/main/resources/modules/SpringBoot/test/system/RoleResTest.java b/src/main/resources/modules/SpringBoot/test/system/RoleResTest.java index 1f2307a5..2b71a692 100644 --- a/src/main/resources/modules/SpringBoot/test/system/RoleResTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/RoleResTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.RoleResManager; import ${basePackage}.module.system.req.RoleResCreateRequest; import ${basePackage}.module.system.req.RoleResDeleteRequest; diff --git a/src/main/resources/modules/SpringBoot/test/system/RoleTest.java b/src/main/resources/modules/SpringBoot/test/system/RoleTest.java index f7a74de6..4f8e0171 100644 --- a/src/main/resources/modules/SpringBoot/test/system/RoleTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/RoleTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.RoleManager; import ${basePackage}.module.system.req.RoleCreateRequest; import ${basePackage}.module.system.req.RoleDeleteRequest; diff --git a/src/main/resources/modules/SpringBoot/test/system/TokensTest.java b/src/main/resources/modules/SpringBoot/test/system/TokensTest.java index 8b389cad..ecd6ff00 100644 --- a/src/main/resources/modules/SpringBoot/test/system/TokensTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/TokensTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.frame.utils.IDgenerator; import ${basePackage}.module.system.mgr.TokensManager; import ${basePackage}.module.system.req.TokensCreateRequest; diff --git a/src/main/resources/modules/SpringBoot/test/system/UserRoleTest.java b/src/main/resources/modules/SpringBoot/test/system/UserRoleTest.java index 9bb4e143..81e53dee 100644 --- a/src/main/resources/modules/SpringBoot/test/system/UserRoleTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/UserRoleTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.UserRoleManager; import ${basePackage}.module.system.req.UserRoleCreateRequest; import ${basePackage}.module.system.req.UserRoleDeleteRequest; diff --git a/src/main/resources/modules/SpringBoot/test/system/UserTest.java b/src/main/resources/modules/SpringBoot/test/system/UserTest.java index f51e53ee..a3fcd5df 100644 --- a/src/main/resources/modules/SpringBoot/test/system/UserTest.java +++ b/src/main/resources/modules/SpringBoot/test/system/UserTest.java @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import org.springframework.transaction.annotation.Transactional; -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.system.mgr.UserManager; import ${basePackage}.module.system.req.UserCreateRequest; import ${basePackage}.module.system.req.UserDeleteRequest; diff --git a/src/main/resources/modules/SpringBoot/test/test.ftl b/src/main/resources/modules/SpringBoot/test/test.ftl index 1d6f02b1..3dfc4fe1 100644 --- a/src/main/resources/modules/SpringBoot/test/test.ftl +++ b/src/main/resources/modules/SpringBoot/test/test.ftl @@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional; <#if table.getImport()?length gt 1> ${table.getImport()} -import ${basePackage}.frame.base.Token; +import ${basePackage}.frame.auth.Token; import ${basePackage}.module.${moduleName}.mgr.${table.getCName()}Manager; import ${basePackage}.module.${moduleName}.req.${table.getCName()}CreateRequest; import ${basePackage}.module.${moduleName}.req.${table.getCName()}DeleteRequest;