架构调整

Former-commit-id: 5b6df6ced39bcb6577f10b2840b7fa3f5e08fde3

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

@@ -85,10 +85,6 @@ public class SpringBootCallable implements Callable {
         generateModule(Tool.createPath(domainDir, "module"), project);
         System.out.println("生成模块:task");
         generateTask(Tool.createPath(domainDir, "task"), project);
-
-        generateResources_template(resourcesDir, project);
-
-        generateModuleForSys(Tool.createPath(domainDir, "module"), project);
         //生成resources文件
         generateResources(resourcesDir, project);
 
@@ -144,9 +140,11 @@ public class SpringBootCallable implements Callable {
             ctxss.put("author", project.getAuthor());
 
             for (Module module : project.getModules()) {
+                if (!module.getNeedGenerate()) {
+                    continue;
+                }
                 File m = Tool.createPath(ajax, module.getModuleName());
                 ctxss.put("moduleName", module.getModuleName());
-
                 for (Table table : module.getTables()) {
                     if (table.getAjax()) {
                         ctxss.put("table", table);
@@ -167,8 +165,10 @@ public class SpringBootCallable implements Callable {
             File api = Tool.createPath(root, "api");
 
             for (Module module : project.getModules()) {
+                if (!module.getNeedGenerate()) {
+                    continue;
+                }
                 File m = Tool.createPath(api, module.getModuleName());
-
                 for (Table table : module.getTables()) {
                     if (table.getApi()) {
                         HashMap<String, Object> ctxss = new HashMap<String, Object>();
@@ -231,8 +231,11 @@ public class SpringBootCallable implements Callable {
             Tool.clear(root);
         }
 
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
         for (Module module : project.getModules()) {// 业务模块
+            if (!module.getNeedGenerate()) {
+                continue;
+            }
+            HashMap<String, Object> ctx = new HashMap<String, Object>();
             ctx.put("project", project);
             ctx.put("module", module);
             ctx.put("domain", project.getDomain());
@@ -246,7 +249,6 @@ public class SpringBootCallable implements Callable {
             File req = Tool.createPath(Tool.createPath(root, module.getModuleName()), "req");
             File rsp = Tool.createPath(Tool.createPath(root, module.getModuleName()), "rsp");
 
-            if (module.getNeedGenerate()) {
             module.setProjectAuthor(project.getAuthor());
             module.setProjectBasePackage(project.getDomain());
             module.setProjectName(project.getName());
@@ -303,12 +305,8 @@ public class SpringBootCallable implements Callable {
                 }
             }
         }
-        }
-    }
 
-    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>();
             ctx.put("project", project);
             ctx.put("domain", project.getDomain());
@@ -347,7 +345,6 @@ public class SpringBootCallable implements Callable {
         }
     }
 
-
     /**
      * 生成frame类
      *
@@ -484,7 +481,6 @@ public class SpringBootCallable implements Callable {
         ctx.put("author", project.getAuthor());
         ctx.put("dBmapper", dBmapper);
         ctx.put("author", project.getAuthor());
-        ctx.put("projectName", project.getName());
         ctx.put("project", project);
 
         freeMarkerManager.outputTemp(Tool.createFile(root, "application.properties"), "SpringBoot/resources/application.ftl", ctx);
@@ -612,6 +608,7 @@ public class SpringBootCallable implements Callable {
             freeMarkerManager.outputTemp(Tool.createFile(screen, "index.ftl"), "SpringBoot/resources/templates/screen/index.ftl", ctx);
 
             for (Module mo : project.getModules()) {
+                if (mo.getNeedGenerate()) {
                     for (Table table : mo.getTables()) {
                         if (table.getHtml()) {
                             File module = Tool.createPath(screen, mo.getModuleName());
@@ -623,6 +620,7 @@ public class SpringBootCallable implements Callable {
                         }
                     }
                 }
+            }
 
             //生成网页
             if (project.getFrame().value() == Frame.管理框架.value()) {
@@ -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) {
         HashMap<String, Object> ctx = new HashMap<String, Object>();
 

src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java

@@ -246,17 +246,8 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
                 newToken.setUserId(0);
                 newToken.setUserName(admin);
                 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 { // 管理员或用户
+<#if project.frameValue() = 1>
                 newToken.setId(tokens.getId());
                 newToken.setToken(tokensFindResponse.getResult().get(0).getToken());
                 newToken.setUserId(tokens.getUserId());
@@ -272,6 +263,7 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
                     return response;
                 }
                 newToken.putRes(resFindResponse.getResult());
+</#if>
             }
 
             response.setToken(newToken);

src/main/resources/modules/SpringBoot/resources/application-dev.ftl

@@ -127,9 +127,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.excluded=/login.htm<#if project.frameValue() = 1>,/ajax/wsys/User/login,/ajax/wsys/User/logout</#if>
 # 超级管理员
 web.url.auth.admin=admin
 web.url.auth.pwd=17fac3376f76d65943d1d26d1f7cb1e5
-</#if>

src/main/resources/modules/SpringBoot/resources/application-prod.ftl

@@ -127,9 +127,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.excluded=/login.htm<#if project.frameValue() = 1>,/ajax/wsys/User/login,/ajax/wsys/User/logout</#if>
 # 超级管理员
 web.url.auth.admin=admin
 web.url.auth.pwd=17fac3376f76d65943d1d26d1f7cb1e5
-</#if>