Merge branch 'develop_master' into FOTON

# Conflicts: # adc-da-main/src/main/resources/application.properties
2021-11-27 19:55:06 +08:00
parent 2d85ecfaa9 7414e25be7
commit 6cf002a489
19 changed files with 972 additions and 142 deletions
@@ -132,8 +132,11 @@ verifyCodeMode=1
 # =============================================================================
 # file模块上传文件的服务器地址
 file.path=/data/slrs/file
-# 文件下载地址参数(弃用)
-file.downloadUrl=
+
+stand.edit.file.path = /usr/laws/file/
+# onlyoffice 预览地址
+file.downloadUrl=http://10.100.5.116:1080/file/
+
 #上传文件白名单-以,分隔
 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt