From 2feebeb028a0eaae672db7aa8c3f1999df0fc73c Mon Sep 17 00:00:00 2001 From: "[moon]" <[moon@jdk.plus]> Date: Sat, 23 Jul 2022 12:39:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=86=E4=BA=8C=E8=BF=9B?= =?UTF-8?q?=E5=88=B6=E6=B6=88=E6=81=AF=E4=BD=9C=E4=B8=BA=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8F=91=E9=80=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README-CN.md | 2 +- README.md | 2 +- pom.xml | 2 +- .../jdk/websocket/global/UserChannelConnectSynchronizer.java | 4 ++++ .../plus/jdk/websocket/properties/WebsocketProperties.java | 4 ++++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README-CN.md b/README-CN.md index 9d87b09..86e2226 100644 --- a/README-CN.md +++ b/README-CN.md @@ -18,7 +18,7 @@ plus.jdk spring-boot-starter-websocket - 1.0.4 + 1.0.5 ``` ## 配置 diff --git a/README.md b/README.md index 7bdb2b9..05f1491 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ plus.jdk spring-boot-starter-websocket - 1.0.4 + 1.0.5 ``` diff --git a/pom.xml b/pom.xml index 4552635..e884b91 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ plus.jdk spring-boot-starter-websocket - 1.0.4 + 1.0.5 spring-boot-starter-websocket A simple websocket component base on netty diff --git a/src/main/java/plus/jdk/websocket/global/UserChannelConnectSynchronizer.java b/src/main/java/plus/jdk/websocket/global/UserChannelConnectSynchronizer.java index 4d4d2f1..f914ab4 100644 --- a/src/main/java/plus/jdk/websocket/global/UserChannelConnectSynchronizer.java +++ b/src/main/java/plus/jdk/websocket/global/UserChannelConnectSynchronizer.java @@ -63,6 +63,7 @@ protected void sendBroadcast(Object userId, String path, byte[] data, Monitor[] builder.setData(ByteString.copyFrom(data)); builder.setUid(userId == null ? "" : userId.toString()); builder.setPath(path); + builder.setType(messageType); WsMessage wsMessage = builder.build(); udpMessageBroadcaster.publish(new BroadcastMessage(wsMessage.toByteArray(), Arrays.asList(monitors))); } @@ -77,6 +78,9 @@ public void run(ApplicationArguments args) throws Exception { WsMessage wsMessage = WsMessage.parseFrom(msg.getContent()); SessionGroupManager sessionGroupManager = beanFactory.getBean(SessionGroupManager.class); ConcurrentLinkedDeque> sessions = sessionGroupManager.getSession(wsMessage.getUid(), wsMessage.getPath()); + if(properties.getPrintBroadcastMessage()) { + log.info("receive broadcast message: {}", wsMessage); + } for (IWsSession session : sessions) { if(MessageType.MESSAGE_TYPE_TEXT.equals(wsMessage.getType())) { session.sendText(new String(wsMessage.getData().toByteArray())); diff --git a/src/main/java/plus/jdk/websocket/properties/WebsocketProperties.java b/src/main/java/plus/jdk/websocket/properties/WebsocketProperties.java index 9fc262d..cbb8230 100644 --- a/src/main/java/plus/jdk/websocket/properties/WebsocketProperties.java +++ b/src/main/java/plus/jdk/websocket/properties/WebsocketProperties.java @@ -89,6 +89,10 @@ public class WebsocketProperties { */ private Integer broadcastMonitorPort = 10300; + /** + * 是否将接收到的udp广播内容打印到日志中 + */ + private Boolean printBroadcastMessage = true; /** * 认证器