From 779321d08ee08c40347afaf5b71b34ea1fff9565 Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Sat, 8 Oct 2022 19:22:58 +0800 Subject: [PATCH] =?UTF-8?q?feature=20#I5RV4W=20=E5=8A=A0=E5=BC=BA=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E5=92=8Cjava=E4=B9=8B=E9=97=B4=E7=9A=84=E4=BA=92?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yomahub/liteflow/core/ComponentInitializer.java | 2 +- .../java/com/yomahub/liteflow/core/ScriptBreakComponent.java | 1 + .../java/com/yomahub/liteflow/core/ScriptCommonComponent.java | 1 + .../main/java/com/yomahub/liteflow/core/ScriptForComponent.java | 1 + .../main/java/com/yomahub/liteflow/core/ScriptIfComponent.java | 1 + .../java/com/yomahub/liteflow/core/ScriptSwitchComponent.java | 1 + .../java/com/yomahub/liteflow/core/ScriptWhileComponent.java | 1 + 7 files changed, 7 insertions(+), 1 deletion(-) 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 5155e1442..d71e90226 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 @@ -51,7 +51,7 @@ public class ComponentInitializer { //默认retryForExceptions为Exception.class LiteflowRetry liteflowRetryAnnotation = AnnoUtil.getAnnotation(nodeComponent.getClass(), LiteflowRetry.class); LiteflowConfig liteflowConfig = LiteflowConfigGetter.get(); - if (ObjectUtil.isNotNull(liteflowRetryAnnotation)) { + if (liteflowRetryAnnotation != null) { nodeComponent.setRetryCount(liteflowRetryAnnotation.retry()); nodeComponent.setRetryForExceptions(liteflowRetryAnnotation.forExceptions()); } else { diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBreakComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBreakComponent.java index 0fa0db6c3..904770b58 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBreakComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptBreakComponent.java @@ -15,6 +15,7 @@ public class ScriptBreakComponent extends NodeBreakComponent implements ScriptCo wrap.setCurrChainName(this.getCurrChainName()); wrap.setNodeId(this.getNodeId()); wrap.setSlotIndex(this.getSlotIndex()); + wrap.setTag(this.getTag()); wrap.setCmpData(this.getCmpData(Object.class)); return (boolean) ScriptExecutorFactory.loadInstance().getScriptExecutor().execute(wrap); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptCommonComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptCommonComponent.java index 40b8705fa..413c98573 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptCommonComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptCommonComponent.java @@ -20,6 +20,7 @@ public class ScriptCommonComponent extends NodeComponent implements ScriptCompon wrap.setCurrChainName(this.getCurrChainName()); wrap.setNodeId(this.getNodeId()); wrap.setSlotIndex(this.getSlotIndex()); + wrap.setTag(this.getTag()); wrap.setCmpData(this.getCmpData(Object.class)); ScriptExecutorFactory.loadInstance().getScriptExecutor().execute(wrap); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptForComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptForComponent.java index 575a26451..d2b05e8a0 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptForComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptForComponent.java @@ -15,6 +15,7 @@ public class ScriptForComponent extends NodeForComponent implements ScriptCompon wrap.setCurrChainName(this.getCurrChainName()); wrap.setNodeId(this.getNodeId()); wrap.setSlotIndex(this.getSlotIndex()); + wrap.setTag(this.getTag()); wrap.setCmpData(this.getCmpData(Object.class)); return (int) ScriptExecutorFactory.loadInstance().getScriptExecutor().execute(wrap); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptIfComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptIfComponent.java index ec8895a39..0affe9730 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptIfComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptIfComponent.java @@ -15,6 +15,7 @@ public class ScriptIfComponent extends NodeIfComponent implements ScriptComponen wrap.setCurrChainName(this.getCurrChainName()); wrap.setNodeId(this.getNodeId()); wrap.setSlotIndex(this.getSlotIndex()); + wrap.setTag(this.getTag()); wrap.setCmpData(this.getCmpData(Object.class)); return (boolean)ScriptExecutorFactory.loadInstance().getScriptExecutor().execute(wrap); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java index 9f8f0d98c..918a7aa37 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptSwitchComponent.java @@ -16,6 +16,7 @@ public class ScriptSwitchComponent extends NodeSwitchComponent implements Script wrap.setCurrChainName(this.getCurrChainName()); wrap.setNodeId(this.getNodeId()); wrap.setSlotIndex(this.getSlotIndex()); + wrap.setTag(this.getTag()); wrap.setCmpData(this.getCmpData(Object.class)); return (String)ScriptExecutorFactory.loadInstance().getScriptExecutor().execute(wrap); } diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptWhileComponent.java b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptWhileComponent.java index c0988e7e6..d6295b46d 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptWhileComponent.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/core/ScriptWhileComponent.java @@ -16,6 +16,7 @@ public class ScriptWhileComponent extends NodeWhileComponent implements ScriptCo wrap.setCurrChainName(this.getCurrChainName()); wrap.setNodeId(this.getNodeId()); wrap.setSlotIndex(this.getSlotIndex()); + wrap.setTag(this.getTag()); wrap.setCmpData(this.getCmpData(Object.class)); return (boolean) ScriptExecutorFactory.loadInstance().getScriptExecutor().execute(wrap); }