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

架构调整

Browse Source 
Former-commit-id: 5b6df6ced39bcb6577f10b2840b7fa3f5e08fde3
master
王兵 5 years ago
parent 853f13c3d5
commit 15de6527ac
4 changed files with 69 additions and 93 deletions
Show Stats Download Patch File Download Diff File

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

@ -85,10 +85,6 @@ public class SpringBootCallable implements Callable {
generateModule(Tool.createPath(domainDir, "module"), project); generateModule(Tool.createPath(domainDir, "module"), project);
System.out.println("生成模块:task"); System.out.println("生成模块:task");
generateTask(Tool.createPath(domainDir, "task"), project); generateTask(Tool.createPath(domainDir, "task"), project);
generateResources_template(resourcesDir, project);
generateModuleForSys(Tool.createPath(domainDir, "module"), project);
//生成resources文件 //生成resources文件
generateResources(resourcesDir, project); generateResources(resourcesDir, project);
@ -144,9 +140,11 @@ public class SpringBootCallable implements Callable {
ctxss.put("author", project.getAuthor()); ctxss.put("author", project.getAuthor());
for (Module module : project.getModules()) { for (Module module : project.getModules()) {
if (!module.getNeedGenerate()) {
continue;
}
File m = Tool.createPath(ajax, module.getModuleName()); File m = Tool.createPath(ajax, module.getModuleName());
ctxss.put("moduleName", module.getModuleName()); ctxss.put("moduleName", module.getModuleName());
for (Table table : module.getTables()) { for (Table table : module.getTables()) {
if (table.getAjax()) { if (table.getAjax()) {
ctxss.put("table", table); ctxss.put("table", table);
@ -167,8 +165,10 @@ public class SpringBootCallable implements Callable {
File api = Tool.createPath(root, "api"); File api = Tool.createPath(root, "api");
for (Module module : project.getModules()) { for (Module module : project.getModules()) {
if (!module.getNeedGenerate()) {
continue;
}
File m = Tool.createPath(api, module.getModuleName()); File m = Tool.createPath(api, module.getModuleName());
for (Table table : module.getTables()) { for (Table table : module.getTables()) {
if (table.getApi()) { if (table.getApi()) {
HashMap<String, Object> ctxss = new HashMap<String, Object>(); HashMap<String, Object> ctxss = new HashMap<String, Object>();
@ -231,8 +231,11 @@ public class SpringBootCallable implements Callable {
Tool.clear(root); Tool.clear(root);
} }
HashMap<String, Object> ctx = new HashMap<String, Object>();
for (Module module : project.getModules()) {// 业务模块 for (Module module : project.getModules()) {// 业务模块
if (!module.getNeedGenerate()) {
continue;
}
HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("project", project); ctx.put("project", project);
ctx.put("module", module); ctx.put("module", module);
ctx.put("domain", project.getDomain()); ctx.put("domain", project.getDomain());
@ -246,69 +249,64 @@ public class SpringBootCallable implements Callable {
File req = Tool.createPath(Tool.createPath(root, module.getModuleName()), "req"); File req = Tool.createPath(Tool.createPath(root, module.getModuleName()), "req");
File rsp = Tool.createPath(Tool.createPath(root, module.getModuleName()), "rsp"); File rsp = Tool.createPath(Tool.createPath(root, module.getModuleName()), "rsp");
if (module.getNeedGenerate()) { module.setProjectAuthor(project.getAuthor());
module.setProjectAuthor(project.getAuthor()); module.setProjectBasePackage(project.getDomain());
module.setProjectBasePackage(project.getDomain()); module.setProjectName(project.getName());
module.setProjectName(project.getName());
for (Table table : module.getTables()) { for (Table table : module.getTables()) {
ctx.put("table", table); ctx.put("table", table);
// 生成Ent // 生成Ent
File file = Tool.createFile(ent, Tool.ABB2Abb(table.getTableName()) + ".java"); File file = Tool.createFile(ent, Tool.ABB2Abb(table.getTableName()) + ".java");
freeMarkerManager.outputTemp(file, "SpringBoot/java/module/ent/entity.ftl", ctx); freeMarkerManager.outputTemp(file, "SpringBoot/java/module/ent/entity.ftl", ctx);
// 生成Mapper
if (table.getSys()) {
freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), "SpringBoot/java/module/mpr/Mapper.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_mapper.xml", ctx);
} else {
freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), "SpringBoot/java/module/mpr/Mapper_NSYS.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_NSYS_mapper.xml", ctx);
}
if (table.getCreate() || table.getDelete() || table.getUpdate() || table.getFind() || table.getGet() || table.getSearch()) { // 生成Mapper
freeMarkerManager.outputTemp(Tool.createFile(mgr, Tool.ABB2Abb(table.getTableName()) + "Manager" + ".java"), "SpringBoot/java/module/mgr/manager.ftl", ctx); if (table.getSys()) {
freeMarkerManager.outputTemp(Tool.createFile(mgr, Tool.ABB2Abb(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBoot/java/module/mgr/managerImpl.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), "SpringBoot/java/module/mpr/Mapper.java", ctx);
} freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_mapper.xml", ctx);
} else {
freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), "SpringBoot/java/module/mpr/Mapper_NSYS.java", ctx);
freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_NSYS_mapper.xml", ctx);
}
if (table.getCreate()) { if (table.getCreate() || table.getDelete() || table.getUpdate() || table.getFind() || table.getGet() || table.getSearch()) {
freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "CreateRequest" + ".java"), "SpringBoot/java/module/req/createRequestClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(mgr, Tool.ABB2Abb(table.getTableName()) + "Manager" + ".java"), "SpringBoot/java/module/mgr/manager.ftl", ctx);
freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "CreateResponse" + ".java"), "SpringBoot/java/module/rsp/createResponseClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(mgr, Tool.ABB2Abb(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBoot/java/module/mgr/managerImpl.ftl", ctx);
} }
if (table.getDelete()) { if (table.getCreate()) {
freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "DeleteRequest" + ".java"), "SpringBoot/java/module/req/deleteRequestClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "CreateRequest" + ".java"), "SpringBoot/java/module/req/createRequestClass.ftl", ctx);
freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "DeleteResponse" + ".java"), "SpringBoot/java/module/rsp/deleteResponseClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "CreateResponse" + ".java"), "SpringBoot/java/module/rsp/createResponseClass.ftl", ctx);
} }
if (table.getUpdate()) { if (table.getDelete()) {
freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "UpdateRequest" + ".java"), "SpringBoot/java/module/req/updateRequestClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "DeleteRequest" + ".java"), "SpringBoot/java/module/req/deleteRequestClass.ftl", ctx);
freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "UpdateResponse" + ".java"), "SpringBoot/java/module/rsp/updateResponseClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "DeleteResponse" + ".java"), "SpringBoot/java/module/rsp/deleteResponseClass.ftl", ctx);
} }
if (table.getFind()) { if (table.getUpdate()) {
freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "FindRequest" + ".java"), "SpringBoot/java/module/req/findRequestClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "UpdateRequest" + ".java"), "SpringBoot/java/module/req/updateRequestClass.ftl", ctx);
freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "FindResponse" + ".java"), "SpringBoot/java/module/rsp/findResponseClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "UpdateResponse" + ".java"), "SpringBoot/java/module/rsp/updateResponseClass.ftl", ctx);
} }
if (table.getGet()) { if (table.getFind()) {
freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "GetRequest" + ".java"), "SpringBoot/java/module/req/getRequestClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "FindRequest" + ".java"), "SpringBoot/java/module/req/findRequestClass.ftl", ctx);
freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "GetResponse" + ".java"), "SpringBoot/java/module/rsp/getResponseClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "FindResponse" + ".java"), "SpringBoot/java/module/rsp/findResponseClass.ftl", ctx);
} }
if (table.getSearch()) { if (table.getGet()) {
freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "SearchRequest" + ".java"), "SpringBoot/java/module/req/searchRequestClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "GetRequest" + ".java"), "SpringBoot/java/module/req/getRequestClass.ftl", ctx);
freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "SearchResponse" + ".java"), "SpringBoot/java/module/rsp/searchResponseClass.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "GetResponse" + ".java"), "SpringBoot/java/module/rsp/getResponseClass.ftl", ctx);
} }
if (table.getSearch()) {
freeMarkerManager.outputTemp(Tool.createFile(req, Tool.ABB2Abb(table.getTableName()) + "SearchRequest" + ".java"), "SpringBoot/java/module/req/searchRequestClass.ftl", ctx);
freeMarkerManager.outputTemp(Tool.createFile(rsp, Tool.ABB2Abb(table.getTableName()) + "SearchResponse" + ".java"), "SpringBoot/java/module/rsp/searchResponseClass.ftl", ctx);
} }
} }
} }
}
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>(); HashMap<String, Object> ctx = new HashMap<String, Object>();
ctx.put("project", project); ctx.put("project", project);
ctx.put("domain", project.getDomain()); ctx.put("domain", project.getDomain());
@ -347,7 +345,6 @@ public class SpringBootCallable implements Callable {
} }
} }
/** /**
* 生成frame类 * 生成frame类
* *
@ -484,7 +481,6 @@ public class SpringBootCallable implements Callable {
ctx.put("author", project.getAuthor()); ctx.put("author", project.getAuthor());
ctx.put("dBmapper", dBmapper); ctx.put("dBmapper", dBmapper);
ctx.put("author", project.getAuthor()); ctx.put("author", project.getAuthor());
ctx.put("projectName", project.getName());
ctx.put("project", project); ctx.put("project", project);
freeMarkerManager.outputTemp(Tool.createFile(root, "application.properties"), "SpringBoot/resources/application.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(root, "application.properties"), "SpringBoot/resources/application.ftl", ctx);
@ -612,14 +608,16 @@ public class SpringBootCallable implements Callable {
freeMarkerManager.outputTemp(Tool.createFile(screen, "index.ftl"), "SpringBoot/resources/templates/screen/index.ftl", ctx); freeMarkerManager.outputTemp(Tool.createFile(screen, "index.ftl"), "SpringBoot/resources/templates/screen/index.ftl", ctx);
for (Module mo : project.getModules()) { for (Module mo : project.getModules()) {
for (Table table : mo.getTables()) { if (mo.getNeedGenerate()) {
if (table.getHtml()) { for (Table table : mo.getTables()) {
File module = Tool.createPath(screen, mo.getModuleName()); if (table.getHtml()) {
ctx.put("table", table); File module = Tool.createPath(screen, mo.getModuleName());
ctx.put("module", module); ctx.put("table", table);
ctx.put("fields", table.getFields()); ctx.put("module", module);
File file = Tool.createFile(module, table.getFName() + ".ftl"); ctx.put("fields", table.getFields());
freeMarkerManager.outputTemp(file, "SpringBoot/resources/templates/screen/module/mgr.ftl", ctx); File file = Tool.createFile(module, table.getFName() + ".ftl");
freeMarkerManager.outputTemp(file, "SpringBoot/resources/templates/screen/module/mgr.ftl", ctx);
}
} }
} }
} }
@ -637,16 +635,6 @@ public class SpringBootCallable implements Callable {
} }
} }
/**
* 生成Resources_template
*
* @param root
* @param project
*/
public void generateResources_template(File root, Project project) {
}
public void generateTestResources(File root, Project project) { public void generateTestResources(File root, Project project) {
HashMap<String, Object> ctx = new HashMap<String, Object>(); HashMap<String, Object> ctx = new HashMap<String, Object>();

12
src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java
Unescape View File

@ -246,17 +246,8 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
newToken.setUserId(0); newToken.setUserId(0);
newToken.setUserName(admin); newToken.setUserName(admin);
newToken.putRes(".*"); newToken.putRes(".*");
// 获取用户的资源
ResFindRequest resFindRequest = new ResFindRequest();
resFindRequest.setPageSize(0);
ResFindResponse resFindResponse = resManager.find(resFindRequest, token);
if (resFindResponse.hasError()) {
response.addErrors(resFindResponse.getErrors());
return response;
}
newToken.putRes(resFindResponse.getResult());
} else { // 管理员或用户 } else { // 管理员或用户
<#if project.frameValue() = 1>
newToken.setId(tokens.getId()); newToken.setId(tokens.getId());
newToken.setToken(tokensFindResponse.getResult().get(0).getToken()); newToken.setToken(tokensFindResponse.getResult().get(0).getToken());
newToken.setUserId(tokens.getUserId()); newToken.setUserId(tokens.getUserId());
@ -272,6 +263,7 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
return response; return response;
} }
newToken.putRes(resFindResponse.getResult()); newToken.putRes(resFindResponse.getResult());
</#if>
} }
response.setToken(newToken); response.setToken(newToken);

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

@ -127,9 +127,7 @@ web.url.login=/login.htm
# 拦截验证 # 拦截验证
web.url.auth.included=/,/**/*.htm,/ajax/** web.url.auth.included=/,/**/*.htm,/ajax/**
# 直接放行 # 直接放行
web.url.auth.excluded=/login.htm,/ajax/wsys/User/login,/ajax/wsys/User/logout web.url.auth.excluded=/login.htm<#if project.frameValue() = 1>,/ajax/wsys/User/login,/ajax/wsys/User/logout</#if>
<#if project.frameValue() = 1>
# 超级管理员 # 超级管理员
web.url.auth.admin=admin web.url.auth.admin=admin
web.url.auth.pwd=17fac3376f76d65943d1d26d1f7cb1e5 web.url.auth.pwd=17fac3376f76d65943d1d26d1f7cb1e5
</#if>

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

@ -127,9 +127,7 @@ web.url.login=/login.htm
# 拦截验证 # 拦截验证
web.url.auth.included=/,/**/*.htm,/ajax/** web.url.auth.included=/,/**/*.htm,/ajax/**
# 直接放行 # 直接放行
web.url.auth.excluded=/login.htm,/ajax/wsys/User/login,/ajax/wsys/User/logout web.url.auth.excluded=/login.htm<#if project.frameValue() = 1>,/ajax/wsys/User/login,/ajax/wsys/User/logout</#if>
<#if project.frameValue() = 1>
# 超级管理员 # 超级管理员
web.url.auth.admin=admin web.url.auth.admin=admin
web.url.auth.pwd=17fac3376f76d65943d1d26d1f7cb1e5 web.url.auth.pwd=17fac3376f76d65943d1d26d1f7cb1e5
</#if>
Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.