open
/
open-dbtool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

架构调整

Browse Source 
Former-commit-id: c88a623c3a4439a40455b7234411f135cbef315e
master
王兵 4 years ago
parent 8e8c641ddd
commit d18be68484
61 changed files with 402 additions and 652 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java
Unescape View File

@ -291,7 +291,7 @@ public class XmlManager {
private Frame getFrame(String str) {
if (str == null || "".equals(str)) {
return Frame.网页框架;
return Frame.管理框架;
}
return Frame.valueOf(str);
}

610
src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
Unescape View File

@ -26,7 +26,6 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.concurrent.Callable;
import java.util.regex.Pattern;
public class SpringBootCallable implements Callable {
@ -62,81 +61,41 @@ public class SpringBootCallable implements Callable {
// 生成资源目录
File resourcesDir = Tool.createPath(dir, "src", "main", "resources");
// 生成域名目录
File domainDir = javaDir;
for (String s : project.getDomain().split("\\.")) {
domainDir = Tool.createPath(domainDir, s);
}
File domainDir = Tool.createPath(javaDir, project.getDomain().split("\\."));
// 生成单元测试java目录
File testJavaDir = Tool.createPath(dir, "src", "test", "java");
File testDomainDir = testJavaDir;
for (String s : project.getDomain().split("\\.")) {
testDomainDir = Tool.createPath(testDomainDir, s);
}
// 生成单元测试域名目录
File testDomainDir = Tool.createPath(testJavaDir, project.getDomain().split("\\."));
// 生成单元测试resources目录
File testResourcesDir = Tool.createPath(dir, "src", "test", "resources");
// 生成POM
generatePom(dir, project);
// Application
// 生成Application
System.out.println("生成模块:Application");
generateApplication(Tool.createPath(domainDir), project);
if (project.getFrame().value() > Frame.空白框架.value()) {//生成java文件
//生成 Controller
if (project.getFrame().value() >= Frame.接口框架.value()) {
System.out.println("生成模块:action");
generateController(Tool.createPath(domainDir, "action"), project);
}
// 生成 Config
if (project.getFrame().value() >= Frame.服务框架.value()) {
System.out.println("生成模块:config");
generateConfig(Tool.createPath(domainDir, "config"), project);
}
System.out.println("生成模块:action");
generateController(Tool.createPath(domainDir, "action"), project);
System.out.println("生成模块:config");
generateConfig(Tool.createPath(domainDir, "config"), project);
System.out.println("生成模块:frame");
generateFrame(Tool.createPath(domainDir, "frame"), project);
System.out.println("生成模块:module");
generateModule(Tool.createPath(domainDir, "module"), project);
System.out.println("生成模块:task");
generateTask(Tool.createPath(domainDir, "task"), project);
// 模块
generateModule(Tool.createPath(domainDir, "module"), project);
if (project.getFrame().value() >= Frame.服务框架.value()) {
generateModuleFor服务框架(Tool.createPath(domainDir, "module"), project);
}
if (project.getFrame().value() >= Frame.接口框架.value()) {
generateModuleFor接口框架(Tool.createPath(domainDir, "module"), project);
}
if (project.getFrame().value() >= Frame.网页框架.value()) {
generateModuleFor网页框架(Tool.createPath(domainDir, "module"), project);
}
// frame等内容
if (project.getFrame().value() > Frame.空白框架.value()) {
System.out.println("生成模块:frame");
generateFrame(Tool.createPath(domainDir, "frame"), project);
}
// Task
System.out.println("生成模块:task");
if (project.getFrame().value() > Frame.空白框架.value()) {
generateTask(Tool.createPath(domainDir, "task"), project);
}
}
generateResources_template(resourcesDir, project);
generateModuleForSys(Tool.createPath(domainDir, "module"), project);
//生成resources文件
generateResources(resourcesDir, project);
if (project.getFrame().value() > Frame.空白框架.value()) {
{//生成Test
System.out.println("生成模块:Test");
generateTest(testDomainDir, project);
}
{//生成Test Resources
System.out.println("生成模块:Test Resources");
generateTestResources(testResourcesDir, project);
}
}
System.out.println("生成模块:Test");
generateTest(testDomainDir, project);
System.out.println("生成模块:Test Resources");
generateTestResources(testResourcesDir, project);
System.out.println("finish");
return true;
@ -172,41 +131,34 @@ public class SpringBootCallable implements Callable {
ctx.put("author", project.getAuthor());
ctx.put("modules", project.getModules());
if (project.getFrame().value() >= Frame.网页框架.value()) {
File control = Tool.createPath(root, "control");
freeMarkerManager.outputTemp(Tool.createFile(control, "Header.java"), "SpringBoot/java/action/control/Header.java", ctx);
File control = Tool.createPath(root, "control");
freeMarkerManager.outputTemp(Tool.createFile(control, "Header.java"), "SpringBoot/java/action/control/Header.java", ctx);
File screen = Tool.createPath(root, "screen");
freeMarkerManager.outputTemp(Tool.createFile(screen, "Index.java"), "SpringBoot/java/action/screen/Index.java", ctx);
File screen = Tool.createPath(root, "screen");
freeMarkerManager.outputTemp(Tool.createFile(screen, "Index.java"), "SpringBoot/java/action/screen/Index.java", ctx);
{// ajax 属于web内容
File ajax = Tool.createPath(root, "ajax");
HashMap<String, Object> ctxss = new HashMap<String, Object>();
ctxss.put("domain", project.getDomain());
ctxss.put("author", project.getAuthor());
{// ajax 属于web内容
File ajax = Tool.createPath(root, "ajax");
HashMap<String, Object> ctxss = new HashMap<String, Object>();
ctxss.put("domain", project.getDomain());
ctxss.put("author", project.getAuthor());
for (Module module : project.getModules()) {
File m = Tool.createPath(ajax, module.getModuleName());
ctxss.put("moduleName", module.getModuleName());
for (Module module : project.getModules()) {
File m = Tool.createPath(ajax, module.getModuleName());
ctxss.put("moduleName", module.getModuleName());
for (Table table : module.getTables()) {
if (table.getAjax()) {
ctxss.put("table", table);
freeMarkerManager.outputTemp(Tool.createFile(m, table.getCName() + "Ajax.java"), "SpringBoot/java/action/ajax/Ajax.java", ctxss);
}
for (Table table : module.getTables()) {
if (table.getAjax()) {
ctxss.put("table", table);
freeMarkerManager.outputTemp(Tool.createFile(m, table.getCName() + "Ajax.java"), "SpringBoot/java/action/ajax/Ajax.java", ctxss);
}
}
}
if (project.getFrame().value() >= Frame.网页框架.value()) {//生成系统模块
File wsys = Tool.createPath(ajax, "wsys");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/action/ajax/wsys/")) {
freeMarkerManager.outputTemp(Tool.createFile(wsys, name), "SpringBoot/java/action/ajax/wsys/" + name, ctx);
}
File wsvr = Tool.createPath(ajax, "wsvr");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/action/ajax/wsvr/")) {
freeMarkerManager.outputTemp(Tool.createFile(wsvr, name), "SpringBoot/java/action/ajax/wsvr/" + name, ctx);
}
if (project.getFrame().value() == Frame.管理框架.value()) {//管理架构
File wsys = Tool.createPath(ajax, "wsys");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/action/ajax/wsys/")) {
freeMarkerManager.outputTemp(Tool.createFile(wsys, name), "SpringBoot/java/action/ajax/wsys/" + name, ctx);
}
}
}
@ -229,7 +181,7 @@ public class SpringBootCallable implements Callable {
}
}
if (project.getFrame().value() >= Frame.网页框架.value()) {//生成系统模块
if (project.getFrame().value() >= Frame.管理框架.value()) {//生成系统模块
File wsys = Tool.createPath(api, "wsys");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/action/api/wsys/")) {
@ -254,18 +206,12 @@ public class SpringBootCallable implements Callable {
ctx.put("author", project.getAuthor());
//config
if (project.getFrame().value() >= Frame.网页框架.value()) {
freeMarkerManager.outputTemp(Tool.createFile(root, "FreeMarkerConfig.java"), "SpringBoot/java/config/FreeMarkerConfig.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "WebMvcConfig.java"), "SpringBoot/java/config/WebMvcConfig.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "CacheConfig.java"), "SpringBoot/java/config/CacheConfig.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "SecurityConfig.java"), "SpringBoot/java/config/SecurityConfig.java", ctx);
}
if (project.getFrame().value() >= Frame.接口框架.value()) {
freeMarkerManager.outputTemp(Tool.createFile(root, "ActionConfig.java"), "SpringBoot/java/config/ActionConfig.java", ctx);
}
if (project.getFrame().value() >= Frame.服务框架.value()) {
freeMarkerManager.outputTemp(Tool.createFile(root, "TaskConfig.java"), "SpringBoot/java/config/TaskConfig.java", ctx);
}
freeMarkerManager.outputTemp(Tool.createFile(root, "FreeMarkerConfig.java"), "SpringBoot/java/config/FreeMarkerConfig.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "WebMvcConfig.java"), "SpringBoot/java/config/WebMvcConfig.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "CacheConfig.java"), "SpringBoot/java/config/CacheConfig.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "SecurityConfig.java"), "SpringBoot/java/config/SecurityConfig.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "ActionConfig.java"), "SpringBoot/java/config/ActionConfig.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "TaskConfig.java"), "SpringBoot/java/config/TaskConfig.java", ctx);
if (project.isNeedAsync()) {
freeMarkerManager.outputTemp(Tool.createFile(root, "ThreadPoolConfig.java"), "SpringBoot/java/config/ThreadPoolConfig.java", ctx);
}
@ -360,88 +306,7 @@ public class SpringBootCallable implements Callable {
}
}
public void generateModuleFor服务框架(File root, Project project) {
Module wsvrModule = tryGetModule(project, "wsvr");
if (wsvrModule == null || !wsvrModule.getNeedGenerate()) {// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("project", project);
ctx.put("domain", project.getDomain());
ctx.put("author", project.getAuthor());
ctx.put("dataBase", project.getDatabase().toString());
File ent = Tool.createPath(root, "wsvr", "ent");
File mpr = Tool.createPath(root, "wsvr", "mpr");
File mgr = Tool.createPath(root, "wsvr", "mgr");
File req = Tool.createPath(root, "wsvr", "req");
File rsp = Tool.createPath(root, "wsvr", "rsp");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsvr/ent/")) {
freeMarkerManager.outputTemp(Tool.createFile(ent, name), "SpringBoot/java/module/wsvr/ent/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsvr/mgr/")) {
freeMarkerManager.outputTemp(Tool.createFile(mgr, name), "SpringBoot/java/module/wsvr/mgr/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsvr/mpr/")) {
if (name.endsWith(".java")) {
freeMarkerManager.outputTemp(Tool.createFile(mpr, name), "SpringBoot/java/module/wsvr/mpr/" + name, ctx);
} else if (name.contains(project.getDatabase().name())) {
freeMarkerManager.outputTemp(Tool.createFile(mpr, name.replaceAll(project.getDatabase().name() + "_", "")), "SpringBoot/java/module/wsvr/mpr/" + name, ctx);
}
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsvr/req/")) {
freeMarkerManager.outputTemp(Tool.createFile(req, name), "SpringBoot/java/module/wsvr/req/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsvr/rsp/")) {
freeMarkerManager.outputTemp(Tool.createFile(rsp, name), "SpringBoot/java/module/wsvr/rsp/" + name, ctx);
}
}
}
public void generateModuleFor接口框架(File root, Project project) {
Module wsysModule = tryGetModule(project, "wsys");
if (wsysModule == null || !wsysModule.getNeedGenerate()) {// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("project", project);
ctx.put("domain", project.getDomain());
ctx.put("author", project.getAuthor());
ctx.put("dataBase", project.getDatabase().toString());
File ent = Tool.createPath(root, "wsys", "ent");
File mpr = Tool.createPath(root, "wsys", "mpr");
File mgr = Tool.createPath(root, "wsys", "mgr");
File req = Tool.createPath(root, "wsys", "req");
File rsp = Tool.createPath(root, "wsys", "rsp");
Pattern compile = Pattern.compile("Dict.*");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/ent/")) {
if (compile.matcher(name).find()) {
freeMarkerManager.outputTemp(Tool.createFile(ent, name), "SpringBoot/java/module/wsys/ent/" + name, ctx);
}
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/mgr/")) {
if (compile.matcher(name).find()) {
freeMarkerManager.outputTemp(Tool.createFile(mgr, name), "SpringBoot/java/module/wsys/mgr/" + name, ctx);
}
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/mpr/")) {
if (compile.matcher(name).find()) {
if (name.endsWith(".java")) {
freeMarkerManager.outputTemp(Tool.createFile(mpr, name), "SpringBoot/java/module/wsys/mpr/" + name, ctx);
} else if (name.contains(project.getDatabase().name())) {
freeMarkerManager.outputTemp(Tool.createFile(mpr, name.replaceAll(project.getDatabase().name() + "_", "")), "SpringBoot/java/module/wsys/mpr/" + name, ctx);
}
}
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/req/")) {
if (compile.matcher(name).find()) {
freeMarkerManager.outputTemp(Tool.createFile(req, name), "SpringBoot/java/module/wsys/req/" + name, ctx);
}
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/rsp/")) {
if (compile.matcher(name).find()) {
freeMarkerManager.outputTemp(Tool.createFile(rsp, name), "SpringBoot/java/module/wsys/rsp/" + name, ctx);
}
}
}
}
public void generateModuleFor网页框架(File root, Project project) {
public void generateModuleForSys(File root, Project project) {
Module wsysModule = tryGetModule(project, "wsys");
if (wsysModule == null || !wsysModule.getNeedGenerate()) {// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
HashMap<String, Object> ctx = new HashMap<String, Object>();
@ -461,9 +326,6 @@ public class SpringBootCallable implements Callable {
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/mgr/")) {
if (name.contains("TokensManager") && project.getFrame().value() < Frame.接口框架.value()) {// 当不需要Web和Api时不需要处理Token问题
continue;
}
freeMarkerManager.outputTemp(Tool.createFile(mgr, name), "SpringBoot/java/module/wsys/mgr/" + name, ctx);
}
@ -538,44 +400,41 @@ public class SpringBootCallable implements Callable {
}
//excel
if (project.getFrame().value() >= Frame.网页框架.value()) {
File excel = Tool.createPath(root, "excel");
File excelannotation = Tool.createPath(excel, "annotation");
File excelconverter = Tool.createPath(excel, "converter");
File exception = Tool.createPath(excel, "exception");
File excelhandler = Tool.createPath(excel, "handler");
File excellistener = Tool.createPath(excel, "listener");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/")) {
freeMarkerManager.outputTemp(Tool.createFile(excel, name), "SpringBoot/java/frame/excel/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/annotation/")) {
freeMarkerManager.outputTemp(Tool.createFile(excelannotation, name), "SpringBoot/java/frame/excel/annotation/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/converter/")) {
freeMarkerManager.outputTemp(Tool.createFile(excelconverter, name), "SpringBoot/java/frame/excel/converter/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/exception/")) {
freeMarkerManager.outputTemp(Tool.createFile(exception, name), "SpringBoot/java/frame/excel/exception/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/handler/")) {
freeMarkerManager.outputTemp(Tool.createFile(excelhandler, name), "SpringBoot/java/frame/excel/handler/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/listener/")) {
freeMarkerManager.outputTemp(Tool.createFile(excellistener, name), "SpringBoot/java/frame/excel/listener/" + name, ctx);
}
File excel = Tool.createPath(root, "excel");
File excelannotation = Tool.createPath(excel, "annotation");
File excelconverter = Tool.createPath(excel, "converter");
File exception = Tool.createPath(excel, "exception");
File excelhandler = Tool.createPath(excel, "handler");
File excellistener = Tool.createPath(excel, "listener");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/")) {
freeMarkerManager.outputTemp(Tool.createFile(excel, name), "SpringBoot/java/frame/excel/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/annotation/")) {
freeMarkerManager.outputTemp(Tool.createFile(excelannotation, name), "SpringBoot/java/frame/excel/annotation/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/converter/")) {
freeMarkerManager.outputTemp(Tool.createFile(excelconverter, name), "SpringBoot/java/frame/excel/converter/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/exception/")) {
freeMarkerManager.outputTemp(Tool.createFile(exception, name), "SpringBoot/java/frame/excel/exception/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/handler/")) {
freeMarkerManager.outputTemp(Tool.createFile(excelhandler, name), "SpringBoot/java/frame/excel/handler/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/listener/")) {
freeMarkerManager.outputTemp(Tool.createFile(excellistener, name), "SpringBoot/java/frame/excel/listener/" + name, ctx);
}
//validation
if (project.getFrame().value() >= Frame.接口框架.value()) {
File validation = Tool.createPath(root, "validation");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/validation/")) {
freeMarkerManager.outputTemp(Tool.createFile(validation, name), "SpringBoot/java/frame/validation/" + name, ctx);
}
File validation = Tool.createPath(root, "validation");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/validation/")) {
freeMarkerManager.outputTemp(Tool.createFile(validation, name), "SpringBoot/java/frame/validation/" + name, ctx);
}
}
/**
* 生成frame类
* 生成Task类
*
* @param root
* @param project
@ -592,7 +451,7 @@ public class SpringBootCallable implements Callable {
//task
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/task/")) {
if (name.contains("TokenTask") && project.getFrame().value() < Frame.网页框架.value()) {
if (name.contains("TokenTask") && project.getFrame().value() == Frame.无.value()) {
continue;
}
freeMarkerManager.outputTemp(Tool.createFile(root, name), "SpringBoot/java/task/" + name, ctx);
@ -630,175 +489,172 @@ public class SpringBootCallable implements Callable {
freeMarkerManager.outputTemp(Tool.createFile(root, "application.properties"), "SpringBoot/resources/application.ftl", ctx);
if (project.getFrame().value() > Frame.空白框架.value()) {
freeMarkerManager.outputTemp(Tool.createFile(root, "start-dev.bat"), "SpringBoot/resources/start-dev.bat", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "start-prod.bat"), "SpringBoot/resources/start-prod.bat", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "application-dev.properties"), "SpringBoot/resources/application-dev.ftl", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "application-prod.properties"), "SpringBoot/resources/application-prod.ftl", ctx);
Tool.outputResource("SpringBoot/resources/logback-spring-dev.xml", Tool.createFile(root, "logback-spring-dev.xml"));
Tool.outputResource("SpringBoot/resources/logback-spring-prod.xml", Tool.createFile(root, "logback-spring-prod.xml"));
freeMarkerManager.outputTemp(Tool.createFile(root, "start-dev.bat"), "SpringBoot/resources/start-dev.bat", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "start-prod.bat"), "SpringBoot/resources/start-prod.bat", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "application-dev.properties"), "SpringBoot/resources/application-dev.ftl", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "application-prod.properties"), "SpringBoot/resources/application-prod.ftl", ctx);
Tool.outputResource("SpringBoot/resources/logback-spring-dev.xml", Tool.createFile(root, "logback-spring-dev.xml"));
Tool.outputResource("SpringBoot/resources/logback-spring-prod.xml", Tool.createFile(root, "logback-spring-prod.xml"));
File dbtool = Tool.createPath(root, "dbtool");
{
XmlManager xmlManager = ManagerFactory.getXmlManager();
xmlManager.saveAs(dbtool, project);
}
File dbtool = Tool.createPath(root, "dbtool");
{
XmlManager xmlManager = ManagerFactory.getXmlManager();
xmlManager.saveAs(dbtool, project);
}
for (Module module : project.getModules()) {
if (module.getNeedGenerate()) {
ctx.put("moduleName", module.getModuleName());
ctx.put("module", module);
File tableDir = Tool.createPath(dbtool, module.getModuleName() + "_table");
for (Table table : module.getTables()) {
ctx.put("table", table);
freeMarkerManager.outputTemp(Tool.createFile(tableDir, project.getDatabase().name() + "_" + table.getTableName() + ".sql"), "SpringBoot/resources/dbtool/table.ftl", ctx);
}
freeMarkerManager.outputTemp(Tool.createFile(tableDir, project.getDatabase().name() + "_ALL_TABLE" + ".sql"), "SpringBoot/resources/dbtool/tableAll.ftl", ctx);
for (Module module : project.getModules()) {
if (module.getNeedGenerate()) {
ctx.put("moduleName", module.getModuleName());
ctx.put("module", module);
File tableDir = Tool.createPath(dbtool, module.getModuleName() + "_table");
for (Table table : module.getTables()) {
ctx.put("table", table);
freeMarkerManager.outputTemp(Tool.createFile(tableDir, project.getDatabase().name() + "_" + table.getTableName() + ".sql"), "SpringBoot/resources/dbtool/table.ftl", ctx);
}
freeMarkerManager.outputTemp(Tool.createFile(tableDir, project.getDatabase().name() + "_ALL_TABLE" + ".sql"), "SpringBoot/resources/dbtool/tableAll.ftl", ctx);
}
}
if (project.getFrame().value() >= Frame.服务框架.value()) {
Module wsvrModule = tryGetModule(project, "wsvr");
if (wsvrModule == null || !wsvrModule.getNeedGenerate()) {// 覆盖
File wsvr = Tool.createPath(dbtool, "wsvr_table");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/dbtool/wsvr_table/")) {
if (name.contains(project.getDatabase().name())) {
freeMarkerManager.outputTemp(Tool.createFile(wsvr, name), "SpringBoot/resources/dbtool/wsvr_table/" + name, ctx);
}
}
}
}
File lib = Tool.createPath(root, "lib");
if (project.getFrame().value() >= Frame.网页框架.value()) {//生成系统模块
Module wsysModule = tryGetModule(project, "wsys");
if (wsysModule == null || !wsysModule.getNeedGenerate()) {// 覆盖
File wsys = Tool.createPath(dbtool, "wsys_table");
if (project.getFrame().value() == Frame.管理框架.value()) {
Module wsysModule = tryGetModule(project, "wsys");
if (wsysModule == null || !wsysModule.getNeedGenerate()) {// 覆盖
File wsys = Tool.createPath(dbtool, "wsys_table");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/dbtool/wsys_table/")) {
if (name.contains(project.getDatabase().name())) {
freeMarkerManager.outputTemp(Tool.createFile(wsys, name), "SpringBoot/resources/dbtool/wsys_table/" + name, ctx);
}
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/dbtool/wsys_table/")) {
if (name.contains(project.getDatabase().name())) {
freeMarkerManager.outputTemp(Tool.createFile(wsys, name), "SpringBoot/resources/dbtool/wsys_table/" + name, ctx);
}
}
}
}
// if (DataBase.Oracle.name().equals(project.getDatabase().name())) {
// File lib = Tool.createPath(root, "lib");
// Tool.outputResource("SpringBoot/resources/lib/ojdbc7-12.1.0.2.jar", Tool.createFile(lib, "ojdbc7-12.1.0.2.jar"));
// }
if (DataBase.SQLite.name().equals(project.getDatabase().name())) {
File dbFile = Tool.createFile(root, project.getName() + ".db3");
Connection connection = null;
Statement statement = null;
try {
Class.forName("org.sqlite.JDBC");
connection = DriverManager.getConnection("jdbc:sqlite:" + dbFile);
for (File fileModule : dbtool.listFiles()) {
if (!fileModule.isDirectory()) {
continue;
}
for (File file : fileModule.listFiles()) {
if (file.getName().startsWith("SQLite_") && !file.getName().startsWith("SQLite_ALL_") && file.getName().endsWith(".sql")) {
statement = connection.createStatement();
String sql = FileUtil.readFileToString(file);
statement.execute(sql);
statement.close();
}
if (DataBase.SQLite.name().equals(project.getDatabase().name())) {
File dbFile = Tool.createFile(root, project.getName() + ".db3");
Connection connection = null;
Statement statement = null;
try {
Class.forName("org.sqlite.JDBC");
connection = DriverManager.getConnection("jdbc:sqlite:" + dbFile);
for (File fileModule : dbtool.listFiles()) {
if (!fileModule.isDirectory()) {
continue;
}
for (File file : fileModule.listFiles()) {
if (file.getName().startsWith("SQLite_") && !file.getName().startsWith("SQLite_ALL_") && file.getName().endsWith(".sql")) {
statement = connection.createStatement();
String sql = FileUtil.readFileToString(file);
statement.execute(sql);
statement.close();
}
}
} catch (ClassNotFoundException | SQLException | IOException e) {
e.printStackTrace();
} finally {
try {
if (statement != null) statement.close();
if (connection != null) connection.close();
} catch (Exception e) {
}
} catch (ClassNotFoundException | SQLException | IOException e) {
e.printStackTrace();
} finally {
try {
if (statement != null) statement.close();
if (connection != null) connection.close();
} catch (Exception e) {
}
}
}
}
if (project.getFrame().value() >= Frame.网页框架.value()) {
System.out.println("生成模块:Static");
File static_ = Tool.createPath(root, "static");
File css = Tool.createPath(static_, "css");
File img = Tool.createPath(static_, "img");
File dist = Tool.createPath(static_, "dist");
Tool.outputResource("SpringBoot/resources/static/favicon.ico", Tool.createFile(static_, "favicon.ico"));
//css文件
freeMarkerManager.outputTemp(Tool.createFile(css, "base.css"), "SpringBoot/resources/static/css/base.css", ctx);
//img
Tool.outputResource("SpringBoot/resources/static/img/logo.png", Tool.createFile(img, "logo.png"));
// dist文件jquery + vue + vue-router + axios
Tool.outputResource("SpringBoot/resources/static/dist/lib.min.js", Tool.createFile(dist, "lib.min.js"));
//element-ui
Tool.outputResource("SpringBoot/resources/static/dist/index.min.js", Tool.createFile(dist, "index.min.js"));
Tool.outputResource("SpringBoot/resources/static/dist/index.min.css", Tool.createFile(dist, "index.min.css"));
File fonts = Tool.createPath(dist, "fonts");
Tool.outputResource("SpringBoot/resources/static/dist/fonts/w-e-icon.woff", Tool.createFile(fonts, "w-e-icon.woff"));
Tool.outputResource("SpringBoot/resources/static/dist/fonts/element-icons.woff", Tool.createFile(fonts, "element-icons.woff"));
Tool.outputResource("SpringBoot/resources/static/dist/fonts/element-icons.ttf", Tool.createFile(fonts, "element-icons.ttf"));
System.out.println("生成模块:Templates");
File templates = Tool.createPath(root, "templates");
File control = Tool.createPath(templates, "control");
File layout = Tool.createPath(templates, "layout");
File screen = Tool.createPath(templates, "screen");
Tool.outputResource("SpringBoot/resources/templates/control/nav.ftl", Tool.createFile(control, "nav.ftl"));
Tool.outputResource("SpringBoot/resources/templates/control/macro.ftl", Tool.createFile(control, "macro.ftl"));
Tool.outputResource("SpringBoot/resources/templates/layout/default.ftl", Tool.createFile(layout, "default.ftl"));
Tool.outputResource("SpringBoot/resources/templates/screen/home.ftl", Tool.createFile(screen, "home.ftl"));
Tool.outputResource("SpringBoot/resources/templates/screen/login.ftl", Tool.createFile(screen, "login.ftl"));
Tool.outputResource("SpringBoot/resources/templates/403.ftl", Tool.createFile(templates, "403.ftl"));
Tool.outputResource("SpringBoot/resources/templates/404.ftl", Tool.createFile(templates, "404.ftl"));
Tool.outputResource("SpringBoot/resources/templates/500.ftl", Tool.createFile(templates, "500.ftl"));
freeMarkerManager.outputTemp(Tool.createFile(screen, "index.ftl"), "SpringBoot/resources/templates/screen/index.ftl", ctx);
for (Module mo : project.getModules()) {
for (Table table : mo.getTables()) {
if (table.getHtml()) {
File module = Tool.createPath(screen, mo.getModuleName());
ctx.put("table", table);
ctx.put("module", module);
ctx.put("fields", table.getFields());
File file = Tool.createFile(module, table.getFName() + ".ftl");
freeMarkerManager.outputTemp(file, "SpringBoot/resources/templates/screen/module/mgr.ftl", ctx);
}
{
System.out.println("生成模块:Static");
File static_ = Tool.createPath(root, "static");
File css = Tool.createPath(static_, "css");
File img = Tool.createPath(static_, "img");
File dist = Tool.createPath(static_, "dist");
Tool.outputResource("SpringBoot/resources/static/favicon.ico", Tool.createFile(static_, "favicon.ico"));
//css文件
freeMarkerManager.outputTemp(Tool.createFile(css, "base.css"), "SpringBoot/resources/static/css/base.css", ctx);
//img
Tool.outputResource("SpringBoot/resources/static/img/logo.png", Tool.createFile(img, "logo.png"));
// dist文件jquery + vue + vue-router + axios
Tool.outputResource("SpringBoot/resources/static/dist/lib.min.js", Tool.createFile(dist, "lib.min.js"));
//element-ui
Tool.outputResource("SpringBoot/resources/static/dist/index.min.js", Tool.createFile(dist, "index.min.js"));
Tool.outputResource("SpringBoot/resources/static/dist/index.min.css", Tool.createFile(dist, "index.min.css"));
File fonts = Tool.createPath(dist, "fonts");
Tool.outputResource("SpringBoot/resources/static/dist/fonts/w-e-icon.woff", Tool.createFile(fonts, "w-e-icon.woff"));
Tool.outputResource("SpringBoot/resources/static/dist/fonts/element-icons.woff", Tool.createFile(fonts, "element-icons.woff"));
Tool.outputResource("SpringBoot/resources/static/dist/fonts/element-icons.ttf", Tool.createFile(fonts, "element-icons.ttf"));
System.out.println("生成模块:Templates");
File templates = Tool.createPath(root, "templates");
File control = Tool.createPath(templates, "control");
File layout = Tool.createPath(templates, "layout");
File screen = Tool.createPath(templates, "screen");
Tool.outputResource("SpringBoot/resources/templates/control/nav.ftl", Tool.createFile(control, "nav.ftl"));
Tool.outputResource("SpringBoot/resources/templates/control/macro.ftl", Tool.createFile(control, "macro.ftl"));
Tool.outputResource("SpringBoot/resources/templates/layout/default.ftl", Tool.createFile(layout, "default.ftl"));
Tool.outputResource("SpringBoot/resources/templates/screen/home.ftl", Tool.createFile(screen, "home.ftl"));
Tool.outputResource("SpringBoot/resources/templates/screen/login.ftl", Tool.createFile(screen, "login.ftl"));
Tool.outputResource("SpringBoot/resources/templates/403.ftl", Tool.createFile(templates, "403.ftl"));
Tool.outputResource("SpringBoot/resources/templates/404.ftl", Tool.createFile(templates, "404.ftl"));
Tool.outputResource("SpringBoot/resources/templates/500.ftl", Tool.createFile(templates, "500.ftl"));
freeMarkerManager.outputTemp(Tool.createFile(screen, "index.ftl"), "SpringBoot/resources/templates/screen/index.ftl", ctx);
for (Module mo : project.getModules()) {
for (Table table : mo.getTables()) {
if (table.getHtml()) {
File module = Tool.createPath(screen, mo.getModuleName());
ctx.put("table", table);
ctx.put("module", module);
ctx.put("fields", table.getFields());
File file = Tool.createFile(module, table.getFName() + ".ftl");
freeMarkerManager.outputTemp(file, "SpringBoot/resources/templates/screen/module/mgr.ftl", ctx);
}
}
}
//生成网页
if (project.getFrame().value() >= Frame.网页框架.value()) {
Module wsysModule = tryGetModule(project, "wsys");// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
if (wsysModule == null || !wsysModule.getNeedGenerate()) {
File wsys = Tool.createPath(screen, "wsys");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/templates/screen/module/wsys/")) {
Tool.outputResource("SpringBoot/resources/templates/screen/module/wsys/" + name, Tool.createFile(wsys, name));
}
//生成网页
if (project.getFrame().value() == Frame.管理框架.value()) {
Module wsysModule = tryGetModule(project, "wsys");// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
if (wsysModule == null || !wsysModule.getNeedGenerate()) {
File wsys = Tool.createPath(screen, "wsys");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/templates/screen/module/wsys/")) {
Tool.outputResource("SpringBoot/resources/templates/screen/module/wsys/" + name, Tool.createFile(wsys, name));
}
}
Module wsvrModule = tryGetModule(project, "wsvr");// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
if (wsvrModule == null || !wsvrModule.getNeedGenerate()) {
File wsvr = Tool.createPath(screen, "wsvr");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/templates/screen/module/wsvr/")) {
Tool.outputResource("SpringBoot/resources/templates/screen/module/wsvr/" + name, Tool.createFile(wsvr, name));
}
Module wsvrModule = tryGetModule(project, "wsvr");// 防止与系统冲突，一般不会重复，通常是架构重新设计时遇到
if (wsvrModule == null || !wsvrModule.getNeedGenerate()) {
File wsvr = Tool.createPath(screen, "wsvr");
for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/templates/screen/module/wsvr/")) {
Tool.outputResource("SpringBoot/resources/templates/screen/module/wsvr/" + name, Tool.createFile(wsvr, name));
}
}
}
}
}
/**
* 生成Resources_template
*
* @param root
* @param project
*/
public void generateResources_template(File root, Project project) {
}
public void generateTestResources(File root, Project project) {
HashMap<String, Object> ctx = new HashMap<String, Object>();
@ -831,6 +687,7 @@ public class SpringBootCallable implements Callable {
ctx.put("author", project.getAuthor());
File file = Tool.createFile(root, "UtilTest" + ".java");
freeMarkerManager.outputTemp(file, "SpringBoot/test/UtilTest.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(root, "ExcelTest.java"), "SpringBoot/test/ExcelTest.java", ctx);
}
for (Module md : project.getModules()) {
@ -852,61 +709,20 @@ public class SpringBootCallable implements Callable {
}
}
if (project.getFrame().value() >= Frame.服务框架.value()) {
HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("domain", project.getDomain());
ctx.put("moduleName", project.getName());
ctx.put("author", project.getAuthor());
File wsvr = Tool.createPath(root, "wsvr");
for (String apiFile : ResourceUtil.getResourceFiles("/modules/SpringBoot/test/wsvr/")) {
freeMarkerManager.outputTemp(Tool.createFile(wsvr, apiFile), "SpringBoot/test/wsvr/" + apiFile, ctx);
}
}
if (project.getFrame().value() >= Frame.接口框架.value()) {
HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("domain", project.getDomain());
ctx.put("moduleName", project.getName());
ctx.put("author", project.getAuthor());
File wsys = Tool.createPath(root, "wsys");
for (String apiFile : ResourceUtil.getResourceFiles("/modules/SpringBoot/test/wsys/")) {
if (apiFile.contains("Dict")) {
freeMarkerManager.outputTemp(Tool.createFile(wsys, apiFile), "SpringBoot/test/wsys/" + apiFile, ctx);
}
}
}
if (project.getFrame().value() >= Frame.网页框架.value()) {
if (project.getFrame().value() == Frame.管理框架.value()) {
HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("domain", project.getDomain());
ctx.put("moduleName", project.getName());
ctx.put("author", project.getAuthor());
ctx.put("project", project);
File wsys = Tool.createPath(root, "wsys");
for (String apiFile : ResourceUtil.getResourceFiles("/modules/SpringBoot/test/wsys/")) {
if (apiFile.contains("TokensTest") && project.getFrame().value() < Frame.接口框架.value()) {
continue;
}
freeMarkerManager.outputTemp(Tool.createFile(wsys, apiFile), "SpringBoot/test/wsys/" + apiFile, ctx);
}
}
if (project.getFrame().value() >= Frame.接口框架.value()) {//数据初始化
HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("project", project);
ctx.put("domain", project.getDomain());
freeMarkerManager.outputTemp(Tool.createFile(root, "DataInit.java"), "SpringBoot/test/DataInit.java", ctx);
}
if (project.getFrame().value() >= Frame.网页框架.value()) {//数据初始化
HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("domain", project.getDomain());
freeMarkerManager.outputTemp(Tool.createFile(root, "ExcelTest.java"), "SpringBoot/test/ExcelTest.java", ctx);
}
}
private Module tryGetModule(Project project, String moduleName) {

6
src/main/java/xyz/wbsite/dbtool/javafx/po/Frame.java
Unescape View File

@ -3,10 +3,8 @@ package xyz.wbsite.dbtool.javafx.po;
public enum Frame {
空白框架(0),
服务框架(1),//内部任务
接口框架(2),//对外提供Http服务
网页框架(3);//对外提供Http服务和Web
无(0),
管理框架(1);//内部任务
Frame(int value) {
this.value = value;

2
src/main/java/xyz/wbsite/dbtool/javafx/po/Project.java
Unescape View File

@ -12,7 +12,7 @@ public class Project extends TreeItem {
this.name = "example-web";
this.domain = "com.example";
this.author = "author";
this.frame = Frame.网页框架;
this.frame = Frame.管理框架;
this.database = DataBase.MySQL;
this.needEMail = false;
this.needCloud = false;

8
src/main/resources/fxml/DetailProject.fxml
Unescape View File

@ -53,21 +53,19 @@
<!-- ROW -->
<Label GridPane.rowIndex="2" GridPane.columnIndex="0" text="*" alignment="CENTER" textAlignment="CENTER"
textFill="RED" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
<Label GridPane.rowIndex="2" GridPane.columnIndex="1" text="数据库类" GridPane.halignment="CENTER"
<Label GridPane.rowIndex="2" GridPane.columnIndex="1" text="基础框架" GridPane.halignment="CENTER"
GridPane.valignment="CENTER"/>
<HBox GridPane.rowIndex="2" GridPane.columnIndex="2" GridPane.columnSpan="4" alignment="CENTER_LEFT"
GridPane.halignment="CENTER"
GridPane.valignment="CENTER">
<children>
<RadioButton mnemonicParsing="false" text="空白框架" selected="true">
<RadioButton mnemonicParsing="false" text="无" selected="true">
<toggleGroup>
<ToggleGroup fx:id="frame"/>
</toggleGroup>
</RadioButton>
<RadioButton mnemonicParsing="false" text="服务框架" toggleGroup="$frame"/>
<RadioButton mnemonicParsing="false" text="接口框架" toggleGroup="$frame"/>
<RadioButton mnemonicParsing="false" text="网页框架" toggleGroup="$frame"/>
<RadioButton mnemonicParsing="false" text="管理框架" toggleGroup="$frame"/>
</children>
</HBox>

8
src/main/resources/modules/SpringBoot/java/Application.ftl
Unescape View File

@ -5,15 +5,13 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
<#if project.frameValue() &gt; 0>
import ${domain}.frame.auth.LocalData;
<#if project.needMoreDB>
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
</#if>
</#if>
@SpringBootApplication
<#if project.frameValue() &gt; 0 && project.needMoreDB>
<#if project.needMoreDB>
@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
<#else>
@EnableAutoConfiguration
@ -26,10 +24,6 @@ public class Application extends SpringBootServletInitializer {
}
public static void main(String[] args) {
<#if project.frameValue() &gt; 0>
LocalData.setApplicationContext(SpringApplication.run(Application.class, args));
<#else>
SpringApplication.run(Application.class, args);
</#if>
}
}

15
src/main/resources/modules/SpringBoot/java/action/GlobalController.java
Unescape View File

@ -35,7 +35,7 @@ import ${domain}.frame.utils.MD5Util;
import ${domain}.frame.utils.MapperUtil;
import ${domain}.frame.utils.RequestUtil;
import ${domain}.frame.utils.StringUtil;
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
import ${domain}.module.wsys.mgr.TokensManager;
import ${domain}.module.wsys.req.TokensBuildRequest;
import ${domain}.module.wsys.rsp.TokensBuildResponse;
@ -55,11 +55,9 @@ import java.util.regex.Pattern;
/**
* 全局请求Controller，如果无特殊请求，则不需再增加其他Controller
<#if project.frameValue() &gt;= 3>
* 全局htm后缀入口{@link GlobalController#action(Model, HttpServletRequest, HttpServletResponse)}
* 全局ajax入口{@link GlobalController#ajax(String, String, String, HttpServletRequest, HttpServletResponse, String, MultipartFile)}
* 全局消息订阅{@link GlobalController#sse(String)}
</#if>
* 全局异常捕捉{@link GlobalController#exceptionHandler(HttpServletRequest, HttpServletResponse, Model, Exception)}
* <p>
* 说明Request命名规则，驼峰式命名
@ -72,7 +70,7 @@ import java.util.regex.Pattern;
@Controller
@ControllerAdvice
public class GlobalController implements ErrorController {
<#if project.frameValue() &gt;= 3>
@Value("${r'${server.servlet.context-path}'}")
private String context;
@Value("${r'${web.url.index}'}")
@ -81,7 +79,6 @@ public class GlobalController implements ErrorController {
private String loginPage;
@Autowired
private FreeMarkerViewResolver viewResolver;
</#if>
/**
* 全局异常捕捉
@ -118,7 +115,6 @@ public class GlobalController implements ErrorController {
public String getErrorPath() {
return ERROR_PATH;
}
<#if project.frameValue() &gt;= 3>
@RequestMapping(value = ERROR_PATH)
public String error(HttpServletRequest request, HttpServletResponse response) {
@ -314,8 +310,6 @@ public class GlobalController implements ErrorController {
return baseResponse;
}
}
</#if>
<#if project.frameValue() &gt;= 2>
@RequestMapping(path = "/api/{module}/{target}/{method}", method = RequestMethod.POST)
@ResponseBody
@ -366,7 +360,7 @@ public class GlobalController implements ErrorController {
return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
}
<#-- 当项目框架只为接口时，无资源维护管理页，则认为是一对一应用接口，不做权限验证 -->
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
// 权限验证
if (StringUtil.isNotEmpty(token)) {
@ -440,8 +434,6 @@ public class GlobalController implements ErrorController {
}
return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
}
</#if>
<#if project.frameValue() &gt;= 3>
private static ConcurrentHashMap<String, SseEmitter> sseMap = new ConcurrentHashMap();
@ -474,5 +466,4 @@ public class GlobalController implements ErrorController {
}
}
}
</#if>
}

22
src/main/resources/modules/SpringBoot/java/action/ajax/wsvr/LogerrAjax.java → src/main/resources/modules/SpringBoot/java/action/ajax/wsys/LogerrAjax.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.action.ajax.wsvr;
package ${domain}.action.ajax.wsys;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile;
@ -11,16 +11,16 @@ import ${domain}.frame.utils.LogUtil;
import ${domain}.frame.utils.MapperUtil;
import ${domain}.frame.utils.ResponseUtil;
import ${domain}.frame.utils.ValidationUtil;
import ${domain}.module.wsvr.ent.Logerr;
import ${domain}.module.wsvr.mgr.LogerrManager;
import ${domain}.module.wsvr.req.LogerrCreateRequest;
import ${domain}.module.wsvr.req.LogerrDeleteRequest;
import ${domain}.module.wsvr.req.LogerrFindRequest;
import ${domain}.module.wsvr.req.LogerrUpdateRequest;
import ${domain}.module.wsvr.rsp.LogerrCreateResponse;
import ${domain}.module.wsvr.rsp.LogerrDeleteResponse;
import ${domain}.module.wsvr.rsp.LogerrFindResponse;
import ${domain}.module.wsvr.rsp.LogerrUpdateResponse;
import ${domain}.module.wsys.ent.Logerr;
import ${domain}.module.wsys.mgr.LogerrManager;
import ${domain}.module.wsys.req.LogerrCreateRequest;
import ${domain}.module.wsys.req.LogerrDeleteRequest;
import ${domain}.module.wsys.req.LogerrFindRequest;
import ${domain}.module.wsys.req.LogerrUpdateRequest;
import ${domain}.module.wsys.rsp.LogerrCreateResponse;
import ${domain}.module.wsys.rsp.LogerrDeleteResponse;
import ${domain}.module.wsys.rsp.LogerrFindResponse;
import ${domain}.module.wsys.rsp.LogerrUpdateResponse;
import java.io.IOException;
import java.util.List;

22
src/main/resources/modules/SpringBoot/java/action/ajax/wsvr/ProfilesAjax.java → src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ProfilesAjax.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.action.ajax.wsvr;
package ${domain}.action.ajax.wsys;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile;
@ -11,16 +11,16 @@ import ${domain}.frame.base.BaseResponse;
import ${domain}.frame.utils.ResponseUtil;
import ${domain}.frame.utils.ValidationUtil;
import ${domain}.frame.excel.exception.TemplateNotMatchException;
import ${domain}.module.wsvr.ent.Profiles;
import ${domain}.module.wsvr.mgr.ProfilesManager;
import ${domain}.module.wsvr.req.ProfilesCreateRequest;
import ${domain}.module.wsvr.req.ProfilesDeleteRequest;
import ${domain}.module.wsvr.req.ProfilesFindRequest;
import ${domain}.module.wsvr.req.ProfilesUpdateRequest;
import ${domain}.module.wsvr.rsp.ProfilesCreateResponse;
import ${domain}.module.wsvr.rsp.ProfilesDeleteResponse;
import ${domain}.module.wsvr.rsp.ProfilesFindResponse;
import ${domain}.module.wsvr.rsp.ProfilesUpdateResponse;
import ${domain}.module.wsys.ent.Profiles;
import ${domain}.module.wsys.mgr.ProfilesManager;
import ${domain}.module.wsys.req.ProfilesCreateRequest;
import ${domain}.module.wsys.req.ProfilesDeleteRequest;
import ${domain}.module.wsys.req.ProfilesFindRequest;
import ${domain}.module.wsys.req.ProfilesUpdateRequest;
import ${domain}.module.wsys.rsp.ProfilesCreateResponse;
import ${domain}.module.wsys.rsp.ProfilesDeleteResponse;
import ${domain}.module.wsys.rsp.ProfilesFindResponse;
import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
import java.io.IOException;
import java.util.List;

6
src/main/resources/modules/SpringBoot/java/config/TaskConfig.java
Unescape View File

@ -4,7 +4,7 @@ import ${domain}.frame.auth.LocalData;
import ${domain}.frame.schedule.RunTask;
import ${domain}.frame.schedule.Scheduler;
import ${domain}.frame.utils.LogUtil;
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
import ${domain}.module.wsys.ent.TaskSql;
import ${domain}.module.wsys.mgr.TaskSqlManager;
import ${domain}.module.wsys.req.TaskSqlFindRequest;
@ -29,7 +29,7 @@ public class TaskConfig {
@Autowired
private Scheduler scheduler;
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
@Autowired
private TaskSqlManager taskSqlManager;
</#if>
@ -69,7 +69,7 @@ public class TaskConfig {
classPathBeanDefinitionScanner.scan(matcher.group(1));
}
}
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
{// 实例化SQL任务
TaskSqlFindRequest taskSqlFindRequest = new TaskSqlFindRequest();

6
src/main/resources/modules/SpringBoot/java/frame/auth/Token.java
Unescape View File

@ -1,7 +1,7 @@
package ${domain}.frame.auth;
import ${domain}.frame.utils.IDgenerator;
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
import ${domain}.module.wsys.ent.Res;
import ${domain}.module.wsys.mgr.ResManager;
import ${domain}.module.wsys.req.ResCreateRequest;
@ -43,7 +43,7 @@ public class Token implements Serializable {
private Set<String> resSet = new HashSet<>();
public boolean hasRes(String res) {
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
{// todo 开发初期收集资源，后期删除
String active = LocalData.getActive();
if (active.contains("dev")) {//测试环境捕获资源
@ -83,7 +83,7 @@ public class Token implements Serializable {
public void putRes(Set<String> resourceSet) {
this.resSet.addAll(resourceSet);
}
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
public void putRes(List<Res> resList) {
if (resList == null) return;

16
src/main/resources/modules/SpringBoot/java/frame/base/BaseEntity.java
Unescape View File

@ -1,8 +1,6 @@
package ${domain}.frame.base;
<#if project.frameValue() &gt; 2>
import com.alibaba.excel.annotation.ExcelIgnore;
</#if>
import com.fasterxml.jackson.annotation.JsonIgnore;
import java.io.Serializable;
@ -20,61 +18,47 @@ public class BaseEntity implements Serializable {
/**
* 主键
*/
<#if project.frameValue() &gt; 2>
@ExcelIgnore
</#if>
private long id;
/**
* 行版本
*/
<#if project.frameValue() &gt; 2>
@ExcelIgnore
</#if>
private long rowVersion;
/**
* 创建用户
*/
@JsonIgnore
<#if project.frameValue() &gt; 2>
@ExcelIgnore
</#if>
private long createBy;
/**
* 创建时间
*/
<#if project.frameValue() &gt; 2>
@ExcelIgnore
</#if>
private Date createTime;
/**
* 最后更新用户
*/
@JsonIgnore
<#if project.frameValue() &gt; 2>
@ExcelIgnore
</#if>
private long lastUpdateBy;
/**
* 最后更新时间
*/
@JsonIgnore
<#if project.frameValue() &gt; 2>
@ExcelIgnore
</#if>
private Date lastUpdateTime;
/**
* 是否删除
*/
@JsonIgnore
<#if project.frameValue() &gt; 2>
@ExcelIgnore
</#if>
private boolean isDeleted;
public long getRowVersion() {

10
src/main/resources/modules/SpringBoot/java/frame/schedule/Scheduler.java
Unescape View File

@ -2,7 +2,11 @@ package ${domain}.frame.schedule;
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.util.ErrorHandler;
import ${domain}.frame.utils.LogUtil;
import xyz.wbsite.frame.utils.LogUtil;
<#if project.frameValue() = 1>
import xyz.wbsite.frame.auth.LocalData;
import xyz.wbsite.module.wsys.mgr.LogerrManager;
</#if>
import java.util.ArrayList;
import java.util.HashMap;
@ -76,14 +80,14 @@ public class Scheduler extends ThreadPoolTaskScheduler implements ErrorHandler {
public void handleError(Throwable throwable) {
LogUtil.dumpException(throwable);
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
String message = throwable.getMessage();
Pattern compile = Pattern.compile("(\\[.*])执行异常！任务ID(\\(.*\\))");
Matcher matcher = compile.matcher(message);
if (matcher.find()) {
String taskName = matcher.group(1);
String taskId = matcher.group(2);
xyz.wbsite.module.wsvr.mgr.LogerrManager logerrManager = xyz.wbsite.frame.auth.LocalData.getBean(xyz.wbsite.module.wsvr.mgr.LogerrManager.class);
LogerrManager logerrManager = LocalData.getBean(LogerrManager.class);
if (logerrManager != null)
logerrManager.addErr("任务错误", "任务" + taskName + "执行错误", "任务" + taskName + "执行错误" + "，任务ID" + taskId);
}

2
src/main/resources/modules/SpringBoot/java/frame/utils/ResponseUtil.java
Unescape View File

@ -34,10 +34,8 @@ public class ResponseUtil {
return null;
}
}
<#if project.frameValue() &gt;= 3>
public static ResponseEntity<byte[]> apply(${domain}.frame.excel.WExcel sheet) {
return apply(sheet.getBytes(), sheet.getName() + ".xlsx");
}
</#if>
}

12
src/main/resources/modules/SpringBoot/java/module/wsys/ent/Dict.java
Unescape View File

@ -1,11 +1,9 @@
package ${domain}.module.wsys.ent;
import ${domain}.frame.base.BaseEntity;
<#if project.frameValue() == 3>
import com.alibaba.excel.annotation.ExcelProperty;
import ${domain}.frame.excel.annotation.ExcelNote;
import ${domain}.frame.excel.annotation.ExcelSheet;
</#if>
/**
* DICT - 字典
@ -14,42 +12,32 @@ import ${domain}.frame.excel.annotation.ExcelSheet;
* @version 0.0.1
* @since 2017-01-01
*/
<#if project.frameValue() == 3>
@ExcelSheet("字典")
</#if>
public class Dict extends BaseEntity {
/**
* DICT_NAME - 字典名称
*/
<#if project.frameValue() == 3>
@ExcelProperty("字典名称")
@ExcelNote("1-50长度的字典名称")
</#if>
private String dictName;
/**
* DICT_COMMENT - 字典代码
*/
<#if project.frameValue() == 3>
@ExcelProperty("字典描述")
@ExcelNote("1-50长度的字典描述")
</#if>
private String dictComment;
/**
* VERSION - 字典版本
*/
<#if project.frameValue() == 3>
@ExcelProperty("字典版本")
@ExcelNote("字典版本.例如:（yyyy-MM-dd HH:mm:ss）")
</#if>
private String version;
/**
* VALID - 是否有效
*/
<#if project.frameValue() == 3>
@ExcelProperty("是否有效")
@ExcelNote("Y/N,是/否")
</#if>
private Boolean valid;
public String getDictName() {

18
src/main/resources/modules/SpringBoot/java/module/wsys/ent/DictItem.java
Unescape View File

@ -1,11 +1,9 @@
package ${domain}.module.wsys.ent;
import ${domain}.frame.base.BaseEntity;
<#if project.frameValue() == 3>
import com.alibaba.excel.annotation.ExcelProperty;
import ${domain}.frame.excel.annotation.ExcelNote;
import ${domain}.frame.excel.annotation.ExcelSheet;
</#if>
/**
* DICT_ITEM - 字典项
@ -14,50 +12,42 @@ import ${domain}.frame.excel.annotation.ExcelSheet;
* @version 0.0.1
* @since 2017-01-01
*/
<#if project.frameValue() == 3>
@ExcelSheet("字典项")
</#if>
public class DictItem extends BaseEntity {
/**
* DICT_NAME - 字典名称
*/
<#if project.frameValue() == 3>
@ExcelProperty("字典名称")
@ExcelNote("字典名称，可为中文或英文，且不能出现重复")
</#if>
private String dictName;
/**
* KEY - 字典键
*/
<#if project.frameValue() == 3>
@ExcelProperty("字典键")
@ExcelNote("字典键一般使用数字或字母 01,02... A,B...")
</#if>
private String key;
/**
* VALUE - 字典值
*/
<#if project.frameValue() == 3>
@ExcelProperty("字典值")
@ExcelNote("字典值一般是实际意思字符或文字\n 长度在(1-100)之间")
</#if>
private String value;
/**
* SORT - 排序
*/
<#if project.frameValue() == 3>
@ExcelProperty("字典排序值")
@ExcelNote("用于标识字典值排列顺序、必须为数字")
</#if>
private Integer sort;
/**
* VALID - 是否有效
*/
<#if project.frameValue() == 3>
@ExcelProperty("是否有效")
@ExcelNote("用于标识该字典值是否有效")
</#if>
private Boolean valid;
public String getDictName() {

2
src/main/resources/modules/SpringBoot/java/module/wsvr/ent/Logerr.java → src/main/resources/modules/SpringBoot/java/module/wsys/ent/Logerr.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.ent;
package ${domain}.module.wsys.ent;
import com.alibaba.excel.annotation.ExcelProperty;
import ${domain}.frame.base.BaseEntity;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/ent/Profiles.java → src/main/resources/modules/SpringBoot/java/module/wsys/ent/Profiles.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.ent;
package ${domain}.module.wsys.ent;
import com.alibaba.excel.annotation.ExcelProperty;
import ${domain}.frame.base.BaseEntity;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/ent/Sequence.java → src/main/resources/modules/SpringBoot/java/module/wsys/ent/Sequence.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.ent;
package ${domain}.module.wsys.ent;
import ${domain}.frame.base.BaseEntity;

18
src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/LogerrManager.java → src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManager.java
Unescape View File

@ -1,14 +1,14 @@
package ${domain}.module.wsvr.mgr;
package ${domain}.module.wsys.mgr;
import ${domain}.frame.auth.Token;
import ${domain}.module.wsvr.req.LogerrCreateRequest;
import ${domain}.module.wsvr.req.LogerrDeleteRequest;
import ${domain}.module.wsvr.req.LogerrFindRequest;
import ${domain}.module.wsvr.req.LogerrUpdateRequest;
import ${domain}.module.wsvr.rsp.LogerrCreateResponse;
import ${domain}.module.wsvr.rsp.LogerrDeleteResponse;
import ${domain}.module.wsvr.rsp.LogerrFindResponse;
import ${domain}.module.wsvr.rsp.LogerrUpdateResponse;
import ${domain}.module.wsys.req.LogerrCreateRequest;
import ${domain}.module.wsys.req.LogerrDeleteRequest;
import ${domain}.module.wsys.req.LogerrFindRequest;
import ${domain}.module.wsys.req.LogerrUpdateRequest;
import ${domain}.module.wsys.rsp.LogerrCreateResponse;
import ${domain}.module.wsys.rsp.LogerrDeleteResponse;
import ${domain}.module.wsys.rsp.LogerrFindResponse;
import ${domain}.module.wsys.rsp.LogerrUpdateResponse;
/**
* 错误日志

28
src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/LogerrManagerImpl.java → src/main/resources/modules/SpringBoot/java/module/wsys/mgr/LogerrManagerImpl.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.mgr;
package ${domain}.module.wsys.mgr;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@ -13,16 +13,16 @@ import ${domain}.frame.utils.IDgenerator;
import ${domain}.frame.utils.MapperUtil;
import ${domain}.frame.utils.Message;
import ${domain}.frame.utils.ValidationUtil;
import ${domain}.module.wsvr.ent.Logerr;
import ${domain}.module.wsvr.mpr.LogerrMapper;
import ${domain}.module.wsvr.req.LogerrCreateRequest;
import ${domain}.module.wsvr.req.LogerrDeleteRequest;
import ${domain}.module.wsvr.req.LogerrFindRequest;
import ${domain}.module.wsvr.req.LogerrUpdateRequest;
import ${domain}.module.wsvr.rsp.LogerrCreateResponse;
import ${domain}.module.wsvr.rsp.LogerrDeleteResponse;
import ${domain}.module.wsvr.rsp.LogerrFindResponse;
import ${domain}.module.wsvr.rsp.LogerrUpdateResponse;
import ${domain}.module.wsys.ent.Logerr;
import ${domain}.module.wsys.mpr.LogerrMapper;
import ${domain}.module.wsys.req.LogerrCreateRequest;
import ${domain}.module.wsys.req.LogerrDeleteRequest;
import ${domain}.module.wsys.req.LogerrFindRequest;
import ${domain}.module.wsys.req.LogerrUpdateRequest;
import ${domain}.module.wsys.rsp.LogerrCreateResponse;
import ${domain}.module.wsys.rsp.LogerrDeleteResponse;
import ${domain}.module.wsys.rsp.LogerrFindResponse;
import ${domain}.module.wsys.rsp.LogerrUpdateResponse;
/**
* LOGERR - 错误日志
@ -54,7 +54,7 @@ public class LogerrManagerImpl implements LogerrManager {
}
long id = IDgenerator.nextId();
${domain}.module.wsvr.ent.Logerr entity = MapperUtil.map(request, ${domain}.module.wsvr.ent.Logerr.class);
${domain}.module.wsys.ent.Logerr entity = MapperUtil.map(request, ${domain}.module.wsys.ent.Logerr.class);
entity.setId(id);
long result = logerrMapper.insert(entity, token);
@ -107,7 +107,7 @@ public class LogerrManagerImpl implements LogerrManager {
return response;
}
${domain}.module.wsvr.ent.Logerr entity = logerrMapper.getById(request.getId(), token);
${domain}.module.wsys.ent.Logerr entity = logerrMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
@ -146,7 +146,7 @@ public class LogerrManagerImpl implements LogerrManager {
if (StringUtil.isNotEmpty(request.getSortKey())) {
PageHelper.orderBy(request.getSortKey() + " " + request.getSortType());
}
PageInfo<${domain}.module.wsvr.ent.Logerr> pageInfo = new PageInfo<>(logerrMapper.find(request, token));
PageInfo<${domain}.module.wsys.ent.Logerr> pageInfo = new PageInfo<>(logerrMapper.find(request, token));
response.setResult(pageInfo.getList());
response.setTotalCount(pageInfo.getTotal());

18
src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/ProfilesManager.java → src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManager.java
Unescape View File

@ -1,14 +1,14 @@
package ${domain}.module.wsvr.mgr;
package ${domain}.module.wsys.mgr;
import ${domain}.frame.auth.Token;
import ${domain}.module.wsvr.req.ProfilesCreateRequest;
import ${domain}.module.wsvr.req.ProfilesDeleteRequest;
import ${domain}.module.wsvr.req.ProfilesFindRequest;
import ${domain}.module.wsvr.req.ProfilesUpdateRequest;
import ${domain}.module.wsvr.rsp.ProfilesCreateResponse;
import ${domain}.module.wsvr.rsp.ProfilesDeleteResponse;
import ${domain}.module.wsvr.rsp.ProfilesFindResponse;
import ${domain}.module.wsvr.rsp.ProfilesUpdateResponse;
import ${domain}.module.wsys.req.ProfilesCreateRequest;
import ${domain}.module.wsys.req.ProfilesDeleteRequest;
import ${domain}.module.wsys.req.ProfilesFindRequest;
import ${domain}.module.wsys.req.ProfilesUpdateRequest;
import ${domain}.module.wsys.rsp.ProfilesCreateResponse;
import ${domain}.module.wsys.rsp.ProfilesDeleteResponse;
import ${domain}.module.wsys.rsp.ProfilesFindResponse;
import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
/**
* 系统配置

28
src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/ProfilesManagerImpl.java → src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.mgr;
package ${domain}.module.wsys.mgr;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@ -13,15 +13,15 @@ import ${domain}.frame.utils.IDgenerator;
import ${domain}.frame.utils.MapperUtil;
import ${domain}.frame.utils.Message;
import ${domain}.frame.utils.ValidationUtil;
import ${domain}.module.wsvr.mpr.ProfilesMapper;
import ${domain}.module.wsvr.req.ProfilesCreateRequest;
import ${domain}.module.wsvr.req.ProfilesDeleteRequest;
import ${domain}.module.wsvr.req.ProfilesFindRequest;
import ${domain}.module.wsvr.req.ProfilesUpdateRequest;
import ${domain}.module.wsvr.rsp.ProfilesCreateResponse;
import ${domain}.module.wsvr.rsp.ProfilesDeleteResponse;
import ${domain}.module.wsvr.rsp.ProfilesFindResponse;
import ${domain}.module.wsvr.rsp.ProfilesUpdateResponse;
import ${domain}.module.wsys.mpr.ProfilesMapper;
import ${domain}.module.wsys.req.ProfilesCreateRequest;
import ${domain}.module.wsys.req.ProfilesDeleteRequest;
import ${domain}.module.wsys.req.ProfilesFindRequest;
import ${domain}.module.wsys.req.ProfilesUpdateRequest;
import ${domain}.module.wsys.rsp.ProfilesCreateResponse;
import ${domain}.module.wsys.rsp.ProfilesDeleteResponse;
import ${domain}.module.wsys.rsp.ProfilesFindResponse;
import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
/**
* PROFILES - 系统配置
@ -32,7 +32,7 @@ import ${domain}.module.wsvr.rsp.ProfilesUpdateResponse;
*/
@Transactional
@Service
public class ProfilesManagerImpl implements ${domain}.module.wsvr.mgr.ProfilesManager {
public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesManager {
@Autowired
private ProfilesMapper profilesMapper;
@ -66,7 +66,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsvr.mgr.ProfilesMa
}
long id = IDgenerator.nextId();
${domain}.module.wsvr.ent.Profiles entity = MapperUtil.map(request, ${domain}.module.wsvr.ent.Profiles.class);
${domain}.module.wsys.ent.Profiles entity = MapperUtil.map(request, ${domain}.module.wsys.ent.Profiles.class);
entity.setId(id);
long result = profilesMapper.insert(entity, token);
@ -119,7 +119,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsvr.mgr.ProfilesMa
return response;
}
${domain}.module.wsvr.ent.Profiles entity = profilesMapper.getById(request.getId(), token);
${domain}.module.wsys.ent.Profiles entity = profilesMapper.getById(request.getId(), token);
if (entity == null) {
response.addError(ErrorType.BUSINESS_ERROR, Message.GET_FAILURE);
return response;
@ -158,7 +158,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsvr.mgr.ProfilesMa
if (StringUtil.isNotEmpty(request.getSortKey())) {
PageHelper.orderBy(request.getSortKey() + " " + request.getSortType());
}
PageInfo<${domain}.module.wsvr.ent.Profiles> pageInfo = new PageInfo<>(profilesMapper.find(request, token));
PageInfo<${domain}.module.wsys.ent.Profiles> pageInfo = new PageInfo<>(profilesMapper.find(request, token));
response.setResult(pageInfo.getList());
response.setTotalCount(pageInfo.getTotal());

10
src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/SequenceManager.java → src/main/resources/modules/SpringBoot/java/module/wsys/mgr/SequenceManager.java
Unescape View File

@ -1,10 +1,10 @@
package ${domain}.module.wsvr.mgr;
package ${domain}.module.wsys.mgr;
import ${domain}.frame.auth.Token;
import ${domain}.module.wsvr.req.SequenceFindRequest;
import ${domain}.module.wsvr.req.SequenceNextRequest;
import ${domain}.module.wsvr.rsp.SequenceFindResponse;
import ${domain}.module.wsvr.rsp.SequenceNextResponse;
import ${domain}.module.wsys.req.SequenceFindRequest;
import ${domain}.module.wsys.req.SequenceNextRequest;
import ${domain}.module.wsys.rsp.SequenceFindResponse;
import ${domain}.module.wsys.rsp.SequenceNextResponse;
/**
* 序列

14
src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/SequenceManagerImpl.java → src/main/resources/modules/SpringBoot/java/module/wsys/mgr/SequenceManagerImpl.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.mgr;
package ${domain}.module.wsys.mgr;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@ -11,12 +11,12 @@ import ${domain}.frame.auth.Token;
import ${domain}.frame.base.ErrorType;
import ${domain}.frame.utils.IDgenerator;
import ${domain}.frame.utils.ValidationUtil;
import ${domain}.module.wsvr.ent.Sequence;
import ${domain}.module.wsvr.mpr.SequenceMapper;
import ${domain}.module.wsvr.req.SequenceFindRequest;
import ${domain}.module.wsvr.req.SequenceNextRequest;
import ${domain}.module.wsvr.rsp.SequenceFindResponse;
import ${domain}.module.wsvr.rsp.SequenceNextResponse;
import ${domain}.module.wsys.ent.Sequence;
import ${domain}.module.wsys.mpr.SequenceMapper;
import ${domain}.module.wsys.req.SequenceFindRequest;
import ${domain}.module.wsys.req.SequenceNextRequest;
import ${domain}.module.wsys.rsp.SequenceFindResponse;
import ${domain}.module.wsys.rsp.SequenceNextResponse;
import java.text.SimpleDateFormat;
import java.util.Date;

6
src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/LogerrMapper.java → src/main/resources/modules/SpringBoot/java/module/wsys/mpr/LogerrMapper.java
Unescape View File

@ -1,10 +1,10 @@
package ${domain}.module.wsvr.mpr;
package ${domain}.module.wsys.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${domain}.frame.auth.Token;
import ${domain}.module.wsvr.ent.Logerr;
import ${domain}.module.wsvr.req.LogerrFindRequest;
import ${domain}.module.wsys.ent.Logerr;
import ${domain}.module.wsys.req.LogerrFindRequest;
import java.util.List;

6
src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/ProfilesMapper.java → src/main/resources/modules/SpringBoot/java/module/wsys/mpr/ProfilesMapper.java
Unescape View File

@ -1,10 +1,10 @@
package ${domain}.module.wsvr.mpr;
package ${domain}.module.wsys.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${domain}.frame.auth.Token;
import ${domain}.module.wsvr.ent.Profiles;
import ${domain}.module.wsvr.req.ProfilesFindRequest;
import ${domain}.module.wsys.ent.Profiles;
import ${domain}.module.wsys.req.ProfilesFindRequest;
import java.util.List;

4
src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/SQLite_LogerrMapper.xml → src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_LogerrMapper.xml
Unescape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${domain}.module.wsvr.mpr.LogerrMapper">
<mapper namespace="${domain}.module.wsys.mpr.LogerrMapper">
<sql id="table">"SYS_LOGERR"</sql>
@ -10,7 +10,7 @@
"ID","LOG_TYPE","LOG_TITLE","LOG_NOTE","LOG_STATE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
</sql>
<resultMap id="logerr" type="${domain}.module.wsvr.ent.Logerr">
<resultMap id="logerr" type="${domain}.module.wsys.ent.Logerr">
<result column="ID" jdbcType="BIGINT" property="id"/>
<result column="LOG_TYPE" jdbcType="VARCHAR" property="logType"/>
<result column="LOG_TITLE" jdbcType="VARCHAR" property="logTitle"/>

4
src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/SQLite_ProfilesMapper.xml → src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ProfilesMapper.xml
Unescape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${domain}.module.wsvr.mpr.ProfilesMapper">
<mapper namespace="${domain}.module.wsys.mpr.ProfilesMapper">
<sql id="table">"SYS_PROFILES"</sql>
@ -10,7 +10,7 @@
"ID","ACTIVE","KEY","VALUE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
</sql>
<resultMap id="profiles" type="${domain}.module.wsvr.ent.Profiles">
<resultMap id="profiles" type="${domain}.module.wsys.ent.Profiles">
<result column="ID" jdbcType="BIGINT" property="id"/>
<result column="ACTIVE" jdbcType="VARCHAR" property="active"/>
<result column="KEY" jdbcType="VARCHAR" property="key"/>

4
src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/SQLite_SequenceMapper.xml → src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_SequenceMapper.xml
Unescape View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${domain}.module.wsvr.mpr.SequenceMapper">
<mapper namespace="${domain}.module.wsys.mpr.SequenceMapper">
<sql id="table">"SYS_SEQUENCE"</sql>
@ -10,7 +10,7 @@
"ID","SEQ_NAME","SEQ_NOTE","YEAR","MONTH","DATE","NEXT_VALUE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME"
</sql>
<resultMap id="sequence" type="${domain}.module.wsvr.ent.Sequence">
<resultMap id="sequence" type="${domain}.module.wsys.ent.Sequence">
<result column="ID" jdbcType="BIGINT" property="id"/>
<result column="SEQ_NAME" jdbcType="VARCHAR" property="seqName"/>
<result column="SEQ_NOTE" jdbcType="VARCHAR" property="seqNote"/>

6
src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/SequenceMapper.java → src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SequenceMapper.java
Unescape View File

@ -1,10 +1,10 @@
package ${domain}.module.wsvr.mpr;
package ${domain}.module.wsys.mpr;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import ${domain}.frame.auth.Token;
import ${domain}.module.wsvr.ent.Sequence;
import ${domain}.module.wsvr.req.SequenceFindRequest;
import ${domain}.module.wsys.ent.Sequence;
import ${domain}.module.wsys.req.SequenceFindRequest;
import java.util.List;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/req/LogerrCreateRequest.java → src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrCreateRequest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.req;
package ${domain}.module.wsys.req;
import org.hibernate.validator.constraints.Length;
import ${domain}.frame.base.BaseRequest;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/req/LogerrDeleteRequest.java → src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrDeleteRequest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.req;
package ${domain}.module.wsys.req;
import ${domain}.frame.base.BaseRequest;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/req/LogerrFindRequest.java → src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrFindRequest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.req;
package ${domain}.module.wsys.req;
import ${domain}.frame.base.BaseFindRequest;
import ${domain}.frame.validation.Select;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/req/LogerrUpdateRequest.java → src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrUpdateRequest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.req;
package ${domain}.module.wsys.req;
import org.hibernate.validator.constraints.Length;
import ${domain}.frame.base.BaseUpdateRequest;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/req/ProfilesCreateRequest.java → src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesCreateRequest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.req;
package ${domain}.module.wsys.req;
import org.hibernate.validator.constraints.Length;
import ${domain}.frame.base.BaseRequest;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/req/ProfilesDeleteRequest.java → src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesDeleteRequest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.req;
package ${domain}.module.wsys.req;
import ${domain}.frame.base.BaseRequest;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/req/ProfilesFindRequest.java → src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesFindRequest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.req;
package ${domain}.module.wsys.req;
import ${domain}.frame.base.BaseFindRequest;
import ${domain}.frame.validation.Select;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/req/ProfilesUpdateRequest.java → src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesUpdateRequest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.req;
package ${domain}.module.wsys.req;
import org.hibernate.validator.constraints.Length;
import ${domain}.frame.base.BaseUpdateRequest;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/req/SequenceFindRequest.java → src/main/resources/modules/SpringBoot/java/module/wsys/req/SequenceFindRequest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.req;
package ${domain}.module.wsys.req;
import ${domain}.frame.base.BaseFindRequest;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/req/SequenceNextRequest.java → src/main/resources/modules/SpringBoot/java/module/wsys/req/SequenceNextRequest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.req;
package ${domain}.module.wsys.req;
import org.hibernate.validator.constraints.Length;
import ${domain}.frame.base.BaseRequest;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/LogerrCreateResponse.java → src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrCreateResponse.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.rsp;
package ${domain}.module.wsys.rsp;
import ${domain}.frame.base.BaseResponse;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/LogerrDeleteResponse.java → src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrDeleteResponse.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.rsp;
package ${domain}.module.wsys.rsp;
import ${domain}.frame.base.BaseResponse;

4
src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/LogerrFindResponse.java → src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrFindResponse.java
Unescape View File

@ -1,7 +1,7 @@
package ${domain}.module.wsvr.rsp;
package ${domain}.module.wsys.rsp;
import ${domain}.frame.base.BaseFindResponse;
import ${domain}.module.wsvr.ent.Logerr;
import ${domain}.module.wsys.ent.Logerr;
/**
* LogerrFindResponse - 错误日志

2
src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/LogerrUpdateResponse.java → src/main/resources/modules/SpringBoot/java/module/wsys/rsp/LogerrUpdateResponse.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.rsp;
package ${domain}.module.wsys.rsp;
import ${domain}.frame.base.BaseResponse;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/ProfilesCreateResponse.java → src/main/resources/modules/SpringBoot/java/module/wsys/rsp/ProfilesCreateResponse.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.rsp;
package ${domain}.module.wsys.rsp;
import ${domain}.frame.base.BaseResponse;

2
src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/ProfilesDeleteResponse.java → src/main/resources/modules/SpringBoot/java/module/wsys/rsp/ProfilesDeleteResponse.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.rsp;
package ${domain}.module.wsys.rsp;
import ${domain}.frame.base.BaseResponse;

4
src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/ProfilesFindResponse.java → src/main/resources/modules/SpringBoot/java/module/wsys/rsp/ProfilesFindResponse.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.rsp;
package ${domain}.module.wsys.rsp;
import ${domain}.frame.base.BaseFindResponse;
@ -9,5 +9,5 @@ import ${domain}.frame.base.BaseFindResponse;
* @version 0.0.1
* @since 2020-07-06
*/
public class ProfilesFindResponse extends BaseFindResponse<${domain}.module.wsvr.ent.Profiles> {
public class ProfilesFindResponse extends BaseFindResponse<${domain}.module.wsys.ent.Profiles> {
}

2
src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/ProfilesUpdateResponse.java → src/main/resources/modules/SpringBoot/java/module/wsys/rsp/ProfilesUpdateResponse.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.rsp;
package ${domain}.module.wsys.rsp;
import ${domain}.frame.base.BaseResponse;

4
src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/SequenceFindResponse.java → src/main/resources/modules/SpringBoot/java/module/wsys/rsp/SequenceFindResponse.java
Unescape View File

@ -1,7 +1,7 @@
package ${domain}.module.wsvr.rsp;
package ${domain}.module.wsys.rsp;
import ${domain}.frame.base.BaseFindResponse;
import ${domain}.module.wsvr.ent.Sequence;
import ${domain}.module.wsys.ent.Sequence;
/**
* SequenceFindResponse - 序列

2
src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/SequenceNextResponse.java → src/main/resources/modules/SpringBoot/java/module/wsys/rsp/SequenceNextResponse.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.module.wsvr.rsp;
package ${domain}.module.wsys.rsp;
import ${domain}.frame.base.BaseResponse;

9
src/main/resources/modules/SpringBoot/pom.ftl
Unescape View File

@ -57,7 +57,6 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<#if project.frameValue() &gt; 0>
<!-- mybatis -->
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
@ -77,7 +76,6 @@
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>1.2.5</version>
</dependency>
<#if project.frameValue() &gt; 1>
<!-- freemarker -->
<dependency>
@ -95,7 +93,6 @@
<artifactId>easyexcel</artifactId>
<version>2.2.6</version>
</dependency>
</#if>
<dependency>
<groupId>net.sf.dozer</groupId>
@ -160,7 +157,7 @@
<version>12.1.0.2.0</version>
</dependency>
</#if>
</#if>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
@ -178,7 +175,6 @@
<build>
<!-- 项目名称 -->
<finalName>${r"${artifactId}"}-${r"${version}"}</finalName>
<#if project.frameValue() &gt; 0>
<!-- 默认的主代码目录 -->
<sourceDirectory>src/main/java</sourceDirectory>
<!-- 默认的测试代码目录 -->
@ -211,13 +207,11 @@
<targetPath>${r'${basedir}'}/target</targetPath>
</resource>
</resources>
</#if>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<#if project.frameValue() &gt; 0>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@ -238,7 +232,6 @@
</webResources>
</configuration>
</plugin>
</#if>
</plugins>
</build>
</project>

4
src/main/resources/modules/SpringBoot/resources/application-dev.ftl
Unescape View File

@ -1,5 +1,4 @@
# 开发环境
<#if project.frameValue() &gt;= 2>
server.port=8080
server.servlet.context-path=
spring.mvc.static-path-pattern=/static/**
@ -26,7 +25,6 @@ spring.servlet.multipart.resolveLazily=false
spring.servlet.multipart.max-file-size=100MB
spring.servlet.multipart.max-request-size=100MB
server.tomcat.max-http-post-size=-1
</#if>
# 日志
logging.config=classpath:logback-spring-dev.xml
<#if project.needMoreDB>
@ -102,7 +100,6 @@ pagehelper.autoRuntimeDialect=true
pagehelper.reasonable=false
pagehelper.supportMethodsArguments=true
pagehelper.params=count=countSql
<#if project.frameValue() &gt;= 2>
# freemarker
spring.freemarker.enabled=true
spring.freemarker.allow-request-override=false
@ -131,6 +128,7 @@ web.url.login=/login.htm
web.url.auth.included=/,/**/*.htm,/ajax/**
# 直接放行
web.url.auth.excluded=/login.htm,/ajax/wsys/User/login,/ajax/wsys/User/logout
<#if project.frameValue() = 1>
# 超级管理员
web.url.auth.admin=admin
web.url.auth.pwd=17fac3376f76d65943d1d26d1f7cb1e5

4
src/main/resources/modules/SpringBoot/resources/application-prod.ftl
Unescape View File

@ -1,5 +1,4 @@
# 生产环境
<#if project.frameValue() &gt;= 2>
server.port=80
server.servlet.context-path=
spring.mvc.static-path-pattern=/static/**
@ -26,7 +25,6 @@ spring.servlet.multipart.resolveLazily=false
spring.servlet.multipart.max-file-size=100MB
spring.servlet.multipart.max-request-size=100MB
server.tomcat.max-http-post-size=-1
</#if>
# 日志
logging.config=classpath:logback-spring-prod.xml
<#if project.needMoreDB>
@ -102,7 +100,6 @@ pagehelper.autoRuntimeDialect=true
pagehelper.reasonable=false
pagehelper.supportMethodsArguments=true
pagehelper.params=count=countSql
<#if project.frameValue() &gt;= 2>
# freemarker
spring.freemarker.enabled=true
spring.freemarker.allow-request-override=false
@ -131,6 +128,7 @@ web.url.login=/login.htm
web.url.auth.included=/,/**/*.htm,/ajax/**
# 直接放行
web.url.auth.excluded=/login.htm,/ajax/wsys/User/login,/ajax/wsys/User/logout
<#if project.frameValue() = 1>
# 超级管理员
web.url.auth.admin=admin
web.url.auth.pwd=17fac3376f76d65943d1d26d1f7cb1e5

4
src/main/resources/modules/SpringBoot/resources/templates/screen/index.ftl
Unescape View File

@ -28,7 +28,7 @@
<span slot="title">核心设置</span>
</template>
${print('<#if token.hasRes("DEV_PROFILES")>')}
<el-menu-item index="${uuid()}" @click="addTab({title: '系统配置', name: 'profiles', url: '${r'${context}'}/wsvr/profiles.htm'})">系统配置</el-menu-item>
<el-menu-item index="${uuid()}" @click="addTab({title: '系统配置', name: 'profiles', url: '${r'${context}'}/wsys/profiles.htm'})">系统配置</el-menu-item>
${print('</#if>')}
${print('<#if token.hasRes("DEV_RES")>')}
<el-menu-item index="${uuid()}" @click="addTab({title: '资源管理', name: 'res', url: '${r'${context}'}/wsys/res.htm'})">资源管理</el-menu-item>
@ -51,7 +51,7 @@
<el-menu-item index="${uuid()}" @click="addTab({title: '调度监控', name: 'schedule', url: '${r'${context}'}/wsys/schedule.htm'})">调度监控</el-menu-item>
${print('</#if>')}
${print('<#if token.hasRes("MNT_LOGERR")>')}
<el-menu-item index="${uuid()}" @click="addTab({title: '错误日志', name: 'logerr', url: '${r'${context}'}/wsvr/logerr.htm'})">错误日志</el-menu-item>
<el-menu-item index="${uuid()}" @click="addTab({title: '错误日志', name: 'logerr', url: '${r'${context}'}/wsys/logerr.htm'})">错误日志</el-menu-item>
${print('</#if>')}
</el-submenu>
${print('</#if>')}

10
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsvr/logerr.ftl
Unescape View File

@ -147,7 +147,7 @@
mixins: [mixin],
el: "#app",
data: {
module: 'wsvr',
module: 'wsys',
target: 'logerr',
vm: {//条件及分页参数
logType: null,
@ -164,7 +164,7 @@
},
methods: {
onStart: function (item) {
new Ajax("wsvr", "logerr").update({
new Ajax("wsys", "logerr").update({
id: item.id,
logState: '1',
rowVersion: item.rowVersion
@ -178,7 +178,7 @@
}.bind(this))
},
onFinish: function (item) {
new Ajax("wsvr", "logerr").update({
new Ajax("wsys", "logerr").update({
id: item.id,
logState: '2',
rowVersion: item.rowVersion
@ -197,7 +197,7 @@
} else {
nav.tipShow("批量处理中...");
this.select.forAsync(function (item, next) {
new Ajax("wsvr", "logerr").update({
new Ajax("wsys", "logerr").update({
id: item.id,
logState: '1',
rowVersion: item.rowVersion
@ -222,7 +222,7 @@
} else {
nav.tipShow("批量处理中...");
this.select.forAsync(function (item, next) {
new Ajax("wsvr", "logerr").update({
new Ajax("wsys", "logerr").update({
id: item.id,
logState: '2',
rowVersion: item.rowVersion

4
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsvr/profiles.ftl
Unescape View File

@ -151,7 +151,7 @@
mixins: [mixin],
el: "#app",
data: {
module: 'wsvr',
module: 'wsys',
target: 'profiles',
vm: {//条件及分页参数
active: null,
@ -211,7 +211,7 @@
cancelButtonText: '取消',
type: 'warning'
}).then(function () {
new Ajax("E:\wangbing\source\dbtool\target\project\wadmin\src\main\resources\templates\screen\wsvr", "profiles").delete({id: item.id}, function (response) {
new Ajax("E:\wangbing\source\dbtool\target\project\wadmin\src\main\resources\templates\screen\wsys", "profiles").delete({id: item.id}, function (response) {
if (response.errors.length > 0) {
nav.e(response.errors[0].message);
} else {

8
src/main/resources/modules/SpringBoot/test/DataInit.java
Unescape View File

@ -10,7 +10,7 @@ import ${domain}.module.wsys.req.DictCreateRequest;
import ${domain}.module.wsys.req.DictItemCreateRequest;
import ${domain}.module.wsys.rsp.DictCreateResponse;
import ${domain}.module.wsys.rsp.DictItemCreateResponse;
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
import ${domain}.module.wsys.ent.Res;
import ${domain}.module.wsys.mgr.ResManager;
import ${domain}.module.wsys.mgr.RoleManager;
@ -50,7 +50,7 @@ public class DataInit {
private DictManager dictManager;
@Autowired
private DictItemManager dictItemManager;
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
@Autowired
private ResManager resManager;
@Autowired
@ -85,7 +85,7 @@ public class DataInit {
}
//endregion
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
//region 管理员初始化
{
List<Res> forDev = new ArrayList<>();
@ -337,7 +337,7 @@ public class DataInit {
assertTrue(!dictItemCreateResponse.hasError());
}
}
<#if project.frameValue() &gt;= 3>
<#if project.frameValue() = 1>
private Res createRes(String code, String name, String resType, String value) {
return createRes(code,name,resType,value,false);

20
src/main/resources/modules/SpringBoot/test/wsvr/LogerrTest.java → src/main/resources/modules/SpringBoot/test/wsys/LogerrTest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.wsvr;
package ${domain}.wsys;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -7,15 +7,15 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
import ${domain}.frame.auth.Token;
import ${domain}.module.wsvr.mgr.LogerrManager;
import ${domain}.module.wsvr.req.LogerrCreateRequest;
import ${domain}.module.wsvr.req.LogerrDeleteRequest;
import ${domain}.module.wsvr.req.LogerrFindRequest;
import ${domain}.module.wsvr.req.LogerrUpdateRequest;
import ${domain}.module.wsvr.rsp.LogerrCreateResponse;
import ${domain}.module.wsvr.rsp.LogerrDeleteResponse;
import ${domain}.module.wsvr.rsp.LogerrFindResponse;
import ${domain}.module.wsvr.rsp.LogerrUpdateResponse;
import ${domain}.module.wsys.mgr.LogerrManager;
import ${domain}.module.wsys.req.LogerrCreateRequest;
import ${domain}.module.wsys.req.LogerrDeleteRequest;
import ${domain}.module.wsys.req.LogerrFindRequest;
import ${domain}.module.wsys.req.LogerrUpdateRequest;
import ${domain}.module.wsys.rsp.LogerrCreateResponse;
import ${domain}.module.wsys.rsp.LogerrDeleteResponse;
import ${domain}.module.wsys.rsp.LogerrFindResponse;
import ${domain}.module.wsys.rsp.LogerrUpdateResponse;
import static junit.framework.TestCase.assertTrue;

20
src/main/resources/modules/SpringBoot/test/wsvr/ProfilesTest.java → src/main/resources/modules/SpringBoot/test/wsys/ProfilesTest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.wsvr;
package ${domain}.wsys;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -7,15 +7,15 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
import ${domain}.frame.auth.Token;
import ${domain}.module.wsvr.mgr.ProfilesManager;
import ${domain}.module.wsvr.req.ProfilesCreateRequest;
import ${domain}.module.wsvr.req.ProfilesDeleteRequest;
import ${domain}.module.wsvr.req.ProfilesFindRequest;
import ${domain}.module.wsvr.req.ProfilesUpdateRequest;
import ${domain}.module.wsvr.rsp.ProfilesCreateResponse;
import ${domain}.module.wsvr.rsp.ProfilesDeleteResponse;
import ${domain}.module.wsvr.rsp.ProfilesFindResponse;
import ${domain}.module.wsvr.rsp.ProfilesUpdateResponse;
import ${domain}.module.wsys.mgr.ProfilesManager;
import ${domain}.module.wsys.req.ProfilesCreateRequest;
import ${domain}.module.wsys.req.ProfilesDeleteRequest;
import ${domain}.module.wsys.req.ProfilesFindRequest;
import ${domain}.module.wsys.req.ProfilesUpdateRequest;
import ${domain}.module.wsys.rsp.ProfilesCreateResponse;
import ${domain}.module.wsys.rsp.ProfilesDeleteResponse;
import ${domain}.module.wsys.rsp.ProfilesFindResponse;
import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
import static junit.framework.TestCase.assertTrue;

8
src/main/resources/modules/SpringBoot/test/wsvr/SequenceTest.java → src/main/resources/modules/SpringBoot/test/wsys/SequenceTest.java
Unescape View File

@ -1,4 +1,4 @@
package ${domain}.wsvr;
package ${domain}.wsys;
import org.junit.Test;
import org.junit.runner.RunWith;
@ -8,9 +8,9 @@ import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
import ${domain}.frame.auth.Token;
import ${domain}.frame.utils.MapperUtil;
import ${domain}.module.wsvr.mgr.SequenceManager;
import ${domain}.module.wsvr.req.SequenceNextRequest;
import ${domain}.module.wsvr.rsp.SequenceNextResponse;
import ${domain}.module.wsys.mgr.SequenceManager;
import ${domain}.module.wsys.req.SequenceNextRequest;
import ${domain}.module.wsys.rsp.SequenceNextResponse;
/**
* SequenceTest - - 序列测试用例
Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.