服务和WEB隔离

Former-commit-id: 5faf746231aedb5fecdf30f735733fc739ade03a

pom.xml

@@ -135,7 +135,7 @@
         <!--<groupId>com.oracle.driver</groupId>-->
         <!--<artifactId>odbc</artifactId>-->
         <!--<version>1.0.0</version>-->
-        <!--<scope>system</scope>-->
+        <!--<scwsysstem</scope>-->
         <!--<systemPath>${project.basedir}/src/main/resources/lib/ojdbc7-12.1.0.2.jar</systemPath>-->
         <!--</dependency>-->
 

src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java

@@ -53,6 +53,7 @@ import xyz.wbsite.dbtool.javafx.po.FieldType;
 import xyz.wbsite.dbtool.javafx.po.Module;
 import xyz.wbsite.dbtool.javafx.po.Project;
 import xyz.wbsite.dbtool.javafx.po.Table;
+import xyz.wbsite.dbtool.javafx.po.Frame;
 import xyz.wbsite.dbtool.javafx.tool.Dialog;
 import xyz.wbsite.dbtool.javafx.tool.Tool;
 import xyz.wbsite.dbtool.javafx.view.DBCheckBoxTableCell;
@@ -488,49 +489,46 @@ public class JavaFxApplication extends Application {
                     currentProject.setProjectAuthor(newValue);
                 }
             });
-            detailProjectController.getNeedWeb().selectedProperty().addListener(new ChangeListener<Boolean>() {
+            detailProjectController.getDatabase().selectedToggleProperty().addListener(new ChangeListener<Toggle>() {
                 @Override
-                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                public void changed(ObservableValue<? extends Toggle> observable, Toggle oldValue, Toggle newValue) {
-                    currentProject.setNeedWeb(newValue);
+                    RadioButton radioButton = (RadioButton) newValue;
+                    currentProject.setDatabase(DataBase.valueOf(radioButton.getText()));
                 }
             });
-            detailProjectController.getSysMD().selectedProperty().addListener(new ChangeListener<Boolean>() {
+            detailProjectController.getFrame().selectedToggleProperty().addListener(new ChangeListener<Toggle>() {
                 @Override
-                public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                public void changed(ObservableValue<? extends Toggle> observable, Toggle oldValue, Toggle newValue) {
-                    currentProject.setNeedSys(newValue);
+                    RadioButton radioButton = (RadioButton) newValue;
+                    currentProject.setFrame(Frame.valueOf(radioButton.getText()));
                 }
             });
-            detailProjectController.getMultiDB().selectedProperty().addListener(new ChangeListener<Boolean>() {
+
+
+            detailProjectController.getNeedMordDB().selectedProperty().addListener(new ChangeListener<Boolean>() {
                 @Override
                 public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
                     currentProject.setNeedMoreDB(newValue);
                 }
             });
-            detailProjectController.getCloud().selectedProperty().addListener(new ChangeListener<Boolean>() {
+            detailProjectController.getNeedCloud().selectedProperty().addListener(new ChangeListener<Boolean>() {
                 @Override
                 public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
                     currentProject.setNeedCloud(newValue);
                 }
             });
-            detailProjectController.getAsync().selectedProperty().addListener(new ChangeListener<Boolean>() {
+            detailProjectController.getNeedAsync().selectedProperty().addListener(new ChangeListener<Boolean>() {
                 @Override
                 public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
                     currentProject.setNeedAsync(newValue);
                 }
             });
-            detailProjectController.geteMail().selectedProperty().addListener(new ChangeListener<Boolean>() {
+            detailProjectController.getNeedMail().selectedProperty().addListener(new ChangeListener<Boolean>() {
                 @Override
                 public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
                     currentProject.setNeedEMail(newValue);
                 }
             });
-            detailProjectController.getDatabase().selectedToggleProperty().addListener(new ChangeListener<Toggle>() {
-                @Override
-                public void changed(ObservableValue<? extends Toggle> observable, Toggle oldValue, Toggle newValue) {
-                    RadioButton radioButton = (RadioButton) newValue;
-                    currentProject.setDatabase(DataBase.valueOf(radioButton.getText()));
-                }
-            });
         }
 
         {//初始化表面板
@@ -707,12 +705,18 @@ public class JavaFxApplication extends Application {
                 radioButton.setSelected(true);
             }
         }
-        detailProjectController.getNeedWeb().setSelected(currentProject.isNeedWeb());
+
-        detailProjectController.getSysMD().setSelected(currentProject.isNeedSys());
+        ObservableList<Toggle> getAuto = detailProjectController.getFrame().getToggles();
-        detailProjectController.getMultiDB().setSelected(currentProject.isNeedMoreDB());
+        for (Toggle toggle : getAuto) {
-        detailProjectController.getCloud().setSelected(currentProject.isNeedCloud());
+            RadioButton radioButton = (RadioButton) toggle;
-        detailProjectController.geteMail().setSelected(currentProject.isNeedEMail());
+            if (radioButton.getText().equals(currentProject.getFrame().name())) {
-        detailProjectController.getAsync().setSelected(currentProject.isNeedAsync());
+                radioButton.setSelected(true);
+            }
+        }
+        detailProjectController.getNeedMordDB().setSelected(currentProject.isNeedMoreDB());
+        detailProjectController.getNeedCloud().setSelected(currentProject.isNeedCloud());
+        detailProjectController.getNeedAsync().setSelected(currentProject.isNeedAsync());
+        detailProjectController.getNeedMail().setSelected(currentProject.isNeedEMail());
 
         if (gridPane != null) {
             mDetail.getChildren().clear();

src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailProjectController.java

@@ -14,35 +14,17 @@ public class DetailProjectController {
     @FXML
     private TextField projectAuthor;
     @FXML
-    private CheckBox needWeb;
+    private ToggleGroup frame;
-    @FXML
-    private CheckBox sysMD;
-    @FXML
-    private CheckBox multiDB;
     @FXML
     private ToggleGroup database;
     @FXML
-    private CheckBox cloud;
+    private CheckBox needMordDB;
     @FXML
-    private CheckBox async;
+    private CheckBox needCloud;
     @FXML
-    private CheckBox eMail;
+    private CheckBox needAsync;
-
+    @FXML
-    public CheckBox getSysMD() {
+    private CheckBox needMail;
-        return sysMD;
-    }
-
-    public void setSysMD(CheckBox sysMD) {
-        this.sysMD = sysMD;
-    }
-
-    public CheckBox getMultiDB() {
-        return multiDB;
-    }
-
-    public void setMultiDB(CheckBox multiDB) {
-        this.multiDB = multiDB;
-    }
 
     public TextField getProjectName() {
         return projectName;
@@ -76,35 +58,43 @@ public class DetailProjectController {
         this.database = database;
     }
 
-    public CheckBox getCloud() {
+    public CheckBox getNeedMordDB() {
-        return cloud;
+        return needMordDB;
+    }
+
+    public void setNeedMordDB(CheckBox needMordDB) {
+        this.needMordDB = needMordDB;
+    }
+
+    public CheckBox getNeedCloud() {
+        return needCloud;
     }
 
-    public void setCloud(CheckBox cloud) {
+    public void setNeedCloud(CheckBox needCloud) {
-        this.cloud = cloud;
+        this.needCloud = needCloud;
     }
 
-    public CheckBox getAsync() {
+    public CheckBox getNeedAsync() {
-        return async;
+        return needAsync;
     }
 
-    public void setAsync(CheckBox async) {
+    public void setNeedAsync(CheckBox needAsync) {
-        this.async = async;
+        this.needAsync = needAsync;
     }
 
-    public CheckBox geteMail() {
+    public CheckBox getNeedMail() {
-        return eMail;
+        return needMail;
     }
 
-    public void seteMail(CheckBox eMail) {
+    public void setNeedMail(CheckBox needMail) {
-        this.eMail = eMail;
+        this.needMail = needMail;
     }
 
-    public CheckBox getNeedWeb() {
+    public ToggleGroup getFrame() {
-        return needWeb;
+        return frame;
     }
 
-    public void setNeedWeb(CheckBox needWeb) {
+    public void setFrame(ToggleGroup frame) {
-        this.needWeb = needWeb;
+        this.frame = frame;
     }
 }

src/main/java/xyz/wbsite/dbtool/javafx/ctrl/MainController.java

@@ -186,22 +186,6 @@ public class MainController {
         Dialog.showVue();
     }
 
-    @FXML
-    public void generateService(ActionEvent actionEvent) {
-        this.modelSave(null);
-        if (dBmanger.doCheck()) {
-            DirectoryChooser directoryChooser = new DirectoryChooser();
-            directoryChooser.setInitialDirectory(dBmanger.getPath());
-            Stage stage = new Stage();
-            File file = directoryChooser.showDialog(stage);
-
-            if (file != null) {
-                System.out.println("生成目录:" + file.getAbsolutePath());
-                dBmanger.generateService(ManagerFactory.getProjectManager().getProject(), file);
-            }
-        }
-    }
-
     @FXML
     public void generateApi(ActionEvent actionEvent) {
         Dialog.showApi();

src/main/java/xyz/wbsite/dbtool/javafx/manger/FreeMarkerManager.java

@@ -11,6 +11,7 @@ import freemarker.template.TemplateMethodModelEx;
 import freemarker.template.TemplateModelException;
 import org.springframework.util.ClassUtils;
 import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer;
+import xyz.wbsite.dbtool.javafx.tool.Tool;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -30,6 +31,7 @@ public class FreeMarkerManager {
         cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
         cfg.setNumberFormat("0.##");
         cfg.setSharedVariable("print", new Print());
+        cfg.setSharedVariable("uuid", new Uuid());
 
         MultiTemplateLoader multiTemplateLoader = new MultiTemplateLoader(new TemplateLoader[]{
                 new ClassTemplateLoader(ClassUtils.getDefaultClassLoader(), "/modules"),
@@ -77,4 +79,12 @@ public class FreeMarkerManager {
         }
     }
 
+    private class Uuid implements TemplateMethodModelEx {
+
+        @Override
+        public Object exec(List list) throws TemplateModelException {
+            return Tool.uuid();
+        }
+    }
+
 }

src/main/java/xyz/wbsite/dbtool/javafx/manger/ProjectManager.java

@@ -5,7 +5,6 @@ import xyz.wbsite.dbtool.javafx.manger.callable.AndroidCallable;
 import xyz.wbsite.dbtool.javafx.manger.callable.ApiCallable;
 import xyz.wbsite.dbtool.javafx.manger.callable.DocCallable;
 import xyz.wbsite.dbtool.javafx.manger.callable.SpringBootCallable;
-import xyz.wbsite.dbtool.javafx.manger.callable.SpringBootServiceCallable;
 import xyz.wbsite.dbtool.javafx.manger.callable.VueCallable;
 import xyz.wbsite.dbtool.javafx.po.AbstractDBmapper;
 import xyz.wbsite.dbtool.javafx.po.AndroidOption;
@@ -352,36 +351,6 @@ public class ProjectManager {
         });
     }
 
-    /**
-     * 生成无网页服务
-     *
-     * @param root
-     */
-    public void generateService(Project project, final File root) {
-        if (!root.exists()) {
-            Dialog.showTimedDialog(1000, "目录不存在!");
-        }
-        Dialog.showProgress("生成中...");
-
-        service.execute(new Runnable() {
-            @Override
-            public void run() {
-                Callable callback = new SpringBootServiceCallable(project, path);
-
-                Future submit = service.submit(callback);
-                try {
-                    submit.get();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                } catch (ExecutionException e) {
-                    e.printStackTrace();
-                }
-                Dialog.stopPopup();
-                Dialog.showSuccess("生成完毕.");
-            }
-        });
-    }
-
     public void generateApi(File module, File api, List<String> domainList, List<Api> apis) {
         if (module.exists()) {
             Dialog.showProgress("生成中...");

src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java

@@ -10,6 +10,7 @@ import xyz.wbsite.dbtool.javafx.annotation.Property;
 import xyz.wbsite.dbtool.javafx.po.DataBase;
 import xyz.wbsite.dbtool.javafx.po.DictItem;
 import xyz.wbsite.dbtool.javafx.po.Field;
+import xyz.wbsite.dbtool.javafx.po.Frame;
 import xyz.wbsite.dbtool.javafx.po.Module;
 import xyz.wbsite.dbtool.javafx.po.Project;
 import xyz.wbsite.dbtool.javafx.po.Table;
@@ -242,6 +243,10 @@ public class XmlManager {
                     Method method = ClassUtil.setMethod(field.getName(), o.getClass(), field.getType());
                     method.setAccessible(true);
                     method.invoke(o, getDataBase(attribute));
+                }else if (field.getType() == Frame.class) {
+                    Method method = ClassUtil.setMethod(field.getName(), o.getClass(), field.getType());
+                    method.setAccessible(true);
+                    method.invoke(o, getFrame(attribute));
                 } else if (field.getType() == StringProperty.class) {
                     Method method = ClassUtil.setMethod(field.getName(), o.getClass(), String.class);
                     method.setAccessible(true);
@@ -288,6 +293,13 @@ public class XmlManager {
         return DataBase.valueOf(str);
     }
 
+    private Frame getFrame(String str) {
+        if (str == null || "".equals(str)) {
+            return Frame.网页框架;
+        }
+        return Frame.valueOf(str);
+    }
+
     private boolean getBoolean(String str) {
         if (str != null && str.matches("true|1")) {
             return true;

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

@@ -5,6 +5,7 @@ import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
 import xyz.wbsite.dbtool.javafx.manger.XmlManager;
 import xyz.wbsite.dbtool.javafx.po.AbstractDBmapper;
 import xyz.wbsite.dbtool.javafx.po.DataBase;
+import xyz.wbsite.dbtool.javafx.po.Frame;
 import xyz.wbsite.dbtool.javafx.po.Module;
 import xyz.wbsite.dbtool.javafx.po.MySQLDBmapper;
 import xyz.wbsite.dbtool.javafx.po.OracleDBmapper;
@@ -25,6 +26,7 @@ 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 {
 
@@ -51,100 +53,80 @@ public class SpringBootCallable implements Callable {
 
     public Boolean call() throws Exception {
         // 创建项目文件夹
-        File projectDir = Tool.createPath(root, project.getProjectName());
+        File dir = Tool.createPath(root, project.getProjectName());
         // 清空内容
-        Tool.clear(projectDir);
+        Tool.clear(dir);
+
         // 生成java目录
-        File javaDir = Tool.createPath(projectDir, "src", "main", "java");
+        File javaDir = Tool.createPath(dir, "src", "main", "java");
         // 生成资源目录
-        File resourcesDir = Tool.createPath(projectDir, "src", "main", "resources");
+        File resourcesDir = Tool.createPath(dir, "src", "main", "resources");
         // 生成域名目录
         File domainDir = javaDir;
         for (String s : project.getProjectBasePackage().split("\\.")) {
             domainDir = Tool.createPath(domainDir, s);
         }
         // 生成单元测试java目录
-        File testJavaDir = Tool.createPath(projectDir, "src", "test", "java");
+        File testJavaDir = Tool.createPath(dir, "src", "test", "java");
         File testDomainDir = testJavaDir;
         for (String s : project.getProjectBasePackage().split("\\.")) {
             testDomainDir = Tool.createPath(testDomainDir, s);
         }
         // 生成单元测试resources目录
-        File testResourcesDir = Tool.createPath(projectDir, "src", "test", "resources");
+        File testResourcesDir = Tool.createPath(dir, "src", "test", "resources");
 
         // 生成POM
-        generatePom(projectDir, project);
+        generatePom(dir, project);
+
+        // Application
+        System.out.println("生成模块:Application");
+        generateApplication(Tool.createPath(domainDir), project);
 
-        {//生成java文件
+        if (project.getFrame().value() > Frame.空白框架.value()) {//生成java文件
             //生成 Controller
-            if (project.isNeedWeb() || project.isNeedApi()) {
+            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);
+            }
 
-            {// 模块
+            // 模块
-                for (Module module : project.getModules()) {// 业务模块
+            generateModule(Tool.createPath(domainDir, "module"), project);
-                    if (module.getNeedGenerate()) {
-                        module.setProjectAuthor(project.getProjectAuthor());
-                        module.setProjectBasePackage(project.getProjectBasePackage());
-                        module.setProjectName(project.getProjectName());
-
-                        File moduleDir = Tool.createPath(domainDir, "module", module.getModuleName());
 
-                        System.out.println("生成模块:Entity");
+            if (project.getFrame().value() >= Frame.服务框架.value()) {
-                        generateEntity(Tool.createPath(moduleDir, "ent"), module);
+                generateModuleFor服务框架(Tool.createPath(domainDir, "module"), project);
-                        System.out.println("生成模块:Mapper");
-                        generateMapper(Tool.createPath(moduleDir, "mpr"), module);
-                        System.out.println("生成模块:Manager");
-                        generateManager(Tool.createPath(moduleDir, "mgr"), module);
-                        System.out.println("生成模块:Request");
-                        generateRequest(Tool.createPath(moduleDir, "req"), module);
-                        System.out.println("生成模块:Response");
-                        generateResponse(Tool.createPath(moduleDir, "rsp"), module);
-                    }
             }
 
-                if (project.isNeedSys()) {//生成系统模块
+            if (project.getFrame().value() >= Frame.接口框架.value()) {
-                    Module module = new Module();
+                generateModuleFor接口框架(Tool.createPath(domainDir, "module"), project);
-                    module.setModuleName("system");
-                    module.setProjectAuthor(project.getProjectAuthor());
-                    module.setProjectBasePackage(project.getProjectBasePackage());
-                    module.setProjectName(project.getProjectName());
-                    File moduleDir = Tool.createPath(domainDir, "module", "system");
-                    generateSystemModule(moduleDir, module);
             }
+
+            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);
-
+            }
-            // Application
-            System.out.println("生成模块:Application");
-            generateApplication(Tool.createPath(domainDir), project);
         }
 
-        {//生成resources文件
+        //生成resources文件
-            System.out.println("生成模块:Resources");
         generateResources(resourcesDir, project);
 
-            if (project.isNeedWeb()) {
+        if (project.getFrame().value() > Frame.空白框架.value()) {
-                System.out.println("生成模块:Static");
-                generateStatic(resourcesDir, project);
-
-                System.out.println("生成模块:Templates");
-                generateTemplates(resourcesDir, project);
-            }
-        }
-
             {//生成Test
                 System.out.println("生成模块:Test");
                 generateTest(testDomainDir, project);
@@ -154,6 +136,8 @@ public class SpringBootCallable implements Callable {
                 System.out.println("生成模块:Test Resources");
                 generateTestResources(testResourcesDir, project);
             }
+        }
+
         System.out.println("finish");
         return true;
     }
@@ -188,7 +172,7 @@ public class SpringBootCallable implements Callable {
         ctx.put("author", project.getProjectAuthor());
         ctx.put("modules", project.getModules());
 
-        if (project.isNeedWeb()) {
+        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);
 
@@ -213,11 +197,11 @@ public class SpringBootCallable implements Callable {
                     }
                 }
 
-                if (project.isNeedSys()) {//生成系统模块
+                if (project.getFrame().value() >= Frame.网页框架.value()) {//生成系统模块
-                    File system = Tool.createPath(ajax, "system");
+                    File wsys = Tool.createPath(ajax, "wsys");
 
-                    for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/action/ajax/system/")) {
+                    for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/action/ajax/wsys/")) {
-                        freeMarkerManager.outputTemp(Tool.createFile(system, name), "SpringBoot/java/action/ajax/system/" + name, ctx);
+                        freeMarkerManager.outputTemp(Tool.createFile(wsys, name), "SpringBoot/java/action/ajax/wsys/" + name, ctx);
                     }
                 }
             }
@@ -241,11 +225,11 @@ public class SpringBootCallable implements Callable {
                 }
             }
 
-            if (project.isNeedSys()) {//生成系统模块
+            if (project.getFrame().value() >= Frame.网页框架.value()) {//生成系统模块
-                File system = Tool.createPath(api, "system");
+                File wsys = Tool.createPath(api, "wsys");
 
-                for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/action/api/system/")) {
+                for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/action/api/wsys/")) {
-                    freeMarkerManager.outputTemp(Tool.createFile(system, name), "SpringBoot/java/action/api/system/" + name, ctx);
+                    freeMarkerManager.outputTemp(Tool.createFile(wsys, name), "SpringBoot/java/action/api/wsys/" + name, ctx);
                 }
             }
         }
@@ -260,19 +244,24 @@ public class SpringBootCallable implements Callable {
             Tool.clear(root);
         }
         HashMap<String, Object> ctx = new HashMap<String, Object>();
+        ctx.put("project", project);
         ctx.put("domain", project.getProjectBasePackage());
         ctx.put("projectName", project.getProjectName());
         ctx.put("author", project.getProjectAuthor());
 
         //config
-        if (project.isNeedWeb() || project.isNeedApi()) {
+        if (project.getFrame().value() >= Frame.网页框架.value()) {
-            freeMarkerManager.outputTemp(Tool.createFile(root, "ActionConfig.java"), "SpringBoot/java/config/ActionConfig.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);
         }
+        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);
+        }
         if (project.isNeedAsync()) {
             freeMarkerManager.outputTemp(Tool.createFile(root, "ThreadPoolConfig.java"), "SpringBoot/java/config/ThreadPoolConfig.java", ctx);
         }
@@ -285,231 +274,203 @@ public class SpringBootCallable implements Callable {
         }
     }
 
-    /**
+    public void generateModule(File root, Project project) {
-     * 生成entity
-     *
-     * @param root
-     * @param md
-     */
-    public void generateEntity(File root, Module md) {
         if (!root.exists()) {
             root.mkdirs();
         } else {
             Tool.clear(root);
         }
 
-        for (Table table : md.getTables()) {
-            HashMap<String, Object> ctx = new HashMap<String, Object>();
-            ctx.put("tool", Tool.class);
-            ctx.put("domain", md.getProjectBasePackage());
-            ctx.put("moduleName", md.getModuleName());
-            ctx.put("table", table);
-            ctx.put("author", md.getProjectAuthor());
-
-            File file = Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + ".java");
-            freeMarkerManager.outputTemp(file, "SpringBoot/java/module/ent/entity.ftl", ctx);
-        }
-    }
-
-    /**
-     * 生成Mapper
-     *
-     * @param root
-     * @param md
-     */
-    public void generateMapper(File root, Module md) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
         HashMap<String, Object> ctx = new HashMap<String, Object>();
-
+        for (Module module : project.getModules()) {// 业务模块
-        ctx.put("tool", Tool.class);
+            ctx.put("project", project);
-        ctx.put("module", md);
+            ctx.put("module", module);
+            ctx.put("domain", project.getProjectBasePackage());
+            ctx.put("author", project.getProjectAuthor());
+            ctx.put("moduleName", module.getModuleName());
             ctx.put("dataBase", project.getDatabase().toString());
-        ctx.put("domain", md.getProjectBasePackage());
-        ctx.put("moduleName", md.getModuleName());
-        ctx.put("author", md.getProjectAuthor());
 
-        for (Table table : md.getTables()) {
+            File ent = Tool.createFile(Tool.createPath(root, module.getModuleName()), "ent");
-            ctx.put("table", table);
+            File mpr = Tool.createFile(Tool.createPath(root, module.getModuleName()), "mpr");
-            if (table.getSys()) {
+            File mgr = Tool.createFile(Tool.createPath(root, module.getModuleName()), "mgr");
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), "SpringBoot/java/module/mpr/Mapper.java", ctx);
+            File req = Tool.createFile(Tool.createPath(root, module.getModuleName()), "req");
-            } else {
+            File rsp = Tool.createFile(Tool.createPath(root, module.getModuleName()), "rsp");
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), "SpringBoot/java/module/mpr/Mapper_NSYS.java", ctx);
-            }
-
-            if (table.getSys()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_mapper.xml", ctx);
-            } else {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_NSYS_mapper.xml", ctx);
-            }
-        }
-    }
-
-    public void generateManager(File root, Module md) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
 
-        ctx.put("tool", Tool.class);
+            if (module.getNeedGenerate()) {
-        ctx.put("module", md);
+                module.setProjectAuthor(project.getProjectAuthor());
-        ctx.put("domain", md.getProjectBasePackage());
+                module.setProjectBasePackage(project.getProjectBasePackage());
-        ctx.put("moduleName", md.getModuleName());
+                module.setProjectName(project.getProjectName());
-        ctx.put("author", md.getProjectAuthor());
 
-        for (Table table : md.getTables()) {
+                for (Table table : module.getTables()) {
                     ctx.put("table", table);
-            freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "Manager" + ".java"), "SpringBoot/java/module/mgr/manager.ftl", ctx);
-            freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBoot/java/module/mgr/managerImpl.ftl", ctx);
-        }
-    }
 
-    /**
+                    // 生成Ent
-     * 生成Request
+                    File file = Tool.createFile(ent, Tool.ABB2Abb(table.getTableName()) + ".java");
-     *
+                    freeMarkerManager.outputTemp(file, "SpringBoot/java/module/ent/entity.ftl", ctx);
-     * @param root
+
-     * @param md
+                    // 生成Mapper
-     */
+                    if (table.getSys()) {
-    public void generateRequest(File root, Module md) {
+                        freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), "SpringBoot/java/module/mpr/Mapper.java", ctx);
-        if (!root.exists()) {
+                        freeMarkerManager.outputTemp(Tool.createFile(mpr, Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBoot/java/module/mpr/" + project.getDatabase().name() + "_mapper.xml", ctx);
-            root.mkdirs();
                     } else {
-            Tool.clear(root);
+                        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);
                     }
 
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
+                    freeMarkerManager.outputTemp(Tool.createFile(mgr, Tool.ABB2Abb(table.getTableName()) + "Manager" + ".java"), "SpringBoot/java/module/mgr/manager.ftl", ctx);
-        ctx.put("tool", Tool.class);
+                    freeMarkerManager.outputTemp(Tool.createFile(mgr, Tool.ABB2Abb(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBoot/java/module/mgr/managerImpl.ftl", ctx);
-        ctx.put("module", md);
-        ctx.put("domain", md.getProjectBasePackage());
-        ctx.put("moduleName", md.getModuleName());
-        ctx.put("author", md.getProjectAuthor());
-
-        for (Table table : md.getTables()) {
-            ctx.put("table", table);
 
                     if (table.getCreate()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "CreateRequest" + ".java"), "SpringBoot/java/module/req/createRequestClass.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()) + "CreateResponse" + ".java"), "SpringBoot/java/module/rsp/createResponseClass.ftl", ctx);
                     }
 
                     if (table.getDelete()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "DeleteRequest" + ".java"), "SpringBoot/java/module/req/deleteRequestClass.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()) + "DeleteResponse" + ".java"), "SpringBoot/java/module/rsp/deleteResponseClass.ftl", ctx);
                     }
 
                     if (table.getUpdate()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "UpdateRequest" + ".java"), "SpringBoot/java/module/req/updateRequestClass.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()) + "UpdateResponse" + ".java"), "SpringBoot/java/module/rsp/updateResponseClass.ftl", ctx);
                     }
 
                     if (table.getFind()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "FindRequest" + ".java"), "SpringBoot/java/module/req/findRequestClass.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()) + "FindResponse" + ".java"), "SpringBoot/java/module/rsp/findResponseClass.ftl", ctx);
                     }
 
                     if (table.getGet()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "GetRequest" + ".java"), "SpringBoot/java/module/req/getRequestClass.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()) + "GetResponse" + ".java"), "SpringBoot/java/module/rsp/getResponseClass.ftl", ctx);
                     }
 
                     if (table.getSearch()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "SearchRequest" + ".java"), "SpringBoot/java/module/req/searchRequestClass.ftl", ctx);
+                        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);
+                    }
                 }
             }
         }
-
-    /**
-     * 生成一般文件
-     *
-     * @param root
-     * @param md
-     */
-    public void generateResponse(File root, Module md) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
     }
 
+    public void generateModuleFor服务框架(File root, Project project) {
         HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("tool", Tool.class);
+        ctx.put("project", project);
-        ctx.put("module", md);
+        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("domain", md.getProjectBasePackage());
+        ctx.put("author", project.getProjectAuthor());
-        ctx.put("moduleName", md.getModuleName());
+        ctx.put("dataBase", project.getDatabase().toString());
-        ctx.put("author", md.getProjectAuthor());
+        File ent = Tool.createPath(root, "wsvr", "ent");
-
+        File mpr = Tool.createPath(root, "wsvr", "mpr");
-        for (Table table : md.getTables()) {
+        File mgr = Tool.createPath(root, "wsvr", "mgr");
-            ctx.put("table", table);
+        File req = Tool.createPath(root, "wsvr", "req");
-
+        File rsp = Tool.createPath(root, "wsvr", "rsp");
-            if (table.getCreate()) {
+        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsvr/ent/")) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "CreateResponse" + ".java"), "SpringBoot/java/module/rsp/createResponseClass.ftl", ctx);
+            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);
             }
-
-            if (table.getDelete()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "DeleteResponse" + ".java"), "SpringBoot/java/module/rsp/deleteResponseClass.ftl", ctx);
         }
-
+        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsvr/req/")) {
-            if (table.getUpdate()) {
+            freeMarkerManager.outputTemp(Tool.createFile(req, name), "SpringBoot/java/module/wsvr/req/" + name, ctx);
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "UpdateResponse" + ".java"), "SpringBoot/java/module/rsp/updateResponseClass.ftl", ctx);
         }
-
+        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsvr/rsp/")) {
-            if (table.getFind()) {
+            freeMarkerManager.outputTemp(Tool.createFile(rsp, name), "SpringBoot/java/module/wsvr/rsp/" + name, ctx);
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "FindResponse" + ".java"), "SpringBoot/java/module/rsp/findResponseClass.ftl", ctx);
         }
-
-            if (table.getGet()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "GetResponse" + ".java"), "SpringBoot/java/module/rsp/getResponseClass.ftl", ctx);
     }
 
-            if (table.getSearch()) {
+    public void generateModuleFor接口框架(File root, Project project) {
-                freeMarkerManager.outputTemp(Tool.createFile(root, Tool.ABB2Abb(table.getTableName()) + "SearchResponse" + ".java"), "SpringBoot/java/module/rsp/searchResponseClass.ftl", ctx);
+        HashMap<String, Object> ctx = new HashMap<String, Object>();
+        ctx.put("project", project);
+        ctx.put("domain", project.getProjectBasePackage());
+        ctx.put("author", project.getProjectAuthor());
+        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 generateSystemModule(File root, Module md) {
+    public void generateModuleFor网页框架(File root, Project project) {
-        File ent = Tool.createPath(root, "ent");
-        File mpr = Tool.createPath(root, "mpr");
-        File mgr = Tool.createPath(root, "mgr");
-        File req = Tool.createPath(root, "req");
-        File rsp = Tool.createPath(root, "rsp");
-
         HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("domain", md.getProjectBasePackage());
+        ctx.put("project", project);
-        ctx.put("moduleName", md.getModuleName());
+        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("author", md.getProjectAuthor());
+        ctx.put("moduleName", "wsys");
+        ctx.put("author", project.getProjectAuthor());
         ctx.put("dataBase", project.getDatabase().toString());
 
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/system/ent/")) {
+        File ent = Tool.createPath(root, "wsys", "ent");
-            freeMarkerManager.outputTemp(Tool.createFile(ent, name), "SpringBoot/java/module/system/ent/" + name, ctx);
+        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");
+        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/ent/")) {
+            freeMarkerManager.outputTemp(Tool.createFile(ent, name), "SpringBoot/java/module/wsys/ent/" + name, ctx);
         }
 
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/system/mgr/")) {
+        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/mgr/")) {
-            if (name.contains("TokensManager") && !project.isNeedWeb() && !project.isNeedApi()) {// 当不需要Web和Api时不需要处理Token问题
+            if (name.contains("TokensManager") && project.getFrame().value() < Frame.接口框架.value()) {// 当不需要Web和Api时不需要处理Token问题
                 continue;
             }
-            freeMarkerManager.outputTemp(Tool.createFile(mgr, name), "SpringBoot/java/module/system/mgr/" + name, ctx);
+            freeMarkerManager.outputTemp(Tool.createFile(mgr, name), "SpringBoot/java/module/wsys/mgr/" + name, ctx);
         }
 
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/system/mpr/")) {
+        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/mpr/")) {
             if (name.endsWith(".java")) {
-                freeMarkerManager.outputTemp(Tool.createFile(mpr, name), "SpringBoot/java/module/system/mpr/" + name, ctx);
+                freeMarkerManager.outputTemp(Tool.createFile(mpr, name), "SpringBoot/java/module/wsys/mpr/" + name, ctx);
             } else if (name.contains(project.getDatabase().name())) {
-                //todo dateBase调试
+                freeMarkerManager.outputTemp(Tool.createFile(mpr, name.replaceAll(project.getDatabase().name() + "_", "")), "SpringBoot/java/module/wsys/mpr/" + name, ctx);
-//                freeMarkerManager.outputTemp(Tool.createFile(mpr, name), "SpringBoot/java/module/system/mpr/" + name, ctx);
-                freeMarkerManager.outputTemp(Tool.createFile(mpr, name.replaceAll(project.getDatabase().name() + "_", "")), "SpringBoot/java/module/system/mpr/" + name, ctx);
             }
         }
 
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/system/req/")) {
+        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/req/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(req, name), "SpringBoot/java/module/system/req/" + name, ctx);
+            freeMarkerManager.outputTemp(Tool.createFile(req, name), "SpringBoot/java/module/wsys/req/" + name, ctx);
         }
 
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/system/rsp/")) {
+        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/module/wsys/rsp/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(rsp, name), "SpringBoot/java/module/system/rsp/" + name, ctx);
+            freeMarkerManager.outputTemp(Tool.createFile(rsp, name), "SpringBoot/java/module/wsys/rsp/" + name, ctx);
         }
     }
 
