From 75d4a9c465c97db04561182912bc99e5e607f7b6 Mon Sep 17 00:00:00 2001
From: wangbing <wangbing@wbsite.xyz>
Date: Sat, 3 Oct 2020 22:32:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wbsite/dbtool/javafx/JavaFxApplication.java    |  7 +++++++
 .../javafx/ctrl/DetailProjectController.java       | 10 ++++++++++
 .../javafx/manger/callable/SpringBootCallable.java |  3 ---
 .../java/xyz/wbsite/dbtool/javafx/po/Project.java  | 14 ++++++++++++++
 src/main/resources/fxml/DetailProject.fxml         | 11 +++++++++--
 .../SpringBoot/java/action/GlobalController.java   |  3 ---
 .../modules/SpringBoot/java/config/TaskConfig.java |  6 ------
 .../modules/SpringBoot/java/frame/auth/Token.java  |  6 ------
 .../SpringBoot/java/frame/schedule/Scheduler.java  |  2 --
 .../java/module/wsys/mgr/TokensManagerImpl.java    |  4 +---
 .../SpringBoot/resources/application-dev.ftl       |  2 +-
 .../SpringBoot/resources/application-prod.ftl      |  2 +-
 .../resources/templates/control/macro.ftl          | 14 ++++++++------
 .../resources/templates/layout/default.ftl         |  2 +-
 .../resources/templates/layout/index.ftl           |  2 +-
 15 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java
index 7ac1152b..8d90af7e 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java
@@ -267,6 +267,12 @@ public class JavaFxApplication extends Application {
                     currentProject.setName(newValue);
                 }
             });
