From 6af775d2770cc954d8780881c8014218fb165c48 Mon Sep 17 00:00:00 2001
From: xxjin <313383180@qq.com>
Date: Fri, 9 May 2025 15:10:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E5=88=B0fastjson2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 45 ++-----------------
tinyflow-java-core/pom.xml | 14 +++++-
.../java/dev/tinyflow/core/node/HttpNode.java | 4 +-
.../tinyflow/core/parser/BaseNodeParser.java | 4 +-
.../dev/tinyflow/core/parser/ChainParser.java | 6 +--
.../dev/tinyflow/core/parser/NodeParser.java | 2 +-
.../core/parser/impl/CodeNodeParser.java | 2 +-
.../core/parser/impl/EndNodeParser.java | 2 +-
.../core/parser/impl/HttpNodeParser.java | 2 +-
.../core/parser/impl/KnowledgeNodeParser.java | 2 +-
.../core/parser/impl/LlmNodeParser.java | 2 +-
.../core/parser/impl/LoopNodeParser.java | 6 +--
.../parser/impl/SearchEngineNodeParser.java | 2 +-
.../core/parser/impl/StartNodeParser.java | 2 +-
.../core/parser/impl/TemplateNodeParser.java | 2 +-
15 files changed, 34 insertions(+), 63 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7566cdc..eba8344 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
dev.tinyflow
tinyflow-java
- 1.0.4
+ 1.0.5
pom
https://tinyflow.dev
@@ -58,7 +58,6 @@
agents-flex-bom
1.0.7
-
com.jfinal
@@ -95,46 +94,8 @@
-
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- 2.10.4
-
- Tinyflow
- Tinyflow
- private
- false
- true
- true
- -Xdoclint:none
- true
- 8
-
-
-
- attach-javadocs
-
- jar
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.6
-
-
- verify
-
- sign
-
-
-
-
+
+
org.sonatype.central
diff --git a/tinyflow-java-core/pom.xml b/tinyflow-java-core/pom.xml
index 256d4db..0f9e2b6 100644
--- a/tinyflow-java-core/pom.xml
+++ b/tinyflow-java-core/pom.xml
@@ -6,7 +6,7 @@
dev.tinyflow
tinyflow-java
- 1.0.4
+ 1.0.5
tinyflow-java-core
@@ -22,8 +22,18 @@
com.agentsflex
agents-flex-bom
+
+
+ com.alibaba
+ fastjson
+
+
+
+
+ com.alibaba.fastjson2
+ fastjson2
+ 2.0.57
-
com.jfinal
enjoy
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/node/HttpNode.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/node/HttpNode.java
index 4401fe5..d2d6f58 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/node/HttpNode.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/node/HttpNode.java
@@ -22,8 +22,8 @@ import com.agentsflex.core.chain.node.BaseNode;
import com.agentsflex.core.llm.client.OkHttpClientUtil;
import com.agentsflex.core.prompt.template.TextPromptTemplate;
import com.agentsflex.core.util.StringUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
import okhttp3.*;
import java.io.IOException;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/BaseNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/BaseNodeParser.java
index 5356b47..53e1025 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/BaseNodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/BaseNodeParser.java
@@ -20,8 +20,8 @@ import com.agentsflex.core.chain.DataType;
import com.agentsflex.core.chain.Parameter;
import com.agentsflex.core.chain.RefType;
import com.agentsflex.core.chain.node.BaseNode;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/ChainParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/ChainParser.java
index 470c4f3..624cd48 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/ChainParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/ChainParser.java
@@ -21,9 +21,9 @@ import com.agentsflex.core.chain.ChainNode;
import com.agentsflex.core.chain.JavascriptStringCondition;
import com.agentsflex.core.util.CollectionUtil;
import com.agentsflex.core.util.StringUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
import dev.tinyflow.core.parser.impl.*;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/NodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/NodeParser.java
index 0a7d807..0a46376 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/NodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/NodeParser.java
@@ -16,7 +16,7 @@
package dev.tinyflow.core.parser;
import com.agentsflex.core.chain.ChainNode;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
public interface NodeParser {
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/CodeNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/CodeNodeParser.java
index 51ab05c..2a59e03 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/CodeNodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/CodeNodeParser.java
@@ -20,7 +20,7 @@ import com.agentsflex.chain.node.JsExecNode;
import com.agentsflex.chain.node.QLExpressExecNode;
import com.agentsflex.core.chain.ChainNode;
import com.agentsflex.core.chain.node.CodeNode;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
import dev.tinyflow.core.parser.BaseNodeParser;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/EndNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/EndNodeParser.java
index 9a079ef..13d9c63 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/EndNodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/EndNodeParser.java
@@ -17,7 +17,7 @@ package dev.tinyflow.core.parser.impl;
import com.agentsflex.core.chain.ChainNode;
import com.agentsflex.core.chain.node.EndNode;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
import dev.tinyflow.core.parser.BaseNodeParser;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/HttpNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/HttpNodeParser.java
index 23b75f3..1795bf5 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/HttpNodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/HttpNodeParser.java
@@ -17,7 +17,7 @@ package dev.tinyflow.core.parser.impl;
import com.agentsflex.core.chain.ChainNode;
import com.agentsflex.core.chain.Parameter;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
import dev.tinyflow.core.node.HttpNode;
import dev.tinyflow.core.parser.BaseNodeParser;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/KnowledgeNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/KnowledgeNodeParser.java
index f464146..00a225a 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/KnowledgeNodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/KnowledgeNodeParser.java
@@ -16,7 +16,7 @@
package dev.tinyflow.core.parser.impl;
import com.agentsflex.core.chain.ChainNode;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
import dev.tinyflow.core.node.KnowledgeNode;
import dev.tinyflow.core.parser.BaseNodeParser;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LlmNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LlmNodeParser.java
index 2bc011f..164aa2b 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LlmNodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LlmNodeParser.java
@@ -19,7 +19,7 @@ import com.agentsflex.core.chain.ChainNode;
import com.agentsflex.core.chain.node.LlmNode;
import com.agentsflex.core.llm.ChatOptions;
import com.agentsflex.core.llm.Llm;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
import dev.tinyflow.core.parser.BaseNodeParser;
import dev.tinyflow.core.provider.LlmProvider;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LoopNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LoopNodeParser.java
index 421dbd1..04fcff7 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LoopNodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/LoopNodeParser.java
@@ -18,9 +18,9 @@ package dev.tinyflow.core.parser.impl;
import com.agentsflex.core.chain.Chain;
import com.agentsflex.core.chain.ChainNode;
import com.agentsflex.core.chain.Parameter;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
import dev.tinyflow.core.node.LoopNode;
import dev.tinyflow.core.parser.BaseNodeParser;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/SearchEngineNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/SearchEngineNodeParser.java
index de6dd62..4bbaa7a 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/SearchEngineNodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/SearchEngineNodeParser.java
@@ -16,7 +16,7 @@
package dev.tinyflow.core.parser.impl;
import com.agentsflex.core.chain.ChainNode;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
import dev.tinyflow.core.node.SearchEngineNode;
import dev.tinyflow.core.parser.BaseNodeParser;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/StartNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/StartNodeParser.java
index 32b7132..7c7a8d7 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/StartNodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/StartNodeParser.java
@@ -17,7 +17,7 @@ package dev.tinyflow.core.parser.impl;
import com.agentsflex.core.chain.ChainNode;
import com.agentsflex.core.chain.node.StartNode;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
import dev.tinyflow.core.parser.BaseNodeParser;
diff --git a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/TemplateNodeParser.java b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/TemplateNodeParser.java
index 44eb9db..13b92d3 100644
--- a/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/TemplateNodeParser.java
+++ b/tinyflow-java-core/src/main/java/dev/tinyflow/core/parser/impl/TemplateNodeParser.java
@@ -16,7 +16,7 @@
package dev.tinyflow.core.parser.impl;
import com.agentsflex.core.chain.ChainNode;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import dev.tinyflow.core.Tinyflow;
import dev.tinyflow.core.node.TemplateNode;
import dev.tinyflow.core.parser.BaseNodeParser;
--
Gitee