From a2c0d1f58ada76da7561dccbc6ca9924f1b9f9e1 Mon Sep 17 00:00:00 2001
From: wangbing <1919101440@qq.com>
Date: Thu, 31 Oct 2019 23:48:28 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dbtool/javafx/JavaFxApplication.java      |  2 +-
 .../javafx/ctrl/DetailTableController.java    | 10 ++++++++
 .../dbtool/javafx/manger/XmlManager.java      |  2 ++
 .../manger/callable/SpringBootCallable.java   |  3 ++-
 .../xyz/wbsite/dbtool/javafx/po/Table.java    |  9 ++++++++
 src/main/resources/fxml/tabledetail.fxml      |  2 ++
 .../java/action/GlobalController.java         | 12 ++++------
 .../SpringBoot/java/action/ajax/Ajax.java     | 23 +++++++++----------
 .../java/action/ajax/system/AuthAjax.java     |  3 +--
 9 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java
index c0324833..34d057bd 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/JavaFxApplication.java
@@ -734,7 +734,7 @@ public class JavaFxApplication extends Application {
             detailTableController.getGet().setSelected(currentTable.getGet());
             detailTableController.getSearch().setSelected(currentTable.getSearch());
             detailTableController.getGetAll().setSelected(currentTable.getGetAll());
-
+            detailTableController.getHtml().setSelected(currentTable.getHtml());
         }
 
 
diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailTableController.java b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailTableController.java
index 2f0d251a..825d359e 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailTableController.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/ctrl/DetailTableController.java
@@ -25,6 +25,8 @@ public class DetailTableController {
     private CheckBox search;
     @FXML
     private CheckBox getAll;
+    @FXML
+    private CheckBox html;
 
     public CheckBox getCreate() {
         return create;
@@ -97,4 +99,12 @@ public class DetailTableController {
     public void setTablecomment(TextField tablecomment) {
         this.tablecomment = tablecomment;
     }
+
+    public CheckBox getHtml() {
+        return html;
+    }
+
+    public void setHtml(CheckBox html) {
+        this.html = html;
+    }
 }
diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java b/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java
index bc73dd8e..5789083a 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/manger/XmlManager.java
@@ -101,6 +101,7 @@ public class XmlManager {
                                     table.setGet(Boolean.parseBoolean(tableElement.getAttribute("get")));
                                     table.setSearch(Boolean.parseBoolean(tableElement.getAttribute("search")));
                                     table.setGetAll(Boolean.parseBoolean(tableElement.getAttribute("getAll")));
+                                    table.setHtml(Boolean.parseBoolean(tableElement.getAttribute("html")));
 
                                     NodeList fields = tableElement.getElementsByTagName("field");
 
@@ -200,6 +201,7 @@ public class XmlManager {
                     table.setAttribute("get", Boolean.toString(t.getGet()));
                     table.setAttribute("search", Boolean.toString(t.getSearch()));
                     table.setAttribute("getAll", Boolean.toString(t.getGetAll()));
+                    table.setAttribute("html", Boolean.toString(t.getHtml()));
 
                     Element fields = doc.createElement("fields");
 
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 ef0044aa..4621e6e6 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
@@ -231,11 +231,12 @@ public class SpringBootCallable implements Callable {
             for (Table table : module.getTables()) {
                 HashMap<String, Object> ctxss = new HashMap<String, Object>();
                 ctxss.put("basePackage", project.getProjectBasePackage());
+                ctxss.put("module", module.getModuleName());
                 ctxss.put("author", project.getProjectAuthor());
                 ctxss.put("date", new Date());
                 ctxss.put("table", table);
 
-                freeMarkerManager.outputTemp(new File(m.getAbsolutePath(), table.getCName()+"Ajax.java"), option + "/java/action/ajax/Ajax.java", ctxss);
+                freeMarkerManager.outputTemp(new File(m.getAbsolutePath(), table.getCName() + "Ajax.java"), option + "/java/action/ajax/Ajax.java", ctxss);
             }
         }
 
diff --git a/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java b/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java
index e11c4bae..ebd3d80b 100644
--- a/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java
+++ b/src/main/java/xyz/wbsite/dbtool/javafx/po/Table.java
@@ -42,6 +42,7 @@ public class Table extends TreeItem {
     private boolean get = true;
     private boolean search = false;
     private boolean getAll = false;
+    private boolean html = false;
 
     /**
      * 对象字段
@@ -185,4 +186,12 @@ public class Table extends TreeItem {
     public void setGetAll(boolean getAll) {
         this.getAll = getAll;
     }
+
+    public boolean getHtml() {
+        return html;
+    }
+
+    public void setHtml(boolean html) {
+        this.html = html;
+    }
 }
diff --git a/src/main/resources/fxml/tabledetail.fxml b/src/main/resources/fxml/tabledetail.fxml
index f33d0522..5781afd1 100644
--- a/src/main/resources/fxml/tabledetail.fxml
+++ b/src/main/resources/fxml/tabledetail.fxml
@@ -36,6 +36,8 @@
             </children>
         </HBox>
 
+        <Label GridPane.rowIndex="3" GridPane.columnIndex="1" text="其他配置" GridPane.halignment="CENTER"  GridPane.valignment="CENTER" />
+        <CheckBox fx:id="html" selected="false" GridPane.rowIndex="3" GridPane.columnIndex="2" text="HTML模板" />
     </children>
 
 </GridPane>
diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
index 2986cdb7..aba3c0aa 100644
--- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
+++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java
@@ -1,6 +1,4 @@
-package $
-
-import javax.servlet.http.HttpServletResponse;{basePackage}.action;
+package ${basePackage}.action;
 
 import ${basePackage}.frame.base.*;
 import ${basePackage}.frame.auth.LocalData;
@@ -17,8 +15,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 
@@ -43,7 +39,7 @@ import java.util.regex.Pattern;
 
 /**
  * 全局请求Controller，如果无特殊请求，则不需再增加其他Controller
- * 全局htm后缀入口{@link GlobalController#action(HttpServletRequest, Model)}
+ * 全局htm后缀入口{@link GlobalController#action(Model, HttpServletRequest, HttpServletResponse)}
  * 全局异常捕捉{@link GlobalController#exceptionHandler(HttpServletRequest, HttpServletResponse, Model, Exception)}
  * 全局上传接口{@link GlobalController#upload(HttpServletRequest)}
  * 全局下载接口{@link GlobalController#download(String)}
@@ -104,7 +100,7 @@ public class GlobalController implements ErrorController {
     }
 
     @RequestMapping(value = ERROR_PATH)
-    public String error(HttpServletRequest request) {
+    public String error(HttpServletRequest request, HttpServletResponse response) {
         Integer statusCode = (Integer) request.getAttribute("javax.servlet.error.status_code");
 
         switch (statusCode) {
@@ -112,7 +108,7 @@ public class GlobalController implements ErrorController {
                 return "404";
             case 403:
                 try {
-                    LocalData.getResponse().sendRedirect("/login.htm");
+                    response.sendRedirect("/login.htm");
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java
index 3e2f006c..a8c5748c 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/Ajax.java
@@ -1,14 +1,13 @@
-package ${basePackage}.action.ajax.system;
+package ${basePackage}.action.ajax.${module};
 
 import ${basePackage}.frame.auth.LocalData;
-import ${basePackage}.frame.base.Ajax;
 import ${basePackage}.frame.utils.MapperUtil;
-import ${basePackage}.module.system.mgr.UserManager;
-import ${basePackage}.module.system.req.*;
-import ${basePackage}.module.system.rsp.*;
+import ${basePackage}.module.${module}.mgr.${table.getCName()}Manager;
+import ${basePackage}.module.${module}.req.*;
+import ${basePackage}.module.${module}.rsp.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class ${table.getCName()}Ajax extends Ajax {
+public class ${table.getCName()}Ajax{
 
     @Autowired
     private ${table.getCName()}Manager ${table.getFName()}Manager;
@@ -19,43 +18,43 @@ public class ${table.getCName()}Ajax extends Ajax {
         return ${table.getFName()}Manager.create(request, LocalData.getToken());
     }
 </#if>
-
 <#if table.getDelete()>
+
     public ${table.getCName()}DeleteResponse delete(String jsonParam) {
         ${table.getCName()}DeleteRequest request = MapperUtil.toJava(jsonParam, ${table.getCName()}DeleteRequest.class);
         return ${table.getFName()}Manager.delete(request, LocalData.getToken());
     }
 </#if>
-
 <#if table.getUpdate()>
+
     public ${table.getCName()}UpdateResponse update(String jsonParam) {
         ${table.getCName()}UpdateRequest request = MapperUtil.toJava(jsonParam, ${table.getCName()}UpdateRequest.class);
         return ${table.getFName()}Manager.update(request, LocalData.getToken());
     }
 </#if>
-
 <#if table.getFind()>
+
     public ${table.getCName()}FindResponse find(String jsonParam) {
         ${table.getCName()}FindRequest request = MapperUtil.toJava(jsonParam, ${table.getCName()}FindRequest.class);
         return ${table.getFName()}Manager.find(request, LocalData.getToken());
     }
 </#if>
-
 <#if table.getGet()>
+
     public ${table.getCName()}GetResponse get(String jsonParam) {
         ${table.getCName()}GetRequest request = MapperUtil.toJava(jsonParam, ${table.getCName()}GetRequest.class);
         return ${table.getFName()}Manager.get(request, LocalData.getToken());
     }
 </#if>
-
 <#if table.getSearch()>
+
     public ${table.getCName()}SearchResponse search(String jsonParam) {
         ${table.getCName()}SearchRequest request = MapperUtil.toJava(jsonParam, ${table.getCName()}SearchRequest.class);
         return ${table.getFName()}Manager.search(request, LocalData.getToken());
     }
 </#if>
-
 <#if table.getGetAll()>
+
     public ${table.getCName()}GetAllResponse getAll(String jsonParam) {
         ${table.getCName()}GetAllRequest request = MapperUtil.toJava(jsonParam, ${table.getCName()}GetAllRequest.class);
         return ${table.getFName()}Manager.getAll(request, LocalData.getToken());
diff --git a/src/main/resources/modules/SpringBoot/java/action/ajax/system/AuthAjax.java b/src/main/resources/modules/SpringBoot/java/action/ajax/system/AuthAjax.java
index f356a937..2b5302cd 100644
--- a/src/main/resources/modules/SpringBoot/java/action/ajax/system/AuthAjax.java
+++ b/src/main/resources/modules/SpringBoot/java/action/ajax/system/AuthAjax.java
@@ -1,6 +1,5 @@
 package ${basePackage}.action.ajax.system;
 
-import ${basePackage}.frame.base.Ajax;
 import ${basePackage}.frame.auth.LocalData;
 import ${basePackage}.frame.base.BaseResponse;
 
@@ -8,7 +7,7 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-public class AuthAjax extends Ajax {
+public class AuthAjax {
 
     public BaseResponse login(String jsonParam) {
         BaseResponse baseResponse = new BaseResponse();