Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2

adc-da-main/src/main/resources/application-dev.properties

@@ -3,7 +3,7 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://192.168.10.47:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
 spring.datasource.username = root
 spring.datasource.password = root
 
@@ -50,4 +50,19 @@ spring.rabbitmq.password=cs986432
 # ==============================================
 # 文档存储路径指向
 # ==============================================
-file.path=/usr/laws/file/
+file.path=/usr/laws/file/
+
+# 云端OCR识别集成配置参数
+#OCR请求识别URL地址
+OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion
+# OCR回调接口地址 配置客户本地的IP及端口号
+OCR.callBackUrl = http://39.98.140.126:10001/api/ocr/OCRRestful/OcrHandleResult
+OCR.userId =dayuzhou1234
+OCR.authCode =123456
+OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M
+# OCR文件存储路径
+OCR.ocrPath=D:/APPSOFT/LAWSOCRDEMO/OCRFILE/
+# OCR文件请求下载或在线预览时URL
+OCR.ocrDownPath=http://106.2.13.189:8089/downfile/
+OCR.times=20
+OCR.convertType=BOTH