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 @@