Merge branch 'thirdApiStage' into fourthStage

# Conflicts:
#	laws-base/laws-base-core/src/main/java/com/jero/config/filter/csrf/CsrfFilter.java

laws-single-startup/src/main/resources/application-dev.yml

@@ -479,3 +479,20 @@ watermark:
   margin:
     top: 100
     left: 60
+
+# srms 接口对接
+srms:
+  # pdf预览 前端url http://ip:port 替换前端地址
+  font_url_pdf: http://localhost:3334/pdfjs/web/viewer.html?file={back_url_pdf}&.pdf
+  # pdf预览 后端url
+  back_url_pdf: /laws-sinotruk/sys/common/view/{id}?type=view&at={token}
+  # 其他文件预览  替换kkfileviewurl
+  font_url_other: http://127.0.0.1:8012/onlinePreview?url={back_url_other}&watermarkTxt={mark}&watermarkSign={mark_md5}
+  # 其他文件预览 后端url 替换后端地址
+  back_url_other: http://localhost:8184/${srms.back_url_pdf}&fullfilename={file_name}
+  # 其他文件水印标识
+  other_md5_mark: cnhtc
+  # E彩通标识
+  etton_sys_code: ETTON
+  # E彩通默认账户
+  etton_sys_user: etton