Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!187

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<String,Object> get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId);
 
     @RequestMapping(value = "/bat-wkflow/activiti_define_start_user",method = RequestMethod.GET)
     Wrapper<String> activiti_define_start(@RequestParam("id") String id, @RequestParam("userId") String userId, @RequestParam("bpnId") String bpnId);

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<String,Object> get_verify_by_instance(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
+        Map<String,Object> stringWrapper = workFlowFeignClient.get_verify_by_instance(taskId,pId);
         return stringWrapper;
     }
 

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;
+
 
 }

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<String,Object> activiti_define_start1(@RequestParam("taskId") String taskId, @RequestParam("pId") String pId){
         return  workFlowFeignClient.get_verify_by_instance(taskId,pId);
     }
 

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