ayan 2 vuotta sitten
vanhempi
commit
778e06134b

+ 3 - 5
jetlinks-components/rule-engine-component/src/main/java/org/jetlinks/community/rule/engine/configuration/RuleEngineConfiguration.java

@@ -2,14 +2,12 @@ package org.jetlinks.community.rule.engine.configuration;
 
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jetlinks.community.rule.engine.commons.TermsConditionEvaluator;
 import org.jetlinks.community.rule.engine.commons.TermsConditionEvaluator;
-import org.jetlinks.core.cluster.ClusterManager;
 import org.jetlinks.core.event.EventBus;
 import org.jetlinks.core.event.EventBus;
 import org.jetlinks.rule.engine.api.RuleEngine;
 import org.jetlinks.rule.engine.api.RuleEngine;
 import org.jetlinks.rule.engine.api.scheduler.Scheduler;
 import org.jetlinks.rule.engine.api.scheduler.Scheduler;
 import org.jetlinks.rule.engine.api.task.ConditionEvaluator;
 import org.jetlinks.rule.engine.api.task.ConditionEvaluator;
 import org.jetlinks.rule.engine.api.task.TaskExecutorProvider;
 import org.jetlinks.rule.engine.api.task.TaskExecutorProvider;
 import org.jetlinks.rule.engine.api.worker.Worker;
 import org.jetlinks.rule.engine.api.worker.Worker;
-import org.jetlinks.rule.engine.cluster.worker.ClusterWorker;
 import org.jetlinks.rule.engine.condition.ConditionEvaluatorStrategy;
 import org.jetlinks.rule.engine.condition.ConditionEvaluatorStrategy;
 import org.jetlinks.rule.engine.condition.DefaultConditionEvaluator;
 import org.jetlinks.rule.engine.condition.DefaultConditionEvaluator;
 import org.jetlinks.rule.engine.condition.supports.DefaultScriptEvaluator;
 import org.jetlinks.rule.engine.condition.supports.DefaultScriptEvaluator;
@@ -60,7 +58,7 @@ public class RuleEngineConfiguration {
     @Bean
     @Bean
     public BeanPostProcessor autoRegisterStrategy(DefaultRuleModelParser defaultRuleModelParser,
     public BeanPostProcessor autoRegisterStrategy(DefaultRuleModelParser defaultRuleModelParser,
                                                   DefaultConditionEvaluator defaultConditionEvaluator,
                                                   DefaultConditionEvaluator defaultConditionEvaluator,
-                                                  ClusterWorker worker) {
+                                                  LocalWorker worker) {
         return new BeanPostProcessor() {
         return new BeanPostProcessor() {
             @Override
             @Override
             public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
             public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
@@ -96,8 +94,8 @@ public class RuleEngineConfiguration {
     }
     }
 
 
     @Bean
     @Bean
-    public ClusterWorker localWorker(EventBus eventBus, ClusterManager clusterManager, ConditionEvaluator evaluator) {
-        return new ClusterWorker("local", "local", eventBus,clusterManager, evaluator);
+    public LocalWorker localWorker(EventBus eventBus, ConditionEvaluator evaluator) {
+        return new LocalWorker("local", "local", eventBus, evaluator);
     }
     }