From c513da731485254b404d5f701ec8f2f029503541 Mon Sep 17 00:00:00 2001
From: sikadai <466608943@qq.com>
Date: Thu, 10 Feb 2022 18:15:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E6=89=A7=E8=A1=8C=E5=99=A8?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=202.=E8=B0=83=E6=95=B4=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E5=99=A8class=E5=88=9D=E5=A7=8B=E5=8C=96=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yomahub/liteflow/core/ComponentInitializer.java  | 4 ++--
 .../src/test/resources/nodeExecutor/application.properties    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ComponentInitializer.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ComponentInitializer.java
index 61bf572d2..7d18ea7cb 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ComponentInitializer.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ComponentInitializer.java
@@ -47,14 +47,14 @@ public class ComponentInitializer {
         //先从组件上取@RetryCount标注，如果没有，则看全局配置，全局配置如果不配置的话，默认是0
         //默认retryForExceptions为Exception.class
         LiteflowRetry liteflowRetryAnnotation = AnnotationUtils.getAnnotation(nodeComponent.getClass(), LiteflowRetry.class);
+        LiteflowConfig liteflowConfig = LiteflowConfigGetter.get();
         if (ObjectUtil.isNotNull(liteflowRetryAnnotation)) {
             nodeComponent.setRetryCount(liteflowRetryAnnotation.retry());
             nodeComponent.setRetryForExceptions(liteflowRetryAnnotation.forExceptions());
         } else {
-            LiteflowConfig liteflowConfig = LiteflowConfigGetter.get();
             nodeComponent.setRetryCount(liteflowConfig.getRetryCount());
-            nodeComponent.setNodeExecutorClass(liteflowConfig.getNodeExecutorClass());
         }
+        nodeComponent.setNodeExecutorClass(liteflowConfig.getNodeExecutorClass());
 
         return nodeComponent;
     }
diff --git a/liteflow-testcase-springboot/src/test/resources/nodeExecutor/application.properties b/liteflow-testcase-springboot/src/test/resources/nodeExecutor/application.properties
index 07f53dddf..62a0d3a9b 100644
--- a/liteflow-testcase-springboot/src/test/resources/nodeExecutor/application.properties
+++ b/liteflow-testcase-springboot/src/test/resources/nodeExecutor/application.properties
@@ -1,4 +1,4 @@
 liteflow.rule-source=nodeExecutor/flow.xml
 liteflow.retry-count=3
 liteflow.slot-size=512
-liteflow.node-executor=com.yomahub.liteflow.entity.executor.DefaultNodeExecutor
\ No newline at end of file
+liteflow.node-executor-class=com.yomahub.liteflow.entity.executor.DefaultNodeExecutor
\ No newline at end of file