替换fastjson为fastjson2，升级rsocket版本到1.1.4,netty版本到4.1.81.Final (#7)

leshalv · web-flow · commit de1092ed850b · 2024-02-06T09:59:04.000+08:00
diff --git a/app-stream-api/pom.xml b/app-stream-api/pom.xml
@@ -27,8 +27,8 @@
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/callback/JsonMarshaller.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/callback/JsonMarshaller.java
@@ -1,6 +1,6 @@
 package com.dingtalk.open.app.api.callback;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.dingtalk.open.app.api.Preconditions;
 
 import java.lang.reflect.Type;
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/chatbot/BotReplier.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/chatbot/BotReplier.java
@@ -1,7 +1,7 @@
 package com.dingtalk.open.app.api.chatbot;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONWriter;
 import com.dingtalk.open.app.api.open.http.HttpConstants;
 import com.dingtalk.open.app.api.util.IoUtils;
 
@@ -14,6 +14,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.alibaba.fastjson2.JSONWriter.Feature.WriteEnumUsingToString;
+
 public class BotReplier {
     private final String webhook;
     private final int timeout = 60000;
@@ -41,12 +43,12 @@ public String replyText(String text, List<String> atUserIds) throws IOException
         Map<String, Object> request = new HashMap<>();
         request.put("msgtype", "text");
         request.put("text", textContent);
-        if (atUserIds != null && atUserIds.size() > 0) {
+        if (atUserIds != null && !atUserIds.isEmpty()) {
             Map<String, Object> atContent = new HashMap<>();
             atContent.put("atUserIds", Collections.singletonList(""));
             request.put("at", atContent);
         }
-        connection.getOutputStream().write(JSON.toJSONBytes(request, SerializerFeature.WriteEnumUsingToString));
+        connection.getOutputStream().write(JSON.toJSONBytes(request, WriteEnumUsingToString));
         connection.getOutputStream().flush();
         if (connection.getResponseCode() == HttpConstants.STATUS_OK) {
             try {
@@ -74,12 +76,12 @@ public String replyMarkdown(String title, String text, List<String> atUserIds) t
         Map<String, Object> request = new HashMap<>();
         request.put("msgtype", "markdown");
         request.put("markdown", markdownContent);
-        if (atUserIds != null && atUserIds.size() > 0) {
+        if (atUserIds != null && !atUserIds.isEmpty()) {
             Map<String, Object> atContent = new HashMap<>();
             atContent.put("atUserIds", Collections.singletonList(""));
             request.put("at", atContent);
         }
-        connection.getOutputStream().write(JSON.toJSONBytes(request, SerializerFeature.WriteEnumUsingToString));
+        connection.getOutputStream().write(JSON.toJSONBytes(request, WriteEnumUsingToString));
         connection.getOutputStream().flush();
         if (connection.getResponseCode() == HttpConstants.STATUS_OK) {
             try {
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/graph/GraphAPIMessage.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/graph/GraphAPIMessage.java
@@ -1,6 +1,7 @@
 package com.dingtalk.open.app.api.graph;
 
-import com.alibaba.fastjson.annotation.JSONField;
+
+import com.alibaba.fastjson2.annotation.JSONField;
 
 import java.util.Map;
 
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/graph/RequestLine.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/graph/RequestLine.java
@@ -1,6 +1,7 @@
 package com.dingtalk.open.app.api.graph;
 
-import com.alibaba.fastjson.annotation.JSONField;
+
+import com.alibaba.fastjson2.annotation.JSONField;
 
 import java.net.URI;
 
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/message/GenericOpenDingTalkEvent.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/message/GenericOpenDingTalkEvent.java
@@ -1,6 +1,7 @@
 package com.dingtalk.open.app.api.message;
 
-import com.alibaba.fastjson.JSONObject;
+
+import com.alibaba.fastjson2.JSONObject;
 
 /**
  * @author feiyin
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/open/HttpOpenApiClient.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/open/HttpOpenApiClient.java
@@ -1,7 +1,7 @@
 package com.dingtalk.open.app.api.open;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONWriter;
 import com.dingtalk.open.app.api.DingTalkAppError;
 import com.dingtalk.open.app.api.open.http.HttpConstants;
 import com.dingtalk.open.app.api.util.IoUtils;
@@ -46,7 +46,7 @@ public OpenConnectionResponse openConnection(OpenConnectionRequest request) thro
         connection.setDoInput(true);
         connection.setDoOutput(true);
         connection.connect();
-        connection.getOutputStream().write(JSON.toJSONBytes(request, SerializerFeature.WriteEnumUsingToString));
+        connection.getOutputStream().write(JSON.toJSONBytes(request, JSONWriter.Feature.WriteEnumUsingToString));
         connection.getOutputStream().flush();
         if (connection.getResponseCode() == HttpConstants.STATUS_OK) {
             byte[] content = IoUtils.readAll(connection.getInputStream());
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/protocol/EventCommandExecutor.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/protocol/EventCommandExecutor.java
@@ -1,6 +1,6 @@
 package com.dingtalk.open.app.api.protocol;
 
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
 import com.dingtalk.open.app.api.DingTalkAppError;
 import com.dingtalk.open.app.api.GenericEventListener;
 import com.dingtalk.open.app.api.Preconditions;
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/protocol/JsonMessageConverter.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/protocol/JsonMessageConverter.java
@@ -1,6 +1,6 @@
 package com.dingtalk.open.app.api.protocol;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 
 import java.lang.reflect.Type;
 
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/protocol/SystemCommandExecutor.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/protocol/SystemCommandExecutor.java
@@ -1,6 +1,6 @@
 package com.dingtalk.open.app.api.protocol;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.dingtalk.open.app.stream.network.api.Context;
 import com.dingtalk.open.app.stream.network.api.logger.InternalLogger;
 import com.dingtalk.open.app.stream.network.api.logger.InternalLoggerFactory;
diff --git a/app-stream-api/src/main/java/com/dingtalk/open/app/api/util/GraphUtils.java b/app-stream-api/src/main/java/com/dingtalk/open/app/api/util/GraphUtils.java
@@ -1,6 +1,6 @@
 package com.dingtalk.open.app.api.util;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.dingtalk.open.app.api.graph.GraphAPIResponse;
 import com.dingtalk.open.app.api.graph.GraphHeaders;
 import com.dingtalk.open.app.api.graph.MediaType;
diff --git a/app-stream-client/pom.xml b/app-stream-client/pom.xml
@@ -49,8 +49,8 @@
             <artifactId>netty-codec-http</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/app-stream-network/app-stream-network-rsocket/pom.xml b/app-stream-network/app-stream-network-rsocket/pom.xml
@@ -24,8 +24,8 @@
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/app-stream-network/app-stream-network-rsocket/src/main/java/com/dingtalk/open/app/stream/network/rsocket/RSocketUnaryContext.java b/app-stream-network/app-stream-network-rsocket/src/main/java/com/dingtalk/open/app/stream/network/rsocket/RSocketUnaryContext.java
@@ -1,6 +1,6 @@
 package com.dingtalk.open.app.stream.network.rsocket;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.dingtalk.open.app.stream.network.api.Context;
 import com.dingtalk.open.app.stream.network.api.ServiceException;
 import com.dingtalk.open.app.stream.network.api.logger.InternalLogger;
diff --git a/app-stream-network/app-stream-network-rsocket/src/main/java/com/dingtalk/open/app/stream/network/rsocket/ReceiverSocket.java b/app-stream-network/app-stream-network-rsocket/src/main/java/com/dingtalk/open/app/stream/network/rsocket/ReceiverSocket.java
@@ -1,6 +1,6 @@
 package com.dingtalk.open.app.stream.network.rsocket;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.dingtalk.open.app.stream.network.api.ClientConnectionListener;
 import com.dingtalk.open.app.stream.network.api.exception.DingTalkNetworkException;
 import com.dingtalk.open.app.stream.network.api.exception.NetWorkError;
diff --git a/app-stream-network/app-stream-network-rsocket/src/main/java/com/dingtalk/open/app/stream/network/rsocket/RsocketTransportConnector.java b/app-stream-network/app-stream-network-rsocket/src/main/java/com/dingtalk/open/app/stream/network/rsocket/RsocketTransportConnector.java
@@ -1,6 +1,6 @@
 package com.dingtalk.open.app.stream.network.rsocket;
 
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
 import com.dingtalk.open.app.stream.network.api.*;
 import io.rsocket.Payload;
 import io.rsocket.RSocket;
diff --git a/app-stream-network/app-stream-network-ws/pom.xml b/app-stream-network/app-stream-network-ws/pom.xml
@@ -23,8 +23,8 @@
             <version>${parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
diff --git a/app-stream-network/app-stream-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/ProtocolFrameHandler.java b/app-stream-network/app-stream-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/ProtocolFrameHandler.java
@@ -1,8 +1,6 @@
 package com.dingtalk.open.app.stream.network.ws;
 
-import com.alibaba.fastjson.JSON;
-import com.dingtalk.open.app.stream.network.api.logger.InternalLogger;
-import com.dingtalk.open.app.stream.network.api.logger.InternalLoggerFactory;
+import com.alibaba.fastjson2.JSON;
 import com.dingtalk.open.app.stream.network.api.utils.NettyByteBufUtils;
 import com.dingtalk.open.app.stream.protocol.ProtocolRequest;
 import com.dingtalk.open.app.stream.protocol.ProtocolResponse;
diff --git a/app-stream-network/app-stream-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/WebSocketContext.java b/app-stream-network/app-stream-network-ws/src/main/java/com/dingtalk/open/app/stream/network/ws/WebSocketContext.java
@@ -1,7 +1,7 @@
 package com.dingtalk.open.app.stream.network.ws;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.serializer.SerializerFeature;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONWriter;
 import com.dingtalk.open.app.stream.network.api.Context;
 import com.dingtalk.open.app.stream.network.api.ServiceException;
 import com.dingtalk.open.app.stream.network.api.logger.InternalLogger;
@@ -29,7 +29,7 @@ public WebSocketContext(String connectionId, ProtocolRequestFacade request, Chan
     @Override
     public void replay(Object payload) {
         ProtocolResponse response = ProtocolResponse.new200Response(request);
-        response.setData(JSON.toJSONString(payload, SerializerFeature.WriteMapNullValue));
+        response.setData(JSON.toJSONString(payload, JSONWriter.Feature.WriteMapNullValue));
         context.writeAndFlush(response).addListener(future -> {
             if (!future.isSuccess()) {
                 LOGGER.error("[DingTalk] websocket connection reply response failed, connectionId={}, messageId={}", connectionId, request.getMessageId(), future.cause());
diff --git a/dingtalk-stream/pom.xml b/dingtalk-stream/pom.xml
@@ -49,8 +49,8 @@
             <artifactId>netty-codec-http</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
@@ -49,40 +49,41 @@
                 <version>4.13.2</version>
                 <scope>test</scope>
             </dependency>
+            <!-- fastjson2 -->
             <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>2.0.0</version>
+                <groupId>com.alibaba.fastjson2</groupId>
+                <artifactId>fastjson2</artifactId>
+                <version>2.0.46</version>
             </dependency>
             <dependency>
                 <groupId>io.rsocket</groupId>
                 <artifactId>rsocket-transport-netty</artifactId>
-                <version>1.1.3</version>
+                <version>1.1.4</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-transport</artifactId>
-                <version>4.1.81.Final</version>
+                <version>4.1.106.Final</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-codec-http</artifactId>
-                <version>4.1.81.Final</version>
+                <version>4.1.106.Final</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-handler-proxy</artifactId>
-                <version>4.1.81.Final</version>
+                <version>4.1.106.Final</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-common</artifactId>
-                <version>4.1.81.Final</version>
+                <version>4.1.106.Final</version>
             </dependency>
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-buffer</artifactId>
-                <version>4.1.81.Final</version>
+                <version>4.1.106.Final</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
