From d593782c1643086cdff8886a813544a836543805 Mon Sep 17 00:00:00 2001
From: wuyuan <15505152113@163.com>
Date: Sat, 29 Mar 2025 09:11:57 +0800
Subject: [PATCH] websocket

---
 .../websocket/handler/PlusWebSocketHandler.java      |  7 ++++---
 .../common/websocket/utils/WebSocketUtils.java       | 12 ++++--------
 dk-modules/resource/pom.xml                          |  8 ++++----
 pom.xml                                              |  4 ++--
 4 files changed, 14 insertions(+), 17 deletions(-)

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 @@
             <artifactId>common-translation</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.dromara</groupId>
-            <artifactId>common-websocket</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.dromara</groupId>-->
+<!--            <artifactId>common-websocket</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>org.dromara</groupId>
diff --git a/pom.xml b/pom.xml
index 63a9d40..699db26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
         <revision>2.2.2</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <spring-boot.version>3.2.11</spring-boot.version>
         <spring-cloud.version>2023.0.3</spring-cloud.version>
         <spring-boot-admin.version>3.2.3</spring-boot-admin.version>
@@ -85,7 +85,7 @@
             <id>dev</id>
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
-                <profiles.active>dev</profiles.active>
+                <profiles.active>wuyuan</profiles.active>
                 <nacos.server>127.0.0.1:8848</nacos.server>
                 <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                 <nacos.config.group>DEFAULT_GROUP</nacos.config.group>