1、资源补充

2、部分BUG修复


Former-commit-id: fa98a9886e19de542b27b3a8358a06b0739f3ebf

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

@@ -194,7 +194,7 @@ public class SpringBootCallable implements Callable {
                 for (Table table : module.getTables()) {
                     HashMap<String, Object> ctxss = new HashMap<String, Object>();
                     ctxss.put("basePackage", project.getProjectBasePackage());
-                    ctxss.put("module", module.getModuleName());
+                    ctxss.put("moduleName", module.getModuleName());
                     ctxss.put("author", project.getProjectAuthor());
                     ctxss.put("date", new Date());
                     ctxss.put("table", table);

src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java

@@ -1,6 +1,5 @@
-package ${basePackage}.action.ajax.${module};
+package ${basePackage}.action.ajax.${moduleName};
 
-import com.fasterxml.jackson.core.TreeNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 import ${basePackage}.frame.excel.WExcel;
@@ -13,18 +12,38 @@ import ${basePackage}.frame.utils.ResponseUtil;
 import ${basePackage}.frame.utils.ValidationUtil;
 import ${basePackage}.frame.excel.exception.ReadErrorException;
 import ${basePackage}.frame.excel.exception.TemplateNotMatchException;
-import ${basePackage}.module.${module}.ent.${table.getCName()};
+import ${basePackage}.module.${moduleName}.ent.${table.getCName()};
-import ${basePackage}.module.${module}.mgr.${table.getCName()}Manager;
+import ${basePackage}.module.${moduleName}.mgr.${table.getCName()}Manager;
-import ${basePackage}.module.${module}.req.${table.getCName()}CreateRequest;
+<#if table.getCreate()>
-import ${basePackage}.module.${module}.req.${table.getCName()}DeleteRequest;
+import ${basePackage}.module.${moduleName}.req.${table.getCName()}CreateRequest;
-import ${basePackage}.module.${module}.req.${table.getCName()}FindRequest;
+</#if>
-import ${basePackage}.module.${module}.req.${table.getCName()}GetRequest;
+<#if table.getDelete()>
-import ${basePackage}.module.${module}.req.${table.getCName()}UpdateRequest;
+import ${basePackage}.module.${moduleName}.req.${table.getCName()}DeleteRequest;
-import ${basePackage}.module.${module}.rsp.${table.getCName()}CreateResponse;
+</#if>
-import ${basePackage}.module.${module}.rsp.${table.getCName()}DeleteResponse;
+<#if table.getFind()>
-import ${basePackage}.module.${module}.rsp.${table.getCName()}FindResponse;
+import ${basePackage}.module.${moduleName}.req.${table.getCName()}FindRequest;
-import ${basePackage}.module.${module}.rsp.${table.getCName()}GetResponse;
+</#if>
-import ${basePackage}.module.${module}.rsp.${table.getCName()}UpdateResponse;
+<#if table.getGet()>
+import ${basePackage}.module.${moduleName}.req.${table.getCName()}GetRequest;
+</#if>
+<#if table.getUpdate()>
+import ${basePackage}.module.${moduleName}.req.${table.getCName()}UpdateRequest;
+</#if>
+<#if table.getCreate()>
+import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}CreateResponse;
+</#if>
+<#if table.getDelete()>
+import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}DeleteResponse;
+</#if>
+<#if table.getFind()>
+import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}FindResponse;
+</#if>
+<#if table.getGet()>
+import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}GetResponse;
+</#if>
+<#if table.getUpdate()>
+import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}UpdateResponse;
+</#if>
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/action/ajax/system/ProfilesAjax.java

@@ -1,6 +1,5 @@
-package ${basePackage}.action.ajax.example;
+package ${basePackage}.action.ajax.system;
 
-import com.fasterxml.jackson.core.TreeNode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
 import ${basePackage}.frame.excel.WExcel;

src/main/resources/modules/SpringBoot/java/action/ajax/system/TaskSqlAjax.java

@@ -1,4 +1,4 @@
-package ${basePackage}.action.ajax.example;
+package ${basePackage}.action.ajax.system;
 
 import com.fasterxml.jackson.core.TreeNode;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/resources/modules/SpringBoot/java/module/mgr/manager.ftl

