From 069f11a713c453f696073a666ac58e5e1776a545 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Fri, 14 Jun 2024 10:54:38 +0800
Subject: [PATCH] =?UTF-8?q?update(REQ-2516)=20-=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=B9=BF=E6=92=AD=E6=B6=88=E6=81=AF=E7=9A=84=20Bean=20?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=B3=A8=E5=86=8C=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=94=AF=E4=B8=80=E5=8C=96=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../starter/StarterBroadcastMQConfiguration.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java
index f79528a62..98b8f4ea5 100644
--- a/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java
+++ b/workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/StarterBroadcastMQConfiguration.java
@@ -54,16 +54,16 @@ public class StarterBroadcastMQConfiguration {
 
     //=================================  Workflow Engine Broadcast MQ  =================================//
     @Bean
-    @ConditionalOnMissingBean(EventHandlerRepository.class)
-    public EventHandlerRepository eventHandlerRepository() {
+    @ConditionalOnMissingBean(value = EventHandlerRepository.class, name = "broadcastEventHandlerRepository")
+    public EventHandlerRepository broadcastEventHandlerRepository() {
         return new EventHandlerRepository((ex, logText) -> {
             log.warn("Workflow Engine Starter MQ, handle warning {}", logText, ex);
         });
     }
 
     @Bean
-    @ConditionalOnMissingBean(EventProducer.class)
-    public EventConsumer eventConsumer(EventHandlerRepository eventHandlerRepository) {
+    @ConditionalOnMissingBean(value = EventProducer.class, name = "broadcastEventConsumer")
+    public EventConsumer broadcastEventConsumer(@Qualifier("broadcastEventHandlerRepository") EventHandlerRepository eventHandlerRepository) {
         Consumer<EventConsumer.EventWrapper> callback = eventWrapper -> {
             if (eventWrapper.isHandled()) {
                 // 只收集被App真正消费的消息.
@@ -116,7 +116,7 @@ public class StarterBroadcastMQConfiguration {
     }
 
     @Bean
-    public WorkflowEngineBroadcastEventListener workflowEngineBroadcastEventListener(@Qualifier("eventConsumer") EventConsumer eventConsumer,
+    public WorkflowEngineBroadcastEventListener workflowEngineBroadcastEventListener(@Qualifier("broadcastEventConsumer") EventConsumer eventConsumer,
                                                                                      WorkflowEngineStarterProperties workflowEngineStarterProperties,
                                                                                      List<InnerWorkflowListener> listenerProvider) {
         return new WorkflowEngineBroadcastEventListener(eventConsumer, workflowEngineStarterProperties, listenerProvider);