修复将二进制消息作为文本消息发送的问题

JDK-Plus · Jul 23, 2022 · 2feebeb · 2feebeb
1 parent 3d160c5
commit 2feebeb
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/README-CN.md b/README-CN.md
@@ -18,7 +18,7 @@
 <dependency>
     <groupId>plus.jdk</groupId>
     <artifactId>spring-boot-starter-websocket</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
 </dependency>
 ```
 ## 配置

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 <dependency>
     <groupId>plus.jdk</groupId>
     <artifactId>spring-boot-starter-websocket</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>plus.jdk</groupId>
     <artifactId>spring-boot-starter-websocket</artifactId>
-    <version>1.0.4</version>
+    <version>1.0.5</version>
 
     <name>spring-boot-starter-websocket</name>
     <description>A simple websocket component base on netty </description>

diff --git 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<IWsSession<?>> 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
@@ -89,6 +89,10 @@ public class WebsocketProperties {
      */
     private Integer broadcastMonitorPort = 10300;
 
+    /**
+     * 是否将接收到的udp广播内容打印到日志中
+     */
+    private Boolean printBroadcastMessage = true;
 
     /**
      * 认证器