From 1f0b0b705835c482e2bfa31784e6e0e5e1b0ef5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E6=88=90=E6=97=BA?= <xuchengwang@sinovatech.com>
Date: Tue, 13 Jun 2023 19:00:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=AC=E5=85=B1?=
=?UTF-8?q?=E5=BC=95=E5=85=A5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
src/main/resources/application.yml | 3 ++-
.../resources/templates/authority/index.ftl | 8 +-------
.../templates/authority/sysApp/sysAppAdd.ftl | 8 +-------
.../templates/authority/sysApp/sysAppEdit.ftl | 8 +-------
.../templates/authority/sysApp/sysAppShow.ftl | 8 +-------
.../templates/authority/sysApp/sysAppTree.ftl | 8 +-------
.../templates/authority/sysApp/sysAppView.ftl | 8 +-------
.../templates/authority/sysRole/sysRoleAdd.ftl | 8 +-------
.../templates/authority/sysRole/sysRoleEdit.ftl | 8 +-------
.../templates/authority/sysRole/sysRoleShow.ftl | 8 +-------
.../templates/authority/sysRole/sysRoleView.ftl | 8 +-------
.../templates/authority/sysUser/sysUserAdd.ftl | 8 +-------
.../templates/authority/sysUser/sysUserEdit.ftl | 8 +-------
.../templates/authority/sysUser/sysUserShow.ftl | 8 +-------
.../templates/authority/sysUser/sysUserView.ftl | 8 +-------
src/main/resources/templates/common/head.ftl | 11 +++++++++++
src/main/resources/templates/login/index.ftl | 8 +-------
.../resources/templates/login/loginShow.ftl | 17 +++--------------
.../resources/templates/login/registerAdmin.ftl | 16 +++-------------
.../templates/login/retrievePassword.ftl | 15 ++++-----------
21 files changed, 39 insertions(+), 144 deletions(-)
create mode 100644 src/main/resources/templates/common/head.ftl
diff --git a/.gitignore b/.gitignore
index df13347..b63281e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
*.iml
target/
*.log
+*.gz
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 271bdad..6de5ebf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,10 +1,11 @@
server:
port: 9100
+ servlet:
+ context-path: /bookManager
spring:
main:
allow-bean-definition-overriding: true
- context-path: /
mvc:
static-path-pattern: classpath:/static/**
pathmatch:
diff --git a/src/main/resources/templates/authority/index.ftl b/src/main/resources/templates/authority/index.ftl
index de3f08b..f5113e4 100644
--- a/src/main/resources/templates/authority/index.ftl
+++ b/src/main/resources/templates/authority/index.ftl
@@ -2,13 +2,7 @@
首页面
-
-
-
-
-
-
-
+ <#include "../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
-
+ <#include "../../common/head.ftl">
+
\ No newline at end of file
diff --git a/src/main/resources/templates/login/index.ftl b/src/main/resources/templates/login/index.ftl
index bceb10d..41b97cb 100644
--- a/src/main/resources/templates/login/index.ftl
+++ b/src/main/resources/templates/login/index.ftl
@@ -2,13 +2,7 @@
首页面
-
-
-
-
-
-
-
+ <#include "../common/head.ftl">
-