From 2c4ef41054663dc3f601e951919e5481e408c1e4 Mon Sep 17 00:00:00 2001
From: wangbing <wangbingit@outlook.com>
Date: Fri, 15 Feb 2019 23:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javafx/manger/callable/SpringBootCallable.java  |   5 ++++-
 .../SpringBoot/resources/application-dev.ftl        |   2 +-
 .../SpringBoot/resources/application-prod.ftl       |   2 +-
 .../resources/static/{img => }/favicon.ico          | Bin
 .../resources/templates/layout/default.ftl          |   1 -
 .../SpringBoot/resources/templates/layout/wap.ftl   |   1 -
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename src/main/resources/modules/SpringBoot/resources/static/{img => }/favicon.ico (100%)

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 071eb6ae..6c4de0df 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
@@ -610,6 +610,10 @@ public class SpringBootCallable implements Callable {
         File dist = new File(static_.getAbsolutePath(), "dist");
         boolean mkdirs4 = dist.mkdirs();
 
+        {
+            Tool.outputResource(option + "/resources/static/favicon.ico", new File(static_.getAbsolutePath(), "favicon.ico"));
+        }
+
         {//css文件
             freeMarkerManager.outputTemp(new File(css.getAbsolutePath(), "base.css"), option + "/resources/static/css/base.css", ctx);
         }
@@ -618,7 +622,6 @@ public class SpringBootCallable implements Callable {
             freeMarkerManager.outputTemp(new File(js.getAbsolutePath(), "ajax.js"), option + "/resources/static/js/ajax.ftl", ctx);
         }
         {//img
-            Tool.outputResource(option + "/resources/static/img/favicon.ico", new File(img.getAbsolutePath(), "favicon.ico"));
             Tool.outputResource(option + "/resources/static/img/logo.png", new File(img.getAbsolutePath(), "logo.png"));
         }
 
diff --git a/src/main/resources/modules/SpringBoot/resources/application-dev.ftl b/src/main/resources/modules/SpringBoot/resources/application-dev.ftl
index 4d0b5c1a..718cfdd1 100644
--- a/src/main/resources/modules/SpringBoot/resources/application-dev.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/application-dev.ftl
@@ -15,7 +15,7 @@ web.welcome.page = index
 # 需要验证授权
 web.url.auth.included = /**
 # 不需要验证授权
-web.url.auth.excluded = /static/**,/open/**,/api,/index,/,/login
+web.url.auth.excluded = /favicon.ico,/static/**,/open/**,/api,/index,/,/login
 # 默认的登录URL
 web.url.login = /login
 # 日志配置
diff --git a/src/main/resources/modules/SpringBoot/resources/application-prod.ftl b/src/main/resources/modules/SpringBoot/resources/application-prod.ftl
index a31c7931..cc209e52 100644
--- a/src/main/resources/modules/SpringBoot/resources/application-prod.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/application-prod.ftl
@@ -16,7 +16,7 @@ web.welcome.page = index
 # 需要验证授权
 web.url.auth.included = /**
 # 不需要验证授权
-web.url.auth.excluded = /static/**,/open/**,/api,/index,/,/login
+web.url.auth.excluded = /favicon.ico,/static/**,/open/**,/api,/index,/,/login
 # 默认的登录URL
 web.url.login = /login
 # 日志配置
diff --git a/src/main/resources/modules/SpringBoot/resources/static/img/favicon.ico b/src/main/resources/modules/SpringBoot/resources/static/favicon.ico
similarity index 100%
rename from src/main/resources/modules/SpringBoot/resources/static/img/favicon.ico
rename to src/main/resources/modules/SpringBoot/resources/static/favicon.ico
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 8274c601..987911b5 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/layout/default.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/layout/default.ftl
@@ -3,7 +3,6 @@
 <head>
     <title></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <link href="${Uri.getUrl('/static/img/favicon.ico')}" rel="Shortcut Icon" type="image/x-icon"/>
     <#--baseJs-->
     <script src="${Uri.getUrl('/static/dist/lib.min.js')}" type="text/javascript"></script>
     <#--element-ui-->
diff --git a/src/main/resources/modules/SpringBoot/resources/templates/layout/wap.ftl b/src/main/resources/modules/SpringBoot/resources/templates/layout/wap.ftl
index 6d6ad26a..7566dcb4 100644
--- a/src/main/resources/modules/SpringBoot/resources/templates/layout/wap.ftl
+++ b/src/main/resources/modules/SpringBoot/resources/templates/layout/wap.ftl
@@ -4,7 +4,6 @@
     <title></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-    <link href="${Uri.getUrl('/static/img/favicon.ico')}" rel="Shortcut Icon" type="image/x-icon"/>
     <#--baseJs-->
     <script src="${Uri.getUrl('/static/dist/lib.min.js')}" type="text/javascript"></script>
     <#--vonic移动端ui-->