From c23f48c5ec15476299edadd91fa18f908d710a4f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 18 七月 2024 08:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/websocket/WebSocketServer.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/websocket/WebSocketServer.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/websocket/WebSocketServer.java
index 33ae939..ee679e8 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/websocket/WebSocketServer.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/websocket/WebSocketServer.java
@@ -1,6 +1,5 @@
package com.ruoyi.system.websocket;
-import com.ruoyi.system.api.util.WebSocketUsers;
import java.util.concurrent.Semaphore;
import javax.websocket.OnClose;
import javax.websocket.OnError;
@@ -38,9 +37,15 @@
session.close();
} else {
WebSocketUsers.put(session.getId(), session, clientType);
- LOGGER.info("\n 建立连接 - {}", session);
+
+ if (clientType == 1) {
+ LOGGER.info("\n 用户端建立连接 - {}", session);
+ WebSocketUsers.sendMessageToUserByText(session, "用户端连接成功");
+ } else if (clientType == 2) {
+ LOGGER.info("\n 拍卖师端建立连接 - {}", session);
+ WebSocketUsers.sendMessageToUserByText(session, "拍卖师端连接成功");
+ }
LOGGER.info("\n 当前人数 - {}", WebSocketUsers.getUsers().size());
- WebSocketUsers.sendMessageToUserByText(session, "连接成功");
}
}
--
Gitblit v1.7.1