修复出现循环引用时报错

Author: zhongxunking

event/src/main/java/org/bekit/event/boot/EventBusConfiguration.java

@@ -15,6 +15,7 @@
 import org.bekit.event.publisher.DefaultEventPublisher;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Import;
 
 /**
@@ -27,6 +28,7 @@ public class EventBusConfiguration {
 
     // 业务事件发布器
     @Bean
+    @DependsOn("org.bekit.event.bus.EventBusesHolder")      // 保证出现循环引用时不会出错
     public EventPublisher eventPublisher(EventBusesHolder eventBusesHolder) {
         return new DefaultEventPublisher(eventBusesHolder.getEventBus(BizListenerType.class));
     }

flow/src/main/java/org/bekit/flow/boot/FlowEngineConfiguration.java

@@ -17,6 +17,7 @@
 import org.bekit.flow.transaction.FlowTxsHolder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Import;
 
 /**
@@ -33,6 +34,7 @@ public class FlowEngineConfiguration {
 
     // 流程引擎
     @Bean
+    @DependsOn({"org.bekit.flow.flow.FlowsHolder", "org.bekit.flow.transaction.FlowTxsHolder"})     // 保证出现循环引用时不会出错
     public FlowEngine flowEngine(FlowsHolder flowsHolder, FlowTxsHolder flowTxsHolder) {
         return new DefaultFlowEngine(flowsHolder, flowTxsHolder);
     }

flow/src/main/java/org/bekit/flow/listener/DefaultFlowListener.java

@@ -15,12 +15,14 @@
 import org.bekit.flow.annotation.listener.FlowListener;
 import org.bekit.flow.event.FlowExceptionEvent;
 import org.bekit.flow.event.NodeDecidedEvent;
+import org.springframework.context.annotation.DependsOn;
 
 /**
  * 默认的流程监听器
  * （流程引擎初始化时会初始化本监听器，其作用是监听所有流程发生的事件，然后将事件转发给对应流程的特定流程监听器（@TheFlowListener））
  */
 @FlowListener
+@DependsOn("org.bekit.event.bus.EventBusesHolder")      // 保证出现循环引用时不会出错
 public class DefaultFlowListener {
     // 特定流程事件发布器
     private EventPublisher eventPublisher;