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; } }