+            detailProjectController.getNote().textProperty().addListener(new ChangeListener<String>() {
+                @Override
+                public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
+                    currentProject.setNote(newValue);
+                }
+            });
             detailProjectController.getDomain().textProperty().addListener(new ChangeListener<String>() {
                 @Override
                 public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
@@ -921,6 +927,7 @@ public class JavaFxApplication extends Application {
     public void loadProject() {
         GridPane gridPane = mProjectLoader.getRoot();
         detailProjectController.getName().setText(currentProject.getName());
+        detailProjectController.getNote().setText(currentProject.getNote());
         detailProjectController.getDomain().setText(currentProject.getDomain());
         detailProjectController.getAuthor().setText(currentProject.getAuthor());
         ObservableList<Toggle> toggles = detailProjectController.getDatabase().getToggles();
diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailProjectController.java b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailProjectController.java
index 2189a057..579b5f6b 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailProjectController.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailProjectController.java
@@ -10,6 +10,8 @@ public class DetailProjectController {
     @FXML
     private TextField name;
     @FXML
+    private TextField note;
+    @FXML
     private TextField domain;
     @FXML
     private TextField author;
@@ -32,6 +34,14 @@ public class DetailProjectController {
         this.name = name;
     }
 
+    public TextField getNote() {
+        return note;
+    }
+
+    public void setNote(TextField note) {
+        this.note = note;
+    }
+
     public TextField getDomain() {
         return domain;
     }
diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
index 083bbf6b..20c79351 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/callable/SpringBootCallable.java
@@ -524,9 +524,6 @@ public class SpringBootCallable implements Callable {
 
         //task
         for (String name : ResourceUtil.listFileName("/modules/SpringBoot/java/task/")) {
-            if (name.contains("TokenTask") && project.getFrame().value() == Frame.无.value()) {
-                continue;
-            }
             freeMarkerManager.outputTemp(Tool.createFile(root, name), "SpringBoot/java/task/" + name, ctx);
         }
     }
diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/Project.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/Project.java
index a7ea62c7..d2eb7d84 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/po/Project.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/Project.java
@@ -23,6 +23,8 @@ public class Project {
 
     @Property("name")
     private SimpleStringProperty name = new SimpleStringProperty();
+    @Property("note")
+    private SimpleStringProperty note = new SimpleStringProperty();
     @Property("domain")
     private String domain;
     @Property("author")
@@ -60,6 +62,18 @@ public class Project {
         this.name.set(name);
     }
 
+    public String getNote() {
+        return note.get();
+    }
+
+    public SimpleStringProperty noteProperty() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note.set(note);
+    }
+
     public String getDomain() {
         return domain;
     }
diff --git a/src/main/resources/fxml/DetailProject.fxml b/src/main/resources/fxml/DetailProject.fxml
index 6154c77b..eb0a3d2a 100644
--- a/src/main/resources/fxml/DetailProject.fxml
+++ b/src/main/resources/fxml/DetailProject.fxml
@@ -38,9 +38,9 @@
 
         <Label GridPane.rowIndex="0" GridPane.columnIndex="3" text="*" alignment="CENTER" textAlignment="CENTER"
                textFill="RED" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
-        <Label GridPane.rowIndex="0" GridPane.columnIndex="4" text="项目作者" GridPane.halignment="CENTER"
+        <Label GridPane.rowIndex="0" GridPane.columnIndex="4" text="项目注释" GridPane.halignment="CENTER"
                GridPane.valignment="CENTER"/>
-        <TextField GridPane.rowIndex="0" GridPane.columnIndex="5" fx:id="author"/>
+        <TextField GridPane.rowIndex="0" GridPane.columnIndex="5" fx:id="note"/>
         <!-- ROW -->
 
         <!-- ROW -->
@@ -50,6 +50,13 @@
                GridPane.valignment="CENTER"/>
         <TextField GridPane.rowIndex="1" GridPane.columnIndex="2" fx:id="domain"/>
 
+        <Label GridPane.rowIndex="1" GridPane.columnIndex="3" text="*" alignment="CENTER" textAlignment="CENTER"
+               textFill="RED" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
+        <Label GridPane.rowIndex="1" GridPane.columnIndex="4" text="项目作者" GridPane.halignment="CENTER"
+               GridPane.valignment="CENTER"/>
+        <TextField GridPane.rowIndex="1" GridPane.columnIndex="5" fx:id="author"/>
+        <!-- ROW -->
+
         <!-- ROW -->
         <Label GridPane.rowIndex="2" GridPane.columnIndex="0" text="*" alignment="CENTER" textAlignment="CENTER"
                textFill="RED" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
index 1480c989..7e7d99a2 100644
--- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
+++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
@@ -302,8 +302,6 @@ public class GlobalController {
             response.addError(ErrorType.BUSINESS_ERROR, "请求过期, 或本地时间错误!");
             return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), visitor.getAppSecret());
         }
-<#-- 当项目框架只为接口时，无资源维护管理页，则认为是一对一应用接口，不做权限验证 -->
-<#if project.frameValue() = 1>
 
         // 权限验证
         if (StringUtil.isNotEmpty(token)) {
@@ -323,7 +321,6 @@ public class GlobalController {
                 return AESUtil.encrypt2Base64(MapperUtil.toJson(response).getBytes(), visitor.getAppSecret());
             }
         }
-</#if>
 
         // 开始处理业务
         try {
diff --git a/src/main/resources/modules/SpringBoot/java/config/TaskConfig.java b/src/main/resources/modules/SpringBoot/java/config/TaskConfig.java
index 69683477..25dc0494 100644
--- a/src/main/resources/modules/SpringBoot/java/config/TaskConfig.java
+++ b/src/main/resources/modules/SpringBoot/java/config/TaskConfig.java
@@ -4,12 +4,10 @@ import ${domain}.frame.auth.LocalData;
 import ${domain}.frame.schedule.RunTask;
 import ${domain}.frame.schedule.Scheduler;
 import ${domain}.frame.utils.LogUtil;
-<#if project.frameValue() = 1>
 import ${domain}.module.wsys.ent.TaskSql;
 import ${domain}.module.wsys.mgr.TaskSqlManager;
 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;
@@ -29,10 +27,8 @@ public class TaskConfig {
 
     @Autowired
     private Scheduler scheduler;
-    <#if project.frameValue() = 1>
     @Autowired
     private TaskSqlManager taskSqlManager;
-    </#if>
 
     @Bean
     public Scheduler registerScheduler() {
@@ -69,7 +65,6 @@ public class TaskConfig {
                 classPathBeanDefinitionScanner.scan(matcher.group(1));
             }
         }
-    <#if project.frameValue() = 1>
 
         {// 实例化SQL任务
             TaskSqlFindRequest taskSqlFindRequest = new TaskSqlFindRequest();
@@ -80,6 +75,5 @@ public class TaskConfig {
                 taskSqlManager.createOrRepeat(taskSql);
             }
         }
-    </#if>
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/modules/SpringBoot/java/frame/auth/Token.java b/src/main/resources/modules/SpringBoot/java/frame/auth/Token.java
index a6d6393f..36f03f5c 100644
--- a/src/main/resources/modules/SpringBoot/java/frame/auth/Token.java
+++ b/src/main/resources/modules/SpringBoot/java/frame/auth/Token.java
@@ -1,9 +1,7 @@
 package ${domain}.frame.auth;
 
-<#if project.frameValue() = 1>
 import ${domain}.module.wsys.ent.Res;
 import ${domain}.module.wsys.mgr.ResManager;
-</#if>
 
 import java.io.Serializable;
 import java.util.HashSet;
@@ -43,7 +41,6 @@ public class Token implements Serializable {
     private Set<String> resSet = new HashSet<>();
 
     public boolean hasRes(String res) {
-<#if project.frameValue() = 1>
         {// todo 开发初期收集资源，后期删除
             String active = LocalData.getActive();
             if (active.contains("dev")) {//测试环境捕获资源
@@ -51,7 +48,6 @@ public class Token implements Serializable {
                 resManager.saveRes(res, LocalData.getSysToken());
             }
         }
-</#if>
 
         for (String s : resSet) {
             if (res.matches(s)) {
@@ -69,7 +65,6 @@ public class Token implements Serializable {
     public void putRes(Set<String> resourceSet) {
         this.resSet.addAll(resourceSet);
     }
-<#if project.frameValue() = 1>
 
     public void putRes(List<Res> resList) {
         if (resList == null) return;
@@ -77,7 +72,6 @@ public class Token implements Serializable {
             this.resSet.add(res.getResValue());
         }
     }
-</#if>
 
     public Set<String> getResSet() {
         return resSet;
diff --git a/src/main/resources/modules/SpringBoot/java/frame/schedule/Scheduler.java b/src/main/resources/modules/SpringBoot/java/frame/schedule/Scheduler.java
index f64ca732..bc9bde92 100644
--- a/src/main/resources/modules/SpringBoot/java/frame/schedule/Scheduler.java
+++ b/src/main/resources/modules/SpringBoot/java/frame/schedule/Scheduler.java
@@ -3,10 +3,8 @@ package ${domain}.frame.schedule;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 import org.springframework.util.ErrorHandler;
 import ${domain}.frame.utils.LogUtil;
-<#if project.frameValue() = 1>
 import ${domain}.frame.auth.LocalData;
 import ${domain}.module.wsys.mgr.LogerrManager;
-</#if>
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java
index 647cb3f3..1ac2e1c3 100644
--- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java
+++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/TokensManagerImpl.java
@@ -266,8 +266,7 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
             if (tokens.getUserName().equals(admin)) {//超级管理员
                 newToken.putRes(".*");
             } else { // 管理员或用户
-<#if project.frameValue() = 1>
-                // 获取用户的资源
+                // 加载用户的资源
                 ResLoadRequest resLoadRequest = new ResLoadRequest();
                 resLoadRequest.setPageSize(0);
                 resLoadRequest.setUserId(tokens.getUserId());
@@ -277,7 +276,6 @@ public class TokensManagerImpl implements ${domain}.module.wsys.mgr.TokensManage
                     return response;
                 }
                 newToken.putRes(resFindResponse.getResult());
-</#if>
             }
 
             response.setToken(newToken);
diff --git a/src/main/resources/modules/SpringBoot/resources/application-dev.ftl b/src/main/resources/modules/SpringBoot/resources/application-dev.ftl
index 66ed1cac..982f07aa 100644
--- a/src/main/resources/modules/SpringBoot/resources/application-dev.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/application-dev.ftl
@@ -139,7 +139,7 @@ web.url.login=/login.htm
 # 拦截验证
 web.url.auth.included=/,/**/*.htm,/ajax/**
 # 直接放行
-web.url.auth.excluded=/login.htm<#if project.frameValue() = 1>,/ajax/wsys/User/login,/ajax/wsys/User/logout</#if>
+web.url.auth.excluded=/login.htm,/ajax/wsys/User/login,/ajax/wsys/User/logout
 # 超级管理员
 web.url.auth.admin=admin
 web.url.auth.pwd=17fac3376f76d65943d1d26d1f7cb1e5
diff --git a/src/main/resources/modules/SpringBoot/resources/application-prod.ftl b/src/main/resources/modules/SpringBoot/resources/application-prod.ftl
index b4d85882..6447b513 100644
--- a/src/main/resources/modules/SpringBoot/resources/application-prod.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/application-prod.ftl
@@ -139,7 +139,7 @@ web.url.login=/login.htm
 # 拦截验证
 web.url.auth.included=/,/**/*.htm,/ajax/**
 # 直接放行
-web.url.auth.excluded=/login.htm<#if project.frameValue() = 1>,/ajax/wsys/User/login,/ajax/wsys/User/logout</#if>
+web.url.auth.excluded=/login.htm,/ajax/wsys/User/login,/ajax/wsys/User/logout
 # 超级管理员
 web.url.auth.admin=admin
 web.url.auth.pwd=17fac3376f76d65943d1d26d1f7cb1e5
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/control/macro.ftl b/src/main/resources/modules/SpringBoot/resources/templates/control/macro.ftl
index 2a92c3c6..667eecd0 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/control/macro.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/control/macro.ftl
@@ -5,12 +5,14 @@
     </#list>
 </#macro>
 <#--
- 参数说明：
-    pageNumber：当前的页码
-    pageSize：页码大小
-    totalCount：总数
-    showPages：显示的页码个数
-    callback：回调函数
+用途说明：生成分页标签
+参数说明：
+  pageNumber：当前的页码
+  pageSize：页码大小
+  totalCount：总数
+  showPages：显示的页码个数
+  callback：回调函数
+用法示例：<@page pageNumber=1 pageSize=10 totalCount=100 showPages=5 callback=onPage/>
 -->
 <#macro page pageNumber pageSize totalCount showPages callback>
 <#if totalCount gt 0>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/layout/default.ftl b/src/main/resources/modules/SpringBoot/resources/templates/layout/default.ftl
index 990e5b2c..ac31e875 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/layout/default.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/layout/default.ftl
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>管理系统</title>
+    <title>${title?default("管理系统")}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <script src="${context}/static/dist/lib.min.js" type="text/javascript"></script>
     <script src="${context}/static/dist/index.min.js" type="text/javascript"></script>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/layout/index.ftl b/src/main/resources/modules/SpringBoot/resources/templates/layout/index.ftl
index b2fab992..89cf5e1a 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/layout/index.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/layout/index.ftl
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>首页</title>
+    <title>${title?default("管理系统")}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <link href="${context}/static/favicon.ico" rel="icon"  type="image/x-icon"/>
     <script src="${context}/static/dist/lib.min.js" type="text/javascript"></script>