Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -3870,7 +3870,9 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
         }
 
-        return voList;
+        //多次驳回之后需要对返回的节点进行去重操作
+        List<RejectNodeVo> collect = voList.stream().distinct().collect(Collectors.toList());
+        return collect;
     }
 
     @Override

src/main/resources/application-dev.yml

@@ -9,16 +9,20 @@ spring:
       datasource:
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://8.142.26.206:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://localhost:3306/tl?useUnicode=true&autoReconnect=true&failOverReadOnly=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+          #url: jdbc:mysql://8.142.26.206:3306/tl?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&autoReconnect=true&failOverReadOnly=false
           username: root
-          password: Zwr~-f6H,u6QE^]C-AD_
+          password: 11223344
+          #password: Zwr~-f6H,u6QE^]C-AD_
+
 
 
   redis:
-    database: 10
-    host: 8.142.26.206
+    database: 11
+    host: localhost
     port: 6379
-    password: wa3re~86Hu&ifniyM   # 密码（默认为空）
+   # password: wa3re~86Hu&ifniyM   # 密码（默认为空）
+    password: # 密码（默认为空）
     timeout: 6000ms  # 连接超时时长（毫秒）
     jedis:
       pool:

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
 
 
 spring: