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 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 listenerProvider) { return new WorkflowEngineBroadcastEventListener(eventConsumer, workflowEngineStarterProperties, listenerProvider);