服务引擎：调增DefaultServiceEngine配置

Author: zhongxunking

service/src/main/java/org/bekit/service/boot/ServiceEngineConfiguration.java

@@ -8,6 +8,7 @@
  */
 package org.bekit.service.boot;
 
+import org.bekit.event.EventPublisher;
 import org.bekit.event.boot.EventBusConfiguration;
 import org.bekit.event.bus.EventBusesHolder;
 import org.bekit.event.publisher.DefaultEventPublisher;
@@ -17,6 +18,7 @@
 import org.bekit.service.service.ServicesHolder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Import;
 
 /**
@@ -29,7 +31,9 @@ public class ServiceEngineConfiguration {
 
     // 服务引擎
     @Bean
-    public ServiceEngine serviceEngine(EventBusesHolder eventBusesHolder) {
-        return new DefaultServiceEngine(new DefaultEventPublisher(eventBusesHolder.getEventBus(ServiceListenerType.class)));
+    @DependsOn({"org.bekit.service.service.ServicesHolder", "org.bekit.event.bus.EventBusesHolder"})    // 保证出现循环引用时不会出错
+    public ServiceEngine serviceEngine(ServicesHolder servicesHolder, EventBusesHolder eventBusesHolder) {
+        EventPublisher eventPublisher = new DefaultEventPublisher(eventBusesHolder.getEventBus(ServiceListenerType.class));
+        return new DefaultServiceEngine(servicesHolder, eventPublisher);
     }
 }

service/src/main/java/org/bekit/service/engine/DefaultServiceEngine.java

@@ -15,7 +15,6 @@
 import org.bekit.service.event.ServiceFinishEvent;
 import org.bekit.service.service.ServiceExecutor;
 import org.bekit.service.service.ServicesHolder;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cglib.core.ReflectUtils;
 
 import java.util.Map;
@@ -24,12 +23,13 @@
  * 服务引擎默认实现类
  */
 public class DefaultServiceEngine implements ServiceEngine {
-    @Autowired
+    // 服务持有器
     private ServicesHolder servicesHolder;
     // 服务事件发布器
     private EventPublisher eventPublisher;
 
-    public DefaultServiceEngine(EventPublisher eventPublisher) {
+    public DefaultServiceEngine(ServicesHolder servicesHolder, EventPublisher eventPublisher) {
+        this.servicesHolder = servicesHolder;
         this.eventPublisher = eventPublisher;
     }