diff --git a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java
index d2f8e7a..a65fd1f 100644
--- a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java
+++ b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java
@@ -55,10 +55,11 @@ public class PlusWebSocketHandler extends AbstractWebSocketHandler {
return;
}
// 创建WebSocket消息DTO对象
- WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto();
+ /*WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto();
webSocketMessageDto.setSessionKeys(List.of(loginUser.getUserId()));
- webSocketMessageDto.setMessage(message.getPayload());
- WebSocketUtils.publishMessage(webSocketMessageDto);
+ webSocketMessageDto.setMessage(message.getPayload());*/
+ WebSocketUtils.sendMessage(loginUser.getUserId(),"pong");
+ WebSocketUtils.sendPongMessage(session);
}
/**
diff --git a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
index c7e9c95..bf6b127 100644
--- a/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
+++ b/dk-common/common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
@@ -98,15 +98,11 @@ public class WebSocketUtils {
ObjectMapper mapper = new ObjectMapper();
mapper.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE);
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
- WebSocketMessageDto broadcastMessage = new WebSocketMessageDto();
- broadcastMessage.setMessage(mapper.writeValueAsString(message));
- RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> {
- log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message);
+ String jsonString = mapper.writeValueAsString(message);
+ WebSocketSessionHolder.getSessionsAll().forEach(key -> {
+ WebSocketSession session = WebSocketSessionHolder.getSessions(key);
+ sendMessage(session, jsonString);
});
-// WebSocketSessionHolder.getSessionsAll().forEach(key -> {
-// WebSocketSession session = WebSocketSessionHolder.getSessions(key);
-// sendMessage(session, jsonString);
-// });
}catch (Exception e) {
e.printStackTrace();
}
diff --git a/dk-modules/resource/pom.xml b/dk-modules/resource/pom.xml
index c7df081..66b0498 100644
--- a/dk-modules/resource/pom.xml
+++ b/dk-modules/resource/pom.xml
@@ -92,10 +92,10 @@
common-translation
-
- org.dromara
- common-websocket
-
+
+
+
+
org.dromara
diff --git a/pom.xml b/pom.xml
index 63a9d40..699db26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
2.2.2
UTF-8
UTF-8
- 17
+ 21
3.2.11
2023.0.3
3.2.3
@@ -85,7 +85,7 @@
dev
- dev
+ wuyuan
127.0.0.1:8848
DEFAULT_GROUP
DEFAULT_GROUP