Merge branch 'master' of https://gitee.com/super-shopkeeper/chaozhanggui
This commit is contained in:
commit
0f6cc8d945
|
|
@ -1,7 +1,7 @@
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
include: common, ryx, ys
|
include: common, ryx, ys
|
||||||
active: dev
|
active: prod
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
max-file-size: 100MB
|
max-file-size: 100MB
|
||||||
|
|
@ -26,9 +26,16 @@ spring:
|
||||||
scheduling:
|
scheduling:
|
||||||
pool:
|
pool:
|
||||||
size: 10
|
size: 10
|
||||||
|
freemarker:
|
||||||
|
template-loader-path: classpath:/temp
|
||||||
|
allow-request-override: false
|
||||||
|
charset: utf-8
|
||||||
|
content-type: text/html
|
||||||
|
expose-request-attributes: true
|
||||||
|
|
||||||
server:
|
server:
|
||||||
port: 8083
|
port: 8083
|
||||||
compression:
|
compression:
|
||||||
enabled: true
|
enabled: true
|
||||||
mime-types: application/json
|
mime-types: application/json
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue