From c45ce58884c59ddf8a6051ba370215e6f62adeb8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 28 七月 2023 10:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/utils/websocket/util/WebSocketUtils.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/websocket/util/WebSocketUtils.java b/ard-work/src/main/java/com/ruoyi/utils/websocket/util/WebSocketUtils.java
similarity index 77%
rename from ruoyi-common/src/main/java/com/ruoyi/common/websocket/util/WebSocketUtils.java
rename to ard-work/src/main/java/com/ruoyi/utils/websocket/util/WebSocketUtils.java
index 91a7730..5d35ed4 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/websocket/util/WebSocketUtils.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/websocket/util/WebSocketUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.common.websocket.util;
+package com.ruoyi.utils.websocket.util;
 
 import com.alibaba.fastjson2.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -6,8 +6,10 @@
 import javax.websocket.RemoteEndpoint;
 import javax.websocket.Session;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.*;
 
 /**
  * @ClassName WebSocketUtils
@@ -63,6 +65,22 @@
             }
         }
     }
+    public static void sendMessage(Session session, List message) {
+        if (session == null) {
+            return;
+        }
+        final RemoteEndpoint.Basic basic = session.getBasicRemote();
+        if (basic == null) {
+            return;
+        }
+        synchronized(session) {
+            try {
+                session.getBasicRemote().sendText( String.join(", ", message));
+            } catch (IOException e) {
+                log.error("sendMessage IOException ",e);
+            }
+        }
+    }
     /**
      * 鎺ㄩ�佹秷鎭埌鍏朵粬瀹㈡埛绔�
      * @param message

--
Gitblit v1.9.3