ak
/
msopen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/resources/application.yml
This commit is contained in:
sgjj 2020-09-07 11:44:41 +08:00
parent cd8a67bc06 b040cd5d1a
commit da964ddd77
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/5.0.0-to-5.1-mysql.sql
View File

File diff suppressed because one or more lines are too long

2
doc/mcms-5.1.sql
View File

File diff suppressed because one or more lines are too long

4
src/main/resources/application.yml
View File

@ -14,9 +14,6 @@ logging:
ms: ms:
# scheme: https #解决使用代理服务器代理应用时标签解析域名依旧为http的问题 # scheme: https #解决使用代理服务器代理应用时标签解析域名依旧为http的问题
mstore:
http: http://store.new.mingsoft.net
host: store.new.mingsoft.net
swagger: swagger:
enable: true #启用swagger文档，生产的时候务必关掉 enable: true #启用swagger文档，生产的时候务必关掉
manager: manager:
@ -70,6 +67,7 @@ spring:
expose-spring-macro-helpers: true expose-spring-macro-helpers: true
prefer-file-system-access: false prefer-file-system-access: false
template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF template-loader-path: classpath:/WEB-INF/manager,classpath:/WEB-INF
#template-loader-path: file:WEB-INF/,file:WEB-INF/manager,classpath:/,classpath:/WEB-INF/manager,classpath:/WEB-INF 管理页面WEB-INF/manger单独配置在jar外面，修改部分ftl避免重新jar打包
settings: settings:
template_update_delay: 1 template_update_delay: 1
default_encoding: UTF-8 default_encoding: UTF-8