提交

6 years ago · 2c4ef41054
parent 4e827ae210
commit 2c4ef41054
6 changed files with 6 additions and 5 deletions
--- 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"));
        }

--- 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
 # 日志配置
--- 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
 # 日志配置
--- a/src/main/resources/modules/SpringBoot/resources/static/img/favicon.ico
+++ b/src/main/resources/modules/SpringBoot/resources/static/img/favicon.ico
--- 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-->
--- 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-->