Merge remote-tracking branch 'origin/master_saas' into master_saas

mec-websocket/src/main/java/com/ym/mec/web/handler/WhiteboardHandler.java

@@ -96,6 +96,9 @@ public class WhiteboardHandler {
             packet.setData(data);
 
             pubSubStore.publish(PubSubType.DISPATCH, new DispatchMessage(roomId, packet, namespace));
+
+            log.info("dispatchMessage SYNC_MESSAGE roomId={}, sid={}, eventName={}, ns={}, addr={}", roomId, client.getSessionId(), eventName,
+                    client.getNamespace(), client.getRemoteAddress());
         } catch (Exception e) {
             log.error("PubSubType.DISPATCH roomId={}, sid={}", roomId, client.getSessionId(), e);
         }
@@ -245,7 +248,8 @@ public class WhiteboardHandler {
      */
     @OnEvent(value = EVENT_SERVER_BROADCAST)
     public void serverBroadcast(SocketIOClient client, String roomId, byte[] encryptedData, byte[] iv) {
-        //log.info("serverBroadcast roomId={}", roomId);
+        log.info("serverBroadcast SYNC_MESSAGE roomId={}, ns={}, sessionId={}, addr={}", roomId, client.getNamespace(),
+                client.getSessionId(), client.getRemoteAddress());
 
         BroadcastOperations roomOperations = namespace.getRoomOperations(roomId);
         // 发送房间广播消息
@@ -264,7 +268,8 @@ public class WhiteboardHandler {
      */
     @OnEvent(value = EVENT_SERVER_VOLATILE_BROADCAST)
     public void serverVolatileBroadcast(SocketIOClient client, String roomId, byte[] encryptedData, byte[] iv) {
-        //log.info("serverVolatileBroadcast roomId={}", roomId);
+        log.info("serverVolatileBroadcast SYNC_MESSAGE roomId={}, ns={}, sessionId={}, addr={}", roomId, client.getNamespace(),
+                client.getSessionId(), client.getRemoteAddress());
 
         BroadcastOperations roomOperations = namespace.getRoomOperations(roomId);
         // 发送房间广播消息

mec-websocket/src/main/java/com/ym/mec/web/support/socket/ServerRunner.java

@@ -40,7 +40,7 @@ public class ServerRunner implements CommandLineRunner {
             // 分布式服务空间请求分发
             Namespace namespace = namespacesHub.get(message.getNamespace());
             if (Objects.nonNull(namespace)) {
-                log.info("PubSubType.DISPATCH room={}, package={}", message.getRoom(), message.getPacket());
+                log.info("PubSubType.DISPATCH SYNC_MESSAGE room={}, ns={}, nodeId={}", message.getRoom(), message.getNamespace(), message.getNodeId());
                 namespace.dispatch(message.getRoom(), message.getPacket());
             }