@@ -1,15 +1,35 @@
 package ${basePackage}.module.${moduleName}.mgr;
 
+<#if table.getCreate()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}CreateRequest;
+</#if>
+<#if table.getDelete()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}DeleteRequest;
+</#if>
+<#if table.getFind()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}FindRequest;
+</#if>
+<#if table.getGet()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}GetRequest;
+</#if>
+<#if table.getUpdate()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}UpdateRequest;
+</#if>
+<#if table.getCreate()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}CreateResponse;
+</#if>
+<#if table.getDelete()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}DeleteResponse;
+</#if>
+<#if table.getFind()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}FindResponse;
+</#if>
+<#if table.getGet()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}GetResponse;
+</#if>
+<#if table.getUpdate()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}UpdateResponse;
+</#if>
 import ${basePackage}.frame.auth.Token;
 
 /**

src/main/resources/modules/SpringBoot/java/module/mgr/managerImpl.ftl

@@ -8,16 +8,36 @@ import ${basePackage}.frame.utils.MapperUtil;
 import ${basePackage}.frame.utils.ValidationUtil;
 import ${basePackage}.module.${moduleName}.ent.${table.getCName()};
 import ${basePackage}.module.${moduleName}.mpr.${table.getCName()}Mapper;
+<#if table.getCreate()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}CreateRequest;
+</#if>
+<#if table.getDelete()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}DeleteRequest;
+</#if>
+<#if table.getFind()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}FindRequest;
+</#if>
+<#if table.getGet()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}GetRequest;
+</#if>
+<#if table.getUpdate()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}UpdateRequest;
+</#if>
+<#if table.getCreate()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}CreateResponse;
+</#if>
+<#if table.getDelete()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}DeleteResponse;
+</#if>
+<#if table.getFind()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}FindResponse;
+</#if>
+<#if table.getGet()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}GetResponse;
+</#if>
+<#if table.getUpdate()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}UpdateResponse;
+</#if>
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.util.StringUtil;

src/main/resources/modules/SpringBoot/java/module/mpr/mapper.java

@@ -1,17 +1,26 @@
 package ${basePackage}.module.${moduleName}.mpr;
 
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Mapper;
-
+import org.apache.ibatis.annotations.Param;
-import java.util.List;
+import ${basePackage}.frame.auth.Token;
-
 import ${basePackage}.module.${moduleName}.ent.${table.getCName()};
+<#if table.getCreate()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}CreateRequest;
+</#if>
+<#if table.getDelete()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}DeleteRequest;
+</#if>
+<#if table.getFind()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}FindRequest;
+</#if>
+<#if table.getGet()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}GetRequest;
+</#if>
+<#if table.getUpdate()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}UpdateRequest;
-import ${basePackage}.frame.auth.Token;
+</#if>
+
+import java.util.List;
 
 /**
  * ${table.tableName} - ${table.tableComment}

src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl

@@ -27,9 +27,29 @@
                     <i class="el-icon-help"></i>
                     <span slot="title">开发设置</span>
                 </template>
+                ${print('<#if token.hasRes("DEV_PROFILES")>')}
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '系统配置', name: 'profiles', url: '${r'${context}'}/system/profiles.htm'})">系统配置</el-menu-item>
+                ${print('</#if>')}
+                ${print('<#if token.hasRes("DEV_RES")>')}
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '资源管理', name: 'res', url: '${r'${context}'}/system/res.htm'})">资源管理</el-menu-item>
+                ${print('</#if>')}
+                ${print('<#if token.hasRes("DEV_TASK_SQL")>')}
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: 'SQL任务', name: 'taskSql', url: '${r'${context}'}/system/taskSql.htm'})">SQL任务</el-menu-item>
+                ${print('</#if>')}
+            </el-submenu>
+            ${print('</#if>')}
+            ${print('<#if token.hasRes("OBS")>')}
+            <el-submenu index="${tool.uuid()}" >
+                <template slot="title">
+                    <i class="el-icon-stopwatch"></i>
+                    <span slot="title">监控运行</span>
+                </template>
+                ${print('<#if token.hasRes("OBS_SCHEDULE")>')}
+                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '调度监控', name: 'schedule', url: '${r'${context}'}/system/schedule.htm'})">调度监控</el-menu-item>
+                ${print('</#if>')}
+                ${print('<#if token.hasRes("OBS_LOG_ERR")>')}
+                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '错误日志', name: 'logErr', url: '${r'${context}'}/system/logErr.htm'})">错误日志</el-menu-item>
+                ${print('</#if>')}
             </el-submenu>
             ${print('</#if>')}
             ${print('<#if token.hasRes("SYS")>')}
@@ -45,27 +65,21 @@
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '文件管理', name: 'file', url: '${r'${context}'}/system/file.htm'})">文件管理</el-menu-item>
                 <el-menu-item index="${tool.uuid()}" @click="addTab({title: '登录管理', name: 'tokens', url: '${r'${context}'}/system/tokens.htm'})">登录管理</el-menu-item>
             </el-submenu>
-            <el-submenu index="${tool.uuid()}" >
-                <template slot="title">
-                    <i class="el-icon-stopwatch"></i>
-                    <span slot="title">监控运行</span>
-                </template>
-                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '错误日志', name: 'logErr', url: '${r'${context}'}/system/logErr.htm'})">错误日志</el-menu-item>
-                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '调度监控', name: 'schedule', url: '${r'${context}'}/system/schedule.htm'})">调度监控</el-menu-item>
-            </el-submenu>
             ${print('</#if>')}
 </#if>
-<#list modules as item>
+<#list modules as module>
-<#if item.hasHtml()>
+<#if module.hasHtml()>
-            ${print('<#if token.hasRes("WEB_')}${item.moduleName?upper_case}${print('")>')}
+            ${print('<#if token.hasRes("WEB_${module.moduleName?upper_case}")>')}
             <el-submenu index="${tool.uuid()}">
                 <template slot="title">
                     <i class="el-icon-document-copy"></i>
-                    <span slot="title">${item.moduleComment}</span>
+                    <span slot="title">${module.moduleComment}</span>
                 </template>
-                <#list item.tables as table>
+                <#list module.tables as table>
                 <#if table.getHtml()>
-                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '${table.tableComment}', name: '${table.tableName}', url: '${r"${context}"}/${item.moduleName}/${table.getFName()}.htm'})">${table.tableComment}</el-menu-item>
+                ${print('<#if token.hasRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}")>')}
+                <el-menu-item index="${tool.uuid()}" @click="addTab({title: '${table.tableComment}', name: '${table.tableName}', url: '${r"${context}"}/${module.moduleName}/${table.getFName()}.htm'})">${table.tableComment}</el-menu-item>
+                ${print('</#if>')}
                 </#if>
                 </#list>
             </el-submenu>

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/profiles.ftl

@@ -141,7 +141,7 @@
         mixins: [mixin],
         el: "#app",
         data: {
-            module: 'example',
+            module: 'system',
             target: 'profiles',
             vm: {//条件及分页参数
                 active: "",
@@ -199,7 +199,7 @@
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(function () {
-                    new Ajax("example", "profiles").delete({id: item.id}, function (response) {
+                    new Ajax("system", "profiles").delete({id: item.id}, function (response) {
                         if (response.errors.length > 0) {
                             nav.e(response.errors[0].message);
                         } else {

src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/taskSql.ftl

@@ -188,7 +188,7 @@
         mixins: [mixin],
         el: "#app",
         data: {
-            module: 'example',
+            module: 'system',
             target: 'taskSql',
             vm: {//条件及分页参数
                 taskName: "",
@@ -267,7 +267,7 @@
                     cancelButtonText: '取消',
                     type: 'warning'
                 }).then(function () {
-                    new Ajax("example", "taskSql").delete({id: item.id}, function (response) {
+                    new Ajax("system", "taskSql").delete({id: item.id}, function (response) {
                         if (response.errors.length > 0) {
                             nav.e(response.errors[0].message);
                         } else {

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

@@ -138,6 +138,18 @@ public class DataInit {
             List<Res> forDev = new ArrayList<>();
             {// 初始化开发角色特有资源
                 forDev.add(createRes("DEV", "开发管理菜单", "菜单", "DEV"));
+
+                forDev.add(createRes("DEV_PROFILES", "系统配置菜单", "菜单", "DEV_PROFILES"));
+                forDev.add(createRes("DEV_PROFILES_HTM", "系统配置管理页", "网页", "/system/profiles.htm"));
+                forDev.add(createRes("DEV_PROFILES_TEMPLATE", "系统配置模板", "请求", "/ajax/system/profiles/template"));
+                forDev.add(createRes("DEV_PROFILES_IMPORT", "系统配置导入", "请求", "/ajax/system/profiles/imports"));
+                forDev.add(createRes("DEV_PROFILES_EXPORT", "系统配置导出", "请求", "/ajax/system/profiles/exports"));
+                forDev.add(createRes("DEV_PROFILES_CREATE", "系统配置新增", "请求", "/ajax/system/profiles/create"));
+                forDev.add(createRes("DEV_PROFILES_DELETE", "系统配置删除", "请求", "/ajax/system/profiles/delete"));
+                forDev.add(createRes("DEV_PROFILES_UPDATE", "系统配置编辑", "请求", "/ajax/system/profiles/update"));
+                forDev.add(createRes("DEV_PROFILES_FIND", "系统配置查询", "请求", "/ajax/system/profiles/find"));
+                forDev.add(createRes("DEV_PROFILES_GET", "系统配置获取", "请求", "/ajax/system/profiles/get"));
+
                 forDev.add(createRes("DEV_RES", "资源管理菜单", "菜单", "DEV_RES"));
                 forDev.add(createRes("DEV_RES_HTM", "资源管理页", "网页", "/system/res.htm"));
                 forDev.add(createRes("DEV_RES_TEMPLATE", "资源模板", "请求", "/ajax/system/res/template"));
@@ -149,14 +161,29 @@ public class DataInit {
                 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", "计划调度菜单", "菜单", "DEV_TASK"));
+                forDev.add(createRes("DEV_TASK_SQL", "SQL任务菜单", "菜单", "DEV_TASK_SQL"));
-                forDev.add(createRes("DEV_TASK_HTM", "计划调度页", "网页", "/system/schedule.htm"));
+                forDev.add(createRes("DEV_TASK_SQL_HTM", "SQL任务管理页", "网页", "/system/taskSql.htm"));
+                forDev.add(createRes("DEV_TASK_SQL_TEMPLATE", "SQL任务模板", "请求", "/ajax/system/taskSql/template"));
+                forDev.add(createRes("DEV_TASK_SQL_IMPORT", "SQL任务导入", "请求", "/ajax/system/taskSql/imports"));
+                forDev.add(createRes("DEV_TASK_SQL_EXPORT", "SQL任务导出", "请求", "/ajax/system/taskSql/exports"));
+                forDev.add(createRes("DEV_TASK_SQL_CREATE", "SQL任务新增", "请求", "/ajax/system/taskSql/create"));
+                forDev.add(createRes("DEV_TASK_SQL_DELETE", "SQL任务删除", "请求", "/ajax/system/taskSql/delete"));
+                forDev.add(createRes("DEV_TASK_SQL_UPDATE", "SQL任务编辑", "请求", "/ajax/system/taskSql/update"));
+                forDev.add(createRes("DEV_TASK_SQL_FIND", "SQL任务查询", "请求", "/ajax/system/taskSql/find"));
+                forDev.add(createRes("DEV_TASK_SQL_GET", "SQL任务获取", "请求", "/ajax/system/taskSql/get"));
+
+                forDev.add(createRes("OBS", "监控运行菜单", "菜单", "OBS"));
+                forDev.add(createRes("OBS_SCHEDULE", "调度监控菜单", "菜单", "OBS_SCHEDULE"));
+                forDev.add(createRes("OBS_SCHEDULE_HTM", "调度监控页", "网页", "/system/schedule.htm"));
+                forDev.add(createRes("OBS_SCHEDULE_FIND", "调度监控查询", "请求", "/ajax/system/schedule/find"));
+                forDev.add(createRes("OBS_SCHEDULE_START", "调度监控启动", "请求", "/ajax/system/schedule/start"));
+                forDev.add(createRes("OBS_SCHEDULE_STOP", "调度监控暂停", "请求", "/ajax/system/schedule/stop"));
 
-                forDev.add(createRes("DEV_LOGERR", "错误日志菜单", "菜单", "DEV_LOGERR"));
+                forDev.add(createRes("OBS_LOG_ERR", "错误日志菜单", "菜单", "OBS_LOG_ERR"));
-                forDev.add(createRes("DEV_LOGERR_HTM", "错误日志管理页", "网页", "/system/logErr.htm"));
+                forDev.add(createRes("OBS_LOG_ERR_HTM", "错误日志管理页", "网页", "/system/logErr.htm"));
-                forDev.add(createRes("DEV_LOGERR_DELETE", "错误日志删除", "请求", "/ajax/system/logErr/delete"));
+                forDev.add(createRes("OBS_LOG_ERR_DELETE", "错误日志删除", "请求", "/ajax/system/logErr/delete"));
-                forDev.add(createRes("DEV_LOGERR_UPDATE", "错误日志更新", "请求", "/ajax/system/logErr/update"));
+                forDev.add(createRes("OBS_LOG_ERR_UPDATE", "错误日志更新", "请求", "/ajax/system/logErr/update"));
-                forDev.add(createRes("DEV_LOGERR_FIND", "错误日志查询", "请求", "/ajax/system/logErr/find"));
+                forDev.add(createRes("OBS_LOG_ERR_FIND", "错误日志查询", "请求", "/ajax/system/logErr/find"));
             }
 
             List<Res> forMgr = new ArrayList<>();
@@ -239,7 +266,7 @@ public class DataInit {
                 forMgr.add(createRes("WEB_${module.moduleName?upper_case}", "${module.moduleComment}菜单", "菜单", "WEB_${module.moduleName?upper_case}"));
     <#list module.tables as table>
         <#if table.html>
-                forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}", "${table.tableComment}管理菜单", "菜单", "WEB_${table.tableName?upper_case}"));
+                forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}", "${table.tableComment}管理菜单", "菜单", "WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}"));
                 forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}_HTM", "${table.tableComment}管理页", "网页", "/${module.moduleName}/${table.getFName()}.htm"));
                 forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}_TEMPLATE", "${table.tableComment}模板", "请求", "/ajax/${module.moduleName}/${table.getFName()}/template"));
                 forMgr.add(createRes("WEB_${module.moduleName?upper_case}_${table.tableName?upper_case}_IMPORT", "${table.tableComment}导入", "请求", "/ajax/${module.moduleName}/${table.getFName()}/imports"));

src/main/resources/modules/SpringBoot/test/test.ftl

@@ -11,16 +11,36 @@ ${table.getImport()}
 </#if>
 import ${basePackage}.frame.auth.Token;
 import ${basePackage}.module.${moduleName}.mgr.${table.getCName()}Manager;
+<#if table.getCreate()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}CreateRequest;
+</#if>
+<#if table.getDelete()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}DeleteRequest;
+</#if>
+<#if table.getFind()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}FindRequest;
+</#if>
+<#if table.getGet()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}GetRequest;
+</#if>
+<#if table.getUpdate()>
 import ${basePackage}.module.${moduleName}.req.${table.getCName()}UpdateRequest;
+</#if>
+<#if table.getCreate()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}CreateResponse;
+</#if>
+<#if table.getDelete()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}DeleteResponse;
+</#if>
+<#if table.getFind()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}FindResponse;
+</#if>
+<#if table.getGet()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}GetResponse;
+</#if>
+<#if table.getUpdate()>
 import ${basePackage}.module.${moduleName}.rsp.${table.getCName()}UpdateResponse;
+</#if>
 
 import static junit.framework.TestCase.assertTrue;