+
     /**
      * 生成frame类
      *
@@ -523,33 +484,54 @@ public class SpringBootCallable implements Callable {
             Tool.clear(root);
         }
         HashMap<String, Object> ctx = new HashMap<String, Object>();
+        ctx.put("project", project);
         ctx.put("domain", project.getProjectBasePackage());
         ctx.put("moduleName", project.getProjectName());
         ctx.put("timestamp", new Date().getTime());
 
-        File auth = Tool.createPath(root, "auth");
-        File base = Tool.createPath(root, "base");
-        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");
-        File schedule = Tool.createPath(root, "schedule");
-        File utils = Tool.createPath(root, "utils");
-        File validation = Tool.createPath(root, "validation");
-
         //auth
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/auth/")) {
+        File auth = Tool.createPath(root, "auth");
-            freeMarkerManager.outputTemp(Tool.createFile(auth, name), "SpringBoot/java/frame/auth/" + name, ctx);
+        freeMarkerManager.outputTemp(Tool.createFile(auth, "LocalData.java"), "SpringBoot/java/frame/auth/LocalData.java", ctx);
+        freeMarkerManager.outputTemp(Tool.createFile(auth, "Token.java"), "SpringBoot/java/frame/auth/Token.java", ctx);
+        if (project.getFrame().value() >= Frame.接口框架.value()) {
+            freeMarkerManager.outputTemp(Tool.createFile(auth, "Verification.java"), "SpringBoot/java/frame/auth/Verification.java", ctx);
         }
 
         //base
+        File base = Tool.createPath(root, "base");
         for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/base/")) {
             freeMarkerManager.outputTemp(Tool.createFile(base, name), "SpringBoot/java/frame/base/" + name, ctx);
         }
 
+        //utils
+        File utils = Tool.createPath(root, "utils");
+        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/utils/")) {
+            ArrayList<String> filters = new ArrayList<>();
+            filters.add("MailUtil.java");
+
+            if (filters.contains(name)) {
+                if (project.isNeedEMail()) {
+                    freeMarkerManager.outputTemp(Tool.createFile(utils, name), "SpringBoot/java/frame/utils/" + name, ctx);
+                }
+            } else {
+                freeMarkerManager.outputTemp(Tool.createFile(utils, name), "SpringBoot/java/frame/utils/" + name, ctx);
+            }
+        }
+
+        File schedule = Tool.createPath(root, "schedule");
+        //schedule
+        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/schedule/")) {
+            freeMarkerManager.outputTemp(Tool.createFile(schedule, name), "SpringBoot/java/frame/schedule/" + name, ctx);
+        }
+
         //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);
             }
@@ -568,32 +550,16 @@ public class SpringBootCallable implements Callable {
             for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/excel/listener/")) {
                 freeMarkerManager.outputTemp(Tool.createFile(excellistener, name), "SpringBoot/java/frame/excel/listener/" + name, ctx);
             }
-
-        //schedule
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/schedule/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(schedule, name), "SpringBoot/java/frame/schedule/" + name, ctx);
-        }
-
-        //utils
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/frame/utils/")) {
-            ArrayList<String> filters = new ArrayList<>();
-            filters.add("MailUtil.java");
-
-            if (filters.contains(name)) {
-                if (project.isNeedEMail()) {
-                    freeMarkerManager.outputTemp(Tool.createFile(utils, name), "SpringBoot/java/frame/utils/" + name, ctx);
-                }
-            } else {
-                freeMarkerManager.outputTemp(Tool.createFile(utils, name), "SpringBoot/java/frame/utils/" + 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);
             }
         }
-
+    }
 
     /**
      * 生成frame类
@@ -613,7 +579,7 @@ public class SpringBootCallable implements Callable {
 
         //task
         for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/java/task/")) {
-            if (name.contains("TokenTask") && !project.isNeedWeb() && !project.isNeedApi()) {
+            if (name.contains("TokenTask") && project.getFrame().value() < Frame.网页框架.value()) {
                 continue;
             }
             freeMarkerManager.outputTemp(Tool.createFile(root, name), "SpringBoot/java/task/" + name, ctx);
@@ -634,30 +600,32 @@ public class SpringBootCallable implements Callable {
     }
 
     /**
-     * 生成properties
+     * 生成Resources
      *
      * @param root
      * @param project
      */
     public void generateResources(File root, Project project) {
         HashMap<String, Object> ctx = new HashMap<String, Object>();
-
         ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("tool", Tool.class);
         ctx.put("dataBase", project.getDatabase().toString());
         ctx.put("author", project.getProjectAuthor());
         ctx.put("dBmapper", dBmapper);
         ctx.put("author", project.getProjectAuthor());
         ctx.put("projectName", project.getProjectName());
         ctx.put("project", project);
+
+        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.properties"), "SpringBoot/resources/application.ftl", 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();
@@ -675,12 +643,22 @@ public class SpringBootCallable implements Callable {
                 freeMarkerManager.outputTemp(Tool.createFile(tableDir, project.getDatabase().name() + "_ALL_TABLE" + ".sql"), "SpringBoot/resources/dbtool/tableAll.ftl", ctx);
             }
 
-        if (project.isNeedSys()) {//生成系统模块
+            if (project.getFrame().value() >= Frame.服务框架.value()) {
-            File system = Tool.createPath(dbtool, "system_table");
+                File wsvr = Tool.createPath(dbtool, "wsvr_table");
 
-            for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/dbtool/system/")) {
+                for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/dbtool/wsvr/")) {
                     if (name.contains(project.getDatabase().name())) {
-                    freeMarkerManager.outputTemp(Tool.createFile(system, name), "SpringBoot/resources/dbtool/system/" + name, ctx);
+                        freeMarkerManager.outputTemp(Tool.createFile(wsvr, name), "SpringBoot/resources/dbtool/wsvr/" + name, ctx);
+                    }
+                }
+            }
+
+            if (project.getFrame().value() >= Frame.网页框架.value()) {//生成系统模块
+                File wsys = Tool.createPath(dbtool, "wsys_table");
+
+                for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/dbtool/wsys/")) {
+                    if (name.contains(project.getDatabase().name())) {
+                        freeMarkerManager.outputTemp(Tool.createFile(wsys, name), "SpringBoot/resources/dbtool/wsys/" + name, ctx);
                     }
                 }
             }
@@ -722,55 +700,22 @@ public class SpringBootCallable implements Callable {
                     }
                 }
             }
-    }
-
-    public void generateTestResources(File root, Project project) {
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-
-        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("projectName", project.getProjectName());
-        ctx.put("tool", Tool.class);
-        ctx.put("dataBase", project.getDatabase().toString());
-        ctx.put("author", project.getProjectAuthor());
-        ctx.put("dBmapper", dBmapper);
-        ctx.put("project", project);
-        freeMarkerManager.outputTemp(Tool.createFile(root, "application.properties"), "SpringBoot/test/application.ftl", ctx);
-        Tool.outputResource("SpringBoot/test/logback-spring.xml", Tool.createFile(root, "logback-spring.xml"));
-    }
-
-    /**
-     * 生成static
-     *
-     * @param root
-     * @param project
-     */
-    public void generateStatic(File root, Project project) {
-
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("tool", Tool.class);
-        ctx.put("author", project.getProjectAuthor());
-        ctx.put("modules", project.getModules());
 
+            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文件
+                //css文件
                 freeMarkerManager.outputTemp(Tool.createFile(css, "base.css"), "SpringBoot/resources/static/css/base.css", ctx);
-        }
 
-        {//img
+                //img
                 Tool.outputResource("SpringBoot/resources/static/img/logo.png", Tool.createFile(img, "logo.png"));
-        }
 
-        {//dist文件
+                // dist文件jquery + vue + vue-router + axios
-            //jquery + vue + vue-router + axios
                 Tool.outputResource("SpringBoot/resources/static/dist/lib.min.js", Tool.createFile(dist, "lib.min.js"));
 
                 //element-ui
@@ -782,17 +727,7 @@ public class SpringBootCallable implements Callable {
                 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");
-    }
-
-    /**
-     * 生成static
-     *
-     * @param root
-     * @param project
-     */
-    public void generateTemplates(File root, Project project) {
-        {//生成
                 File templates = Tool.createPath(root, "templates");
                 File control = Tool.createPath(templates, "control");
                 File layout = Tool.createPath(templates, "layout");
@@ -806,25 +741,12 @@ public class SpringBootCallable implements Callable {
                 Tool.outputResource("SpringBoot/resources/templates/404.ftl", Tool.createFile(templates, "404.ftl"));
                 Tool.outputResource("SpringBoot/resources/templates/500.ftl", Tool.createFile(templates, "500.ftl"));
 
-            {
-                HashMap<String, Object> ctx = new HashMap<String, Object>();
-                ctx.put("domain", project.getProjectBasePackage());
-                ctx.put("tool", new Tool());
-                ctx.put("author", project.getProjectAuthor());
-                ctx.put("modules", project.getModules());
-                ctx.put("sysMD", project.isNeedSys());
                 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());
-                        HashMap<String, Object> ctx = new HashMap<String, Object>();
-                        ctx.put("domain", project.getProjectBasePackage());
-                        ctx.put("tool", Tool.class);
-                        ctx.put("author", project.getProjectAuthor());
                             ctx.put("table", table);
                             ctx.put("module", module);
                             ctx.put("fields", table.getFields());
@@ -834,22 +756,35 @@ public class SpringBootCallable implements Callable {
                     }
                 }
 
-            if (project.isNeedSys()) {//生成系统模块
+                //生成网页
-                File system = Tool.createPath(screen, "system");
+                if (project.getFrame().value() >= Frame.网页框架.value()) {
-                for (String name : ResourceUtil.getResourceFiles("/modules/SpringBoot/resources/templates/screen/module/system/")) {
+                    File wsys = Tool.createPath(screen, "wsys");
-                    Tool.outputResource("SpringBoot/resources/templates/screen/module/system/" + name, Tool.createFile(system, name));
+                    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));
+                    }
                 }
             }
         }
     }
 
