From 127147176e8035ae73f77cb81b74aa643bddbc41 Mon Sep 17 00:00:00 2001 From: "yadong.zhang" Date: Mon, 1 Jul 2019 18:11:51 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8Dfreemarker=E8=AF=AD?= =?UTF-8?q?=E6=B3=95=E9=97=AE=E9=A2=98=EF=BC=8C=E5=8E=BB=E6=8E=89=E8=BF=87?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=AF=AD=E6=B3=95=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD=EF=BC=88?= =?UTF-8?q?=E9=9C=80=E6=89=8B=E5=8A=A8=E5=BC=80=E5=90=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 3 ++ .../src/main/resources/application-test.yml | 3 ++ .../main/resources/templates/article/list.ftl | 2 +- .../src/main/resources/templates/config.ftl | 2 +- .../src/main/resources/templates/index.ftl | 12 ++--- .../resources/templates/layout/setting.ftl | 6 +-- .../resources/templates/layout/sidebar.ftl | 12 ++--- .../src/main/resources/templates/login.ftl | 6 +-- .../runner/BlogApplicationRunner.java | 48 ++++++++++++++++++- .../zyd/blog/controller/RenderController.java | 11 ----- .../src/main/resources/application-dev.yml | 3 ++ .../src/main/resources/application-test.yml | 4 ++ .../src/main/resources/templates/about.ftl | 2 +- .../src/main/resources/templates/archives.ftl | 2 +- .../src/main/resources/templates/article.ftl | 11 +++-- .../main/resources/templates/disclaimer.ftl | 2 +- .../main/resources/templates/guestbook.ftl | 7 +-- .../resources/templates/include/macros.ftl | 12 ++--- .../src/main/resources/templates/index.ftl | 20 ++++---- .../resources/templates/layout/footer.ftl | 12 ++--- .../resources/templates/layout/header.ftl | 12 ++--- .../resources/templates/layout/sidebar.ftl | 22 ++++----- .../src/main/resources/templates/links.ftl | 3 +- .../main/resources/templates/recommended.ftl | 3 +- .../resources/templates/testWebsocket.ftl | 47 ------------------ .../main/resources/templates/updateLog.ftl | 3 +- 26 files changed, 133 insertions(+), 137 deletions(-) delete mode 100644 blog-web/src/main/resources/templates/testWebsocket.ftl diff --git a/blog-admin/src/main/resources/application-dev.yml b/blog-admin/src/main/resources/application-dev.yml index 2194f96..f9e73c8 100644 --- a/blog-admin/src/main/resources/application-dev.yml +++ b/blog-admin/src/main/resources/application-dev.yml @@ -55,6 +55,9 @@ logging: app: # 是否启用kaptcha验证码 enableKaptcha: false + # 启用后,项目在启动时会打印数据库(Mysql和Redis)链接信息(包含密码) + # 代码请参考 + enabledConfigLog: true # shiro配置项 shiro: loginUrl: "/passport/login/" diff --git a/blog-admin/src/main/resources/application-test.yml b/blog-admin/src/main/resources/application-test.yml index d44a8ca..1c72811 100644 --- a/blog-admin/src/main/resources/application-test.yml +++ b/blog-admin/src/main/resources/application-test.yml @@ -54,6 +54,9 @@ logging: app: # 是否启用kaptcha验证码 enableKaptcha: false + # 启用后,项目在启动时会打印数据库(Mysql和Redis)链接信息(包含密码) + # 代码请参考 + enabledConfigLog: false # shiro配置项 shiro: loginUrl: "/passport/login/" diff --git a/blog-admin/src/main/resources/templates/article/list.ftl b/blog-admin/src/main/resources/templates/article/list.ftl index 0306a52..e9f7dd0 100644 --- a/blog-admin/src/main/resources/templates/article/list.ftl +++ b/blog-admin/src/main/resources/templates/article/list.ftl @@ -15,7 +15,7 @@