From f000f3767ac187adfadae6213a0eb4a656332a1a Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 18 Dec 2023 14:22:54 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B0=83=E6=95=B4=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=BE=85=E5=8A=9E=E4=BA=8B=E4=BB=B6=E7=9A=84=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9,=E5=90=8C=E6=97=B6=E8=B0=83=E6=95=B4=20RocketMQ=20?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/conf/RocketMqEventConfiguration.java     | 15 ++++++++++++---
 .../notice/RocketMqMessagePushEventListener.java  |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/RocketMqEventConfiguration.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/RocketMqEventConfiguration.java
index 8650d88ad..6cdb2e248 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/RocketMqEventConfiguration.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/conf/RocketMqEventConfiguration.java
@@ -1,6 +1,10 @@
 package cn.axzo.workflow.core.conf;
 
-import cn.axzo.framework.rocketmq.*;
+import cn.axzo.framework.rocketmq.DefaultEventConsumer;
+import cn.axzo.framework.rocketmq.EventConsumer;
+import cn.axzo.framework.rocketmq.EventHandlerRepository;
+import cn.axzo.framework.rocketmq.EventProducer;
+import cn.axzo.framework.rocketmq.RocketMQEventProducer;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
@@ -9,6 +13,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.Objects;
 import java.util.function.Consumer;
 
 /**
@@ -76,7 +81,11 @@ public class RocketMqEventConfiguration {
     //    }
     @Bean
     EventHandlerRepository eventHandlerRepository() {
-        return new EventHandlerRepository((ex, logText) ->
-                log.warn("MQ, handle warning {} , Exception: {}", logText, JSON.toJSONString(ex)));
+        return new EventHandlerRepository((ex, logText) -> {
+            log.warn("MQ, handle warning {} , Exception: {}", logText, JSON.toJSONString(ex));
+            if (Objects.nonNull(ex)) {
+                throw new RuntimeException(ex);
+            }
+        });
     }
 }
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
index d29850b28..36056daaa 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
@@ -160,7 +160,7 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis
                     event.getNoticeConfig().getPending().getPendingMessageId(), JSON.toJSONString(event.getAssigner()));
         }
         MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING_COMPLETE,
-                event, null);
+                event, collectionVariable(event));
         sendMessageQueue(dto, PROCESS_PUSH_PENDING_COMPLETE);
         if (log.isDebugEnabled()) {
             log.debug("RocketMqMessagePushEventListener#onPendingComplete...end, msgTemplateId: {}, receivePerson: " +