-    public void generateTest(File root, Project project) {
+    public void generateTestResources(File root, Project project) {
+        HashMap<String, Object> ctx = new HashMap<String, Object>();
 
+        ctx.put("domain", project.getProjectBasePackage());
+        ctx.put("projectName", project.getProjectName());
+        ctx.put("dataBase", project.getDatabase().toString());
+        ctx.put("author", project.getProjectAuthor());
+        ctx.put("dBmapper", dBmapper);
+        ctx.put("project", project);
+        freeMarkerManager.outputTemp(Tool.createFile(root, "application.properties"), "SpringBoot/test/application.ftl", ctx);
+        Tool.outputResource("SpringBoot/test/logback-spring.xml", Tool.createFile(root, "logback-spring.xml"));
+    }
+
+    public void generateTest(File root, Project project) {
         {
             File config = Tool.createPath(root, "config");
             config.mkdirs();
             HashMap<String, Object> ctx = new HashMap<String, Object>();
-            ctx.put("tool", Tool.class);
             ctx.put("domain", project.getProjectBasePackage());
             ctx.put("moduleName", project.getProjectName());
             ctx.put("author", project.getProjectAuthor());
@@ -859,7 +794,6 @@ public class SpringBootCallable implements Callable {
 
         {
             HashMap<String, Object> ctx = new HashMap<String, Object>();
-            ctx.put("tool", Tool.class);
             ctx.put("domain", project.getProjectBasePackage());
             ctx.put("moduleName", project.getProjectName());
             ctx.put("author", project.getProjectAuthor());
@@ -877,7 +811,6 @@ public class SpringBootCallable implements Callable {
                     ctx.put("domain", project.getProjectBasePackage());
                     ctx.put("module", md);
                     ctx.put("moduleName", md.getModuleName());
-                    ctx.put("tool", Tool.class);
                     ctx.put("table", table);
                     ctx.put("author", md.getProjectAuthor());
 
@@ -887,31 +820,60 @@ public class SpringBootCallable implements Callable {
             }
         }
 
-        if (project.isNeedSys()) {//生成系统模块
+        if (project.getFrame().value() >= Frame.服务框架.value()) {
             HashMap<String, Object> ctx = new HashMap<String, Object>();
-            ctx.put("tool", Tool.class);
+
             ctx.put("domain", project.getProjectBasePackage());
             ctx.put("moduleName", project.getProjectName());
             ctx.put("author", project.getProjectAuthor());
-            File system = Tool.createPath(root, "system");
+            File wsvr = Tool.createPath(root, "wsvr");
 
-            for (String apiFile : ResourceUtil.getResourceFiles("/modules/SpringBoot/test/system/")) {
+            for (String apiFile : ResourceUtil.getResourceFiles("/modules/SpringBoot/test/wsvr/")) {
-                if (apiFile.contains("TokensTest") && !project.isNeedWeb() && !project.isNeedApi()) {
+                freeMarkerManager.outputTemp(Tool.createFile(wsvr, apiFile), "SpringBoot/test/wsvr/" + apiFile, ctx);
-                    continue;
             }
-                freeMarkerManager.outputTemp(Tool.createFile(system, apiFile), "SpringBoot/test/system/" + apiFile, ctx);
         }
+
+        if (project.getFrame().value() >= Frame.接口框架.value()) {
+            HashMap<String, Object> ctx = new HashMap<String, Object>();
+
+            ctx.put("domain", project.getProjectBasePackage());
+            ctx.put("moduleName", project.getProjectName());
+            ctx.put("author", project.getProjectAuthor());
+            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()) {
             HashMap<String, Object> ctx = new HashMap<String, Object>();
-            ctx.put("tool", Tool.class);
             ctx.put("domain", project.getProjectBasePackage());
             ctx.put("moduleName", project.getProjectName());
             ctx.put("author", project.getProjectAuthor());
-            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.getProjectBasePackage());
             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.getProjectBasePackage());
+            freeMarkerManager.outputTemp(Tool.createFile(root, "ExcelTest.java"), "SpringBoot/test/ExcelTest.java", ctx);
+        }
     }
 }

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

@@ -1,620 +0,0 @@
-package xyz.wbsite.dbtool.javafx.manger.callable;
-
-import xyz.wbsite.dbtool.javafx.manger.FreeMarkerManager;
-import xyz.wbsite.dbtool.javafx.manger.ManagerFactory;
-import xyz.wbsite.dbtool.javafx.manger.XmlManager;
-import xyz.wbsite.dbtool.javafx.po.AbstractDBmapper;
-import xyz.wbsite.dbtool.javafx.po.DataBase;
-import xyz.wbsite.dbtool.javafx.po.Module;
-import xyz.wbsite.dbtool.javafx.po.MySQLDBmapper;
-import xyz.wbsite.dbtool.javafx.po.OracleDBmapper;
-import xyz.wbsite.dbtool.javafx.po.Project;
-import xyz.wbsite.dbtool.javafx.po.SQLiteDBmapper;
-import xyz.wbsite.dbtool.javafx.po.Table;
-import xyz.wbsite.dbtool.javafx.tool.Tool;
-import xyz.wbsite.dbtool.web.frame.utils.FileUtil;
-import xyz.wbsite.dbtool.web.frame.utils.ResourceUtil;
-
-import java.io.File;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.concurrent.Callable;
-
-public class SpringBootServiceCallable implements Callable {
-
-    private File root;
-    private Project project;
-    private AbstractDBmapper dBmapper;
-    private FreeMarkerManager freeMarkerManager;
-
-    public SpringBootServiceCallable(Project project, File root) {
-        this.root = root;
-        this.project = project;
-        this.freeMarkerManager = ManagerFactory.getFreeMarkerManager();
-        // 根据配置获取数据库处理器
-        if (project.getDatabase().name().equals(DataBase.MySQL.name())) {
-            this.dBmapper = new MySQLDBmapper();
-        } else if (project.getDatabase().name().equals(DataBase.Oracle.name())) {
-            this.dBmapper = new OracleDBmapper();
-        } else if (project.getDatabase().name().equals(DataBase.SQLite.name())) {
-            this.dBmapper = new SQLiteDBmapper();
-        } else {
-            this.dBmapper = new MySQLDBmapper();
-        }
-    }
-
-    public Boolean call() throws Exception {
-        // 创建项目文件夹
-        File projectDir = Tool.createPath(root, project.getProjectName());
-        // 清空内容
-        Tool.clear(projectDir);
-        // 生成java目录
-        File javaDir = Tool.createPath(projectDir.getAbsolutePath(), "src", "main", "java");
-        // 生成资源目录
-        File resourcesDir = Tool.createPath(projectDir.getAbsolutePath(), "src", "main", "resources");
-        // 生成域名目录
-        File domainDir = javaDir;
-        for (String s : project.getProjectBasePackage().split("\\.")) {
-            domainDir = Tool.createPath(domainDir.getAbsolutePath(), s);
-        }
-        // 生成单元测试java目录
-        File testJavaDir = Tool.createPath(projectDir.getAbsolutePath(), "src", "test", "java");
-        File testDomainDir = testJavaDir;
-        for (String s : project.getProjectBasePackage().split("\\.")) {
-            testDomainDir = Tool.createPath(testDomainDir.getAbsolutePath(), s);
-        }
-        // 生成单元测试resources目录
-        File testResourcesDir = Tool.createPath(projectDir.getAbsolutePath(), "src", "test", "resources");
-
-        // 生成POM
-        generatePom(projectDir, project);
-
-        {//生成java文件
-            // 生成 Config
-            System.out.println("生成模块:config");
-            generateConfig(Tool.createPath(domainDir.getAbsolutePath(), "config"), project);
-
-
-            {// 模块
-                for (Module module : project.getModules()) {// 业务模块
-                    module.setProjectAuthor(project.getProjectAuthor());
-                    module.setProjectBasePackage(project.getProjectBasePackage());
-                    module.setProjectName(project.getProjectName());
-
-                    File moduleDir = Tool.createPath(domainDir.getAbsolutePath(), "module", module.getModuleName());
-
-                    System.out.println("生成模块:Entity");
-                    generateEntity(Tool.createPath(moduleDir.getAbsolutePath(), "ent"), module);
-                    System.out.println("生成模块:Mapper");
-                    generateMapper(Tool.createPath(moduleDir.getAbsolutePath(), "mpr"), module);
-                    System.out.println("生成模块:Manager");
-                    generateManager(Tool.createPath(moduleDir.getAbsolutePath(), "mgr"), module);
-                    System.out.println("生成模块:Request");
-                    generateRequest(Tool.createPath(moduleDir.getAbsolutePath(), "req"), module);
-                    System.out.println("生成模块:Response");
-                    generateResponse(Tool.createPath(moduleDir.getAbsolutePath(), "rsp"), module);
-                }
-            }
-
-            // frame等内容
-            System.out.println("生成模块:frame");
-            generateFrame(Tool.createPath(domainDir.getAbsolutePath(), "frame"), project);
-
-            // Task
-            System.out.println("生成模块:task");
-            generateTask(Tool.createPath(domainDir.getAbsolutePath(), "task"), project);
-
-            // Application
-            System.out.println("生成模块:Application");
-            generateApplication(Tool.createPath(domainDir.getAbsolutePath()), project);
-        }
-
-        {//生成resources文件
-            System.out.println("生成模块:Resources");
-            generateResources(resourcesDir, project);
-            System.out.println("生成模块:Static");
-            System.out.println("生成模块:Templates");
-        }
-
-        {//生成Test
-            System.out.println("生成模块:Test");
-            generateTest(testDomainDir, project);
-        }
-
-        {//生成Test Resources
-            System.out.println("生成模块:Test Resources");
-            generateTestResources(testResourcesDir, project);
-        }
-        System.out.println("finish");
-        return true;
-    }
-
-
-    /**
-     * 生成POM.xml
-     *
-     * @param root
-     * @param project
-     */
-    public void generatePom(File root, Project project) {
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("projectName", project.getProjectName());
-        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("dataBase", project.getDatabase().toString());
-        ctx.put("project", project);
-        freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "pom.xml"), "SpringBootService/pom.ftl", ctx);
-    }
-
-    public void generateConfig(File root, Project project) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("projectName", project.getProjectName());
-        ctx.put("author", project.getProjectAuthor());
-
-        //config
-        freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "ScheduleConfig.java"), "SpringBootService/java/config/ScheduleConfig.java", ctx);
-        if (project.getDatabase().name().equals(DataBase.SQLite.name())) {
-            freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "SQLiteConfig.java"), "SpringBootService/java/config/SQLiteConfig.java", ctx);
-        }
-        if (project.isNeedMoreDB()) {
-            freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "MapperMainConfig.java"), "SpringBootService/java/config/MapperMainConfig.java", ctx);
-            freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "MapperTwoConfig.java"), "SpringBootService/java/config/MapperTwoConfig.java", ctx);
-        }
-    }
-
-    /**
-     * 生成entity
-     *
-     * @param root
-     * @param md
-     */
-    public void generateEntity(File root, Module md) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
-
-        for (Table table : md.getTables()) {
-            HashMap<String, Object> ctx = new HashMap<String, Object>();
-            ctx.put("tool", Tool.class);
-            ctx.put("domain", md.getProjectBasePackage());
-            ctx.put("moduleName", md.getModuleName());
-            ctx.put("table", table);
-            ctx.put("author", md.getProjectAuthor());
-
-            File file = Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + ".java");
-            freeMarkerManager.outputTemp(file, "SpringBootService/java/module/ent/entity.ftl", ctx);
-        }
-    }
-
-    /**
-     * 生成Mapper
-     *
-     * @param root
-     * @param md
-     */
-    public void generateMapper(File root, Module md) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-
-        ctx.put("tool", Tool.class);
-        ctx.put("module", md);
-        ctx.put("dataBase", project.getDatabase().toString());
-        ctx.put("domain", md.getProjectBasePackage());
-        ctx.put("moduleName", md.getModuleName());
-        ctx.put("author", md.getProjectAuthor());
-
-        for (Table table : md.getTables()) {
-            ctx.put("table", table);
-            freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".java"), "SpringBootService/java/module/mpr/mapper.java", ctx);
-
-            if (table.getSys()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBootService/java/module/mpr/" + project.getDatabase().name() + "_mapper.xml", ctx);
-            } else {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Mapper" + ".xml"), "SpringBootService/java/module/mpr/" + project.getDatabase().name() + "_NSYS_mapper.xml", ctx);
-            }
-        }
-    }
-
-    public void generateManager(File root, Module md) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-
-        ctx.put("tool", Tool.class);
-        ctx.put("module", md);
-        ctx.put("domain", md.getProjectBasePackage());
-        ctx.put("moduleName", md.getModuleName());
-        ctx.put("author", md.getProjectAuthor());
-
-        for (Table table : md.getTables()) {
-            ctx.put("table", table);
-            freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Manager" + ".java"), "SpringBootService/java/module/mgr/manager.ftl", ctx);
-            freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "ManagerImpl" + ".java"), "SpringBootService/java/module/mgr/managerImpl.ftl", ctx);
-        }
-    }
-
-    /**
-     * 生成Request
-     *
-     * @param root
-     * @param md
-     */
-    public void generateRequest(File root, Module md) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
-
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("tool", Tool.class);
-        ctx.put("module", md);
-        ctx.put("domain", md.getProjectBasePackage());
-        ctx.put("moduleName", md.getModuleName());
-        ctx.put("author", md.getProjectAuthor());
-
-        if (md.getModuleName().equals("api")) {
-            freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "ApiExampleRequest" + ".java"), "SpringBootService/java/module/req/ApiExampleRequest.java", ctx);
-        }
-
-        for (Table table : md.getTables()) {
-            ctx.put("table", table);
-
-            if (table.getCreate()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "CreateRequest" + ".java"), "SpringBootService/java/module/req/createRequestClass.ftl", ctx);
-            }
-
-            if (table.getDelete()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "DeleteRequest" + ".java"), "SpringBootService/java/module/req/deleteRequestClass.ftl", ctx);
-            }
-
-            if (table.getUpdate()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "UpdateRequest" + ".java"), "SpringBootService/java/module/req/updateRequestClass.ftl", ctx);
-            }
-
-            if (table.getFind()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "FindRequest" + ".java"), "SpringBootService/java/module/req/findRequestClass.ftl", ctx);
-            }
-
-            if (table.getGet()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "GetRequest" + ".java"), "SpringBootService/java/module/req/getRequestClass.ftl", ctx);
-            }
-
-            if (table.getSearch()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "SearchRequest" + ".java"), "SpringBootService/java/module/req/searchRequestClass.ftl", ctx);
-            }
-        }
-    }
-
-    /**
-     * 生成一般文件
-     *
-     * @param root
-     * @param md
-     */
-    public void generateResponse(File root, Module md) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
-
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("tool", Tool.class);
-        ctx.put("module", md);
-        ctx.put("domain", md.getProjectBasePackage());
-        ctx.put("moduleName", md.getModuleName());
-        ctx.put("author", md.getProjectAuthor());
-
-        if (md.getModuleName().equals("api")) {
-            freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "ApiExampleResponse" + ".java"), "SpringBootService/java/module/rsp/ApiExampleResponse.java", ctx);
-        }
-
-        for (Table table : md.getTables()) {
-            ctx.put("table", table);
-
-            if (table.getCreate()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "CreateResponse" + ".java"), "SpringBootService/java/module/rsp/createResponseClass.ftl", ctx);
-            }
-
-            if (table.getDelete()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "DeleteResponse" + ".java"), "SpringBootService/java/module/rsp/deleteResponseClass.ftl", ctx);
-            }
-
-            if (table.getUpdate()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "UpdateResponse" + ".java"), "SpringBootService/java/module/rsp/updateResponseClass.ftl", ctx);
-            }
-
-            if (table.getFind()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "FindResponse" + ".java"), "SpringBootService/java/module/rsp/findResponseClass.ftl", ctx);
-            }
-
-            if (table.getGet()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "GetResponse" + ".java"), "SpringBootService/java/module/rsp/getResponseClass.ftl", ctx);
-            }
-
-            if (table.getSearch()) {
-                freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "SearchResponse" + ".java"), "SpringBootService/java/module/rsp/searchResponseClass.ftl", ctx);
-            }
-        }
-    }
-
-    /**
-     * 生成frame类
-     *
-     * @param root
-     * @param project
-     */
-    public void generateFrame(File root, Project project) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("moduleName", project.getProjectName());
-        ctx.put("timestamp", new Date().getTime());
-
-        File auth = Tool.createPath(root.getAbsolutePath(), "auth");
-        File base = Tool.createPath(root.getAbsolutePath(), "base");
-        File excel = Tool.createPath(root.getAbsolutePath(), "excel");
-        File excelannotation = Tool.createPath(excel.getAbsolutePath(), "annotation");
-        File excelconverter = Tool.createPath(excel.getAbsolutePath(), "converter");
-        File exception = Tool.createPath(excel.getAbsolutePath(), "exception");
-        File excelstyle = Tool.createPath(excel.getAbsolutePath(), "style");
-        File schedule = Tool.createPath(root.getAbsolutePath(), "schedule");
-        File utils = Tool.createPath(root.getAbsolutePath(), "utils");
-        File validation = Tool.createPath(root.getAbsolutePath(), "validation");
-
-        //auth
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/frame/auth/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(auth.getAbsolutePath(), name), "SpringBootService/java/frame/auth/" + name, ctx);
-        }
-
-        //base
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/frame/base/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(base.getAbsolutePath(), name), "SpringBootService/java/frame/base/" + name, ctx);
-        }
-
-        //excel
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/frame/excel/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(excel.getAbsolutePath(), name), "SpringBootService/java/frame/excel/" + name, ctx);
-        }
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/frame/excel/annotation/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(excelannotation.getAbsolutePath(), name), "SpringBootService/java/frame/excel/annotation/" + name, ctx);
-        }
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/frame/excel/converter/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(excelconverter.getAbsolutePath(), name), "SpringBootService/java/frame/excel/converter/" + name, ctx);
-        }
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/frame/excel/exception/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(exception.getAbsolutePath(), name), "SpringBootService/java/frame/excel/exception/" + name, ctx);
-        }
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/frame/excel/style/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(excelstyle.getAbsolutePath(), name), "SpringBootService/java/frame/excel/style/" + name, ctx);
-        }
-
-        //schedule
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/frame/schedule/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(schedule.getAbsolutePath(), name), "SpringBootService/java/frame/schedule/" + name, ctx);
-        }
-        //utils
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/frame/utils/")) {
-            ArrayList<String> filters = new ArrayList<>();
-            filters.add("MailUtil.java");
-
-            if (filters.contains(name)) {
-                if (project.isNeedEMail()) {
-                    freeMarkerManager.outputTemp(Tool.createFile(utils.getAbsolutePath(), name), "SpringBootService/java/frame/utils/" + name, ctx);
-                }
-            } else {
-                freeMarkerManager.outputTemp(Tool.createFile(utils.getAbsolutePath(), name), "SpringBootService/java/frame/utils/" + name, ctx);
-            }
-        }
-
-        //validation
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/frame/validation/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(validation.getAbsolutePath(), name), "SpringBootService/java/frame/validation/" + name, ctx);
-        }
-    }
-
-
-    /**
-     * 生成frame类
-     *
-     * @param root
-     * @param project
-     */
-    public void generateTask(File root, Project project) {
-        if (!root.exists()) {
-            root.mkdirs();
-        } else {
-            Tool.clear(root);
-        }
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("moduleName", project.getProjectName());
-        ctx.put("timestamp", new Date().getTime());
-
-        //task
-        for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/java/task/")) {
-            freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), name), "SpringBootService/java/task/" + name, ctx);
-        }
-    }
-
-    /**
-     * 生成base类
-     *
-     * @param root
-     * @param project
-     */
-    public void generateApplication(File root, Project project) {
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("moduleName", project.getProjectName());
-        ctx.put("project", project);
-        ctx.put("timestamp", new Date().getTime());
-        freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "Application.java"), "SpringBootService/java/Application.ftl", ctx);
-    }
-
-    /**
-     * 生成properties
-     *
-     * @param root
-     * @param project
-     */
-    public void generateResources(File root, Project project) {
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-
-        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("tool", Tool.class);
-        ctx.put("dataBase", project.getDatabase().toString());
-        ctx.put("author", project.getProjectAuthor());
-        ctx.put("dBmapper", dBmapper);
-        ctx.put("author", project.getProjectAuthor());
-        ctx.put("projectName", project.getProjectName());
-        ctx.put("project", project);
-        freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "start-dev.bat"), "SpringBootService/resources/start-dev.bat", ctx);
-        freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "start-prod.bat"), "SpringBootService/resources/start-prod.bat", ctx);
-        freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "application-dev.properties"), "SpringBootService/resources/application-dev.ftl", ctx);
-        freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "application-prod.properties"), "SpringBootService/resources/application-prod.ftl", ctx);
-        Tool.outputResource("SpringBootService/resources/logback-spring.xml", Tool.createFile(root.getAbsolutePath(), "logback-spring.xml"));
-
-        File dbtool = Tool.createPath(root.getAbsolutePath(), "dbtool");
-        {
-            XmlManager xmlManager = ManagerFactory.getXmlManager();
-            xmlManager.saveAs(dbtool, project);
-        }
-
-        for (Module module : project.getModules()) {
-            ctx.put("moduleName", module.getModuleName());
-            ctx.put("module", module);
-            File tableDir = Tool.createPath(dbtool.getAbsolutePath(), module.getModuleName() + "_table");
-            for (Table table : module.getTables()) {
-                ctx.put("table", table);
-                freeMarkerManager.outputTemp(Tool.createFile(tableDir.getAbsolutePath(), project.getDatabase().name() + "_" + table.getTableName() + ".sql"), "SpringBootService/resources/dbtool/table.ftl", ctx);
-            }
-            freeMarkerManager.outputTemp(Tool.createFile(tableDir.getAbsolutePath(), project.getDatabase().name() + "_ALL_TABLE" + ".sql"), "SpringBootService/resources/dbtool/tableAll.ftl", ctx);
-        }
-
-        if (project.isNeedSys()) {//生成系统模块
-            File system = Tool.createPath(dbtool.getAbsolutePath(), "system_table");
-
-            for (String name : ResourceUtil.getResourceFiles("/modules/SpringBootService/resources/dbtool/system/")) {
-                if (name.contains(project.getDatabase().name())) {
-                    freeMarkerManager.outputTemp(Tool.createFile(system.getAbsolutePath(), name), "SpringBootService/resources/dbtool/system/" + name, ctx);
-                }
-            }
-        }
-
-        if (DataBase.SQLite.name().equals(project.getDatabase().name())) {
-            File dbFile = Tool.createFile(root.getAbsolutePath(), project.getProjectName() + ".db");
-            Connection connection = null;
-            Statement statement = null;
-            try {
-                Class.forName("org.sqlite.JDBC");
-                connection = DriverManager.getConnection("jdbc:sqlite:" + dbFile.getAbsolutePath());
-
-                for (File fileModule : dbtool.listFiles()) {
-                    if (!fileModule.isDirectory()) {
-                        continue;
-                    }
-                    for (File file : fileModule.listFiles()) {
-                        if (!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) {
-
-                }
-            }
-        }
-    }
-
-    public void generateTestResources(File root, Project project) {
-        HashMap<String, Object> ctx = new HashMap<String, Object>();
-
-        ctx.put("domain", project.getProjectBasePackage());
-        ctx.put("projectName", project.getProjectName());
-        ctx.put("tool", Tool.class);
-        ctx.put("dataBase", project.getDatabase().toString());
-        ctx.put("author", project.getProjectAuthor());
-        ctx.put("dBmapper", dBmapper);
-        ctx.put("project", project);
-        freeMarkerManager.outputTemp(Tool.createFile(root.getAbsolutePath(), "application.properties"), "SpringBootService/test/application.ftl", ctx);
-        Tool.outputResource("SpringBootService/test/logback-spring.xml", Tool.createFile(root.getAbsolutePath(), "logback-spring.xml"));
-    }
-
-    public void generateTest(File root, Project project) {
-
-        {
-            File config = Tool.createPath(root.getAbsolutePath(), "config");
-            config.mkdirs();
-            HashMap<String, Object> ctx = new HashMap<String, Object>();
-            ctx.put("tool", Tool.class);
-            ctx.put("domain", project.getProjectBasePackage());
-            ctx.put("moduleName", project.getProjectName());
-            ctx.put("author", project.getProjectAuthor());
-            File file = Tool.createFile(config.getAbsolutePath(), "TestConfig" + ".java");
-            freeMarkerManager.outputTemp(file, "SpringBootService/test/TestConfig.ftl", ctx);
-        }
-
-        {
-            HashMap<String, Object> ctx = new HashMap<String, Object>();
-            ctx.put("tool", Tool.class);
-            ctx.put("domain", project.getProjectBasePackage());
-            ctx.put("moduleName", project.getProjectName());
-            ctx.put("author", project.getProjectAuthor());
-            File file = Tool.createFile(root.getAbsolutePath(), "UtilTest" + ".java");
-            freeMarkerManager.outputTemp(file, "SpringBootService/test/UtilTest.java", ctx);
-        }
-
-        for (Module md : project.getModules()) {
-            File module = Tool.createPath(root.getAbsolutePath(), md.getModuleName());
-
-            for (Table table : md.getTables()) {
-                HashMap<String, Object> ctx = new HashMap<String, Object>();
-
-                ctx.put("tool", Tool.class);
-                ctx.put("module", md);
-                ctx.put("domain", md.getProjectBasePackage());
-                ctx.put("moduleName", md.getModuleName());
-                ctx.put("table", table);
-                ctx.put("author", md.getProjectAuthor());
-
-                File file = Tool.createFile(module.getAbsolutePath(), Tool.ABB2Abb(table.getTableName()) + "Test" + ".java");
-                freeMarkerManager.outputTemp(file, "SpringBootService/test/test.ftl", ctx);
-            }
-        }
-    }
-}

