From fc2664079dd7e5ad80611d5427c588ce99239675 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 29 Sep 2021 18:03:32 +0800 Subject: [PATCH 1/2] feat: There is no way the --- .../main/java/com/adc/da/FeignClient/workFlowFeignClient.java | 2 +- .../com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java | 4 ++-- .../src/main/java/com/adc/da/common/BusProcessNew.java | 2 ++ .../com/adc/da/workFlow/controller/WorkFlowController.java | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java index 5c8cf3cd..837075b6 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java @@ -18,7 +18,7 @@ import java.util.Set; public interface workFlowFeignClient { @RequestMapping(value = "/bat-wkflow/task/get_verify_by_instance",method = RequestMethod.GET) - long get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId); + Map get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId); @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET) Wrapper activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId); diff --git a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java index aa8221bc..e58144dd 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java +++ b/adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java @@ -25,8 +25,8 @@ public class workFlowFeignClientImpl { @Autowired private IUserEOService userEOService; - public long get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ - long stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId); + public Map get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ + Map stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId); return stringWrapper; } diff --git a/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java b/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java index b0a3a035..03303efc 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java +++ b/adc-da-activiti/src/main/java/com/adc/da/common/BusProcessNew.java @@ -44,5 +44,7 @@ public class BusProcessNew { private String finishFlag; + private long commitStatus; + } diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java index 523b81e8..479551dc 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java @@ -53,7 +53,7 @@ public class WorkFlowController { @ApiOperation(value = "流程实例明细验证是否完成") @GetMapping("/get_verify_by_instance") - public long activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ + public Map activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){ return workFlowFeignClient.get_verify_by_instance(taskId,pId); } From d7cd16a69c099a07f0aadf3d3583da03fb5cb1a6 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 30 Sep 2021 15:36:39 +0800 Subject: [PATCH 2/2] feat: There is no way the --- adc-da-main/src/main/resources/application-dev.properties | 8 ++++++-- 1 file changed, 6 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 4afc5acb..a4e5272b 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -4,7 +4,7 @@ #============================================= spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false -#spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false +#spring.datasource.url = jdbc:mysql://10.96.10.54/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.username = root spring.datasource.password = root @@ -49,6 +49,10 @@ spring.rabbitmq.port=5672 spring.rabbitmq.username=guest spring.rabbitmq.password=guest spring.rabbitmq.listener.simple.acknowledge-mode= manual +# 生产者 默认关闭 发版 需改为 true +spring.rabbitmq.listener.direct.auto-startup=false +# 消费者 默认关闭 发版 需改为 true +spring.rabbitmq.listener.simple.auto-startup=false #消费失败消息干掉 spring.rabbitmq.listener.simple.default-requeue-rejected= true #5秒 @@ -70,7 +74,7 @@ OCR.userId =dayuzhou1234 OCR.authCode =123456 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M # OCR文件存储路径 -OCR.ocrPath=/opt/foton-slrs/front/dist/file/ +OCR.ocrPath=/opt/foton-slrs/front/dist/file/a # OCR文件请求下载或在线预览时URL OCR.ocrDownPath=http://62.234.136.153:8038/file/ OCR.times=20