From 3b03f7a7ea14f84cb84402adb717dddf02c4fa31 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Thu, 18 Nov 2021 17:27:08 +0800 Subject: [PATCH 1/8] =?UTF-8?q?update:=E4=BF=AE=E6=AD=A3=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?ocr=E8=AF=86=E5=88=AB=E6=96=87=E4=BB=B6=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 3d67866a..e8488555 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -67,8 +67,8 @@ OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M # OCR文件存储路径 -OCR.ocrPath=/data/slrs/ocrResultFile +OCR.ocrPath=/data/slrs/ocrResultFile/ # OCR文件请求下载或在线预览时URL -OCR.ocrDownPath=/data/slrs/ocrResultFile +OCR.ocrDownPath=/data/slrs/ocrResultFile/ OCR.times=20 OCR.convertType=BOTH \ No newline at end of file From 6ba96a22ea3c8f260fc1c69b3d018d7e61dbe858 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Fri, 19 Nov 2021 11:25:57 +0800 Subject: [PATCH 2/8] =?UTF-8?q?update:=E6=96=B0=E5=A2=9E=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index e8488555..f71986ae 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -57,6 +57,7 @@ spring.rabbitmq.listener.simple.retry.max-attempts= 5 # 文档存储路径指向 # ============================================== file.path=/data/slrs/file +file.split.path=/data/slrs/file/splitImage/ # 云端OCR识别集成配置参数 #OCR请求识别URL地址 From fa76e1eb6cbb1bed4881bf96068868c20740049c Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Fri, 19 Nov 2021 15:14:23 +0800 Subject: [PATCH 3/8] =?UTF-8?q?update:=E6=9B=B4=E6=96=B0=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=AD=98=E5=82=A8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarFileSplitInfoEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index d2f18ceb..0959bbe3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -478,7 +478,7 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService if (!file1.exists()) { file1.mkdirs(); } - String filepathandname = filePath + "/img/" + imageName; + String filepathandname = splitFilePath +"/" + imageName; try { FileOutputStream fos = new FileOutputStream(filepathandname); fos.write(bytev); From 09ebe8f3948bb80c137ee1c3e12c5554a0b05324 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sat, 20 Nov 2021 11:31:26 +0800 Subject: [PATCH 4/8] feat: There is no way the --- adc-da-main/src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index f71986ae..a4aa4373 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -63,7 +63,7 @@ file.split.path=/data/slrs/file/splitImage/ #OCR请求识别URL地址 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion # OCR回调接口地址 配置客户本地的IP及端口号 -OCR.callBackUrl = https://slrs.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult +OCR.callBackUrl = https://srms.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M From ed128e1403d033f9b12c0c71c44c351dc701516b Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sat, 20 Nov 2021 16:46:00 +0800 Subject: [PATCH 5/8] feat: There is no way the --- .../src/main/resources/application.properties | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 6f42d8db..75fa37d5 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -9,12 +9,12 @@ spring.profiles.active=dev server.compression.enabled=true server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript # 端口号设置 -server.port=9999 +server.port=4202 #主服务session超时 server.servlet.session.timeout =600 #tomcat /resource/local/version-manager 创建tomcat指定临时目录 -server.tomcat.basedir=/resource/local/version-manager +server.tomcat.basedir=/data/slrs/temp # http-only server.session.cookie.http-only=true @@ -30,20 +30,14 @@ logging.level.org.springframework=info # 请求前缀 restPath=/api -#server.servlet.context-path=/api #是否将自己注册到Eureka Server上，默认为true eureka.client.register-with-eureka=true ##是否从Eureka Server上获取注册信息，默认为true eureka.client.fetch-registry=true +eureka.instance.prefer-ip-address=true - -#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ -#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/ -#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/ - -eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/ -#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/ +eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/ # 请求连接的超时时间 默认的时间为 1 秒 ribbon.ConnectTimeout=500000 @@ -137,9 +131,9 @@ verifyCodeMode=1 # 文件上传管控及配置 # ============================================================================= # file模块上传文件的服务器地址 -file.path=D:/uploadfile/bus -# 文件下载地址参数 -file.downloadUrl=http://39.98.140.126:10001/uploadPath +file.path=/data/slrs/file +# 文件下载地址参数(弃用) +file.downloadUrl= #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt @@ -147,14 +141,13 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt # elasticsearch 配置 # ============================================================================= elasticsearch.clustername=elasticsearch -elasticsearch.ip=172.17.0.1 +elasticsearch.ip=10.100.5.122 elasticsearch.port=9300 elasticsearch.poolSize=5 elas.flag=true # 文档转换TCP通讯地址 convert.host=127.0.0.1 -#convert.host=0.0.0.0 # ============================================================================= # scheduled 配置 From 5c358d557055b50f39a3ee46c60362fbc42be364 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Mon, 29 Nov 2021 22:34:31 +0800 Subject: [PATCH 6/8] =?UTF-8?q?update:ocr=E5=9B=9E=E8=B0=83=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java index c79bdc83..ef8e0e7b 100644 --- a/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/ocr/service/impl/OCRRestfulServiceImpl.java @@ -180,7 +180,7 @@ public class OCRRestfulServiceImpl implements OCRRestfulService { logger.info(saveJsonFilePath); File saveJsonFile = new File(saveJsonFilePath); System.out.println(saveJsonFile); - wordFile.transferTo(saveJsonFile); + jsonFile.transferTo(saveJsonFile); // FileUtils.copyInputStreamToFile(jsonFile.getInputStream(),new File(saveJsonFilePath)); // savePic(jsonFile.getInputStream(),saveJsonFilePath); logger.info("Json存储完成"); From bdf1692e62a67fd7410feb592f7c50cebc95cb33 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Wed, 8 Dec 2021 21:26:20 +0800 Subject: [PATCH 7/8] feat: There is no way the --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 605d2d3d..21b5ccfd 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -135,7 +135,7 @@ file.path=/data/slrs/file stand.edit.file.path = /usr/laws/file/ # onlyoffice 预览地址 -file.downloadUrl=http://10.100.5.116:1080/file/ +file.downloadUrl=https://srms.foton.com.cn/file/ #上传文件白名单-以,分隔 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt From 79e7719be447f558743849c374d18b54a8ae57ee Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 15 Dec 2021 14:26:03 +0800 Subject: [PATCH 8/8] feat: There is no way the --- adc-da-main/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties index 21b5ccfd..be7c405b 100644 --- a/adc-da-main/src/main/resources/application.properties +++ b/adc-da-main/src/main/resources/application.properties @@ -133,7 +133,7 @@ verifyCodeMode=1 # file模块上传文件的服务器地址 file.path=/data/slrs/file -stand.edit.file.path = /usr/laws/file/ +stand.edit.file.path = /data/slrs/file/ # onlyoffice 预览地址 file.downloadUrl=https://srms.foton.com.cn/file/