Merge branch 'develop_master' into FOTON

This commit is contained in:
super_liu
2022-05-18 11:40:27 +08:00
13 changed files with 452 additions and 3 deletions
@@ -138,7 +138,7 @@ stand.edit.file.path = /data/slrs/file/
file.downloadUrl=https://srms.foton.com.cn/file/
#上传文件白名单-以,分隔
upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg
upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt,pdg,rar,zip,dot
# =============================================================================
# elasticsearch 配置