From 6fdacca914ef38e6cc91292ef07c5af32bd92991 Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期二, 03 十二月 2024 11:12:40 +0800
Subject: [PATCH] 1. BgTask增加onStatusChange参数，通过外界传递如何发送状态改变的消息 2. BackgroundTaskCtrl.kt 创建了BgTask对象并传递了onStatusChange参数 3. WebSocketMessageUtil 类名修改为 WebSocketMessageDecoder 4. SendWebSocketMessageUtil 类名修改为 WebSocketSendMessageUtil
---
src/main/kotlin/cn/flightfeather/supervision/socket/WebSocketMessageDecoder.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/socket/WebSocketMessageUtil.java b/src/main/kotlin/cn/flightfeather/supervision/socket/WebSocketMessageDecoder.java
similarity index 89%
rename from src/main/kotlin/cn/flightfeather/supervision/socket/WebSocketMessageUtil.java
rename to src/main/kotlin/cn/flightfeather/supervision/socket/WebSocketMessageDecoder.java
index 1a09218..7603ebc 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/socket/WebSocketMessageUtil.java
+++ b/src/main/kotlin/cn/flightfeather/supervision/socket/WebSocketMessageDecoder.java
@@ -3,9 +3,7 @@
import cn.flightfeather.supervision.common.utils.JsonUtil;
import org.springframework.util.StringUtils;
-import java.util.*;
-
-public class WebSocketMessageUtil {
+public class WebSocketMessageDecoder {
private static final String START_STR = "##";
private static final String SPLIT_STR = "&&";
private static final String END_STR = "%%";
@@ -34,7 +32,8 @@
*/
public static WebSocketMessage decodeMessage(String message) {
if (!verificationMessage(message)) {
- return null;
+ // 鍙戞尌涓�涓笉浼氳澶勭悊鐨勬秷鎭�
+ return new WebSocketMessage(-1, "");
}
WebSocketMessage webSocketMessage = new WebSocketMessage();
String[] parts = message.substring(START_STR.length(), message.length() - END_STR.length()).split(SPLIT_STR);
@@ -47,6 +46,6 @@
* @return 鐢熸垚鐨勬秷鎭瓧绗︿覆
*/
public static String encodeMessage(WebSocketMessage webSocketMessage) {
- return START_STR + webSocketMessage.getType() + SPLIT_STR + JsonUtil.INSTANCE.getGson().toJson(webSocketMessage.getContent()) + END_STR;
+ return START_STR + webSocketMessage.getType() + SPLIT_STR + JsonUtil.INSTANCE.getGson().toJson(webSocketMessage.getContent(), webSocketMessage.getContent().getClass()) + END_STR;
}
}
--
Gitblit v1.9.3