diff --git a/.gitignore b/.gitignore index df1334795fae3a063cdaa378e4cd3c9ee719c065..b63281ed526109213da2c1e97efb7caf062a606f 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 271bdad9ee5f482bb56ef6f4e05c6a4d9f0d424c..d16c9d8b489f74b8dea03341b07f2a34b16e588a 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: @@ -43,6 +44,17 @@ spring: time-between-eviction-runs-millis: 60000 # 配置一个连接在池中最小生存的时间,单位是毫秒 min-evictable-idle-time-millis: 300000 + #设置 FreeMarKar 模板引擎 + freemarker: + request-context-attribute: request # req 访问 + request-suffix: .ftl #模板后缀名 + content-type: text/html #文档类型 + charset: UTF-8 #页面编码格式 + cache: false #缓存配置 false 关掉 + template-loader-path: classpath:/templates/ #模板加载路径 按需配置 + enabled: true + settings: + number_format: '0.##' #数字格式化,无小数点 redis: host: 127.0.0.1 #10.1.137.204 port: 6379 @@ -64,17 +76,6 @@ mybatis-plus: mapper-locations: classpath*:mapper/*/*Mapper.xml configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - #设置 FreeMarKar 模板引擎 - freemarker: - request-context-attribute: request # req 访问 - request-suffix: .ftl #模板后缀名 - content-type: text/html #文档类型 - charset: UTF-8 #页面编码格式 - cache: false #缓存配置 false 关掉 - template-loader-path: classpath:/templates/ #模板加载路径 按需配置 - enabled: true - settings: - number_format: '0.##' #数字格式化,无小数点 knife4j: enable: true # 开启增强配置 production: false # true 开启生产环境api屏蔽,false 关闭api屏蔽 diff --git a/src/main/resources/templates/authority/index.ftl b/src/main/resources/templates/authority/index.ftl index de3f08bf9fb1193196a7c47b4eeddc0b2d212f0f..0f57af866cf09bbc3c58a9f9a81c6cea0843673b 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 bceb10d8674a32c161dd57865a062c808db54e09..cb01a76d17ff4944b2172c49b4d34f9f473803e3 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"> -