diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java index 2a6ae34c..ed24dd9b 100644 --- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java +++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java @@ -642,6 +642,7 @@ public class SpringBootCallable implements Callable { ctx.put("project", project); freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "start-dev.bat"), "SpringBoot/resources/start-dev.bat", ctx); freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "start-prod.bat"), "SpringBoot/resources/start-prod.bat", ctx); + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "application.properties"), "SpringBoot/resources/application.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "application-dev.properties"), "SpringBoot/resources/application-dev.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "application-prod.properties"), "SpringBoot/resources/application-prod.ftl", ctx); Tool.outputResource("SpringBoot/resources/logback-spring.xml", Tool.createFile(root.getAbsolutePath(), "logback-spring.xml")); @@ -902,11 +903,8 @@ public class SpringBootCallable implements Callable { ctx.put("author", project.getProjectAuthor()); ctx.put("date", new Date()); ctx.put("project", project); - File system = Tool.createPath(root.getAbsolutePath(), "datainit"); - for (String apiFile : ResourceUtil.getResourceFiles("/modules/SpringBoot/test/datainit/")) { - freeMarkerManager.outputTemp(Tool.createFile(system.getAbsolutePath(), apiFile), "SpringBoot/test/datainit/" + apiFile, ctx); - } + freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "DataInit.java"), "SpringBoot/test/DataInit.java", ctx); } } } 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 5315a27e..63931105 100644 --- a/src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java +++ b/src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java @@ -92,4 +92,9 @@ public class LocalData { public static Environment getEnvironment() { return getBean(Environment.class); } + + public static String getActive() { + String[] profiles = getEnvironment().getActiveProfiles(); + return String.join(",", profiles); + } } diff --git a/src/main/resources/modules/SpringBoot/java/frame/auth/Token.java b/src/main/resources/modules/SpringBoot/java/frame/auth/Token.java index 88360644..8fcbfb94 100644 --- a/src/main/resources/modules/SpringBoot/java/frame/auth/Token.java +++ b/src/main/resources/modules/SpringBoot/java/frame/auth/Token.java @@ -43,24 +43,22 @@ public class Token implements Serializable { public boolean hasRes(String res) { {// todo 开发初期收集资源，后期删除 - 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()); - } + String active = LocalData.getActive(); + if (active.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()); } } } @@ -93,7 +91,6 @@ public class Token implements Serializable { return resSet; } - public long getId() { return id; } diff --git a/src/main/resources/modules/SpringBoot/java/frame/excel/annotation/Ignore.java b/src/main/resources/modules/SpringBoot/java/frame/excel/annotation/Ignore.java index 75327992..ae038654 100644 --- a/src/main/resources/modules/SpringBoot/java/frame/excel/annotation/Ignore.java +++ b/src/main/resources/modules/SpringBoot/java/frame/excel/annotation/Ignore.java @@ -7,7 +7,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Ignore - Excel列忽略注解，在导入导出过程中不会对存在该注解的字典进行解析 + * Ignore - Excel列忽略注解，在导入导出过程中不会对存在该注解的字段进行解析 * * @author wangbing * @version 0.0.1 diff --git a/src/main/resources/modules/SpringBoot/java/frame/utils/ZipUtil.java b/src/main/resources/modules/SpringBoot/java/frame/utils/ZipUtil.java index fcdb8dca..5b16176d 100644 --- a/src/main/resources/modules/SpringBoot/java/frame/utils/ZipUtil.java +++ b/src/main/resources/modules/SpringBoot/java/frame/utils/ZipUtil.java @@ -135,11 +135,4 @@ public class ZipUtil { in.close(); } } - - public static void main(String[] args) { - //解压 - unZip(new File("E:\\AAA.zip"), new File("E:\\AAA")); - //压缩 - toZip(new File("E:\\AAA"), new File("E:\\AAA.zip")); - } } 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 ba6c23d7..92697cb1 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 @@ -64,6 +64,17 @@ public class ResManagerImpl implements ResManager { return response; } + ResFindRequest resFindRequest = new ResFindRequest(); + resFindRequest.setResCode(request.getResCode()); + ResFindResponse resFindResponse = this.find(resFindRequest, token); + if (resFindResponse.hasError()) { + response.addErrors(resFindResponse.getErrors()); + return response; + } else if (resFindResponse.getResult().size() > 0) { + response.addError(ErrorType.BUSINESS_ERROR, Message.INSERT_DUPLICATE); + return response; + } + long id = IDgenerator.nextId(); Res entity = MapperUtil.map(request, Res.class); entity.setId(id); diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DeptMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DeptMapper.xml index d28c35ea..f29f079c 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DeptMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DeptMapper.xml @@ -2,7 +2,7 @@ - + "SYS_DEPT" @@ -10,7 +10,7 @@ "ID","DEPT_CODE","DEPT_NAME","DEPT_ALIAS","SUP_CODE","SUP_NAME","VALID","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DictItemMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DictItemMapper.xml index 23c9d053..6f3722b3 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DictItemMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DictItemMapper.xml @@ -2,7 +2,7 @@ - + "SYS_DICT_ITEM" @@ -10,7 +10,7 @@ "ID","DICT_NAME","KEY","VALUE","SORT","VALID","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DictMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DictMapper.xml index 82df4a8c..439adcc5 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DictMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_DictMapper.xml @@ -2,7 +2,7 @@ - + "SYS_DICT" @@ -10,7 +10,7 @@ "ID","DICT_NAME","DICT_COMMENT","VERSION","VALID","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_FileMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_FileMapper.xml index 3ad6bda1..c41c7e00 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_FileMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_FileMapper.xml @@ -2,7 +2,7 @@ - + "SYS_FILE" @@ -10,7 +10,7 @@ "ID","NAME","FILE_TYPE","ATTRIBUTE1","ATTRIBUTE2","LOCATION","URL","URL_DOWNLOAD","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_LogErrMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_LogErrMapper.xml index 14ee435d..efc7cdb3 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_LogErrMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_LogErrMapper.xml @@ -2,7 +2,7 @@ - + "SYS_LOG_ERR" @@ -10,7 +10,7 @@ "ID","LOG_ERR_TYPE","TITLE","CONTENT","LOG_ERR_RESULT","ATTRIBUTE1","ATTRIBUTE2","ATTRIBUTE3","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml index 47850f14..26a342af 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_ResMapper.xml @@ -2,7 +2,7 @@ - + "SYS_RES" @@ -10,7 +10,7 @@ "ID","RES_CODE","RES_NAME","RES_TYPE","RES_VALUE","SUP_CODE","SUP_NAME","VALID","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_RoleMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_RoleMapper.xml index ad245b55..d6911bc0 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_RoleMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_RoleMapper.xml @@ -2,7 +2,7 @@ - + "SYS_ROLE" @@ -10,7 +10,7 @@ "ID","CODE","NAME","COMMENT","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_RoleResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_RoleResMapper.xml index fab2aaab..271489c9 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_RoleResMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_RoleResMapper.xml @@ -2,7 +2,7 @@ - + "SYS_ROLE_RES" @@ -10,7 +10,7 @@ "ID","ROLE_ID","ROLE_CODE","RES_ID","RES_CODE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_TokensMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_TokensMapper.xml index 3e3a4ec8..cdcacbdb 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_TokensMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_TokensMapper.xml @@ -2,7 +2,7 @@ - + "SYS_TOKENS" @@ -10,7 +10,7 @@ "ID","TOKEN","USER_ID","USER_NAME","LOGIN_TIME","VALID_TIME","VALID","DEPT_ID","DEPT_CODE","DEPT_NAME","TERMINAL_TYPE","TERMINAL_IP","TERMINAL_INFO","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserMapper.xml index feb54170..6a3ccb9a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserMapper.xml @@ -2,7 +2,7 @@ - + "SYS_USER" @@ -10,7 +10,7 @@ "ID","USER_NAME","USER_CODE","USER_ALIAS","USER_PWD","USER_STATUS","DEPT_ID","DEPT_CODE","DEPT_NAME","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserRoleMapper.xml b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserRoleMapper.xml index 565742c5..d15bbae0 100644 --- a/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserRoleMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/system/mpr/SQLite_UserRoleMapper.xml @@ -2,7 +2,7 @@ - + "SYS_USER_ROLE" @@ -10,7 +10,7 @@ "ID","USER_ID","USER_CODE","ROLE_ID","ROLE_CODE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" - + diff --git a/src/main/resources/modules/SpringBoot/resources/application.ftl b/src/main/resources/modules/SpringBoot/resources/application.ftl new file mode 100644 index 00000000..257b3064 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/resources/application.ftl @@ -0,0 +1 @@ +spring.profiles.active=dev \ No newline at end of file diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl index 45153775..071b37c6 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl @@ -21,12 +21,21 @@ text-color="#d6d6d6" active-text-color="#ffd04b"> <#if sysMD> + + + 资源管理 + 错误日志 + 计划调度 + - 字典管理 + 字典管理 文件管理 资源管理 用户管理 @@ -34,20 +43,6 @@ 角色管理 登录管理 - - - 任务列表 - - - - 错误日志 - <#list modules as item> <#if item.hasHtml()> @@ -77,16 +72,9 @@
    -
  • - 全屏 -
    • -
  • - 消息 -
  • - 账户信息 + ${r'${token.userName?default("登录信息")}'} 个人信息 @@ -94,6 +82,13 @@
    • +
  • + 消息 +
    • +
  • + 全屏 +
  • 系统版本
    • diff --git a/src/main/resources/modules/SpringBoot/test/DataInit.java b/src/main/resources/modules/SpringBoot/test/DataInit.java new file mode 100644 index 00000000..b46f8a62 --- /dev/null +++ b/src/main/resources/modules/SpringBoot/test/DataInit.java @@ -0,0 +1,317 @@ +package ${basePackage}; + +import ${basePackage}.frame.auth.Token; +import ${basePackage}.frame.base.BaseResponse; +import ${basePackage}.frame.utils.MapperUtil; +import ${basePackage}.frame.utils.Message; +import ${basePackage}.module.system.ent.Res; +import ${basePackage}.module.system.mgr.DictItemManager; +import ${basePackage}.module.system.mgr.DictManager; +import ${basePackage}.module.system.mgr.ResManager; +import ${basePackage}.module.system.mgr.RoleManager; +import ${basePackage}.module.system.mgr.RoleResManager; +import ${basePackage}.module.system.req.DictCreateRequest; +import ${basePackage}.module.system.req.DictItemCreateRequest; +import ${basePackage}.module.system.req.ResCreateRequest; +import ${basePackage}.module.system.req.ResFindRequest; +import ${basePackage}.module.system.req.RoleCreateRequest; +import ${basePackage}.module.system.req.RoleResCheckRequest; +import ${basePackage}.module.system.rsp.DictCreateResponse; +import ${basePackage}.module.system.rsp.DictItemCreateResponse; +import ${basePackage}.module.system.rsp.ResCreateResponse; +import ${basePackage}.module.system.rsp.ResFindResponse; +import ${basePackage}.module.system.rsp.RoleCreateResponse; +import ${basePackage}.module.system.rsp.RoleResCheckResponse; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +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 java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static org.junit.Assert.assertTrue; + +@RunWith(SpringRunner.class) +@SpringBootTest +@Transactional +public class DataInit { + + @Autowired + private DictManager dictManager; + @Autowired + private DictItemManager dictItemManager; + @Autowired + private ResManager resManager; + @Autowired + private RoleManager roleManager; + @Autowired + private RoleResManager roleCreateRequest; + @Autowired + private Token token; + + /** + * 字典数据初始化 + */ + @Test + @Rollback(false) + public void init() { + //region 字典初始化 + { + {// 终端类型 + createDict("TERMINAL_TYPE", "终端类型", new String[][]{ + {"WEB", "游览器端"}, + {"API", "接口端"}, + {"PHONE", "手机端"}, + }); + } + + {// 错误日志结果 + createDict("LOG_ERR_RESULT", "错误日志结果", new String[][]{ + {"未处理", "未处理"}, + {"已处理", "已处理"}, + {"搁置", "搁置"}, + }); + } + + {// 资源类型 + createDict("RES_TYPE", "资源类型", new String[][]{ + {"菜单", "菜单"}, + {"网页", "网页"}, + {"请求", "请求"}, + }); + } + {// 用户状态 + createDict("USER_STATUS", "用户状态", new String[][]{ + {"正常", "正常"}, + {"初始密码", "初始密码"}, + {"锁定/注销", "锁定/注销"}, + }); + } + {// 日志错误类型 + createDict("LOG_ERR_TYPE", "日志错误类型", new String[][]{ + {"系统错误", "系统错误"}, + {"业务错误", "业务错误"}, + }); + } + {// 文件类型 + createDict("FILE_TYPE", "文件类型", new String[][]{ + {"IMG", "图片"}, + }); + } + } + //endregion + + //region 管理员初始化 + { + List forDev = new ArrayList<>(); + {// 初始化开发角色特有资源 + forDev.add(createRes("DEV", "开发管理", "菜单", "DEV")); + forDev.add(createRes("DEV_RES", "资源管理", "网页", "/system/res.htm")); + forDev.add(createRes("DEV_RES_CREATE", "资源新增", "请求", "/ajax/system/res/create")); + forDev.add(createRes("DEV_RES_DELETE", "资源删除", "请求", "/ajax/system/res/delete")); + forDev.add(createRes("DEV_RES_UPDATE", "资源编辑", "请求", "/ajax/system/res/update")); + forDev.add(createRes("DEV_RES_FIND", "资源查询", "请求", "/ajax/system/res/find")); + forDev.add(createRes("DEV_RES_GET", "资源获取", "请求", "/ajax/system/res/get")); + forDev.add(createRes("DEV_TASK", "计划调度", "网页", "/system/schedule.htm")); + forDev.add(createRes("DEV_LOGERR", "错误日志", "网页", "/system/logErr.htm")); + forDev.add(createRes("DEV_LOGERR_DELETE", "错误日志删除", "请求", "/ajax/system/logErr/delete")); + forDev.add(createRes("DEV_LOGERR_UPDATE", "错误日志更新", "请求", "/ajax/system/logErr/update")); + forDev.add(createRes("DEV_LOGERR_FIND", "错误日志查询", "请求", "/ajax/system/logErr/find")); + } + + List forMgr = new ArrayList<>(); + {// 初始化管理资源 + forMgr.add(createRes("SYS", "系统管理", "菜单", "SYS")); + forMgr.add(createRes("SYS_INDEX_ROOT", "根页", "网页", "/")); + forMgr.add(createRes("SYS_INDEX", "主页", "网页", "/index.htm")); + forMgr.add(createRes("SYS_INDEX_HOME", "首页", "网页", "/home.htm")); + + forMgr.add(createRes("SYS_DICT", "字典管理", "网页", "/system/dict.htm")); + forMgr.add(createRes("SYS_DICT_CREATE", "字典新建", "请求", "/ajax/system/dict/create")); + forMgr.add(createRes("SYS_DICT_DELETE", "字典删除", "请求", "/ajax/system/dict/delete")); + forMgr.add(createRes("SYS_DICT_UPDATE", "字典更新", "请求", "/ajax/system/dict/update")); + forMgr.add(createRes("SYS_DICT_FIND", "字典查询", "请求", "/ajax/system/dict/find")); + forMgr.add(createRes("SYS_DICT_GET", "字典获取", "请求", "/ajax/system/dict/get")); + forMgr.add(createRes("SYS_DICT_IMPORT", "字典导入", "请求", "/ajax/system/dict/imports")); + forMgr.add(createRes("SYS_DICT_EXPORT", "字典导出", "请求", "/ajax/system/dict/exports")); + forMgr.add(createRes("SYS_DICT_ITEM", "字典项管理", "网页", "/system/dictItem.htm")); + forMgr.add(createRes("SYS_DICT_ITEM_CREATE", "字典项新增", "请求", "/ajax/system/dictItem/create")); + forMgr.add(createRes("SYS_DICT_ITEM_DELETE", "字典项删除", "请求", "/ajax/system/dictItem/delete")); + forMgr.add(createRes("SYS_DICT_ITEM_UPDATE", "字典项更新", "请求", "/ajax/system/dictItem/update")); + forMgr.add(createRes("SYS_DICT_ITEM_FIND", "字典项查找", "请求", "/ajax/system/dictItem/find")); + forMgr.add(createRes("SYS_DICT_ITEM_GET", "字典项获取", "请求", "/ajax/system/dictItem/get")); + forMgr.add(createRes("SYS_DICT_LOAD", "字典详情", "请求", "/ajax/system/dict/load")); + + forMgr.add(createRes("SYS_RES_TREE", "资源树查询", "请求", "/ajax/system/res/tree")); + + forMgr.add(createRes("SYS_USER", "用户管理", "网页", "/system/user.htm")); + forMgr.add(createRes("SYS_USER_CREATE", "用户新增", "请求", "/ajax/system/user/create")); + forMgr.add(createRes("SYS_USER_DELETE", "用户删除", "请求", "/ajax/system/user/delete")); + forMgr.add(createRes("SYS_USER_UPDATE", "用户更新", "请求", "/ajax/system/user/update")); + forMgr.add(createRes("SYS_USER_FIND", "用户查询", "请求", "/ajax/system/user/find")); + forMgr.add(createRes("SYS_USER_GET", "用户获取", "请求", "/ajax/system/user/get")); + forMgr.add(createRes("SYS_USER_IMPORT", "用户导入", "请求", "/ajax/system/user/imports")); + forMgr.add(createRes("SYS_USER_EXPORT", "用户导出", "请求", "/ajax/system/user/exports")); + + forMgr.add(createRes("SYS_DEPT", "机构管理", "网页", "/system/dept.htm")); + forMgr.add(createRes("SYS_DEPT_CREATE", "机构新增", "请求", "/ajax/system/dept/create")); + forMgr.add(createRes("SYS_DEPT_DELETE", "机构删除", "请求", "/ajax/system/dept/delete")); + forMgr.add(createRes("SYS_DEPT_UPDATE", "机构更新", "请求", "/ajax/system/dept/update")); + forMgr.add(createRes("SYS_DEPT_FIND", "机构查询", "请求", "/ajax/system/dept/find")); + forMgr.add(createRes("SYS_DEPT_GET", "机构获取", "请求", "/ajax/system/dept/get")); + forMgr.add(createRes("SYS_DEPT_TREE", "机构树查询", "请求", "/ajax/system/dept/tree")); + forMgr.add(createRes("SYS_DEPT_IMPORT", "机构导入", "请求", "/ajax/system/dept/imports")); + forMgr.add(createRes("SYS_DEPT_EXPORT", "机构导出", "请求", "/ajax/system/dept/exports")); + + forMgr.add(createRes("SYS_FILE", "文件管理", "网页", "/system/file.htm")); + forMgr.add(createRes("SYS_FILE_DELETE", "文件删除", "请求", "/ajax/system/file/delete")); + forMgr.add(createRes("SYS_FILE_FIND", "文件查询", "请求", "/ajax/system/file/find")); + + forMgr.add(createRes("SYS_ROLE", "角色管理", "网页", "/system/role.htm")); + forMgr.add(createRes("SYS_ROLE_CREATE", "角色新增", "请求", "/ajax/system/role/create")); + forMgr.add(createRes("SYS_ROLE_DELETE", "角色删除", "请求", "/ajax/system/role/delete")); + forMgr.add(createRes("SYS_ROLE_UPDATE", "角色更新", "请求", "/ajax/system/role/update")); + forMgr.add(createRes("SYS_ROLE_FIND", "角色查询", "请求", "/ajax/system/role/find")); + forMgr.add(createRes("SYS_ROLE_GET", "角色获取", "请求", "/ajax/system/role/get")); + forMgr.add(createRes("SYS_ROLE_RESCHECK", "角色资源分配", "请求", "/ajax/system/roleRes/check")); + forMgr.add(createRes("SYS_ROLE_ROLERES", "角色资源关系查询", "请求", "/ajax/system/roleRes/find")); + + forMgr.add(createRes("SYS_TOKENS", "登录凭证管理", "网页", "/system/tokens.htm")); + forMgr.add(createRes("SYS_TOKENS_FIND", "登录凭证查询", "请求", "/ajax/system/tokens/find")); + forMgr.add(createRes("SYS_TOKENS_EXPORT", "凭证导出", "请求", "/ajax/system/tokens/exports")); + forMgr.add(createRes("SYS_TOKENS_LOGOUT", "凭证注销", "请求", "/ajax/system/tokens/logout")); + +<#list project.modules as module> + <#list module.tables as table> + <#if table.html> + forMgr.add(createRes("WEB_${table.tableName}", "${table.tableComment}管理", "网页", "/${module.moduleName}/${table.getFName()}.htm")); + + <#if table.create> + forMgr.add(createRes("WEB_${table.tableName}_CREATE", "${table.tableComment}新增", "请求", "/ajax/${module.moduleName}/${table.getFName()}/create")); + + <#if table.delete> + forMgr.add(createRes("WEB_${table.tableName}_DELETE", "${table.tableComment}删除", "请求", "/ajax/${module.moduleName}/${table.getFName()}/delete")); + + <#if table.update> + forMgr.add(createRes("WEB_${table.tableName}_UPDATE", "${table.tableComment}更新", "请求", "/ajax/${module.moduleName}/${table.getFName()}/update")); + + <#if table.find> + forMgr.add(createRes("WEB_${table.tableName}_FIND", "${table.tableComment}查询", "请求", "/ajax/${module.moduleName}/${table.getFName()}/find")); + + <#if table.get> + forMgr.add(createRes("WEB_${table.tableName}_GET", "${table.tableComment}获取", "请求", "/ajax/${module.moduleName}/${table.getFName()}/get")); + + <#if table.search> + forMgr.add(createRes("WEB_${table.tableName}_SEARCH", "${table.tableComment}搜索", "请求", "/ajax/${module.moduleName}/${table.getFName()}/search")); + + + + + } + + {//初始化开发角色 + Long roleId = createRole("developer", "开发", "开发"); + for (Res res : forDev) { + allocateRes(roleId, "developer", res.getId(), res.getResCode()); + } + for (Res res : forMgr) { + allocateRes(roleId, "developer", res.getId(), res.getResCode()); + } + } + {//初始化管理角色 + Long roleId = createRole("management", "管理员", "管理员"); + for (Res res : forMgr) { + allocateRes(roleId, "management", res.getId(), res.getResCode()); + } + } + } + //endregion + } + + private void createDict(String name, String comment, String[][] items) { + DictCreateRequest dictCreateRequest = new DictCreateRequest(); + dictCreateRequest.setDictName(name); + dictCreateRequest.setDictComment(comment); + dictCreateRequest.setVersion(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + dictCreateRequest.setValid(true); + DictCreateResponse dictCreateResponse = dictManager.create(dictCreateRequest, token); + printError(dictCreateResponse); + assertTrue(!dictCreateResponse.hasError()); + + for (int i = 0; i < items.length; i++) { + String[] item = items[i]; + DictItemCreateRequest dictItemCreateRequest = new DictItemCreateRequest(); + dictItemCreateRequest.setDictName(name); + dictItemCreateRequest.setKey(item[0]); + dictItemCreateRequest.setValue(item[1]); + dictItemCreateRequest.setSort(i); + dictItemCreateRequest.setValid(true); + DictItemCreateResponse dictItemCreateResponse = dictItemManager.create(dictItemCreateRequest, token); + printError(dictItemCreateResponse); + assertTrue(!dictItemCreateResponse.hasError()); + } + } + + private Res createRes(String code, String name, String resType, String value) { + ResCreateRequest resCreateRequest = new ResCreateRequest(); + resCreateRequest.setResName(name); + resCreateRequest.setResCode(code); + resCreateRequest.setResType(resType); + resCreateRequest.setResValue(value); + resCreateRequest.setValid(true); + ResCreateResponse resCreateResponse = resManager.create(resCreateRequest, token); + printError(resCreateResponse); + if (resCreateResponse.hasError() && resCreateResponse.getErrors().get(0).getMessage().equals(Message.INSERT_DUPLICATE)) { + ResFindRequest resFindRequest = new ResFindRequest(); + resFindRequest.setResCode(code); + ResFindResponse resFindResponse = resManager.find(resFindRequest, token); + return resFindResponse.getResult().get(0); + } else if (resCreateResponse.hasError()) { + assertTrue(!resCreateResponse.hasError()); + return null; + } else { + Res res = new Res(); + res.setResCode(code); + res.setResName(name); + res.setResType(resType); + res.setId(resCreateResponse.getId()); + return res; + } + } + + private Long createRole(String roleCode, String roleName, String roleComment) { + RoleCreateRequest roleCreateRequest = new RoleCreateRequest(); + roleCreateRequest.setCode(roleCode); + roleCreateRequest.setName(roleName); + roleCreateRequest.setComment(roleComment); + RoleCreateResponse roleCreateResponse = roleManager.create(roleCreateRequest, token); + printError(roleCreateResponse); + assertTrue(!roleCreateResponse.hasError()); + return roleCreateResponse.getId(); + } + + private void allocateRes(Long roleId, String roleCode, Long resId, String resCode) { + RoleResCheckRequest roleResCheckRequest = new RoleResCheckRequest(); + roleResCheckRequest.setRoleId(roleId); + roleResCheckRequest.setRoleCode(roleCode); + roleResCheckRequest.setResId(resId); + roleResCheckRequest.setResCode(resCode); + roleResCheckRequest.setChecked(true); + + RoleResCheckResponse roleResCheckResponse = roleCreateRequest.check(roleResCheckRequest, token); + printError(roleResCheckResponse); + assertTrue(!roleResCheckResponse.hasError()); + } + + private void printError(BaseResponse response) { + if (response.hasError()) { + System.err.println("==========>" + MapperUtil.toJson(response)); + } + } +} \ No newline at end of file diff --git a/src/main/resources/modules/SpringBoot/test/UtilTest.java b/src/main/resources/modules/SpringBoot/test/UtilTest.java index 77c18c37..40da564f 100644 --- a/src/main/resources/modules/SpringBoot/test/UtilTest.java +++ b/src/main/resources/modules/SpringBoot/test/UtilTest.java @@ -16,6 +16,7 @@ import ${basePackage}.frame.utils.MD5Util; import ${basePackage}.frame.utils.MapperUtil; import ${basePackage}.frame.utils.ProcessUtil; import ${basePackage}.frame.utils.RSAUtil; +import ${basePackage}.frame.utils.ZipUtil; import ${basePackage}.module.system.ent.Dept; import java.io.File; @@ -109,6 +110,14 @@ public class UtilTest { System.out.println(b); } + @Test + public void testZipUtil() { + //解压 + ZipUtil.unZip(new File("E:\\AAA.zip"), new File("E:\\AAA")); + //压缩 + ZipUtil.toZip(new File("E:\\AAA"), new File("E:\\AAA.zip")); + } + @Test public void testExcel() { // 准备导出数据 diff --git a/src/main/resources/modules/SpringBoot/test/datainit/DictInit.java b/src/main/resources/modules/SpringBoot/test/datainit/DictInit.java deleted file mode 100644 index 89f58990..00000000 --- a/src/main/resources/modules/SpringBoot/test/datainit/DictInit.java +++ /dev/null @@ -1,113 +0,0 @@ -package ${basePackage}.datainit; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -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.auth.Token; -import ${basePackage}.frame.utils.MapperUtil; -import ${basePackage}.module.system.mgr.DictItemManager; -import ${basePackage}.module.system.mgr.DictManager; -import ${basePackage}.module.system.req.DictCreateRequest; -import ${basePackage}.module.system.req.DictItemCreateRequest; -import ${basePackage}.module.system.rsp.DictCreateResponse; -import ${basePackage}.module.system.rsp.DictItemCreateResponse; - -import java.text.SimpleDateFormat; -import java.util.Date; - -import static org.junit.Assert.assertTrue; - -@RunWith(SpringRunner.class) -@SpringBootTest -@Transactional -public class DictInit { - - @Autowired - private DictManager dictManager; - @Autowired - private DictItemManager dictItemManager; - @Autowired - private Token token; - - /** - * 字典数据初始化 - */ - @Test - @Rollback(false) - public void init() { - {// 终端类型 - createDict("TERMINAL_TYPE", "终端类型", new String[][]{ - {"WEB", "游览器端"}, - {"API", "接口端"}, - {"PHONE", "手机端"}, - }); - } - - {// 错误日志结果 - createDict("LOG_ERR_RESULT", "错误日志结果", new String[][]{ - {"未处理", "未处理"}, - {"已处理", "已处理"}, - {"搁置", "搁置"}, - }); - } - - {// 资源类型 - createDict("RES_TYPE", "资源类型", new String[][]{ - {"目录", "目录"}, - {"网页地址", "网页地址"}, - {"异步请求", "异步请求"}, - }); - } - {// 用户状态 - createDict("USER_STATUS", "用户状态", new String[][]{ - {"正常", "正常"}, - {"初始密码", "初始密码"}, - {"锁定/注销", "锁定/注销"}, - }); - } - {// 日志错误类型 - createDict("LOG_ERR_TYPE", "日志错误类型", new String[][]{ - {"系统错误", "系统错误"}, - {"业务错误", "业务错误"}, - }); - } - {// 文件类型 - createDict("FILE_TYPE", "文件类型", new String[][]{ - {"IMG", "图片"}, - }); - } - } - - private void createDict(String name, String comment, String[][] items) { - DictCreateRequest dictCreateRequest = new DictCreateRequest(); - dictCreateRequest.setDictName(name); - dictCreateRequest.setDictComment(comment); - dictCreateRequest.setVersion(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - dictCreateRequest.setValid(true); - DictCreateResponse dictCreateResponse = dictManager.create(dictCreateRequest, token); - if (dictCreateResponse.hasError()) { - System.err.println("==========>" + MapperUtil.toJson(dictCreateResponse)); - } - assertTrue(!dictCreateResponse.hasError()); - - for (int i = 0; i < items.length; i++) { - String[] item = items[i]; - DictItemCreateRequest dictItemCreateRequest = new DictItemCreateRequest(); - dictItemCreateRequest.setDictName(name); - dictItemCreateRequest.setKey(item[0]); - dictItemCreateRequest.setValue(item[1]); - dictItemCreateRequest.setSort(i); - dictItemCreateRequest.setValid(true); - DictItemCreateResponse dictItemCreateResponse = dictItemManager.create(dictItemCreateRequest, token); - if (dictItemCreateResponse.hasError()) { - System.err.println("==========>" + MapperUtil.toJson(dictItemCreateResponse)); - } - assertTrue(!dictItemCreateResponse.hasError()); - } - } -} - diff --git a/src/main/resources/modules/SpringBoot/test/datainit/RoleInit.java b/src/main/resources/modules/SpringBoot/test/datainit/RoleInit.java deleted file mode 100644 index a9f851b5..00000000 --- a/src/main/resources/modules/SpringBoot/test/datainit/RoleInit.java +++ /dev/null @@ -1,199 +0,0 @@ -package ${basePackage}.datainit; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -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.auth.Token; -import ${basePackage}.frame.utils.MapperUtil; -import ${basePackage}.module.system.mgr.ResManager; -import ${basePackage}.module.system.mgr.RoleManager; -import ${basePackage}.module.system.mgr.RoleResManager; -import ${basePackage}.module.system.req.ResCreateRequest; -import ${basePackage}.module.system.req.RoleCreateRequest; -import ${basePackage}.module.system.req.RoleResCheckRequest; -import ${basePackage}.module.system.rsp.ResCreateResponse; -import ${basePackage}.module.system.rsp.RoleCreateResponse; -import ${basePackage}.module.system.rsp.RoleResCheckResponse; - -import static org.junit.Assert.assertTrue; - -@RunWith(SpringRunner.class) -@SpringBootTest -@Transactional -public class RoleInit { - - @Autowired - private ResManager resManager; - @Autowired - private RoleManager roleManager; - @Autowired - private RoleResManager roleCreateRequest; - @Autowired - private Token token; - - /** - * 字典数据初始化 - */ - @Test - @Rollback(false) - public void init() { - String roleCode = "management"; - String roleName = "管理员"; - String roleComment = "管理员"; - Long roleId = null; - - {//初始化角色 - roleId = createRole(roleCode, roleName, roleComment); - } - - {// 初始化核心管理资源，涉及系统运行，特殊需要再放开 -// createRes(roleId, roleCode, "WEB_DICT", "字典管理", "网页地址", "/system/dict.htm"); -// createRes(roleId, roleCode, "WEB_DICT_CREATE", "字典新建", "异步请求", "/ajax/system/dict/create"); -// createRes(roleId, roleCode, "WEB_DICT_DELETE", "字典删除", "异步请求", "/ajax/system/dict/delete"); -// createRes(roleId, roleCode, "WEB_DICT_UPDATE", "字典更新", "异步请求", "/ajax/system/dict/update"); -// createRes(roleId, roleCode, "WEB_DICT_FIND", "字典查询", "异步请求", "/ajax/system/dict/find"); -// createRes(roleId, roleCode, "WEB_DICT_GET", "字典获取", "异步请求", "/ajax/system/dict/get"); -// createRes(roleId, roleCode, "WEB_DICT_LOAD", "字典详情", "异步请求", "/ajax/system/dict/load"); -// createRes(roleId, roleCode, "WEB_DICT_IMPORT", "字典导入", "异步请求", "/ajax/system/dict/imports"); -// createRes(roleId, roleCode, "WEB_DICT_EXPORT", "字典导出", "异步请求", "/ajax/system/dict/exports"); -// createRes(roleId, roleCode, "WEB_DICT_ITEM", "字典项管理", "网页地址", "/system/dictItem.htm"); -// createRes(roleId, roleCode, "WEB_DICT_ITEM_CREATE", "字典项新增", "异步请求", "/ajax/system/dictItem/create"); -// createRes(roleId, roleCode, "WEB_DICT_ITEM_DELETE", "字典项删除", "异步请求", "/ajax/system/dictItem/delete"); -// createRes(roleId, roleCode, "WEB_DICT_ITEM_UPDATE", "字典项更新", "异步请求", "/ajax/system/dictItem/update"); -// createRes(roleId, roleCode, "WEB_DICT_ITEM_FIND", "字典项查找", "异步请求", "/ajax/system/dictItem/find"); -// createRes(roleId, roleCode, "WEB_DICT_ITEM_GET", "字典项获取", "异步请求", "/ajax/system/dictItem/get"); -// createRes(roleId, roleCode, "WEB_RES", "资源管理", "网页地址", "/system/res.htm"); -// createRes(roleId, roleCode, "WEB_RES_CREATE", "资源新增", "异步请求", "/ajax/system/res/create"); -// createRes(roleId, roleCode, "WEB_RES_DELETE", "资源删除", "异步请求", "/ajax/system/res/delete"); -// createRes(roleId, roleCode, "WEB_RES_UPDATE", "资源编辑", "异步请求", "/ajax/system/res/update"); -// createRes(roleId, roleCode, "WEB_RES_FIND", "资源查询", "异步请求", "/ajax/system/res/find"); -// createRes(roleId, roleCode, "WEB_RES_GET", "资源获取", "异步请求", "/ajax/system/res/get"); -// createRes(roleId, roleCode, "WEB_RES_TREE", "资源树查询", "异步请求", "/ajax/system/res/tree"); -// createRes(roleId, roleCode, "WEB_LOGERR", "错误日志", "网页地址", "/system/logErr.htm"); -// createRes(roleId, roleCode, "WEB_LOGERR_DELETE", "错误日志删除", "异步请求", "/ajax/system/logErr/delete"); -// createRes(roleId, roleCode, "WEB_LOGERR_UPDATE", "错误日志更新", "异步请求", "/ajax/system/logErr/update"); -// createRes(roleId, roleCode, "WEB_LOGERR_FIND", "错误日志查询", "异步请求", "/ajax/system/logErr/find"); - } - - {// 初始化一般管理资源 - createRes(roleId, roleCode, "WEB", "网页资源", "目录", ""); - createRes(roleId, roleCode, "WEB_INDEX", "主页", "网页地址", "/index.htm"); - createRes(roleId, roleCode, "WEB_INDEX_HOME", "首页", "网页地址", "/home.htm"); - createRes(roleId, roleCode, "WEB_INDEX_ROOT", "根页", "网页地址", "/"); - - createRes(roleId, roleCode, "WEB_USER", "用户管理", "网页地址", "/system/user.htm"); - createRes(roleId, roleCode, "WEB_USER_CREATE", "用户新增", "异步请求", "/ajax/system/user/create"); - createRes(roleId, roleCode, "WEB_USER_DELETE", "用户删除", "异步请求", "/ajax/system/user/delete"); - createRes(roleId, roleCode, "WEB_USER_UPDATE", "用户更新", "异步请求", "/ajax/system/user/update"); - createRes(roleId, roleCode, "WEB_USER_FIND", "用户查询", "异步请求", "/ajax/system/user/find"); - createRes(roleId, roleCode, "WEB_USER_GET", "用户获取", "异步请求", "/ajax/system/user/get"); - createRes(roleId, roleCode, "WEB_USER_IMPORT", "用户导入", "异步请求", "/ajax/system/user/imports"); - createRes(roleId, roleCode, "WEB_USER_EXPORT", "用户导出", "异步请求", "/ajax/system/user/exports"); - - createRes(roleId, roleCode, "WEB_DEPT", "机构管理", "网页地址", "/system/dept.htm"); - createRes(roleId, roleCode, "WEB_DEPT_CREATE", "机构新增", "异步请求", "/ajax/system/dept/create"); - createRes(roleId, roleCode, "WEB_DEPT_DELETE", "机构删除", "异步请求", "/ajax/system/dept/delete"); - createRes(roleId, roleCode, "WEB_DEPT_UPDATE", "机构更新", "异步请求", "/ajax/system/dept/update"); - createRes(roleId, roleCode, "WEB_DEPT_FIND", "机构查询", "异步请求", "/ajax/system/dept/find"); - createRes(roleId, roleCode, "WEB_DEPT_GET", "机构获取", "异步请求", "/ajax/system/dept/get"); - createRes(roleId, roleCode, "WEB_DEPT_TREE", "机构树查询", "异步请求", "/ajax/system/dept/tree"); - createRes(roleId, roleCode, "WEB_DEPT_IMPORT", "机构导入", "异步请求", "/ajax/system/dept/imports"); - createRes(roleId, roleCode, "WEB_DEPT_EXPORT", "机构导出", "异步请求", "/ajax/system/dept/exports"); - - createRes(roleId, roleCode, "WEB_FILE", "文件管理", "网页地址", "/system/file.htm"); - createRes(roleId, roleCode, "WEB_FILE_DELETE", "文件删除", "异步请求", "/ajax/system/file/delete"); - createRes(roleId, roleCode, "WEB_FILE_FIND", "文件查询", "异步请求", "/ajax/system/file/find"); - - createRes(roleId, roleCode, "WEB_ROLE", "角色管理", "网页地址", "/system/role.htm"); - createRes(roleId, roleCode, "WEB_ROLE_CREATE", "角色新增", "异步请求", "/ajax/system/role/create"); - createRes(roleId, roleCode, "WEB_ROLE_DELETE", "角色删除", "异步请求", "/ajax/system/role/delete"); - createRes(roleId, roleCode, "WEB_ROLE_UPDATE", "角色更新", "异步请求", "/ajax/system/role/update"); - createRes(roleId, roleCode, "WEB_ROLE_FIND", "角色查询", "异步请求", "/ajax/system/role/find"); - createRes(roleId, roleCode, "WEB_ROLE_GET", "角色获取", "异步请求", "/ajax/system/role/get"); - createRes(roleId, roleCode, "WEB_ROLE_RESCHECK", "角色资源分配", "异步请求", "/ajax/system/roleRes/check"); - createRes(roleId, roleCode, "WEB_ROLE_ROLERES", "角色资源关系查询", "异步请求", "/ajax/system/roleRes/find"); - - createRes(roleId, roleCode, "WEB_TASK", "计划任务", "网页地址", "/system/schedule.htm"); - - createRes(roleId, roleCode, "WEB_TOKENS", "登录凭证管理", "网页地址", "/system/tokens.htm"); - createRes(roleId, roleCode, "WEB_TOKENS_FIND", "登录凭证查询", "异步请求", "/ajax/system/tokens/find"); - createRes(roleId, roleCode, "WEB_TOKENS_EXPORT", "凭证导出", "异步请求", "/ajax/system/tokens/exports"); - createRes(roleId, roleCode, "WEB_TOKENS_LOGOUT", "凭证注销", "异步请求", "/ajax/system/tokens/logout"); - -<#list project.modules as module> - <#list module.tables as table> - <#if table.html> - createRes(roleId, roleCode, "WEB_${table.tableName}", "${table.tableComment}管理", "网页地址", "/${module.moduleName}/${table.getFName()}.htm"); - - <#if table.create> - createRes(roleId, roleCode, "WEB_${table.tableName}_CREATE", "${table.tableComment}新增", "异步请求", "/ajax/${module.moduleName}/${table.getFName()}/create"); - - <#if table.delete> - createRes(roleId, roleCode, "WEB_${table.tableName}_DELETE", "${table.tableComment}删除", "异步请求", "/ajax/${module.moduleName}/${table.getFName()}/delete"); - - <#if table.update> - createRes(roleId, roleCode, "WEB_${table.tableName}_UPDATE", "${table.tableComment}更新", "异步请求", "/ajax/${module.moduleName}/${table.getFName()}/update"); - - <#if table.find> - createRes(roleId, roleCode, "WEB_${table.tableName}_FIND", "${table.tableComment}查询", "异步请求", "/ajax/${module.moduleName}/${table.getFName()}/find"); - - <#if table.get> - createRes(roleId, roleCode, "WEB_${table.tableName}_GET", "${table.tableComment}获取", "异步请求", "/ajax/${module.moduleName}/${table.getFName()}/get"); - - <#if table.search> - createRes(roleId, roleCode, "WEB_${table.tableName}_SEARCH", "${table.tableComment}搜索", "异步请求", "/ajax/${module.moduleName}/${table.getFName()}/search"); - - - - - } - } - - private void createRes(Long roleId, String roleCode, String code, String name, String resType, String value) { - ResCreateRequest resCreateRequest = new ResCreateRequest(); - resCreateRequest.setResName(name); - resCreateRequest.setResCode(code); - resCreateRequest.setResType(resType); - resCreateRequest.setResValue(value); - resCreateRequest.setValid(true); - ResCreateResponse resCreateResponse = resManager.create(resCreateRequest, token); - if (resCreateResponse.hasError()) { - System.err.println("==========>" + MapperUtil.toJson(resCreateResponse)); - } - assertTrue(!resCreateResponse.hasError()); - allocateRes(roleId, roleCode, resCreateResponse.getId(), code); - } - - private Long createRole(String roleCode, String roleName, String roleComment) { - RoleCreateRequest roleCreateRequest = new RoleCreateRequest(); - roleCreateRequest.setCode(roleCode); - roleCreateRequest.setName(roleName); - roleCreateRequest.setComment(roleComment); - RoleCreateResponse roleCreateResponse = roleManager.create(roleCreateRequest, token); - if (roleCreateResponse.hasError()) { - System.err.println("==========>" + MapperUtil.toJson(roleCreateResponse)); - } - assertTrue(!roleCreateResponse.hasError()); - return roleCreateResponse.getId(); - } - - private void allocateRes(Long roleId, String roleCode, Long resId, String resCode) { - RoleResCheckRequest roleResCheckRequest = new RoleResCheckRequest(); - roleResCheckRequest.setRoleId(roleId); - roleResCheckRequest.setRoleCode(roleCode); - roleResCheckRequest.setResId(resId); - roleResCheckRequest.setResCode(resCode); - roleResCheckRequest.setChecked(true); - - RoleResCheckResponse roleResCheckResponse = roleCreateRequest.check(roleResCheckRequest, token); - if (roleResCheckResponse.hasError()) { - System.err.println("==========>" + MapperUtil.toJson(roleResCheckResponse)); - } - assertTrue(!roleResCheckResponse.hasError()); - } -} -