From ba6a2c01b37172c17682c43e25e9a360c9188cb5 Mon Sep 17 00:00:00 2001 From: "everywhere.z" Date: Sun, 6 Nov 2022 13:13:25 +0800 Subject: [PATCH] =?UTF-8?q?enhancement=20#I5P263=20=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=BC=82=E5=B8=B8=EF=BC=8C=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yomahub/liteflow/script/ScriptExecutor.java | 2 +- .../yomahub/liteflow/script/groovy/GroovyScriptExecutor.java | 5 ++--- .../liteflow/script/javascript/JavaScriptExecutor.java | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/script/ScriptExecutor.java b/liteflow-core/src/main/java/com/yomahub/liteflow/script/ScriptExecutor.java index 1c7ca8628..9b96f129c 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/script/ScriptExecutor.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/script/ScriptExecutor.java @@ -11,7 +11,7 @@ public interface ScriptExecutor { void load(String nodeId, String script); - Object execute(ScriptExecuteWrap wrap); + Object execute(ScriptExecuteWrap wrap) throws Exception; void cleanCache(); } diff --git a/liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java b/liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java index 23064ddf7..0d1a4a926 100644 --- a/liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java +++ b/liteflow-script-plugin/liteflow-script-groovy/src/main/java/com/yomahub/liteflow/script/groovy/GroovyScriptExecutor.java @@ -50,7 +50,7 @@ public class GroovyScriptExecutor implements ScriptExecutor { } @Override - public Object execute(ScriptExecuteWrap wrap) { + public Object execute(ScriptExecuteWrap wrap) throws Exception{ try{ if (!compiledScriptMap.containsKey(wrap.getNodeId())){ String errorMsg = StrUtil.format("script for node[{}] is not loaded", wrap.getNodeId()); @@ -91,8 +91,7 @@ public class GroovyScriptExecutor implements ScriptExecutor { return compiledScript.eval(bindings); }catch (Exception e){ log.error(e.getMessage(), e); - String errorMsg = StrUtil.format("script execute error for node[{}]", wrap.getNodeId()); - throw new ScriptExecuteException(errorMsg); + throw e; } } diff --git a/liteflow-script-plugin/liteflow-script-javascript/src/main/java/com/yomahub/liteflow/script/javascript/JavaScriptExecutor.java b/liteflow-script-plugin/liteflow-script-javascript/src/main/java/com/yomahub/liteflow/script/javascript/JavaScriptExecutor.java index 13bc2dc7d..771bdf43f 100644 --- a/liteflow-script-plugin/liteflow-script-javascript/src/main/java/com/yomahub/liteflow/script/javascript/JavaScriptExecutor.java +++ b/liteflow-script-plugin/liteflow-script-javascript/src/main/java/com/yomahub/liteflow/script/javascript/JavaScriptExecutor.java @@ -51,7 +51,7 @@ public class JavaScriptExecutor implements ScriptExecutor { } @Override - public Object execute(ScriptExecuteWrap wrap) { + public Object execute(ScriptExecuteWrap wrap) throws Exception{ try{ if (!compiledScriptMap.containsKey(wrap.getNodeId())){ String errorMsg = StrUtil.format("script for node[{}] is not loaded", wrap.getNodeId()); @@ -92,8 +92,7 @@ public class JavaScriptExecutor implements ScriptExecutor { return compiledScript.eval(bindings); }catch (Exception e){ log.error(e.getMessage(), e); - String errorMsg = StrUtil.format("script execute error for node[{}]", wrap.getNodeId()); - throw new ScriptExecuteException(errorMsg); + throw e; } }