|
@@ -1,4 +1,4 @@
|
|
-package com.ruoyi.framework.websocket;
|
|
|
|
|
|
+package com.ruoyi.websocket;
|
|
|
|
|
|
import java.io.IOException;
|
|
import java.io.IOException;
|
|
import java.util.Collection;
|
|
import java.util.Collection;
|
|
@@ -6,16 +6,18 @@ import java.util.Map;
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
import javax.websocket.Session;
|
|
import javax.websocket.Session;
|
|
|
|
+
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
|
/**
|
|
/**
|
|
* websocket 客户端用户集
|
|
* websocket 客户端用户集
|
|
- *
|
|
|
|
|
|
+ *
|
|
* @author ruoyi
|
|
* @author ruoyi
|
|
*/
|
|
*/
|
|
-public class WebSocketUsers
|
|
|
|
-{
|
|
|
|
|
|
+@Slf4j
|
|
|
|
+public class WebSocketUsers {
|
|
/**
|
|
/**
|
|
* WebSocketUsers 日志控制器
|
|
* WebSocketUsers 日志控制器
|
|
*/
|
|
*/
|
|
@@ -29,11 +31,10 @@ public class WebSocketUsers
|
|
/**
|
|
/**
|
|
* 存储用户
|
|
* 存储用户
|
|
*
|
|
*
|
|
- * @param key 唯一键
|
|
|
|
|
|
+ * @param key 唯一键
|
|
* @param session 用户信息
|
|
* @param session 用户信息
|
|
*/
|
|
*/
|
|
- public static void put(String key, Session session)
|
|
|
|
- {
|
|
|
|
|
|
+ public static void put(String key, Session session) {
|
|
USERS.put(key, session);
|
|
USERS.put(key, session);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -41,28 +42,21 @@ public class WebSocketUsers
|
|
* 移除用户
|
|
* 移除用户
|
|
*
|
|
*
|
|
* @param session 用户信息
|
|
* @param session 用户信息
|
|
- *
|
|
|
|
* @return 移除结果
|
|
* @return 移除结果
|
|
*/
|
|
*/
|
|
- public static boolean remove(Session session)
|
|
|
|
- {
|
|
|
|
|
|
+ public static boolean remove(Session session) {
|
|
String key = null;
|
|
String key = null;
|
|
boolean flag = USERS.containsValue(session);
|
|
boolean flag = USERS.containsValue(session);
|
|
- if (flag)
|
|
|
|
- {
|
|
|
|
|
|
+ if (flag) {
|
|
Set<Map.Entry<String, Session>> entries = USERS.entrySet();
|
|
Set<Map.Entry<String, Session>> entries = USERS.entrySet();
|
|
- for (Map.Entry<String, Session> entry : entries)
|
|
|
|
- {
|
|
|
|
|
|
+ for (Map.Entry<String, Session> entry : entries) {
|
|
Session value = entry.getValue();
|
|
Session value = entry.getValue();
|
|
- if (value.equals(session))
|
|
|
|
- {
|
|
|
|
|
|
+ if (value.equals(session)) {
|
|
key = entry.getKey();
|
|
key = entry.getKey();
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
|
|
+ } else {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
return remove(key);
|
|
return remove(key);
|
|
@@ -73,18 +67,14 @@ public class WebSocketUsers
|
|
*
|
|
*
|
|
* @param key 键
|
|
* @param key 键
|
|
*/
|
|
*/
|
|
- public static boolean remove(String key)
|
|
|
|
- {
|
|
|
|
|
|
+ public static boolean remove(String key) {
|
|
LOGGER.info("\n 正在移出用户 - {}", key);
|
|
LOGGER.info("\n 正在移出用户 - {}", key);
|
|
Session remove = USERS.remove(key);
|
|
Session remove = USERS.remove(key);
|
|
- if (remove != null)
|
|
|
|
- {
|
|
|
|
|
|
+ if (remove != null) {
|
|
boolean containsValue = USERS.containsValue(remove);
|
|
boolean containsValue = USERS.containsValue(remove);
|
|
LOGGER.info("\n 移出结果 - {}", containsValue ? "失败" : "成功");
|
|
LOGGER.info("\n 移出结果 - {}", containsValue ? "失败" : "成功");
|
|
return containsValue;
|
|
return containsValue;
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
|
|
+ } else {
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -94,8 +84,7 @@ public class WebSocketUsers
|
|
*
|
|
*
|
|
* @return 返回用户集合
|
|
* @return 返回用户集合
|
|
*/
|
|
*/
|
|
- public static Map<String, Session> getUsers()
|
|
|
|
- {
|
|
|
|
|
|
+ public static Map<String, Session> getUsers() {
|
|
return USERS;
|
|
return USERS;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -104,12 +93,11 @@ public class WebSocketUsers
|
|
*
|
|
*
|
|
* @param message 消息内容
|
|
* @param message 消息内容
|
|
*/
|
|
*/
|
|
- public static void sendMessageToUsersByText(String message)
|
|
|
|
- {
|
|
|
|
|
|
+ public static void sendMessageToUsersByText(String message) {
|
|
Collection<Session> values = USERS.values();
|
|
Collection<Session> values = USERS.values();
|
|
- for (Session value : values)
|
|
|
|
- {
|
|
|
|
|
|
+ for (Session value : values) {
|
|
sendMessageToUserByText(value, message);
|
|
sendMessageToUserByText(value, message);
|
|
|
|
+ log.info("message:{}", message);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -117,23 +105,16 @@ public class WebSocketUsers
|
|
* 发送文本消息
|
|
* 发送文本消息
|
|
*
|
|
*
|
|
* @param userName 自己的用户名
|
|
* @param userName 自己的用户名
|
|
- * @param message 消息内容
|
|
|
|
|
|
+ * @param message 消息内容
|
|
*/
|
|
*/
|
|
- public static void sendMessageToUserByText(Session session, String message)
|
|
|
|
- {
|
|
|
|
- if (session != null)
|
|
|
|
- {
|
|
|
|
- try
|
|
|
|
- {
|
|
|
|
|
|
+ public static void sendMessageToUserByText(Session session, String message) {
|
|
|
|
+ if (session != null) {
|
|
|
|
+ try {
|
|
session.getBasicRemote().sendText(message);
|
|
session.getBasicRemote().sendText(message);
|
|
- }
|
|
|
|
- catch (IOException e)
|
|
|
|
- {
|
|
|
|
|
|
+ } catch (IOException e) {
|
|
LOGGER.error("\n[发送消息异常]", e);
|
|
LOGGER.error("\n[发送消息异常]", e);
|
|
}
|
|
}
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
|
|
+ } else {
|
|
LOGGER.info("\n[你已离线]");
|
|
LOGGER.info("\n[你已离线]");
|
|
}
|
|
}
|
|
}
|
|
}
|