src/main/java/xyz/wbsite/dbtool/javafx/po/Frame.java

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

src/main/java/xyz/wbsite/dbtool/javafx/po/Project.java

@@ -12,7 +12,7 @@ public class Project extends TreeItem {
         this.projectName = "example-web";
         this.projectBasePackage = "com.example";
         this.projectAuthor = "author";
-        this.needSys = true;
+        this.frame = Frame.网页框架;
         this.needEMail = false;
         this.needCloud = false;
         this.database = DataBase.MySQL;
@@ -30,20 +30,18 @@ public class Project extends TreeItem {
     private String projectBasePackage;
     @Property("author")
     private String projectAuthor;
+    @Property(value = "frame")
+    private Frame frame;
+    @Property(value = "database")
+    private DataBase database;
     @Property("needMoreDB")
     private boolean needMoreDB;
     @Property("needEMail")
     private boolean needEMail;
-    @Property("needSys")
-    private boolean needSys;
     @Property("needCloud")
     private boolean needCloud;
     @Property("needAsync")
     private boolean needAsync;
-    @Property("needWeb")
-    private boolean needWeb;
-    @Property(value = "database")
-    private DataBase database;
 
     /**
      * 对象
@@ -97,14 +95,6 @@ public class Project extends TreeItem {
         this.needMoreDB = needMoreDB;
     }
 
-    public boolean isNeedSys() {
-        return needSys;
-    }
-
-    public void setNeedSys(boolean needSys) {
-        this.needSys = needSys;
-    }
-
     public boolean isNeedCloud() {
         return needCloud;
     }
@@ -137,12 +127,16 @@ public class Project extends TreeItem {
         this.needAsync = needAsync;
     }
 
-    public boolean isNeedWeb() {
+    public Frame getFrame() {
-        return needWeb;
+        return frame;
+    }
+
+    public void setFrame(Frame frame) {
+        this.frame = frame;
     }
 
-    public void setNeedWeb(boolean needWeb) {
+    public int frameValue() {
-        this.needWeb = needWeb;
+        return frame.value();
     }
 
     public boolean isNeedApi() {

src/main/java/xyz/wbsite/dbtool/javafx/tool/ApiClassReader.java

@@ -60,7 +60,7 @@ public class ApiClassReader {
     }
 
     public static void main(String[] args) throws IOException {
-        ApiClassReader javaClassReader = new ApiClassReader(new File("D:\\wangbing\\Project\\dbtool\\target\\project\\example-web\\src\\main\\java\\com\\example\\action\\api\\system\\DictApi.java"));
+        ApiClassReader javaClassReader = new ApiClassReader(new File("D:\\wangbing\\Project\\dbtool\\target\\project\\example-web\\src\\main\\java\\com\\example\\action\\api\\wsys\\DictApi.java"));
 
         System.out.println();
     }

src/main/java/xyz/wbsite/dbtool/javafx/tool/DocClassReader.java

@@ -56,7 +56,7 @@ public class DocClassReader {
     }
 
     public static void main(String[] args) throws IOException {
-        DocClassReader javaClassReader = new DocClassReader(new File("D:\\wangbing\\Project\\dbtool\\target\\project\\example-web\\src\\main\\java\\com\\example\\action\\api\\system\\DictApi.java"));
+        DocClassReader javaClassReader = new DocClassReader(new File("D:\\wangbing\\Project\\dbtool\\target\\project\\example-web\\src\\main\\java\\com\\example\\action\\api\\wsys\\DictApi.java"));
 
         System.out.println();
     }

src/main/java/xyz/wbsite/dbtool/javafx/tool/EntityReader.java

@@ -230,7 +230,7 @@ public class EntityReader {
     }
 
     public static void main(String[] args) throws IOException {
-        EntityReader javaClassReader = new EntityReader(new File("D:\\wangbing\\Project\\dbtool\\target\\project\\example-web\\src\\main\\java\\com\\example\\module\\system\\rsp\\DictFindResponse.java"));
+        EntityReader javaClassReader = new EntityReader(new File("D:\\wangbing\\Project\\dbtool\\target\\project\\example-web\\src\\main\\java\\com\\example\\module\\wsys\\rsp\\DictFindResponse.java"));
 
         System.out.println();
     }

src/main/java/xyz/wbsite/dbtool/javafx/tool/RequestReader.java

@@ -204,7 +204,7 @@ public class RequestReader {
     }
 
     public static void main(String[] args) throws IOException {
-        RequestReader requestReader = new RequestReader(new File("E:\\wangbing\\source\\dbtool\\target\\project\\wadmin\\src\\main\\java\\xyz\\wbsite\\module\\system\\req\\DictFindRequest.java"));
+        RequestReader requestReader = new RequestReader(new File("E:\\wangbing\\source\\dbtool\\target\\project\\wadmin\\src\\main\\java\\xyz\\wbsite\\module\\wsys\\req\\DictFindRequest.java"));
 
         System.out.println();
     }

src/main/java/xyz/wbsite/dbtool/javafx/tool/ResponseReader.java

@@ -248,7 +248,7 @@ public class ResponseReader {
     }
 
     public static void main(String[] args) throws IOException {
-        ResponseReader requestReader = new ResponseReader(new File("D:\\wangbing\\Project\\dbtool\\target\\project\\example-web\\src\\main\\java\\com\\example\\module\\system\\rsp\\DictFindResponse.java"));
+        ResponseReader requestReader = new ResponseReader(new File("D:\\wangbing\\Project\\dbtool\\target\\project\\example-web\\src\\main\\java\\com\\example\\module\\wsys\\rsp\\DictFindResponse.java"));
 
         System.out.println();
     }

src/main/java/xyz/wbsite/dbtool/web/frame/auth/LocalData.java

@@ -27,7 +27,7 @@ public class LocalData {
         system = new Token();
         system.setId(0);
         system.setUserId(0);
-        system.setUserName("system");
+        system.setUserName("wsys");
     }
 
     public static Token getSysToken() {

src/main/resources/fxml/DetailProject.fxml

@@ -26,6 +26,7 @@
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
         <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+        <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES"/>
     </rowConstraints>
     <children>
         <!-- ROW -->
@@ -59,40 +60,50 @@
               GridPane.halignment="CENTER"
               GridPane.valignment="CENTER">
             <children>
-                <RadioButton mnemonicParsing="false" text="MySQL" selected="true">
+                <RadioButton mnemonicParsing="false" text="空白框架" selected="true">
                     <toggleGroup>
-                        <ToggleGroup fx:id="database"/>
+                        <ToggleGroup fx:id="frame"/>
                     </toggleGroup>
                 </RadioButton>
-                <RadioButton mnemonicParsing="false" text="Oracle" toggleGroup="$database"/>
+                <RadioButton mnemonicParsing="false" text="服务框架" toggleGroup="$frame"/>
-                <RadioButton mnemonicParsing="false" text="SQLite" toggleGroup="$database"/>
+                <RadioButton mnemonicParsing="false" text="接口框架" toggleGroup="$frame"/>
+                <RadioButton mnemonicParsing="false" text="网页框架" toggleGroup="$frame"/>
             </children>
         </HBox>
 
         <!-- ROW -->
-        <Label GridPane.rowIndex="3" GridPane.columnIndex="1" text="其他配置" GridPane.halignment="CENTER"
+        <Label GridPane.rowIndex="3" GridPane.columnIndex="0" text="*" alignment="CENTER" textAlignment="CENTER"
+               textFill="RED" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
+        <Label GridPane.rowIndex="3" GridPane.columnIndex="1" text="数据库类" GridPane.halignment="CENTER"
                GridPane.valignment="CENTER"/>
 
         <HBox GridPane.rowIndex="3" GridPane.columnIndex="2" GridPane.columnSpan="4" alignment="CENTER_LEFT"
               GridPane.halignment="CENTER"
               GridPane.valignment="CENTER">
             <children>
-                <CheckBox fx:id="needWeb" selected="true" text="WEB管理"/>
+                <RadioButton mnemonicParsing="false" text="MySQL" selected="true">
-                <CheckBox fx:id="sysMD" selected="true" text="系统模块"/>
+                    <toggleGroup>
-                <CheckBox fx:id="multiDB" text="多数据库"/>
+                        <ToggleGroup fx:id="database"/>
-                <CheckBox fx:id="cloud" selected="false" text="添加Cloud"/>
+                    </toggleGroup>
-                <CheckBox fx:id="api" selected="false" text="Api接口"/>
+                </RadioButton>
+                <RadioButton mnemonicParsing="false" text="Oracle" toggleGroup="$database"/>
+                <RadioButton mnemonicParsing="false" text="SQLite" toggleGroup="$database"/>
             </children>
         </HBox>
 
+        <!-- ROW -->
+        <Label GridPane.rowIndex="4" GridPane.columnIndex="1" text="其他配置" GridPane.halignment="CENTER"
+               GridPane.valignment="CENTER"/>
+
         <HBox GridPane.rowIndex="4" GridPane.columnIndex="2" GridPane.columnSpan="4" alignment="CENTER_LEFT"
               GridPane.halignment="CENTER"
               GridPane.valignment="CENTER">
             <children>
-                <CheckBox fx:id="eMail" selected="false" text="发送邮件"/>
+                <CheckBox fx:id="needMordDB" selected="false" text="多数据库"/>
-                <CheckBox fx:id="async" selected="false" text="异步编程"/>
+                <CheckBox fx:id="needCloud" selected="false" text="添加Cloud"/>
+                <CheckBox fx:id="needAsync" selected="false" text="异步编程"/>
+                <CheckBox fx:id="needMail" selected="false" text="发送邮件"/>
             </children>
         </HBox>
     </children>
-
 </GridPane>

src/main/resources/fxml/main.fxml

@@ -36,7 +36,6 @@
                         <MenuItem mnemonicParsing="false" onAction="#generateApi" text="生成Api"/>
                         <MenuItem mnemonicParsing="false" onAction="#generateVue" text="生成Vue"/>
                         <MenuItem mnemonicParsing="false" onAction="#generateAndroid" text="生成Android"/>
-                        <MenuItem mnemonicParsing="false" onAction="#generateService" text="生成Service"/>
                         <MenuItem mnemonicParsing="false" onAction="#generateDoc" text="生成Doc"/>
                     </items>
                 </Menu>

src/main/resources/modules/SpringBoot/java/Application.ftl

@@ -3,15 +3,17 @@ package ${domain};
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-<#if project.needMoreDB>
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-</#if>
 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.needMoreDB>
+<#if project.frameValue() &gt; 0 && project.needMoreDB>
 @EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
 <#else>
 @EnableAutoConfiguration
@@ -24,6 +26,10 @@ 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>
     }
 }

src/main/resources/modules/SpringBoot/java/action/GlobalController.java

@@ -35,9 +35,11 @@ import ${domain}.frame.utils.MD5Util;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.RequestUtil;
 import ${domain}.frame.utils.StringUtil;
-import ${domain}.module.system.mgr.TokensManager;
+<#if project.frameValue() &gt;= 3>
-import ${domain}.module.system.req.TokensBuildRequest;
+import ${domain}.module.wsys.mgr.TokensManager;
-import ${domain}.module.system.rsp.TokensBuildResponse;
+import ${domain}.module.wsys.req.TokensBuildRequest;
+import ${domain}.module.wsys.rsp.TokensBuildResponse;
+</#if>
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -53,7 +55,7 @@ import java.util.regex.Pattern;
 
 /**
  * 全局请求Controller，如果无特殊请求，则不需再增加其他Controller
-<#if project.needWeb>
+<#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)}
@@ -70,7 +72,7 @@ import java.util.regex.Pattern;
 @Controller
 @ControllerAdvice
 public class GlobalController implements ErrorController {
-    <#if project.needWeb>
+    <#if project.frameValue() &gt;= 3>
     @Value("${r'${server.servlet.context-path}'}")
     private String context;
     @Value("${r'${web.url.index}'}")
@@ -116,7 +118,7 @@ public class GlobalController implements ErrorController {
     public String getErrorPath() {
         return ERROR_PATH;
     }
-<#if project.needWeb>
+<#if project.frameValue() &gt;= 3>
 
     @RequestMapping(value = ERROR_PATH)
     public String error(HttpServletRequest request, HttpServletResponse response) {
@@ -313,7 +315,7 @@ public class GlobalController implements ErrorController {
         }
     }
 </#if>
-<#if project.needApi>
+<#if project.frameValue() &gt;= 2>
 
     @RequestMapping(path = "/api/{module}/{target}/{method}", method = RequestMethod.POST)
     @ResponseBody
@@ -363,6 +365,8 @@ public class GlobalController implements ErrorController {
             response.addError(ErrorType.BUSINESS_ERROR, "请求过期, 或本地时间错误!");
             return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
         }
+<#-- 当项目框架只为接口时，无资源维护管理页，则认为是一对一应用接口，不做权限验证 -->
+<#if project.frameValue() &gt;= 3>
 
         // 权限验证
         if (StringUtil.isNotEmpty(token)) {
@@ -376,12 +380,13 @@ public class GlobalController implements ErrorController {
                 return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
             }
         } else {
-            String excluded = LocalData.getEnvironment().getProperty("web.url.auth.excluded", "") + ",/api/system/User/login";
+            String excluded = LocalData.getEnvironment().getProperty("web.url.auth.excluded", "") + ",/api/wsys/User/login";
             if (!excluded.contains(excluded)) {
                 response.addError(ErrorType.BUSINESS_ERROR, "请通过登录接口获取Token!");
                 return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
             }
         }
+</#if>
 
         // 开始处理业务
         try {
@@ -436,7 +441,7 @@ public class GlobalController implements ErrorController {
         return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), appSecret);
     }
 </#if>
-<#if project.needWeb>
+<#if project.frameValue() &gt;= 3>
 
     private static ConcurrentHashMap<String, SseEmitter> sseMap = new ConcurrentHashMap();
 

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DeptAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
@@ -11,18 +11,18 @@ import ${domain}.frame.utils.LogUtil;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.ResponseUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Dept;
+import ${domain}.module.wsys.ent.Dept;
-import ${domain}.module.system.mgr.DeptManager;
+import ${domain}.module.wsys.mgr.DeptManager;
-import ${domain}.module.system.req.DeptCreateRequest;
+import ${domain}.module.wsys.req.DeptCreateRequest;
-import ${domain}.module.system.req.DeptDeleteRequest;
+import ${domain}.module.wsys.req.DeptDeleteRequest;
-import ${domain}.module.system.req.DeptFindRequest;
+import ${domain}.module.wsys.req.DeptFindRequest;
-import ${domain}.module.system.req.DeptTreeRequest;
+import ${domain}.module.wsys.req.DeptTreeRequest;
-import ${domain}.module.system.req.DeptUpdateRequest;
+import ${domain}.module.wsys.req.DeptUpdateRequest;
-import ${domain}.module.system.rsp.DeptCreateResponse;
+import ${domain}.module.wsys.rsp.DeptCreateResponse;
-import ${domain}.module.system.rsp.DeptDeleteResponse;
+import ${domain}.module.wsys.rsp.DeptDeleteResponse;
-import ${domain}.module.system.rsp.DeptFindResponse;
+import ${domain}.module.wsys.rsp.DeptFindResponse;
-import ${domain}.module.system.rsp.DeptTreeResponse;
+import ${domain}.module.wsys.rsp.DeptTreeResponse;
-import ${domain}.module.system.rsp.DeptUpdateResponse;
+import ${domain}.module.wsys.rsp.DeptUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
@@ -11,18 +11,18 @@ import ${domain}.frame.utils.LogUtil;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.ResponseUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Dict;
+import ${domain}.module.wsys.ent.Dict;
-import ${domain}.module.system.mgr.DictManager;
+import ${domain}.module.wsys.mgr.DictManager;
-import ${domain}.module.system.req.DictCreateRequest;
+import ${domain}.module.wsys.req.DictCreateRequest;
-import ${domain}.module.system.req.DictDeleteRequest;
+import ${domain}.module.wsys.req.DictDeleteRequest;
-import ${domain}.module.system.req.DictFindRequest;
+import ${domain}.module.wsys.req.DictFindRequest;
-import ${domain}.module.system.req.DictLoadRequest;
+import ${domain}.module.wsys.req.DictLoadRequest;
-import ${domain}.module.system.req.DictUpdateRequest;
+import ${domain}.module.wsys.req.DictUpdateRequest;
-import ${domain}.module.system.rsp.DictCreateResponse;
+import ${domain}.module.wsys.rsp.DictCreateResponse;
-import ${domain}.module.system.rsp.DictDeleteResponse;
+import ${domain}.module.wsys.rsp.DictDeleteResponse;
-import ${domain}.module.system.rsp.DictFindResponse;
+import ${domain}.module.wsys.rsp.DictFindResponse;
-import ${domain}.module.system.rsp.DictLoadResponse;
+import ${domain}.module.wsys.rsp.DictLoadResponse;
-import ${domain}.module.system.rsp.DictUpdateResponse;
+import ${domain}.module.wsys.rsp.DictUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/DictItemAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+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.system.ent.DictItem;
+import ${domain}.module.wsys.ent.DictItem;
-import ${domain}.module.system.mgr.DictItemManager;
+import ${domain}.module.wsys.mgr.DictItemManager;
-import ${domain}.module.system.req.DictItemCreateRequest;
+import ${domain}.module.wsys.req.DictItemCreateRequest;
-import ${domain}.module.system.req.DictItemDeleteRequest;
+import ${domain}.module.wsys.req.DictItemDeleteRequest;
-import ${domain}.module.system.req.DictItemFindRequest;
+import ${domain}.module.wsys.req.DictItemFindRequest;
-import ${domain}.module.system.req.DictItemUpdateRequest;
+import ${domain}.module.wsys.req.DictItemUpdateRequest;
-import ${domain}.module.system.rsp.DictItemCreateResponse;
+import ${domain}.module.wsys.rsp.DictItemCreateResponse;
-import ${domain}.module.system.rsp.DictItemDeleteResponse;
+import ${domain}.module.wsys.rsp.DictItemDeleteResponse;
-import ${domain}.module.system.rsp.DictItemFindResponse;
+import ${domain}.module.wsys.rsp.DictItemFindResponse;
-import ${domain}.module.system.rsp.DictItemUpdateResponse;
+import ${domain}.module.wsys.rsp.DictItemUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/FileAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
@@ -15,15 +15,15 @@ import ${domain}.frame.utils.LogUtil;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.ResponseUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.File;
+import ${domain}.module.wsys.ent.File;
-import ${domain}.module.system.mgr.FileManager;
+import ${domain}.module.wsys.mgr.FileManager;
-import ${domain}.module.system.req.FileCreateRequest;
+import ${domain}.module.wsys.req.FileCreateRequest;
-import ${domain}.module.system.req.FileDeleteRequest;
+import ${domain}.module.wsys.req.FileDeleteRequest;
-import ${domain}.module.system.req.FileFindRequest;
+import ${domain}.module.wsys.req.FileFindRequest;
-import ${domain}.module.system.rsp.FileCreateResponse;
+import ${domain}.module.wsys.rsp.FileCreateResponse;
-import ${domain}.module.system.rsp.FileDeleteResponse;
+import ${domain}.module.wsys.rsp.FileDeleteResponse;
-import ${domain}.module.system.rsp.FileFindResponse;
+import ${domain}.module.wsys.rsp.FileFindResponse;
-import ${domain}.module.system.rsp.FileUploadResponse;
+import ${domain}.module.wsys.rsp.FileUploadResponse;
 
 import java.io.IOException;
 import java.net.URLEncoder;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/LogErrAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+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.system.ent.LogErr;
+import ${domain}.module.wsys.ent.LogErr;
-import ${domain}.module.system.mgr.LogErrManager;
+import ${domain}.module.wsys.mgr.LogErrManager;
-import ${domain}.module.system.req.LogErrCreateRequest;
+import ${domain}.module.wsys.req.LogErrCreateRequest;
-import ${domain}.module.system.req.LogErrDeleteRequest;
+import ${domain}.module.wsys.req.LogErrDeleteRequest;
-import ${domain}.module.system.req.LogErrFindRequest;
+import ${domain}.module.wsys.req.LogErrFindRequest;
-import ${domain}.module.system.req.LogErrUpdateRequest;
+import ${domain}.module.wsys.req.LogErrUpdateRequest;
-import ${domain}.module.system.rsp.LogErrCreateResponse;
+import ${domain}.module.wsys.rsp.LogErrCreateResponse;
-import ${domain}.module.system.rsp.LogErrDeleteResponse;
+import ${domain}.module.wsys.rsp.LogErrDeleteResponse;
-import ${domain}.module.system.rsp.LogErrFindResponse;
+import ${domain}.module.wsys.rsp.LogErrFindResponse;
-import ${domain}.module.system.rsp.LogErrUpdateResponse;
+import ${domain}.module.wsys.rsp.LogErrUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+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.system.ent.Profiles;
+import ${domain}.module.wsys.ent.Profiles;
-import ${domain}.module.system.mgr.ProfilesManager;
+import ${domain}.module.wsys.mgr.ProfilesManager;
-import ${domain}.module.system.req.ProfilesCreateRequest;
+import ${domain}.module.wsys.req.ProfilesCreateRequest;
-import ${domain}.module.system.req.ProfilesDeleteRequest;
+import ${domain}.module.wsys.req.ProfilesDeleteRequest;
-import ${domain}.module.system.req.ProfilesFindRequest;
+import ${domain}.module.wsys.req.ProfilesFindRequest;
-import ${domain}.module.system.req.ProfilesUpdateRequest;
+import ${domain}.module.wsys.req.ProfilesUpdateRequest;
-import ${domain}.module.system.rsp.ProfilesCreateResponse;
+import ${domain}.module.wsys.rsp.ProfilesCreateResponse;
-import ${domain}.module.system.rsp.ProfilesDeleteResponse;
+import ${domain}.module.wsys.rsp.ProfilesDeleteResponse;
-import ${domain}.module.system.rsp.ProfilesFindResponse;
+import ${domain}.module.wsys.rsp.ProfilesFindResponse;
-import ${domain}.module.system.rsp.ProfilesUpdateResponse;
+import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ResAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
@@ -11,18 +11,18 @@ import ${domain}.frame.utils.LogUtil;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.ResponseUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Res;
+import ${domain}.module.wsys.ent.Res;
-import ${domain}.module.system.mgr.ResManager;
+import ${domain}.module.wsys.mgr.ResManager;
-import ${domain}.module.system.req.ResCreateRequest;
+import ${domain}.module.wsys.req.ResCreateRequest;
-import ${domain}.module.system.req.ResDeleteRequest;
+import ${domain}.module.wsys.req.ResDeleteRequest;
-import ${domain}.module.system.req.ResFindRequest;
+import ${domain}.module.wsys.req.ResFindRequest;
-import ${domain}.module.system.req.ResTreeRequest;
+import ${domain}.module.wsys.req.ResTreeRequest;
-import ${domain}.module.system.req.ResUpdateRequest;
+import ${domain}.module.wsys.req.ResUpdateRequest;
-import ${domain}.module.system.rsp.ResCreateResponse;
+import ${domain}.module.wsys.rsp.ResCreateResponse;
-import ${domain}.module.system.rsp.ResDeleteResponse;
+import ${domain}.module.wsys.rsp.ResDeleteResponse;
-import ${domain}.module.system.rsp.ResFindResponse;
+import ${domain}.module.wsys.rsp.ResFindResponse;
-import ${domain}.module.system.rsp.ResTreeResponse;
+import ${domain}.module.wsys.rsp.ResTreeResponse;
-import ${domain}.module.system.rsp.ResUpdateResponse;
+import ${domain}.module.wsys.rsp.ResUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+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.system.ent.Role;
+import ${domain}.module.wsys.ent.Role;
-import ${domain}.module.system.mgr.RoleManager;
+import ${domain}.module.wsys.mgr.RoleManager;
-import ${domain}.module.system.req.RoleCreateRequest;
+import ${domain}.module.wsys.req.RoleCreateRequest;
-import ${domain}.module.system.req.RoleDeleteRequest;
+import ${domain}.module.wsys.req.RoleDeleteRequest;
-import ${domain}.module.system.req.RoleFindRequest;
+import ${domain}.module.wsys.req.RoleFindRequest;
-import ${domain}.module.system.req.RoleUpdateRequest;
+import ${domain}.module.wsys.req.RoleUpdateRequest;
-import ${domain}.module.system.rsp.RoleCreateResponse;
+import ${domain}.module.wsys.rsp.RoleCreateResponse;
-import ${domain}.module.system.rsp.RoleDeleteResponse;
+import ${domain}.module.wsys.rsp.RoleDeleteResponse;
-import ${domain}.module.system.rsp.RoleFindResponse;
+import ${domain}.module.wsys.rsp.RoleFindResponse;
-import ${domain}.module.system.rsp.RoleUpdateResponse;
+import ${domain}.module.wsys.rsp.RoleUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/RoleResAjax.java

@@ -1,18 +1,18 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import ${domain}.frame.auth.LocalData;
-import ${domain}.module.system.mgr.RoleResManager;
+import ${domain}.module.wsys.mgr.RoleResManager;
-import ${domain}.module.system.req.RoleResCheckRequest;
+import ${domain}.module.wsys.req.RoleResCheckRequest;
-import ${domain}.module.system.req.RoleResCreateRequest;
+import ${domain}.module.wsys.req.RoleResCreateRequest;
-import ${domain}.module.system.req.RoleResDeleteRequest;
+import ${domain}.module.wsys.req.RoleResDeleteRequest;
-import ${domain}.module.system.req.RoleResFindRequest;
+import ${domain}.module.wsys.req.RoleResFindRequest;
-import ${domain}.module.system.req.RoleResUpdateRequest;
+import ${domain}.module.wsys.req.RoleResUpdateRequest;
-import ${domain}.module.system.rsp.RoleResCheckResponse;
+import ${domain}.module.wsys.rsp.RoleResCheckResponse;
-import ${domain}.module.system.rsp.RoleResCreateResponse;
+import ${domain}.module.wsys.rsp.RoleResCreateResponse;
-import ${domain}.module.system.rsp.RoleResDeleteResponse;
+import ${domain}.module.wsys.rsp.RoleResDeleteResponse;
-import ${domain}.module.system.rsp.RoleResFindResponse;
+import ${domain}.module.wsys.rsp.RoleResFindResponse;
-import ${domain}.module.system.rsp.RoleResUpdateResponse;
+import ${domain}.module.wsys.rsp.RoleResUpdateResponse;
 
 public class RoleResAjax {
 

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/ScheduleAjax.java

@@ -1,16 +1,15 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import ${domain}.frame.base.ErrorType;
 import ${domain}.frame.schedule.Scheduler;
 import ${domain}.frame.utils.StringUtil;
-import ${domain}.module.system.ent.Schedule;
+import ${domain}.module.wsys.req.ScheduleFindRequest;
-import ${domain}.module.system.req.ScheduleFindRequest;
+import ${domain}.module.wsys.req.ScheduleStartRequest;
-import ${domain}.module.system.req.ScheduleStartRequest;
+import ${domain}.module.wsys.req.ScheduleStopRequest;
-import ${domain}.module.system.req.ScheduleStopRequest;
+import ${domain}.module.wsys.rsp.ScheduleFindResponse;
-import ${domain}.module.system.rsp.ScheduleFindResponse;
+import ${domain}.module.wsys.rsp.ScheduleStartResponse;
-import ${domain}.module.system.rsp.ScheduleStartResponse;
+import ${domain}.module.wsys.rsp.ScheduleStopResponse;
-import ${domain}.module.system.rsp.ScheduleStopResponse;
 
 import java.util.Iterator;
 import java.util.List;
@@ -39,10 +38,10 @@ public class ScheduleAjax {
 
     public ScheduleFindResponse find(ScheduleFindRequest request) {
         ScheduleFindResponse response = new ScheduleFindResponse();
-        List<Schedule> schedules = scheduler.taskList();
+        List<Scheduler.Schedule> schedules = scheduler.taskList();
-        Iterator<Schedule> iterator = schedules.iterator();
+        Iterator<Scheduler.Schedule> iterator = schedules.iterator();
         while (iterator.hasNext()) {
-            Schedule next = iterator.next();
+            Scheduler.Schedule next = iterator.next();
             if (!StringUtil.isEmpty(request.getTaskId()) && !next.getId().contains(request.getTaskId())) {
                 iterator.remove();
             }

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

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import com.fasterxml.jackson.core.TreeNode;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,16 +12,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.system.ent.TaskSql;
+import ${domain}.module.wsys.ent.TaskSql;
-import ${domain}.module.system.mgr.TaskSqlManager;
+import ${domain}.module.wsys.mgr.TaskSqlManager;
-import ${domain}.module.system.req.TaskSqlCreateRequest;
+import ${domain}.module.wsys.req.TaskSqlCreateRequest;
-import ${domain}.module.system.req.TaskSqlDeleteRequest;
+import ${domain}.module.wsys.req.TaskSqlDeleteRequest;
-import ${domain}.module.system.req.TaskSqlFindRequest;
+import ${domain}.module.wsys.req.TaskSqlFindRequest;
-import ${domain}.module.system.req.TaskSqlUpdateRequest;
+import ${domain}.module.wsys.req.TaskSqlUpdateRequest;
-import ${domain}.module.system.rsp.TaskSqlCreateResponse;
+import ${domain}.module.wsys.rsp.TaskSqlCreateResponse;
-import ${domain}.module.system.rsp.TaskSqlDeleteResponse;
+import ${domain}.module.wsys.rsp.TaskSqlDeleteResponse;
-import ${domain}.module.system.rsp.TaskSqlFindResponse;
+import ${domain}.module.wsys.rsp.TaskSqlFindResponse;
-import ${domain}.module.system.rsp.TaskSqlUpdateResponse;
+import ${domain}.module.wsys.rsp.TaskSqlUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/TokensAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
@@ -11,18 +11,18 @@ import ${domain}.frame.utils.LogUtil;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.ResponseUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Tokens;
+import ${domain}.module.wsys.ent.Tokens;
-import ${domain}.module.system.mgr.TokensManager;
+import ${domain}.module.wsys.mgr.TokensManager;
-import ${domain}.module.system.req.TokensCreateRequest;
+import ${domain}.module.wsys.req.TokensCreateRequest;
-import ${domain}.module.system.req.TokensDeleteRequest;
+import ${domain}.module.wsys.req.TokensDeleteRequest;
-import ${domain}.module.system.req.TokensFindRequest;
+import ${domain}.module.wsys.req.TokensFindRequest;
-import ${domain}.module.system.req.TokensLogoutRequest;
+import ${domain}.module.wsys.req.TokensLogoutRequest;
-import ${domain}.module.system.req.TokensUpdateRequest;
+import ${domain}.module.wsys.req.TokensUpdateRequest;
-import ${domain}.module.system.rsp.TokensCreateResponse;
+import ${domain}.module.wsys.rsp.TokensCreateResponse;
-import ${domain}.module.system.rsp.TokensDeleteResponse;
+import ${domain}.module.wsys.rsp.TokensDeleteResponse;
-import ${domain}.module.system.rsp.TokensFindResponse;
+import ${domain}.module.wsys.rsp.TokensFindResponse;
-import ${domain}.module.system.rsp.TokensLogoutResponse;
+import ${domain}.module.wsys.rsp.TokensLogoutResponse;
-import ${domain}.module.system.rsp.TokensUpdateResponse;
+import ${domain}.module.wsys.rsp.TokensUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -16,27 +16,27 @@ import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.RequestUtil;
 import ${domain}.frame.utils.ResponseUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.User;
+import ${domain}.module.wsys.ent.User;
-import ${domain}.module.system.mgr.TokensManager;
+import ${domain}.module.wsys.mgr.TokensManager;
-import ${domain}.module.system.mgr.UserManager;
+import ${domain}.module.wsys.mgr.UserManager;
-import ${domain}.module.system.req.TokensCreateRequest;
+import ${domain}.module.wsys.req.TokensCreateRequest;
-import ${domain}.module.system.req.TokensLogoutRequest;
+import ${domain}.module.wsys.req.TokensLogoutRequest;
-import ${domain}.module.system.req.UserChangePwdRequest;
+import ${domain}.module.wsys.req.UserChangePwdRequest;
-import ${domain}.module.system.req.UserCreateRequest;
+import ${domain}.module.wsys.req.UserCreateRequest;
-import ${domain}.module.system.req.UserDeleteRequest;
+import ${domain}.module.wsys.req.UserDeleteRequest;
-import ${domain}.module.system.req.UserFindRequest;
+import ${domain}.module.wsys.req.UserFindRequest;
-import ${domain}.module.system.req.UserLoginRequest;
+import ${domain}.module.wsys.req.UserLoginRequest;
-import ${domain}.module.system.req.UserLogoutRequest;
+import ${domain}.module.wsys.req.UserLogoutRequest;
-import ${domain}.module.system.req.UserUpdateRequest;
+import ${domain}.module.wsys.req.UserUpdateRequest;
-import ${domain}.module.system.rsp.TokensCreateResponse;
+import ${domain}.module.wsys.rsp.TokensCreateResponse;
-import ${domain}.module.system.rsp.TokensLogoutResponse;
+import ${domain}.module.wsys.rsp.TokensLogoutResponse;
-import ${domain}.module.system.rsp.UserChangePwdResponse;
+import ${domain}.module.wsys.rsp.UserChangePwdResponse;
-import ${domain}.module.system.rsp.UserCreateResponse;
+import ${domain}.module.wsys.rsp.UserCreateResponse;
-import ${domain}.module.system.rsp.UserDeleteResponse;
+import ${domain}.module.wsys.rsp.UserDeleteResponse;
-import ${domain}.module.system.rsp.UserFindResponse;
+import ${domain}.module.wsys.rsp.UserFindResponse;
-import ${domain}.module.system.rsp.UserLoginResponse;
+import ${domain}.module.wsys.rsp.UserLoginResponse;
-import ${domain}.module.system.rsp.UserLogoutResponse;
+import ${domain}.module.wsys.rsp.UserLogoutResponse;
-import ${domain}.module.system.rsp.UserUpdateResponse;
+import ${domain}.module.wsys.rsp.UserUpdateResponse;
 
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/UserRoleAjax.java

@@ -1,16 +1,16 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import ${domain}.frame.auth.LocalData;
-import ${domain}.module.system.mgr.UserRoleManager;
+import ${domain}.module.wsys.mgr.UserRoleManager;
-import ${domain}.module.system.req.UserRoleCreateRequest;
+import ${domain}.module.wsys.req.UserRoleCreateRequest;
-import ${domain}.module.system.req.UserRoleDeleteRequest;
+import ${domain}.module.wsys.req.UserRoleDeleteRequest;
-import ${domain}.module.system.req.UserRoleFindRequest;
+import ${domain}.module.wsys.req.UserRoleFindRequest;
-import ${domain}.module.system.req.UserRoleUpdateRequest;
+import ${domain}.module.wsys.req.UserRoleUpdateRequest;
-import ${domain}.module.system.rsp.UserRoleCreateResponse;
+import ${domain}.module.wsys.rsp.UserRoleCreateResponse;
-import ${domain}.module.system.rsp.UserRoleDeleteResponse;
+import ${domain}.module.wsys.rsp.UserRoleDeleteResponse;
-import ${domain}.module.system.rsp.UserRoleFindResponse;
+import ${domain}.module.wsys.rsp.UserRoleFindResponse;
-import ${domain}.module.system.rsp.UserRoleUpdateResponse;
+import ${domain}.module.wsys.rsp.UserRoleUpdateResponse;
 
 public class UserRoleAjax {
 

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorAjax.java

@@ -1,4 +1,4 @@
-package ${domain}.action.ajax.system;
+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.system.ent.Visitor;
+import ${domain}.module.wsys.ent.Visitor;
-import ${domain}.module.system.mgr.VisitorManager;
+import ${domain}.module.wsys.mgr.VisitorManager;
-import ${domain}.module.system.req.VisitorCreateRequest;
+import ${domain}.module.wsys.req.VisitorCreateRequest;
-import ${domain}.module.system.req.VisitorDeleteRequest;
+import ${domain}.module.wsys.req.VisitorDeleteRequest;
-import ${domain}.module.system.req.VisitorFindRequest;
+import ${domain}.module.wsys.req.VisitorFindRequest;
-import ${domain}.module.system.req.VisitorUpdateRequest;
+import ${domain}.module.wsys.req.VisitorUpdateRequest;
-import ${domain}.module.system.rsp.VisitorCreateResponse;
+import ${domain}.module.wsys.rsp.VisitorCreateResponse;
-import ${domain}.module.system.rsp.VisitorDeleteResponse;
+import ${domain}.module.wsys.rsp.VisitorDeleteResponse;
-import ${domain}.module.system.rsp.VisitorFindResponse;
+import ${domain}.module.wsys.rsp.VisitorFindResponse;
-import ${domain}.module.system.rsp.VisitorUpdateResponse;
+import ${domain}.module.wsys.rsp.VisitorUpdateResponse;
 
 import java.io.IOException;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/action/ajax/wsys/VisitorResAjax.java

@@ -1,16 +1,16 @@
-package ${domain}.action.ajax.system;
+package ${domain}.action.ajax.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import ${domain}.frame.auth.LocalData;
-import ${domain}.module.system.mgr.VisitorResManager;
+import ${domain}.module.wsys.mgr.VisitorResManager;
-import ${domain}.module.system.req.VisitorResCreateRequest;
+import ${domain}.module.wsys.req.VisitorResCreateRequest;
-import ${domain}.module.system.req.VisitorResDeleteRequest;
+import ${domain}.module.wsys.req.VisitorResDeleteRequest;
-import ${domain}.module.system.req.VisitorResFindRequest;
+import ${domain}.module.wsys.req.VisitorResFindRequest;
-import ${domain}.module.system.req.VisitorResUpdateRequest;
+import ${domain}.module.wsys.req.VisitorResUpdateRequest;
-import ${domain}.module.system.rsp.VisitorResCreateResponse;
+import ${domain}.module.wsys.rsp.VisitorResCreateResponse;
-import ${domain}.module.system.rsp.VisitorResDeleteResponse;
+import ${domain}.module.wsys.rsp.VisitorResDeleteResponse;
-import ${domain}.module.system.rsp.VisitorResFindResponse;
+import ${domain}.module.wsys.rsp.VisitorResFindResponse;
-import ${domain}.module.system.rsp.VisitorResUpdateResponse;
+import ${domain}.module.wsys.rsp.VisitorResUpdateResponse;
 
 public class VisitorResAjax{
 

src/main/resources/modules/SpringBoot/java/action/api/wsys/DictApi.java

@@ -1,11 +1,11 @@
-package ${domain}.action.api.system;
+package ${domain}.action.api.wsys;
 
 import ${domain}.frame.auth.LocalData;
-import ${domain}.module.system.mgr.DictManager;
+import ${domain}.module.wsys.mgr.DictManager;
-import ${domain}.module.system.req.DictFindRequest;
+import ${domain}.module.wsys.req.DictFindRequest;
-import ${domain}.module.system.req.DictLoadRequest;
+import ${domain}.module.wsys.req.DictLoadRequest;
-import ${domain}.module.system.rsp.DictFindResponse;
+import ${domain}.module.wsys.rsp.DictFindResponse;
-import ${domain}.module.system.rsp.DictLoadResponse;
+import ${domain}.module.wsys.rsp.DictLoadResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class DictApi {

src/main/resources/modules/SpringBoot/java/action/api/wsys/FileApi.java

@@ -1,17 +1,17 @@
-package ${domain}.action.api.system;
+package ${domain}.action.api.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.base.ErrorType;
 import ${domain}.frame.utils.Base64Util;
 import ${domain}.frame.utils.MapperUtil;
-import ${domain}.module.system.mgr.FileManager;
+import ${domain}.module.wsys.mgr.FileManager;
-import ${domain}.module.system.req.FileDownloadRequest;
+import ${domain}.module.wsys.req.FileDownloadRequest;
-import ${domain}.module.system.req.FileGetRequest;
+import ${domain}.module.wsys.req.FileGetRequest;
-import ${domain}.module.system.req.FileUploadRequest;
+import ${domain}.module.wsys.req.FileUploadRequest;
-import ${domain}.module.system.rsp.FileDownloadResponse;
+import ${domain}.module.wsys.rsp.FileDownloadResponse;
-import ${domain}.module.system.rsp.FileGetResponse;
+import ${domain}.module.wsys.rsp.FileGetResponse;
-import ${domain}.module.system.rsp.FileUploadResponse;
+import ${domain}.module.wsys.rsp.FileUploadResponse;
 
 public class FileApi {
 

src/main/resources/modules/SpringBoot/java/action/api/wsys/UserApi.java

@@ -1,4 +1,4 @@
-package ${domain}.action.api.system;
+package ${domain}.action.api.wsys;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import ${domain}.frame.auth.LocalData;
@@ -6,23 +6,23 @@ import ${domain}.frame.base.ErrorType;
 import ${domain}.frame.utils.MD5Util;
 import ${domain}.frame.utils.RequestUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.User;
+import ${domain}.module.wsys.ent.User;
-import ${domain}.module.system.mgr.TokensManager;
+import ${domain}.module.wsys.mgr.TokensManager;
-import ${domain}.module.system.mgr.UserManager;
+import ${domain}.module.wsys.mgr.UserManager;
-import ${domain}.module.system.req.TokensCreateRequest;
+import ${domain}.module.wsys.req.TokensCreateRequest;
-import ${domain}.module.system.req.UserCreateRequest;
+import ${domain}.module.wsys.req.UserCreateRequest;
-import ${domain}.module.system.req.UserDeleteRequest;
+import ${domain}.module.wsys.req.UserDeleteRequest;
-import ${domain}.module.system.req.UserFindRequest;
+import ${domain}.module.wsys.req.UserFindRequest;
-import ${domain}.module.system.req.UserGetRequest;
+import ${domain}.module.wsys.req.UserGetRequest;
-import ${domain}.module.system.req.UserLoginRequest;
+import ${domain}.module.wsys.req.UserLoginRequest;
-import ${domain}.module.system.req.UserUpdateRequest;
+import ${domain}.module.wsys.req.UserUpdateRequest;
-import ${domain}.module.system.rsp.TokensCreateResponse;
+import ${domain}.module.wsys.rsp.TokensCreateResponse;
-import ${domain}.module.system.rsp.UserCreateResponse;
+import ${domain}.module.wsys.rsp.UserCreateResponse;
-import ${domain}.module.system.rsp.UserDeleteResponse;
+import ${domain}.module.wsys.rsp.UserDeleteResponse;
-import ${domain}.module.system.rsp.UserFindResponse;
+import ${domain}.module.wsys.rsp.UserFindResponse;
-import ${domain}.module.system.rsp.UserGetResponse;
+import ${domain}.module.wsys.rsp.UserGetResponse;
-import ${domain}.module.system.rsp.UserLoginResponse;
+import ${domain}.module.wsys.rsp.UserLoginResponse;
-import ${domain}.module.system.rsp.UserUpdateResponse;
+import ${domain}.module.wsys.rsp.UserUpdateResponse;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Calendar;

src/main/resources/modules/SpringBoot/java/config/SecurityConfig.java

@@ -15,9 +15,9 @@ import org.springframework.security.web.access.intercept.FilterSecurityIntercept
 import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.auth.Token;
 import ${domain}.frame.utils.CookieUtil;
-import ${domain}.module.system.mgr.TokensManager;
+import ${domain}.module.wsys.mgr.TokensManager;
-import ${domain}.module.system.req.TokensBuildRequest;
+import ${domain}.module.wsys.req.TokensBuildRequest;
-import ${domain}.module.system.rsp.TokensBuildResponse;
+import ${domain}.module.wsys.rsp.TokensBuildResponse;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;

src/main/resources/modules/SpringBoot/java/config/TaskConfig.java

@@ -4,10 +4,12 @@ import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.schedule.RunTask;
 import ${domain}.frame.schedule.Scheduler;
 import ${domain}.frame.utils.LogUtil;
-import ${domain}.module.system.ent.TaskSql;
+<#if project.frameValue() &gt;= 3>
-import ${domain}.module.system.mgr.TaskSqlManager;
+import ${domain}.module.wsys.ent.TaskSql;
-import ${domain}.module.system.req.TaskSqlFindRequest;
+import ${domain}.module.wsys.mgr.TaskSqlManager;
-import ${domain}.module.system.rsp.TaskSqlFindResponse;
+import ${domain}.module.wsys.req.TaskSqlFindRequest;
+import ${domain}.module.wsys.rsp.TaskSqlFindResponse;
+</#if>
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -27,8 +29,10 @@ public class TaskConfig {
 
     @Autowired
     private Scheduler scheduler;
+    <#if project.frameValue() &gt;= 3>
     @Autowired
     private TaskSqlManager taskSqlManager;
+    </#if>
 
     @Bean
     public Scheduler registerScheduler() {
@@ -65,6 +69,7 @@ public class TaskConfig {
                 classPathBeanDefinitionScanner.scan(matcher.group(1));
             }
         }
+    <#if project.frameValue() &gt;= 3>
 
         {// 实例化SQL任务
             TaskSqlFindRequest taskSqlFindRequest = new TaskSqlFindRequest();
@@ -75,6 +80,6 @@ public class TaskConfig {
                 taskSqlManager.createOrRepeat(taskSql);
             }
         }
+    </#if>
     }
-
 }

src/main/resources/modules/SpringBoot/java/frame/auth/LocalData.java

@@ -28,7 +28,7 @@ public class LocalData {
         system = new Token();
         system.setId(0);
         system.setUserId(0);
-        system.setUserName("system");
+        system.setUserName("wsys");
         system.putRes(".*");
     }
 

src/main/resources/modules/SpringBoot/java/frame/auth/Token.java

@@ -1,11 +1,13 @@
 package ${domain}.frame.auth;
 
 import ${domain}.frame.utils.IDgenerator;
-import ${domain}.module.system.ent.Res;
+<#if project.frameValue() &gt;= 3>
-import ${domain}.module.system.mgr.ResManager;
+import ${domain}.module.wsys.ent.Res;
-import ${domain}.module.system.req.ResCreateRequest;
+import ${domain}.module.wsys.mgr.ResManager;
-import ${domain}.module.system.req.ResFindRequest;
+import ${domain}.module.wsys.req.ResCreateRequest;
-import ${domain}.module.system.rsp.ResFindResponse;
+import ${domain}.module.wsys.req.ResFindRequest;
+import ${domain}.module.wsys.rsp.ResFindResponse;
+</#if>
 
 import java.io.Serializable;
 import java.util.HashSet;
@@ -41,7 +43,7 @@ public class Token implements Serializable {
     private Set<String> resSet = new HashSet<>();
 
     public boolean hasRes(String res) {
-
+<#if project.frameValue() &gt;= 3>
         {// todo 开发初期收集资源，后期删除
             String active = LocalData.getActive();
             if (active.contains("dev")) {//测试环境捕获资源
@@ -63,6 +65,7 @@ public class Token implements Serializable {
                 }
             }
         }
+</#if>
 
         for (String s : resSet) {
             if (res.matches(s)) {
@@ -80,6 +83,7 @@ public class Token implements Serializable {
     public void putRes(Set<String> resourceSet) {
         this.resSet.addAll(resourceSet);
     }
+<#if project.frameValue() &gt;= 3>
 
     public void putRes(List<Res> resList) {
         if (resList == null) return;
@@ -87,6 +91,7 @@ public class Token implements Serializable {
             this.resSet.add(res.getResValue());
         }
     }
+</#if>
 
     public Set<String> getResSet() {
         return resSet;

src/main/resources/modules/SpringBoot/java/frame/base/BaseEntity.java

@@ -1,6 +1,8 @@
 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;
@@ -18,47 +20,61 @@ 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() {

src/main/resources/modules/SpringBoot/java/frame/schedule/Scheduler.java

@@ -2,9 +2,7 @@ package ${domain}.frame.schedule;
 
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.util.ErrorHandler;
-import ${domain}.frame.auth.LocalData;
+import ${domain}.frame.utils.LogUtil;
-import ${domain}.module.system.ent.Schedule;
-import ${domain}.module.system.mgr.LogErrManager;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -76,16 +74,20 @@ public class Scheduler extends ThreadPoolTaskScheduler implements ErrorHandler {
 
     @Override
     public void handleError(Throwable throwable) {
+        LogUtil.dumpException(throwable);
+
+<#if project.frameValue() &gt;= 3>
         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);
-            LogErrManager logErrManager = LocalData.getBean(LogErrManager.class);
+            ${domain}.module.wsys.mgr.LogErrManager logErrManager = xyz.wbsite.frame.auth.LocalData.getBean(${domain}.module.wsys.mgr.LogErrManager.class);
             if (logErrManager != null)
                 logErrManager.addErr("SYS_ERR", "任务" + taskName + "执行错误", "任务" + taskName + "执行错误" + "，任务ID" + taskId);
         }
+</#if>
     }
 
     class TaskWrapper {
@@ -105,4 +107,43 @@ public class Scheduler extends ThreadPoolTaskScheduler implements ErrorHandler {
             this.run = true;
         }
     }
+
+    public static class Schedule {
+        private String id;
+        private String name;
+        private String note;
+        private boolean run;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getNote() {
+            return note;
+        }
+
+        public void setNote(String note) {
+            this.note = note;
+        }
+
+        public boolean isRun() {
+            return run;
+        }
+
+        public void setRun(boolean run) {
+            this.run = run;
+        }
+    }
 }

src/main/resources/modules/SpringBoot/java/frame/utils/ResponseUtil.java

@@ -4,7 +4,6 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import ${domain}.frame.excel.WExcel;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -35,8 +34,10 @@ public class ResponseUtil {
             return null;
         }
     }
+<#if project.frameValue() &gt;= 3>
 
-    public static ResponseEntity<byte[]> apply(WExcel sheet) {
+    public static ResponseEntity<byte[]> apply(${domain}.frame.excel.WExcel sheet) {
         return apply(sheet.getBytes(), sheet.getName() + ".xlsx");
     }
+</#if>
 }

src/main/resources/modules/SpringBoot/java/frame/validation/DictValidator.java

@@ -3,10 +3,6 @@ package ${domain}.frame.validation;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorContextImpl;
 import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.utils.StringUtil;
-import ${domain}.module.system.ent.DictItem;
-import ${domain}.module.system.mgr.DictManager;
-import ${domain}.module.system.req.DictLoadRequest;
-import ${domain}.module.system.rsp.DictLoadResponse;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -43,10 +39,10 @@ public class DictValidator implements ConstraintValidator<Dict, String> {
             return false;
         } else {
             // name 字典名称
-            DictLoadRequest dictLoadRequest = new DictLoadRequest();
+            ${domain}.module.wsys.req.DictLoadRequest dictLoadRequest = new ${domain}.module.wsys.req.DictLoadRequest();
             dictLoadRequest.setDictName(name);
-            DictManager dictManager = LocalData.getBean(DictManager.class);
+            ${domain}.module.wsys.mgr.DictManager dictManager = LocalData.getBean(${domain}.module.wsys.mgr.DictManager.class);
-            DictLoadResponse dictLoadResponse = dictManager.load(dictLoadRequest, LocalData.getSysToken());
+            ${domain}.module.wsys.rsp.DictLoadResponse dictLoadResponse = dictManager.load(dictLoadRequest, LocalData.getSysToken());
 
             if (dictLoadResponse.hasError()) {
                 constraintValidatorContext.disableDefaultConstraintViolation();
@@ -55,10 +51,10 @@ public class DictValidator implements ConstraintValidator<Dict, String> {
                 return false;
             }
 
-            List<DictItem> dictItems = dictLoadResponse.getDictItems();
+            List<${domain}.module.wsys.ent.DictItem> dictItems = dictLoadResponse.getDictItems();
             int i = 0;
             for (; i < dictItems.size(); i++) {
-                DictItem dictItem = dictItems.get(i);
+                ${domain}.module.wsys.ent.DictItem dictItem = dictItems.get(i);
                 if (o.equals(dictItem.getKey())) {
                     break;
                 }

src/main/resources/modules/SpringBoot/java/module/wsvr/ent/Sequence.java

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

src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/SequenceManager.java

@@ -0,0 +1,35 @@
+package ${domain}.module.wsvr.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;
+
+/**
+ * 序列
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-06-25
+ */
+public interface SequenceManager {
+
+    /**
+     * 查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    SequenceFindResponse find(SequenceFindRequest request, Token token);
+
+    /**
+     * 获得对象
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return
+     */
+    SequenceNextResponse next(SequenceNextRequest request, Token token);
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/mgr/SequenceManagerImpl.java

@@ -0,0 +1,153 @@
+package ${domain}.module.wsvr.mgr;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.github.pagehelper.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+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 java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+
+/**
+ * SEQUENCE - 序列
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-06-25
+ */
+@Transactional
+@Service
+public class SequenceManagerImpl implements SequenceManager {
+
+    @Autowired
+    private SequenceMapper sequenceMapper;
+
+    private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+
+    /**
+     * 查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 响应
+     */
+    @Transactional(readOnly = true)
+    public SequenceFindResponse find(SequenceFindRequest request, Token token) {
+        SequenceFindResponse response = new SequenceFindResponse();
+
+        ValidationUtil.validate(request, response);
+        if (response.hasError()) {
+            return response;
+        }
+
+        if (request.getPageSize() != 0) {
+            PageHelper.startPage(request.getPageNumber(), request.getPageSize());
+        }
+        if (StringUtil.isNotEmpty(request.getSortKey())) {
+            PageHelper.orderBy(request.getSortKey() + " " + request.getSortType());
+        }
+        PageInfo<Sequence> pageInfo = new PageInfo<>(sequenceMapper.find(request, token));
+
+        response.setResult(pageInfo.getList());
+        response.setTotalCount(pageInfo.getTotal());
+
+        return response;
+    }
+
+    /**
+     * 获得对象
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 响应
+     */
+    @Transactional(readOnly = true)
+    public SequenceNextResponse next(SequenceNextRequest request, Token token) {
+        SequenceNextResponse response = new SequenceNextResponse();
+
+        int value = 0;
+        String year = null;
+        String month = null;
+        String date = null;
+        String format = dateFormat.format(new Date());
+        if (request.getByYear()) year = format.substring(0, 4);
+        if (request.getByMonth()) month = format.substring(4, 6);
+        if (request.getByDate()) date = format.substring(6, 8);
+
+        ValidationUtil.validate(request, response);
+        if (response.hasError()) {
+            return response;
+        }
+
+        int retryCount = 100;
+        do {
+            // 首先查询是否已经开始的序列
+            SequenceFindRequest sequenceFindRequest = new SequenceFindRequest();
+            sequenceFindRequest.setSeqName(request.getSeqName());
+            sequenceFindRequest.setYear(year);
+            sequenceFindRequest.setMonth(month);
+            sequenceFindRequest.setDate(date);
+            SequenceFindResponse sequenceFindResponse = this.find(sequenceFindRequest, token);
+            if (sequenceFindResponse.getTotalCount() > 0) {
+                Sequence sequence = sequenceFindResponse.getResult().get(0);
+                // 检查流水是否达到上限,达到最大值或理论最大值
+                if (sequence.getNextValue() > request.getMaxValue()) {
+                    response.addError(ErrorType.BUSINESS_ERROR, "流水已达上限，请等待下个周期!");
+                    return response;
+                }
+                // 更新下一个流水号
+                sequence.setNextValue(sequence.getNextValue() + request.getSeqStep());
+                long update = sequenceMapper.update(sequence, token);
+                if (update == 1) {
+                    value = sequence.getNextValue() - request.getSeqStep();
+                    break;
+                }
+            } else {// 未开始的序列
+                Sequence forCreate = new Sequence();
+                long id = IDgenerator.nextId();
+                forCreate.setId(id);
+                forCreate.setSeqName(request.getSeqName());
+                forCreate.setSeqNote(request.getSeqNote());
+                forCreate.setYear(year);
+                forCreate.setMonth(month);
+                forCreate.setDate(date);
+                forCreate.setNextValue(request.getMinValue() + request.getSeqStep());
+                long insert = sequenceMapper.insert(forCreate, token);
+                if (insert == 1) {
+                    value = request.getMinValue();
+                    break;
+                }
+            }
+            retryCount--;
+        } while (value <= 0 && retryCount > 0);
+
+        try {
+            TransactionAspectSupport.currentTransactionStatus().flush();
+        } catch (Exception e) {
+            response.addError(ErrorType.BUSINESS_ERROR, "生成序列失败，请稍后再试!");
+            return response;
+        }
+
+        response.setSequence(String.format(Locale.CHINA, "%s%s%s%s%0" + String.valueOf(request.getMaxValue()).length() + "d",
+                request.getSeqPrefix(),
+                year == null ? "" : year,
+                month == null ? "" : month,
+                date == null ? "" : date,
+                value));
+        return response;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/SQLite_SequenceMapper.xml

@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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">
+
+    <sql id="table">"SYS_SEQUENCE"</sql>
+
+    <sql id="entityColumnList">
+        "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">
+        <result column="ID"  jdbcType="BIGINT" property="id"/>
+        <result column="SEQ_NAME"  jdbcType="VARCHAR" property="seqName"/>
+        <result column="SEQ_NOTE"  jdbcType="VARCHAR" property="seqNote"/>
+        <result column="YEAR"  jdbcType="VARCHAR" property="year"/>
+        <result column="MONTH"  jdbcType="VARCHAR" property="month"/>
+        <result column="DATE"  jdbcType="VARCHAR" property="date"/>
+        <result column="NEXT_VALUE"  jdbcType="INTEGER" property="nextValue"/>
+        <result column="ROW_VERSION"  jdbcType="BIGINT" property="rowVersion"/>
+        <result column="IS_DELETED"  jdbcType="BIT" property="isDeleted"/>
+        <result column="CREATE_BY"  jdbcType="BIGINT" property="createBy"/>
+        <result column="CREATE_TIME"  jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="LAST_UPDATE_BY"  jdbcType="BIGINT" property="lastUpdateBy"/>
+        <result column="LAST_UPDATE_TIME"  jdbcType="TIMESTAMP" property="lastUpdateTime"/>
+    </resultMap>
+
+    <insert id="insert">
+        INSERT INTO
+        <include refid="table"/>
+        (
+        <include refid="entityColumnList"/>
+        )
+        VALUES
+        (
+        ${r'#'}{request.id},
+        ${r'#'}{request.seqName,jdbcType=VARCHAR},
+        ${r'#'}{request.seqNote,jdbcType=VARCHAR},
+        ${r'#'}{request.year,jdbcType=VARCHAR},
+        ${r'#'}{request.month,jdbcType=VARCHAR},
+        ${r'#'}{request.date,jdbcType=VARCHAR},
+        ${r'#'}{request.nextValue,jdbcType=INTEGER},
+        0,
+        0,
+        ${r'#'}{token.userId,jdbcType=NUMERIC},
+        datetime('now','localtime'),
+        NULL,
+        NULL
+        )
+    </insert>
+
+    <insert id="insertBatch">
+        INSERT INTO
+        <include refid="table"/>
+        (
+        <include refid="entityColumnList"/>
+        )
+        VALUES
+        <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
+            ${r'#'}{item.id},
+            ${r'#'}{item.seqName,jdbcType=VARCHAR},
+            ${r'#'}{item.seqNote,jdbcType=VARCHAR},
+            ${r'#'}{item.year,jdbcType=VARCHAR},
+            ${r'#'}{item.month,jdbcType=VARCHAR},
+            ${r'#'}{item.date,jdbcType=VARCHAR},
+            ${r'#'}{item.nextValue,jdbcType=INTEGER},
+            0,
+            0,
+            ${r'#'}{token.userId,jdbcType=NUMERIC},
+            datetime('now','localtime'),
+            NULL,
+            NULL
+        </foreach >
+    </insert>
+
+    <update id="delete">
+        UPDATE
+        <include refid="table"/>
+        SET "IS_DELETED" = 1
+        WHERE "IS_DELETED" = 0
+        AND "ID" = ${r'#'}{id}
+    </update>
+
+    <update id="deleteBatch">
+        UPDATE
+        <include refid="table"/>
+        SET "IS_DELETED" = 1
+        WHERE "IS_DELETED" = 0
+        AND "ID" IN
+        <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
+            ${r'#'}{item}
+        </foreach>
+    </update>
+
+    <update id="update">
+        UPDATE
+        <include refid="table"/>
+        SET
+        "SEQ_NAME" = ${r'#'}{request.seqName,jdbcType=VARCHAR},
+        "SEQ_NOTE" = ${r'#'}{request.seqNote,jdbcType=VARCHAR},
+        "YEAR" = ${r'#'}{request.year,jdbcType=VARCHAR},
+        "MONTH" = ${r'#'}{request.month,jdbcType=VARCHAR},
+        "DATE" = ${r'#'}{request.date,jdbcType=VARCHAR},
+        "NEXT_VALUE" = ${r'#'}{request.nextValue,jdbcType=INTEGER},
+        "ROW_VERSION" = "ROW_VERSION" + 1,
+        "LAST_UPDATE_BY" = ${r'#'}{token.userId},
+        "LAST_UPDATE_TIME" = datetime('now','localtime')
+        WHERE "IS_DELETED" = 0
+        AND "ID" = ${r'#'}{request.id}
+        AND "ROW_VERSION" = ${r'#'}{request.rowVersion}
+    </update>
+
+    <select id="find" resultMap="sequence">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        <if test="request.seqName != null and request.seqName != ''">
+            AND "SEQ_NAME" = ${r'#'}{request.seqName}
+        </if>
+        <if test="request.year != null and request.year != ''">
+            AND "YEAR" = ${r'#'}{request.year}
+        </if>
+        <if test="request.month != null and request.month != ''">
+            AND "MONTH" = ${r'#'}{request.month}
+        </if>
+        <if test="request.date != null and request.date != ''">
+            AND "DATE" = ${r'#'}{request.date}
+        </if>
+    </select>
+
+    <select id="search" resultMap="sequence">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+    </select>
+
+    <select id="getById" resultMap="sequence">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        AND "ID" = ${r'#'}{id}
+    </select>
+
+    <select id="getByIds" resultMap="sequence">
+        SELECT
+        <include refid="entityColumnList"/>
+        FROM
+        <include refid="table"/>
+        WHERE "IS_DELETED" = 0
+        AND "ID" IN
+        <foreach collection="list" item="item" index="index" separator="," open="(" close=")">
+            ${r'#'}{item}
+        </foreach>
+    </select>
+</mapper>

src/main/resources/modules/SpringBoot/java/module/wsvr/mpr/SequenceMapper.java

@@ -0,0 +1,91 @@
+package ${domain}.module.wsvr.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 java.util.List;
+
+/**
+ * SEQUENCE - 序列
+ *
+ * @author wangbing
+ * @since 2020-06-27
+ */
+@Mapper
+public interface SequenceMapper {
+
+    /**
+     * 插入
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回数量
+     */
+    long insert(@Param("request") Sequence request, @Param("token") Token token);
+
+    /**
+     * 批量插入
+     *
+     * @param list  对象集合
+     * @param token 令牌
+     * @return 返回数量
+     */
+    long insertBatch(@Param("list") List<Sequence> list, @Param("token") Token token);
+
+    /**
+     * 逻辑删除
+     *
+     * @param id    主键
+     * @param token 令牌
+     * @return 返回数量
+     */
+    long delete(@Param("id") Long id, @Param("token") Token token);
+
+    /**
+     * 批量逻辑删除
+     *
+     * @param list  主键集合
+     * @param token 令牌
+     * @return 返回数量
+     */
+    long deleteBatch(@Param("list") List<Long> list, @Param("token") Token token);
+
+    /**
+     * 更新
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回数量
+     */
+    long update(@Param("request") Sequence request, @Param("token") Token token);
+
+    /**
+     * 查询
+     *
+     * @param request 请求对象
+     * @param token   令牌
+     * @return 返回对象
+     */
+    List<Sequence> find(@Param("request") SequenceFindRequest request, @Param("token") Token token);
+
+    /**
+     * 获得对象
+     *
+     * @param id    主键
+     * @param token 令牌
+     * @return 返回对象
+     */
+    Sequence getById(@Param("id") Long id, @Param("token") Token token);
+
+    /**
+     * 获得对象
+     *
+     * @param list  主键集合
+     * @param token 令牌
+     * @return 返回对象
+     */
+    List<Sequence> getByIds(@Param("list") List<Long> list, @Param("token") Token token);
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/req/SequenceFindRequest.java

@@ -0,0 +1,93 @@
+package ${domain}.module.wsvr.req;
+
+import ${domain}.frame.base.BaseFindRequest;
+
+import java.util.Date;
+
+/**
+ * SequenceFindRequest - 序列查询
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-06-27
+ */
+public class SequenceFindRequest extends BaseFindRequest {
+
+    /**
+     * 序列名称.
+     */
+    private String seqName;
+
+    /**
+     * 年.
+     */
+    private String year;
+
+    /**
+     * 月.
+     */
+    private String month;
+
+    /**
+     * 日.
+     */
+    private String date;
+
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
+    public String getSeqName() {
+        return this.seqName;
+    }
+
+    public void setSeqName(String seqName) {
+        this.seqName = seqName;
+    }
+
+    public String getYear() {
+        return this.year;
+    }
+
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getMonth() {
+        return this.month;
+    }
+
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
+    public String getDate() {
+        return this.date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/req/SequenceNextRequest.java

@@ -0,0 +1,136 @@
+package ${domain}.module.wsvr.req;
+
+import org.hibernate.validator.constraints.Length;
+import ${domain}.frame.base.BaseRequest;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * SequenceNextRequest - 序列获取
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-06-25
+ */
+public class SequenceNextRequest extends BaseRequest {
+
+    /**
+     * 序列名称.
+     */
+    @NotBlank(message = "[seqName]序列名称不能为空")
+    @Length(min = 1, max = 50, message = "[seqName]序列名称长度不合法(1-50)")
+    private String seqName;
+
+    /**
+     * 序列备注.
+     */
+    @Length(min = 0, max = 50, message = "[seqNote]序列备注长度不合法(0-50)")
+    private String seqNote;
+
+    /**
+     * 序列号前缀
+     */
+    private String seqPrefix;
+
+    /**
+     * 流水号步长
+     */
+    private int seqStep = 1;
+
+    /**
+     * 最小流水号.
+     */
+    private int minValue = 1;
+
+    /**
+     * 最大流水号.
+     */
+    private int maxValue = 99999;
+
+    /**
+     * 年.
+     */
+    private boolean byYear;
+
+    /**
+     * 月.
+     */
+    private boolean byMonth;
+
+    /**
+     * 日.
+     */
+    private boolean byDate;
+
+    public String getSeqName() {
+        return seqName;
+    }
+
+    public void setSeqName(String seqName) {
+        this.seqName = seqName;
+    }
+
+    public String getSeqNote() {
+        return seqNote;
+    }
+
+    public void setSeqNote(String seqNote) {
+        this.seqNote = seqNote;
+    }
+
+    public void setByYear(boolean byYear) {
+        this.byYear = byYear;
+    }
+
+    public boolean getByYear() {
+        return byYear;
+    }
+
+    public boolean getByMonth() {
+        return byMonth;
+    }
+
+    public void setByMonth(boolean byMonth) {
+        this.byMonth = byMonth;
+    }
+
+    public boolean getByDate() {
+        return byDate;
+    }
+
+    public void setByDate(boolean byDate) {
+        this.byDate = byDate;
+    }
+
+    public String getSeqPrefix() {
+        return seqPrefix;
+    }
+
+    public void setSeqPrefix(String seqPrefix) {
+        this.seqPrefix = seqPrefix;
+    }
+
+    public int getSeqStep() {
+        return seqStep;
+    }
+
+    public void setSeqStep(int seqStep) {
+        this.seqStep = seqStep;
+    }
+
+    public int getMinValue() {
+        return minValue;
+    }
+
+    public void setMinValue(int minValue) {
+        this.minValue = minValue;
+    }
+
+    public int getMaxValue() {
+        return maxValue;
+    }
+
+    public void setMaxValue(int maxValue) {
+        this.maxValue = maxValue;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/SequenceFindResponse.java

@@ -0,0 +1,14 @@
+package ${domain}.module.wsvr.rsp;
+
+import ${domain}.frame.base.BaseFindResponse;
+import ${domain}.module.wsvr.ent.Sequence;
+
+/**
+ * SequenceFindResponse - 序列
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-06-27
+ */
+public class SequenceFindResponse extends BaseFindResponse<Sequence> {
+}

src/main/resources/modules/SpringBoot/java/module/wsvr/rsp/SequenceNextResponse.java

@@ -0,0 +1,26 @@
+package ${domain}.module.wsvr.rsp;
+
+import ${domain}.frame.base.BaseResponse;
+
+/**
+ * SequenceNextResponse - 序列
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 2020-06-25
+ */
+public class SequenceNextResponse extends BaseResponse {
+
+    /**
+     * 序列
+     */
+    private String sequence;
+
+    public String getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+}

src/main/resources/modules/SpringBoot/java/module/wsys/ent/Dept.java

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

src/main/resources/modules/SpringBoot/java/module/wsys/ent/DeptTree.java

@@ -1,4 +1,4 @@
-package ${domain}.module.system.ent;
+package ${domain}.module.wsys.ent;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/module/wsys/ent/Dict.java

@@ -1,9 +1,11 @@
-package ${domain}.module.system.ent;
+package ${domain}.module.wsys.ent;
 
 import ${domain}.frame.base.BaseEntity;
-import ${domain}.frame.excel.annotation.ExcelNote;
+<#if project.frameValue() == 3>
 import com.alibaba.excel.annotation.ExcelProperty;
+import ${domain}.frame.excel.annotation.ExcelNote;
 import ${domain}.frame.excel.annotation.ExcelSheet;
+</#if>
 
 /**
  * DICT - 字典
@@ -12,32 +14,42 @@ 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() {

src/main/resources/modules/SpringBoot/java/module/wsys/ent/DictItem.java

@@ -1,9 +1,11 @@
-package ${domain}.module.system.ent;
+package ${domain}.module.wsys.ent;
 
 import ${domain}.frame.base.BaseEntity;
-import ${domain}.frame.excel.annotation.ExcelNote;
+<#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 - 字典项
@@ -12,38 +14,50 @@ 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() {

src/main/resources/modules/SpringBoot/java/module/wsys/ent/File.java

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

src/main/resources/modules/SpringBoot/java/module/wsys/ent/LogErr.java

@@ -1,4 +1,4 @@
-package ${domain}.module.system.ent;
+package ${domain}.module.wsys.ent;
 
 import ${domain}.frame.excel.annotation.ExcelNote;
 import ${domain}.frame.excel.annotation.ExcelSelect;

src/main/resources/modules/SpringBoot/java/module/wsys/ent/Profiles.java

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

src/main/resources/modules/SpringBoot/java/module/wsys/ent/Res.java

@@ -1,4 +1,4 @@
-package ${domain}.module.system.ent;
+package ${domain}.module.wsys.ent;
 
 import ${domain}.frame.excel.annotation.ExcelNote;
 import ${domain}.frame.excel.annotation.ExcelSelect;

src/main/resources/modules/SpringBoot/java/module/wsys/ent/ResTree.java

@@ -1,4 +1,4 @@
-package ${domain}.module.system.ent;
+package ${domain}.module.wsys.ent;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/resources/modules/SpringBoot/java/module/wsys/ent/Role.java

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

src/main/resources/modules/SpringBoot/java/module/wsys/ent/RoleRes.java

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

src/main/resources/modules/SpringBoot/java/module/wsys/ent/TaskSql.java

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

src/main/resources/modules/SpringBoot/java/module/wsys/ent/Tokens.java

@@ -1,4 +1,4 @@
-package ${domain}.module.system.ent;
+package ${domain}.module.wsys.ent;
 
 import java.util.Date;
 import ${domain}.frame.excel.annotation.ExcelNote;

src/main/resources/modules/SpringBoot/java/module/wsys/ent/User.java

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

src/main/resources/modules/SpringBoot/java/module/wsys/ent/UserRole.java

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

src/main/resources/modules/SpringBoot/java/module/wsys/ent/Visitor.java

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

src/main/resources/modules/SpringBoot/java/module/wsys/ent/VisitorRes.java

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

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

@@ -1,16 +1,16 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.DeptCreateRequest;
+import ${domain}.module.wsys.req.DeptCreateRequest;
-import ${domain}.module.system.req.DeptDeleteRequest;
+import ${domain}.module.wsys.req.DeptDeleteRequest;
-import ${domain}.module.system.req.DeptFindRequest;
+import ${domain}.module.wsys.req.DeptFindRequest;
-import ${domain}.module.system.req.DeptTreeRequest;
+import ${domain}.module.wsys.req.DeptTreeRequest;
-import ${domain}.module.system.req.DeptUpdateRequest;
+import ${domain}.module.wsys.req.DeptUpdateRequest;
-import ${domain}.module.system.rsp.DeptCreateResponse;
+import ${domain}.module.wsys.rsp.DeptCreateResponse;
-import ${domain}.module.system.rsp.DeptDeleteResponse;
+import ${domain}.module.wsys.rsp.DeptDeleteResponse;
-import ${domain}.module.system.rsp.DeptFindResponse;
+import ${domain}.module.wsys.rsp.DeptFindResponse;
-import ${domain}.module.system.rsp.DeptTreeResponse;
+import ${domain}.module.wsys.rsp.DeptTreeResponse;
-import ${domain}.module.system.rsp.DeptUpdateResponse;
+import ${domain}.module.wsys.rsp.DeptUpdateResponse;
 
 /**
  * 部门

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -13,19 +13,19 @@ import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.StringUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Dept;
+import ${domain}.module.wsys.ent.Dept;
-import ${domain}.module.system.ent.DeptTree;
+import ${domain}.module.wsys.ent.DeptTree;
-import ${domain}.module.system.mpr.DeptMapper;
+import ${domain}.module.wsys.mpr.DeptMapper;
-import ${domain}.module.system.req.DeptCreateRequest;
+import ${domain}.module.wsys.req.DeptCreateRequest;
-import ${domain}.module.system.req.DeptDeleteRequest;
+import ${domain}.module.wsys.req.DeptDeleteRequest;
-import ${domain}.module.system.req.DeptFindRequest;
+import ${domain}.module.wsys.req.DeptFindRequest;
-import ${domain}.module.system.req.DeptTreeRequest;
+import ${domain}.module.wsys.req.DeptTreeRequest;
-import ${domain}.module.system.req.DeptUpdateRequest;
+import ${domain}.module.wsys.req.DeptUpdateRequest;
-import ${domain}.module.system.rsp.DeptCreateResponse;
+import ${domain}.module.wsys.rsp.DeptCreateResponse;
-import ${domain}.module.system.rsp.DeptDeleteResponse;
+import ${domain}.module.wsys.rsp.DeptDeleteResponse;
-import ${domain}.module.system.rsp.DeptFindResponse;
+import ${domain}.module.wsys.rsp.DeptFindResponse;
-import ${domain}.module.system.rsp.DeptTreeResponse;
+import ${domain}.module.wsys.rsp.DeptTreeResponse;
-import ${domain}.module.system.rsp.DeptUpdateResponse;
+import ${domain}.module.wsys.rsp.DeptUpdateResponse;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -1,14 +1,14 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.DictItemCreateRequest;
+import ${domain}.module.wsys.req.DictItemCreateRequest;
-import ${domain}.module.system.req.DictItemDeleteRequest;
+import ${domain}.module.wsys.req.DictItemDeleteRequest;
-import ${domain}.module.system.req.DictItemFindRequest;
+import ${domain}.module.wsys.req.DictItemFindRequest;
-import ${domain}.module.system.req.DictItemUpdateRequest;
+import ${domain}.module.wsys.req.DictItemUpdateRequest;
-import ${domain}.module.system.rsp.DictItemCreateResponse;
+import ${domain}.module.wsys.rsp.DictItemCreateResponse;
-import ${domain}.module.system.rsp.DictItemDeleteResponse;
+import ${domain}.module.wsys.rsp.DictItemDeleteResponse;
-import ${domain}.module.system.rsp.DictItemFindResponse;
+import ${domain}.module.wsys.rsp.DictItemFindResponse;
-import ${domain}.module.system.rsp.DictItemUpdateResponse;
+import ${domain}.module.wsys.rsp.DictItemUpdateResponse;
 
 /**
  * 字典项

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -12,16 +12,16 @@ import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.DictItem;
+import ${domain}.module.wsys.ent.DictItem;
-import ${domain}.module.system.mpr.DictItemMapper;
+import ${domain}.module.wsys.mpr.DictItemMapper;
-import ${domain}.module.system.req.DictItemCreateRequest;
+import ${domain}.module.wsys.req.DictItemCreateRequest;
-import ${domain}.module.system.req.DictItemDeleteRequest;
+import ${domain}.module.wsys.req.DictItemDeleteRequest;
-import ${domain}.module.system.req.DictItemFindRequest;
+import ${domain}.module.wsys.req.DictItemFindRequest;
-import ${domain}.module.system.req.DictItemUpdateRequest;
+import ${domain}.module.wsys.req.DictItemUpdateRequest;
-import ${domain}.module.system.rsp.DictItemCreateResponse;
+import ${domain}.module.wsys.rsp.DictItemCreateResponse;
-import ${domain}.module.system.rsp.DictItemDeleteResponse;
+import ${domain}.module.wsys.rsp.DictItemDeleteResponse;
-import ${domain}.module.system.rsp.DictItemFindResponse;
+import ${domain}.module.wsys.rsp.DictItemFindResponse;
-import ${domain}.module.system.rsp.DictItemUpdateResponse;
+import ${domain}.module.wsys.rsp.DictItemUpdateResponse;
 
 /**
  * DICT_ITEM - 字典项

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

@@ -1,16 +1,16 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.DictCreateRequest;
+import ${domain}.module.wsys.req.DictCreateRequest;
-import ${domain}.module.system.req.DictDeleteRequest;
+import ${domain}.module.wsys.req.DictDeleteRequest;
-import ${domain}.module.system.req.DictFindRequest;
+import ${domain}.module.wsys.req.DictFindRequest;
-import ${domain}.module.system.req.DictLoadRequest;
+import ${domain}.module.wsys.req.DictLoadRequest;
-import ${domain}.module.system.req.DictUpdateRequest;
+import ${domain}.module.wsys.req.DictUpdateRequest;
-import ${domain}.module.system.rsp.DictCreateResponse;
+import ${domain}.module.wsys.rsp.DictCreateResponse;
-import ${domain}.module.system.rsp.DictDeleteResponse;
+import ${domain}.module.wsys.rsp.DictDeleteResponse;
-import ${domain}.module.system.rsp.DictFindResponse;
+import ${domain}.module.wsys.rsp.DictFindResponse;
-import ${domain}.module.system.rsp.DictLoadResponse;
+import ${domain}.module.wsys.rsp.DictLoadResponse;
-import ${domain}.module.system.rsp.DictUpdateResponse;
+import ${domain}.module.wsys.rsp.DictUpdateResponse;
 
 /**
  * 字典

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -12,20 +12,20 @@ import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Dict;
+import ${domain}.module.wsys.ent.Dict;
-import ${domain}.module.system.mpr.DictMapper;
+import ${domain}.module.wsys.mpr.DictMapper;
-import ${domain}.module.system.req.DictCreateRequest;
+import ${domain}.module.wsys.req.DictCreateRequest;
-import ${domain}.module.system.req.DictDeleteRequest;
+import ${domain}.module.wsys.req.DictDeleteRequest;
-import ${domain}.module.system.req.DictFindRequest;
+import ${domain}.module.wsys.req.DictFindRequest;
-import ${domain}.module.system.req.DictItemFindRequest;
+import ${domain}.module.wsys.req.DictItemFindRequest;
-import ${domain}.module.system.req.DictLoadRequest;
+import ${domain}.module.wsys.req.DictLoadRequest;
-import ${domain}.module.system.req.DictUpdateRequest;
+import ${domain}.module.wsys.req.DictUpdateRequest;
-import ${domain}.module.system.rsp.DictCreateResponse;
+import ${domain}.module.wsys.rsp.DictCreateResponse;
-import ${domain}.module.system.rsp.DictDeleteResponse;
+import ${domain}.module.wsys.rsp.DictDeleteResponse;
-import ${domain}.module.system.rsp.DictFindResponse;
+import ${domain}.module.wsys.rsp.DictFindResponse;
-import ${domain}.module.system.rsp.DictItemFindResponse;
+import ${domain}.module.wsys.rsp.DictItemFindResponse;
-import ${domain}.module.system.rsp.DictLoadResponse;
+import ${domain}.module.wsys.rsp.DictLoadResponse;
-import ${domain}.module.system.rsp.DictUpdateResponse;
+import ${domain}.module.wsys.rsp.DictUpdateResponse;
 
 import java.util.List;
 

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

@@ -1,12 +1,12 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.FileCreateRequest;
+import ${domain}.module.wsys.req.FileCreateRequest;
-import ${domain}.module.system.req.FileDeleteRequest;
+import ${domain}.module.wsys.req.FileDeleteRequest;
-import ${domain}.module.system.req.FileFindRequest;
+import ${domain}.module.wsys.req.FileFindRequest;
-import ${domain}.module.system.rsp.FileCreateResponse;
+import ${domain}.module.wsys.rsp.FileCreateResponse;
-import ${domain}.module.system.rsp.FileDeleteResponse;
+import ${domain}.module.wsys.rsp.FileDeleteResponse;
-import ${domain}.module.system.rsp.FileFindResponse;
+import ${domain}.module.wsys.rsp.FileFindResponse;
 
 /**
  * 文件

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -12,14 +12,14 @@ import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.File;
+import ${domain}.module.wsys.ent.File;
-import ${domain}.module.system.mpr.FileMapper;
+import ${domain}.module.wsys.mpr.FileMapper;
-import ${domain}.module.system.req.FileCreateRequest;
+import ${domain}.module.wsys.req.FileCreateRequest;
-import ${domain}.module.system.req.FileDeleteRequest;
+import ${domain}.module.wsys.req.FileDeleteRequest;
-import ${domain}.module.system.req.FileFindRequest;
+import ${domain}.module.wsys.req.FileFindRequest;
-import ${domain}.module.system.rsp.FileCreateResponse;
+import ${domain}.module.wsys.rsp.FileCreateResponse;
-import ${domain}.module.system.rsp.FileDeleteResponse;
+import ${domain}.module.wsys.rsp.FileDeleteResponse;
-import ${domain}.module.system.rsp.FileFindResponse;
+import ${domain}.module.wsys.rsp.FileFindResponse;
 
 /**
  * FILE - 文件

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

@@ -1,14 +1,14 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.LogErrCreateRequest;
+import ${domain}.module.wsys.req.LogErrCreateRequest;
-import ${domain}.module.system.req.LogErrDeleteRequest;
+import ${domain}.module.wsys.req.LogErrDeleteRequest;
-import ${domain}.module.system.req.LogErrFindRequest;
+import ${domain}.module.wsys.req.LogErrFindRequest;
-import ${domain}.module.system.req.LogErrUpdateRequest;
+import ${domain}.module.wsys.req.LogErrUpdateRequest;
-import ${domain}.module.system.rsp.LogErrCreateResponse;
+import ${domain}.module.wsys.rsp.LogErrCreateResponse;
-import ${domain}.module.system.rsp.LogErrDeleteResponse;
+import ${domain}.module.wsys.rsp.LogErrDeleteResponse;
-import ${domain}.module.system.rsp.LogErrFindResponse;
+import ${domain}.module.wsys.rsp.LogErrFindResponse;
-import ${domain}.module.system.rsp.LogErrUpdateResponse;
+import ${domain}.module.wsys.rsp.LogErrUpdateResponse;
 
 /**
  * 错误日志

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.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.system.ent.LogErr;
+import ${domain}.module.wsys.ent.LogErr;
-import ${domain}.module.system.mpr.LogErrMapper;
+import ${domain}.module.wsys.mpr.LogErrMapper;
-import ${domain}.module.system.req.LogErrCreateRequest;
+import ${domain}.module.wsys.req.LogErrCreateRequest;
-import ${domain}.module.system.req.LogErrDeleteRequest;
+import ${domain}.module.wsys.req.LogErrDeleteRequest;
-import ${domain}.module.system.req.LogErrFindRequest;
+import ${domain}.module.wsys.req.LogErrFindRequest;
-import ${domain}.module.system.req.LogErrUpdateRequest;
+import ${domain}.module.wsys.req.LogErrUpdateRequest;
-import ${domain}.module.system.rsp.LogErrCreateResponse;
+import ${domain}.module.wsys.rsp.LogErrCreateResponse;
-import ${domain}.module.system.rsp.LogErrDeleteResponse;
+import ${domain}.module.wsys.rsp.LogErrDeleteResponse;
-import ${domain}.module.system.rsp.LogErrFindResponse;
+import ${domain}.module.wsys.rsp.LogErrFindResponse;
-import ${domain}.module.system.rsp.LogErrUpdateResponse;
+import ${domain}.module.wsys.rsp.LogErrUpdateResponse;
 
 /**
  * LOG_ERR - 错误日志
@@ -33,7 +33,7 @@ import ${domain}.module.system.rsp.LogErrUpdateResponse;
  */
 @Transactional
 @Service
-public class LogErrManagerImpl implements ${domain}.module.system.mgr.LogErrManager {
+public class LogErrManagerImpl implements LogErrManager {
 
     @Autowired
     private LogErrMapper logErrMapper;

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

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

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -13,16 +13,16 @@ import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.StringUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Profiles;
+import ${domain}.module.wsys.ent.Profiles;
-import ${domain}.module.system.mpr.ProfilesMapper;
+import ${domain}.module.wsys.mpr.ProfilesMapper;
-import ${domain}.module.system.req.ProfilesCreateRequest;
+import ${domain}.module.wsys.req.ProfilesCreateRequest;
-import ${domain}.module.system.req.ProfilesDeleteRequest;
+import ${domain}.module.wsys.req.ProfilesDeleteRequest;
-import ${domain}.module.system.req.ProfilesFindRequest;
+import ${domain}.module.wsys.req.ProfilesFindRequest;
-import ${domain}.module.system.req.ProfilesUpdateRequest;
+import ${domain}.module.wsys.req.ProfilesUpdateRequest;
-import ${domain}.module.system.rsp.ProfilesCreateResponse;
+import ${domain}.module.wsys.rsp.ProfilesCreateResponse;
-import ${domain}.module.system.rsp.ProfilesDeleteResponse;
+import ${domain}.module.wsys.rsp.ProfilesDeleteResponse;
-import ${domain}.module.system.rsp.ProfilesFindResponse;
+import ${domain}.module.wsys.rsp.ProfilesFindResponse;
-import ${domain}.module.system.rsp.ProfilesUpdateResponse;
+import ${domain}.module.wsys.rsp.ProfilesUpdateResponse;
 
 
 /**

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

@@ -1,18 +1,18 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.ResCreateRequest;
+import ${domain}.module.wsys.req.ResCreateRequest;
-import ${domain}.module.system.req.ResDeleteRequest;
+import ${domain}.module.wsys.req.ResDeleteRequest;
-import ${domain}.module.system.req.ResFindRequest;
+import ${domain}.module.wsys.req.ResFindRequest;
-import ${domain}.module.system.req.ResLoadRequest;
+import ${domain}.module.wsys.req.ResLoadRequest;
-import ${domain}.module.system.req.ResTreeRequest;
+import ${domain}.module.wsys.req.ResTreeRequest;
-import ${domain}.module.system.req.ResUpdateRequest;
+import ${domain}.module.wsys.req.ResUpdateRequest;
-import ${domain}.module.system.rsp.ResCreateResponse;
+import ${domain}.module.wsys.rsp.ResCreateResponse;
-import ${domain}.module.system.rsp.ResDeleteResponse;
+import ${domain}.module.wsys.rsp.ResDeleteResponse;
-import ${domain}.module.system.rsp.ResFindResponse;
+import ${domain}.module.wsys.rsp.ResFindResponse;
-import ${domain}.module.system.rsp.ResLoadResponse;
+import ${domain}.module.wsys.rsp.ResLoadResponse;
-import ${domain}.module.system.rsp.ResTreeResponse;
+import ${domain}.module.wsys.rsp.ResTreeResponse;
-import ${domain}.module.system.rsp.ResUpdateResponse;
+import ${domain}.module.wsys.rsp.ResUpdateResponse;
 
 /**
  * 资源

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -13,21 +13,21 @@ import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Res;
+import ${domain}.module.wsys.ent.Res;
-import ${domain}.module.system.ent.ResTree;
+import ${domain}.module.wsys.ent.ResTree;
-import ${domain}.module.system.mpr.ResMapper;
+import ${domain}.module.wsys.mpr.ResMapper;
-import ${domain}.module.system.req.ResCreateRequest;
+import ${domain}.module.wsys.req.ResCreateRequest;
-import ${domain}.module.system.req.ResDeleteRequest;
+import ${domain}.module.wsys.req.ResDeleteRequest;
-import ${domain}.module.system.req.ResFindRequest;
+import ${domain}.module.wsys.req.ResFindRequest;
-import ${domain}.module.system.req.ResLoadRequest;
+import ${domain}.module.wsys.req.ResLoadRequest;
-import ${domain}.module.system.req.ResTreeRequest;
+import ${domain}.module.wsys.req.ResTreeRequest;
-import ${domain}.module.system.req.ResUpdateRequest;
+import ${domain}.module.wsys.req.ResUpdateRequest;
-import ${domain}.module.system.rsp.ResCreateResponse;
+import ${domain}.module.wsys.rsp.ResCreateResponse;
-import ${domain}.module.system.rsp.ResDeleteResponse;
+import ${domain}.module.wsys.rsp.ResDeleteResponse;
-import ${domain}.module.system.rsp.ResFindResponse;
+import ${domain}.module.wsys.rsp.ResFindResponse;
-import ${domain}.module.system.rsp.ResLoadResponse;
+import ${domain}.module.wsys.rsp.ResLoadResponse;
-import ${domain}.module.system.rsp.ResTreeResponse;
+import ${domain}.module.wsys.rsp.ResTreeResponse;
-import ${domain}.module.system.rsp.ResUpdateResponse;
+import ${domain}.module.wsys.rsp.ResUpdateResponse;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -1,14 +1,14 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.RoleCreateRequest;
+import ${domain}.module.wsys.req.RoleCreateRequest;
-import ${domain}.module.system.req.RoleDeleteRequest;
+import ${domain}.module.wsys.req.RoleDeleteRequest;
-import ${domain}.module.system.req.RoleFindRequest;
+import ${domain}.module.wsys.req.RoleFindRequest;
-import ${domain}.module.system.req.RoleUpdateRequest;
+import ${domain}.module.wsys.req.RoleUpdateRequest;
-import ${domain}.module.system.rsp.RoleCreateResponse;
+import ${domain}.module.wsys.rsp.RoleCreateResponse;
-import ${domain}.module.system.rsp.RoleDeleteResponse;
+import ${domain}.module.wsys.rsp.RoleDeleteResponse;
-import ${domain}.module.system.rsp.RoleFindResponse;
+import ${domain}.module.wsys.rsp.RoleFindResponse;
-import ${domain}.module.system.rsp.RoleUpdateResponse;
+import ${domain}.module.wsys.rsp.RoleUpdateResponse;
 
 /**
  * 角色

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -12,16 +12,16 @@ import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Role;
+import ${domain}.module.wsys.ent.Role;
-import ${domain}.module.system.mpr.RoleMapper;
+import ${domain}.module.wsys.mpr.RoleMapper;
-import ${domain}.module.system.req.RoleCreateRequest;
+import ${domain}.module.wsys.req.RoleCreateRequest;
-import ${domain}.module.system.req.RoleDeleteRequest;
+import ${domain}.module.wsys.req.RoleDeleteRequest;
-import ${domain}.module.system.req.RoleFindRequest;
+import ${domain}.module.wsys.req.RoleFindRequest;
-import ${domain}.module.system.req.RoleUpdateRequest;
+import ${domain}.module.wsys.req.RoleUpdateRequest;
-import ${domain}.module.system.rsp.RoleCreateResponse;
+import ${domain}.module.wsys.rsp.RoleCreateResponse;
-import ${domain}.module.system.rsp.RoleDeleteResponse;
+import ${domain}.module.wsys.rsp.RoleDeleteResponse;
-import ${domain}.module.system.rsp.RoleFindResponse;
+import ${domain}.module.wsys.rsp.RoleFindResponse;
-import ${domain}.module.system.rsp.RoleUpdateResponse;
+import ${domain}.module.wsys.rsp.RoleUpdateResponse;
 
 /**
  * ROLE - 角色

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

@@ -1,16 +1,16 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.RoleResCheckRequest;
+import ${domain}.module.wsys.req.RoleResCheckRequest;
-import ${domain}.module.system.req.RoleResCreateRequest;
+import ${domain}.module.wsys.req.RoleResCreateRequest;
-import ${domain}.module.system.req.RoleResDeleteRequest;
+import ${domain}.module.wsys.req.RoleResDeleteRequest;
-import ${domain}.module.system.req.RoleResFindRequest;
+import ${domain}.module.wsys.req.RoleResFindRequest;
-import ${domain}.module.system.req.RoleResUpdateRequest;
+import ${domain}.module.wsys.req.RoleResUpdateRequest;
-import ${domain}.module.system.rsp.RoleResCheckResponse;
+import ${domain}.module.wsys.rsp.RoleResCheckResponse;
-import ${domain}.module.system.rsp.RoleResCreateResponse;
+import ${domain}.module.wsys.rsp.RoleResCreateResponse;
-import ${domain}.module.system.rsp.RoleResDeleteResponse;
+import ${domain}.module.wsys.rsp.RoleResDeleteResponse;
-import ${domain}.module.system.rsp.RoleResFindResponse;
+import ${domain}.module.wsys.rsp.RoleResFindResponse;
-import ${domain}.module.system.rsp.RoleResUpdateResponse;
+import ${domain}.module.wsys.rsp.RoleResUpdateResponse;
 
 /**
  * 角色资源关系

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -13,18 +13,18 @@ import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.RoleRes;
+import ${domain}.module.wsys.ent.RoleRes;
-import ${domain}.module.system.mpr.RoleResMapper;
+import ${domain}.module.wsys.mpr.RoleResMapper;
-import ${domain}.module.system.req.RoleResCheckRequest;
+import ${domain}.module.wsys.req.RoleResCheckRequest;
-import ${domain}.module.system.req.RoleResCreateRequest;
+import ${domain}.module.wsys.req.RoleResCreateRequest;
-import ${domain}.module.system.req.RoleResDeleteRequest;
+import ${domain}.module.wsys.req.RoleResDeleteRequest;
-import ${domain}.module.system.req.RoleResFindRequest;
+import ${domain}.module.wsys.req.RoleResFindRequest;
-import ${domain}.module.system.req.RoleResUpdateRequest;
+import ${domain}.module.wsys.req.RoleResUpdateRequest;
-import ${domain}.module.system.rsp.RoleResCheckResponse;
+import ${domain}.module.wsys.rsp.RoleResCheckResponse;
-import ${domain}.module.system.rsp.RoleResCreateResponse;
+import ${domain}.module.wsys.rsp.RoleResCreateResponse;
-import ${domain}.module.system.rsp.RoleResDeleteResponse;
+import ${domain}.module.wsys.rsp.RoleResDeleteResponse;
-import ${domain}.module.system.rsp.RoleResFindResponse;
+import ${domain}.module.wsys.rsp.RoleResFindResponse;
-import ${domain}.module.system.rsp.RoleResUpdateResponse;
+import ${domain}.module.wsys.rsp.RoleResUpdateResponse;
 
 /**
  * ROLE_RES - 角色资源关系

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

@@ -1,15 +1,15 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.ent.TaskSql;
+import ${domain}.module.wsys.ent.TaskSql;
-import ${domain}.module.system.req.TaskSqlCreateRequest;
+import ${domain}.module.wsys.req.TaskSqlCreateRequest;
-import ${domain}.module.system.req.TaskSqlDeleteRequest;
+import ${domain}.module.wsys.req.TaskSqlDeleteRequest;
-import ${domain}.module.system.req.TaskSqlFindRequest;
+import ${domain}.module.wsys.req.TaskSqlFindRequest;
-import ${domain}.module.system.req.TaskSqlUpdateRequest;
+import ${domain}.module.wsys.req.TaskSqlUpdateRequest;
-import ${domain}.module.system.rsp.TaskSqlCreateResponse;
+import ${domain}.module.wsys.rsp.TaskSqlCreateResponse;
-import ${domain}.module.system.rsp.TaskSqlDeleteResponse;
+import ${domain}.module.wsys.rsp.TaskSqlDeleteResponse;
-import ${domain}.module.system.rsp.TaskSqlFindResponse;
+import ${domain}.module.wsys.rsp.TaskSqlFindResponse;
-import ${domain}.module.system.rsp.TaskSqlUpdateResponse;
+import ${domain}.module.wsys.rsp.TaskSqlUpdateResponse;
 
 /**
  * SQL任务

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -18,16 +18,16 @@ import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.SqlUtil;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.TaskSql;
+import ${domain}.module.wsys.ent.TaskSql;
-import ${domain}.module.system.mpr.TaskSqlMapper;
+import ${domain}.module.wsys.mpr.TaskSqlMapper;
-import ${domain}.module.system.req.TaskSqlCreateRequest;
+import ${domain}.module.wsys.req.TaskSqlCreateRequest;
-import ${domain}.module.system.req.TaskSqlDeleteRequest;
+import ${domain}.module.wsys.req.TaskSqlDeleteRequest;
-import ${domain}.module.system.req.TaskSqlFindRequest;
+import ${domain}.module.wsys.req.TaskSqlFindRequest;
-import ${domain}.module.system.req.TaskSqlUpdateRequest;
+import ${domain}.module.wsys.req.TaskSqlUpdateRequest;
-import ${domain}.module.system.rsp.TaskSqlCreateResponse;
+import ${domain}.module.wsys.rsp.TaskSqlCreateResponse;
-import ${domain}.module.system.rsp.TaskSqlDeleteResponse;
+import ${domain}.module.wsys.rsp.TaskSqlDeleteResponse;
-import ${domain}.module.system.rsp.TaskSqlFindResponse;
+import ${domain}.module.wsys.rsp.TaskSqlFindResponse;
-import ${domain}.module.system.rsp.TaskSqlUpdateResponse;
+import ${domain}.module.wsys.rsp.TaskSqlUpdateResponse;
 
 import java.time.Duration;
 

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

@@ -1,18 +1,18 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.TokensBuildRequest;
+import ${domain}.module.wsys.req.TokensBuildRequest;
-import ${domain}.module.system.req.TokensCreateRequest;
+import ${domain}.module.wsys.req.TokensCreateRequest;
-import ${domain}.module.system.req.TokensDeleteRequest;
+import ${domain}.module.wsys.req.TokensDeleteRequest;
-import ${domain}.module.system.req.TokensFindRequest;
+import ${domain}.module.wsys.req.TokensFindRequest;
-import ${domain}.module.system.req.TokensLogoutRequest;
+import ${domain}.module.wsys.req.TokensLogoutRequest;
-import ${domain}.module.system.req.TokensUpdateRequest;
+import ${domain}.module.wsys.req.TokensUpdateRequest;
-import ${domain}.module.system.rsp.TokensBuildResponse;
+import ${domain}.module.wsys.rsp.TokensBuildResponse;
-import ${domain}.module.system.rsp.TokensCreateResponse;
+import ${domain}.module.wsys.rsp.TokensCreateResponse;
-import ${domain}.module.system.rsp.TokensDeleteResponse;
+import ${domain}.module.wsys.rsp.TokensDeleteResponse;
-import ${domain}.module.system.rsp.TokensFindResponse;
+import ${domain}.module.wsys.rsp.TokensFindResponse;
-import ${domain}.module.system.rsp.TokensLogoutResponse;
+import ${domain}.module.wsys.rsp.TokensLogoutResponse;
-import ${domain}.module.system.rsp.TokensUpdateResponse;
+import ${domain}.module.wsys.rsp.TokensUpdateResponse;
 
 /**
  * 通行证

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -17,24 +17,24 @@ import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Tokens;
+import ${domain}.module.wsys.ent.Tokens;
-import ${domain}.module.system.mpr.TokensMapper;
+import ${domain}.module.wsys.mpr.TokensMapper;
-import ${domain}.module.system.req.ResFindRequest;
+import ${domain}.module.wsys.req.ResFindRequest;
-import ${domain}.module.system.req.ResLoadRequest;
+import ${domain}.module.wsys.req.ResLoadRequest;
-import ${domain}.module.system.req.TokensBuildRequest;
+import ${domain}.module.wsys.req.TokensBuildRequest;
-import ${domain}.module.system.req.TokensCreateRequest;
+import ${domain}.module.wsys.req.TokensCreateRequest;
-import ${domain}.module.system.req.TokensDeleteRequest;
+import ${domain}.module.wsys.req.TokensDeleteRequest;
-import ${domain}.module.system.req.TokensFindRequest;
+import ${domain}.module.wsys.req.TokensFindRequest;
-import ${domain}.module.system.req.TokensLogoutRequest;
+import ${domain}.module.wsys.req.TokensLogoutRequest;
-import ${domain}.module.system.req.TokensUpdateRequest;
+import ${domain}.module.wsys.req.TokensUpdateRequest;
-import ${domain}.module.system.rsp.ResFindResponse;
+import ${domain}.module.wsys.rsp.ResFindResponse;
-import ${domain}.module.system.rsp.ResLoadResponse;
+import ${domain}.module.wsys.rsp.ResLoadResponse;
-import ${domain}.module.system.rsp.TokensBuildResponse;
+import ${domain}.module.wsys.rsp.TokensBuildResponse;
-import ${domain}.module.system.rsp.TokensCreateResponse;
+import ${domain}.module.wsys.rsp.TokensCreateResponse;
-import ${domain}.module.system.rsp.TokensDeleteResponse;
+import ${domain}.module.wsys.rsp.TokensDeleteResponse;
-import ${domain}.module.system.rsp.TokensFindResponse;
+import ${domain}.module.wsys.rsp.TokensFindResponse;
-import ${domain}.module.system.rsp.TokensLogoutResponse;
+import ${domain}.module.wsys.rsp.TokensLogoutResponse;
-import ${domain}.module.system.rsp.TokensUpdateResponse;
+import ${domain}.module.wsys.rsp.TokensUpdateResponse;
 
 /**
  * TOKENS - 通行证
@@ -45,7 +45,7 @@ import ${domain}.module.system.rsp.TokensUpdateResponse;
  */
 @Transactional
 @Service
-public class TokensManagerImpl implements ${domain}.module.system.mgr.TokensManager {
+public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManager {
 
     @Value("${r'${web.url.auth.admin}'}")
     private String admin;

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

@@ -1,16 +1,16 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.UserChangePwdRequest;
+import ${domain}.module.wsys.req.UserChangePwdRequest;
-import ${domain}.module.system.req.UserCreateRequest;
+import ${domain}.module.wsys.req.UserCreateRequest;
-import ${domain}.module.system.req.UserDeleteRequest;
+import ${domain}.module.wsys.req.UserDeleteRequest;
-import ${domain}.module.system.req.UserFindRequest;
+import ${domain}.module.wsys.req.UserFindRequest;
-import ${domain}.module.system.req.UserUpdateRequest;
+import ${domain}.module.wsys.req.UserUpdateRequest;
-import ${domain}.module.system.rsp.UserChangePwdResponse;
+import ${domain}.module.wsys.rsp.UserChangePwdResponse;
-import ${domain}.module.system.rsp.UserCreateResponse;
+import ${domain}.module.wsys.rsp.UserCreateResponse;
-import ${domain}.module.system.rsp.UserDeleteResponse;
+import ${domain}.module.wsys.rsp.UserDeleteResponse;
-import ${domain}.module.system.rsp.UserFindResponse;
+import ${domain}.module.wsys.rsp.UserFindResponse;
-import ${domain}.module.system.rsp.UserUpdateResponse;
+import ${domain}.module.wsys.rsp.UserUpdateResponse;
 
 /**
  * 用户

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -15,26 +15,26 @@ import ${domain}.frame.utils.MD5Util;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.Dept;
+import ${domain}.module.wsys.ent.Dept;
-import ${domain}.module.system.ent.Role;
+import ${domain}.module.wsys.ent.Role;
-import ${domain}.module.system.ent.User;
+import ${domain}.module.wsys.ent.User;
-import ${domain}.module.system.mpr.UserMapper;
+import ${domain}.module.wsys.mpr.UserMapper;
-import ${domain}.module.system.req.DeptFindRequest;
+import ${domain}.module.wsys.req.DeptFindRequest;
-import ${domain}.module.system.req.RoleFindRequest;
+import ${domain}.module.wsys.req.RoleFindRequest;
-import ${domain}.module.system.req.UserChangePwdRequest;
+import ${domain}.module.wsys.req.UserChangePwdRequest;
-import ${domain}.module.system.req.UserCreateRequest;
+import ${domain}.module.wsys.req.UserCreateRequest;
-import ${domain}.module.system.req.UserDeleteRequest;
+import ${domain}.module.wsys.req.UserDeleteRequest;
-import ${domain}.module.system.req.UserFindRequest;
+import ${domain}.module.wsys.req.UserFindRequest;
-import ${domain}.module.system.req.UserRoleCreateRequest;
+import ${domain}.module.wsys.req.UserRoleCreateRequest;
-import ${domain}.module.system.req.UserUpdateRequest;
+import ${domain}.module.wsys.req.UserUpdateRequest;
-import ${domain}.module.system.rsp.DeptFindResponse;
+import ${domain}.module.wsys.rsp.DeptFindResponse;
-import ${domain}.module.system.rsp.RoleFindResponse;
+import ${domain}.module.wsys.rsp.RoleFindResponse;
-import ${domain}.module.system.rsp.UserChangePwdResponse;
+import ${domain}.module.wsys.rsp.UserChangePwdResponse;
-import ${domain}.module.system.rsp.UserCreateResponse;
+import ${domain}.module.wsys.rsp.UserCreateResponse;
-import ${domain}.module.system.rsp.UserDeleteResponse;
+import ${domain}.module.wsys.rsp.UserDeleteResponse;
-import ${domain}.module.system.rsp.UserFindResponse;
+import ${domain}.module.wsys.rsp.UserFindResponse;
-import ${domain}.module.system.rsp.UserRoleCreateResponse;
+import ${domain}.module.wsys.rsp.UserRoleCreateResponse;
-import ${domain}.module.system.rsp.UserUpdateResponse;
+import ${domain}.module.wsys.rsp.UserUpdateResponse;
 
 /**
  * USER - 用户

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

@@ -1,14 +1,14 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import ${domain}.frame.auth.Token;
-import ${domain}.module.system.req.UserRoleCreateRequest;
+import ${domain}.module.wsys.req.UserRoleCreateRequest;
-import ${domain}.module.system.req.UserRoleDeleteRequest;
+import ${domain}.module.wsys.req.UserRoleDeleteRequest;
-import ${domain}.module.system.req.UserRoleFindRequest;
+import ${domain}.module.wsys.req.UserRoleFindRequest;
-import ${domain}.module.system.req.UserRoleUpdateRequest;
+import ${domain}.module.wsys.req.UserRoleUpdateRequest;
-import ${domain}.module.system.rsp.UserRoleCreateResponse;
+import ${domain}.module.wsys.rsp.UserRoleCreateResponse;
-import ${domain}.module.system.rsp.UserRoleDeleteResponse;
+import ${domain}.module.wsys.rsp.UserRoleDeleteResponse;
-import ${domain}.module.system.rsp.UserRoleFindResponse;
+import ${domain}.module.wsys.rsp.UserRoleFindResponse;
-import ${domain}.module.system.rsp.UserRoleUpdateResponse;
+import ${domain}.module.wsys.rsp.UserRoleUpdateResponse;
 
 /**
  * 用户角色授权

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

@@ -1,4 +1,4 @@
-package ${domain}.module.system.mgr;
+package ${domain}.module.wsys.mgr;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -12,16 +12,16 @@ import ${domain}.frame.utils.IDgenerator;
 import ${domain}.frame.utils.MapperUtil;
 import ${domain}.frame.utils.Message;
 import ${domain}.frame.utils.ValidationUtil;
-import ${domain}.module.system.ent.UserRole;
+import ${domain}.module.wsys.ent.UserRole;
-import ${domain}.module.system.mpr.UserRoleMapper;
+import ${domain}.module.wsys.mpr.UserRoleMapper;
-import ${domain}.module.system.req.UserRoleCreateRequest;
+import ${domain}.module.wsys.req.UserRoleCreateRequest;
-import ${domain}.module.system.req.UserRoleDeleteRequest;
+import ${domain}.module.wsys.req.UserRoleDeleteRequest;
-import ${domain}.module.system.req.UserRoleFindRequest;
+import ${domain}.module.wsys.req.UserRoleFindRequest;
-import ${domain}.module.system.req.UserRoleUpdateRequest;
+import ${domain}.module.wsys.req.UserRoleUpdateRequest;
-import ${domain}.module.system.rsp.UserRoleCreateResponse;
+import ${domain}.module.wsys.rsp.UserRoleCreateResponse;
-import ${domain}.module.system.rsp.UserRoleDeleteResponse;
+import ${domain}.module.wsys.rsp.UserRoleDeleteResponse;
-import ${domain}.module.system.rsp.UserRoleFindResponse;
+import ${domain}.module.wsys.rsp.UserRoleFindResponse;
-import ${domain}.module.system.rsp.UserRoleUpdateResponse;
+import ${domain}.module.wsys.rsp.UserRoleUpdateResponse;
 
 /**
  * USER_ROLE - 用户角色授权