"git@git.gitsec.cn:baidan/Chaos-Mesh.git" did not exist on "a67a7093da9686d9b505bd3f6b74d0b1b1bc889a"
Commit 09b87a9e authored by guwd's avatar guwd
Browse files

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/application.yml
No related merge requests found
Showing with 2 additions and 5 deletions
+2 -5
......@@ -17,9 +17,7 @@ ms:
mstore:
http: http://store.i.mingsoft.net/
host: store.i.mingsoft.net
login: http://ms.i.mingsoft.net/sso/login.do
login: http://platform.i.mingsoft.net/sso/login.do
# scheme: https #解决使用代理服务器代理应用时标签解析域名依旧为http的问题
swagger:
enable: true #启用swagger文档,生产的时候务必关掉 访问地址:http://ip|域名/项目发布名/swagger-ui.html
......@@ -36,7 +34,7 @@ ms:
denied: .exe,.jsp
back-up: /upload_back
multipart:
#最大上传文件大小 单位:KB 默认10M,1024=1M
#最大上传文件大小 单位:KB
max-file-size: 10240
#文件暂存临时目录
upload-temp-dir: temp
......@@ -88,7 +86,6 @@ spring:
force: true
charset: utf-8
enabled: true
mybatis-plus:
global-config:
db-config:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment