From 986c6976dc086ef26e7e912e516f99de35ba5343 Mon Sep 17 00:00:00 2001
From: wangbing <1919101440@qq.com>
Date: Sat, 2 Nov 2019 19:37:46 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=8D=87=E7=BA=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manger/callable/SpringBootCallable.java   |  4 +---
 .../java/action/control/Footer.java           | 15 ---------------
 .../resources/templates/control/footer.ftl    |  5 -----
 .../resources/templates/layout/default.ftl    |  1 -
 .../resources/templates/screen/demo.ftl       | 19 -------------------
 5 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 src/main/resources/modules/SpringBoot/java/action/control/Footer.java
 delete mode 100644 src/main/resources/modules/SpringBoot/resources/templates/control/footer.ftl
 delete mode 100644 src/main/resources/modules/SpringBoot/resources/templates/screen/demo.ftl

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 5ab06cd4..9fed11e3 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
@@ -220,7 +220,6 @@ public class SpringBootCallable implements Callable {
         File screen = new File(root.getAbsolutePath(), "screen");
         screen.mkdirs();
 
-        freeMarkerManager.outputTemp(new File(control.getAbsolutePath(), "Footer.java"), option + "/java/action/control/Footer.java", ctx);
         freeMarkerManager.outputTemp(new File(control.getAbsolutePath(), "Header.java"), option + "/java/action/control/Header.java", ctx);
 
         freeMarkerManager.outputTemp(new File(system.getAbsolutePath(), "AuthAjax.java"), option + "/java/action/ajax/system/AuthAjax.java", ctx);
@@ -718,13 +717,12 @@ public class SpringBootCallable implements Callable {
             screen.mkdirs();
             Tool.outputResource(option + "/resources/templates/control/nav.ftl", new File(control.getAbsolutePath(), "nav.ftl"));
             Tool.outputResource(option + "/resources/templates/control/header.ftl", new File(control.getAbsolutePath(), "header.ftl"));
-            Tool.outputResource(option + "/resources/templates/control/footer.ftl", new File(control.getAbsolutePath(), "footer.ftl"));
+//            Tool.outputResource(option + "/resources/templates/control/footer.ftl", new File(control.getAbsolutePath(), "footer.ftl"));
             Tool.outputResource(option + "/resources/templates/control/macro.ftl", new File(control.getAbsolutePath(), "macro.ftl"));
 //            Tool.outputResource(option + "/resources/templates/control/mint-ui-extend.ftl", new File(control.getAbsolutePath(), "mint-ui-extend.ftl"));
             Tool.outputResource(option + "/resources/templates/layout/default.ftl", new File(layout.getAbsolutePath(), "default.ftl"));
             Tool.outputResource(option + "/resources/templates/layout/index.ftl", new File(layout.getAbsolutePath(), "index.ftl"));
             Tool.outputResource(option + "/resources/templates/layout/app.ftl", new File(layout.getAbsolutePath(), "app.ftl"));
-            Tool.outputResource(option + "/resources/templates/screen/demo.ftl", new File(screen.getAbsolutePath(), "demo.ftl"));
             Tool.outputResource(option + "/resources/templates/screen/home.ftl", new File(screen.getAbsolutePath(), "home.ftl"));
             Tool.outputResource(option + "/resources/templates/screen/login.ftl", new File(screen.getAbsolutePath(), "login.ftl"));
             Tool.outputResource(option + "/resources/templates/403.ftl", new File(templates.getAbsolutePath(), "403.ftl"));
diff --git a/src/main/resources/modules/SpringBoot/java/action/control/Footer.java b/src/main/resources/modules/SpringBoot/java/action/control/Footer.java
deleted file mode 100644
index 054e25c0..00000000
--- a/src/main/resources/modules/SpringBoot/java/action/control/Footer.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package ${basePackage}.action.control;
-
-import ${basePackage}.frame.base.Control;
-import org.springframework.ui.Model;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class Footer extends Control {
-
-    @Override
-    public void exec(Model model, HttpServletRequest request, HttpServletResponse response) {
-
-    }
-}
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/control/footer.ftl b/src/main/resources/modules/SpringBoot/resources/templates/control/footer.ftl
deleted file mode 100644
index 99ee1a7e..00000000
--- a/src/main/resources/modules/SpringBoot/resources/templates/control/footer.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-<div style="height: 50px;background-color: #303133">
-    <center>
-        <h3 style="color: #ffffff">------------------------------this is footer html------------------------------</h3>
-    </center>
-</div>
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 9da65252..9ee558d7 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/layout/default.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/layout/default.ftl
@@ -10,7 +10,6 @@
     <link href="${context}/static/css/base.css" rel="stylesheet"/>
 </head>
 <body>
-<#include controlHolder("macro")/>
 <#include controlHolder("nav")/>
 <#include screenHolder()/>
 </body>
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/demo.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/demo.ftl
deleted file mode 100644
index ec9ad6ab..00000000
--- a/src/main/resources/modules/SpringBoot/resources/templates/screen/demo.ftl
+++ /dev/null
@@ -1,19 +0,0 @@
-<div id="app" v-cloak>
-
-</div>
-<style>
-
-</style>
-<script>
-    var app = new Vue({
-        el: "#app",
-        data: {},
-        methods: {},
-        filters: {},
-        created: function () {
-        },
-        mounted: function () {
-        },
-        watch: {}
-    })
-</script>