diff --git a/agentcenter-sdk/pom.xml b/agentcenter-sdk/pom.xml
index 34d0fe3..3f5f750 100644
--- a/agentcenter-sdk/pom.xml
+++ b/agentcenter-sdk/pom.xml
@@ -16,7 +16,7 @@
1.16.18
5.5.4
- 2.0.23
+ 1.2.74
1.8
UTF-8
@@ -53,8 +53,8 @@
- com.alibaba.fastjson2
- fastjson2
+ com.alibaba
+ fastjson
${fastjson.version}
@@ -70,8 +70,8 @@
hutool-all
- com.alibaba.fastjson2
- fastjson2
+ com.alibaba
+ fastjson
javax.servlet
diff --git a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSApiResult.java b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSApiResult.java
index 1748f53..6bc5e6c 100644
--- a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSApiResult.java
+++ b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSApiResult.java
@@ -1,7 +1,7 @@
package com.nsgk.agentcentersdk.api;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.nsgk.agentcentersdk.err.NSErrno;
import lombok.Data;
@@ -52,6 +52,11 @@ public final class NSApiResult
this(suc ? NS_RESULT_SUCCESS : NS_RESULT_ERROR, msg, data, timestamp, errno);
}
+ public boolean IsSuccess()
+ {
+ return NS_RESULT_SUCCESS == code;
+ }
+
static NSApiResult Success(String msg, Object data)
{
return new NSApiResult(NS_RESULT_SUCCESS, msg, data);
diff --git a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDK.java b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDK.java
index 72069ac..b46e392 100644
--- a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDK.java
+++ b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDK.java
@@ -17,7 +17,7 @@ public final class NSSDK
private static final ThreadLocal _privateKey = new ThreadLocal<>();
private static final ThreadLocal _serverInit = new ThreadLocal<>();
- public static boolean InitClient(String host, short port, String identifier, String publicKey, int timeout)
+ public static boolean InitClient(String host, Short port, String identifier, String publicKey, int timeout)
{
if(NSConv.FALSE(_clientInit.get()))
return false;
diff --git a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKClient.java b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKClient.java
index 4b5b714..ac28d8d 100644
--- a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKClient.java
+++ b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKClient.java
@@ -1,8 +1,8 @@
package com.nsgk.agentcentersdk.api;
import cn.hutool.core.util.URLUtil;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.nsgk.agentcentersdk.core.NSConstants;
import com.nsgk.agentcentersdk.core.NSProtocol;
import com.nsgk.agentcentersdk.core.NSReportObject;
@@ -35,12 +35,12 @@ import lombok.experimental.Accessors;
public final class NSSDKClient
{
private final String host;
- private final short port;
+ private final Short port;
private final String identifier;
private final String publicKey;
private int timeout;
- NSSDKClient(String host, short port, String identifier, String publicKey, int timeout)
+ NSSDKClient(String host, Short port, String identifier, String publicKey, int timeout)
{
this.host = host;
this.port = port;
@@ -74,7 +74,7 @@ public final class NSSDKClient
private String BuildUrl(String url)
{
- return URLUtil.completeUrl(host + ":" + port, url);
+ return URLUtil.completeUrl(host + (null != port ? ":" + port : ""), url);
}
private void WriteDataObject(NSNetworkRequest request, NSReportObject object)
diff --git a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKServer.java b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKServer.java
index 0771754..1cc0696 100644
--- a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKServer.java
+++ b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/api/NSSDKServer.java
@@ -1,6 +1,6 @@
package com.nsgk.agentcentersdk.api;
-import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson.JSON;
import com.nsgk.agentcentersdk.core.NSConstants;
import com.nsgk.agentcentersdk.core.NSProtocol;
import com.nsgk.agentcentersdk.core.NSReportObject;
diff --git a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/core/NSReportObject.java b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/core/NSReportObject.java
index 1f20ade..96367d3 100644
--- a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/core/NSReportObject.java
+++ b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/core/NSReportObject.java
@@ -1,7 +1,7 @@
package com.nsgk.agentcentersdk.core;
import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson.JSON;
import com.nsgk.agentcentersdk.err.NSErrGlobal;
import com.nsgk.agentcentersdk.err.NSErrno;
import com.nsgk.agentcentersdk.utility.NSSignTool;
diff --git a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/entity/NSEntity.java b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/entity/NSEntity.java
index 1cf0e71..690911d 100644
--- a/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/entity/NSEntity.java
+++ b/agentcenter-sdk/src/main/java/com/nsgk/agentcentersdk/entity/NSEntity.java
@@ -2,7 +2,7 @@ package com.nsgk.agentcentersdk.entity;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
-import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson.JSON;
import com.nsgk.agentcentersdk.utility.NSArr;
import com.nsgk.agentcentersdk.utility.NSReflect;
import com.nsgk.agentcentersdk.utility.NSStr;
@@ -131,6 +131,20 @@ public class NSEntity implements Serializable
return false;
}
+ @SuppressWarnings("unchecked")
+ public T Add(String name, Object val)
+ {
+ Set(name, val);
+ return (T)this;
+ }
+
+ @SuppressWarnings("unchecked")
+ public T Add_s(String name, Object val)
+ {
+ Set_s(name, val);
+ return (T)this;
+ }
+
// json反序列化
@SuppressWarnings("unchecked")
public boolean FromJson(String json)
diff --git a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/listener/ContractionListener.java b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/listener/ContractionListener.java
index 3f0b781..b6e4642 100644
--- a/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/listener/ContractionListener.java
+++ b/ruoyi-agentcenter/src/main/java/com/ruoyi/agentcenter/listener/ContractionListener.java
@@ -65,8 +65,9 @@ public class ContractionListener
.setOrderAt(new Date())
.setAgentStatus(TAgentTask.AGENT_STATUS_READY)
.setOrderStatus("2")
- .normalized();
+ .normalized()
;
+ contraction.setCreateBy("admin");
return contraction;
}