From 9a1aab96fa27e2491cb2bb11b965279e3ef42376 Mon Sep 17 00:00:00 2001
From: "everywhere.z" <weenyc31@163.com>
Date: Sun, 22 Sep 2024 16:28:02 +0800
Subject: [PATCH] =?UTF-8?q?feature=20#IASS9Z=20=E6=96=B0=E7=9A=84java?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E6=8F=92=E4=BB=B6=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?java8~java17=E7=9A=84=E6=89=80=E6=9C=89=E8=AF=AD=E6=B3=95?=
 =?UTF-8?q?=E7=89=B9=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../liteflow/script/javax/JavaxExecutor.java        | 13 +++++--------
 pom.xml                                             |  4 ++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/liteflow-script-plugin/liteflow-script-javax/src/main/java/com/yomahub/liteflow/script/javax/JavaxExecutor.java b/liteflow-script-plugin/liteflow-script-javax/src/main/java/com/yomahub/liteflow/script/javax/JavaxExecutor.java
index f28c050d5..9b2323c73 100644
--- a/liteflow-script-plugin/liteflow-script-javax/src/main/java/com/yomahub/liteflow/script/javax/JavaxExecutor.java
+++ b/liteflow-script-plugin/liteflow-script-javax/src/main/java/com/yomahub/liteflow/script/javax/JavaxExecutor.java
@@ -8,7 +8,8 @@ import com.yomahub.liteflow.script.ScriptExecutor;
 import com.yomahub.liteflow.script.exception.ScriptLoadException;
 import com.yomahub.liteflow.util.CopyOnWriteHashMap;
 import org.noear.liquor.eval.CodeSpec;
-import org.noear.liquor.eval.ScriptEvaluator;
+import org.noear.liquor.eval.ParamSpec;
+import org.noear.liquor.eval.Scripts;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,12 +18,8 @@ import java.util.Map;
 public class JavaxExecutor extends ScriptExecutor {
     private final Map<String, CodeSpec> compiledScriptMap = new CopyOnWriteHashMap<>();
 
-    private ScriptEvaluator scriptEvaluator;
-
     @Override
     public ScriptExecutor init() {
-        scriptEvaluator = new ScriptEvaluator();
-        scriptEvaluator.setPrintable(true);
         return this;
     }
 
@@ -54,7 +51,7 @@ public class JavaxExecutor extends ScriptExecutor {
             throw new ScriptLoadException(errorMsg);
         }
         CodeSpec codeSpec = compiledScriptMap.get(wrap.getNodeId());
-        return scriptEvaluator.eval(codeSpec, wrap);
+        return Scripts.eval(codeSpec, wrap);
     }
 
     @Override
@@ -71,8 +68,8 @@ public class JavaxExecutor extends ScriptExecutor {
     public Object compile(String script) throws Exception {
         CodeSpec codeSpec = new CodeSpec(convertScript(script))
                 .returnType(Object.class)
-                .parameters(new String[] {"_meta"}, new Class[] {ScriptExecuteWrap.class});
-        scriptEvaluator.compile(codeSpec);
+                .parameters(new ParamSpec("_meta", ScriptExecuteWrap.class));
+        Scripts.compile(codeSpec);
         return codeSpec;
     }
 
diff --git a/pom.xml b/pom.xml
index eea9cb820..468c3a7e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,7 @@
 	</scm>
 
 	<properties>
-		<revision>2.12.3</revision>
+		<revision>2.12.4</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>8</maven.compiler.source>
@@ -77,7 +77,7 @@
 		<redisson.version>3.21.0</redisson.version>
 		<janino.version>3.1.12</janino.version>
 		<kotlin.version>1.9.23</kotlin.version>
-		<liquor.version>1.2.7-SNAPSHOT</liquor.version>
+		<liquor.version>1.3.1</liquor.version>
 	</properties>
 
 	<dependencyManagement>