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

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

@@ -97,8 +97,8 @@ public class WhiteboardHandler {
 
             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().getName(), client.getRemoteAddress());
+            log.info("dispatchMessage SYNC_MESSAGE roomId={}, sid={}, ns={}, eventName={}, addr={}", roomId, client.getSessionId(),
+                    client.getNamespace().getName(), eventName, client.getRemoteAddress());
         } catch (Exception e) {
             log.error("PubSubType.DISPATCH roomId={}, sid={}", roomId, client.getSessionId(), e);
         }
@@ -248,8 +248,8 @@ public class WhiteboardHandler {
      */
     @OnEvent(value = EVENT_SERVER_BROADCAST)
     public void serverBroadcast(SocketIOClient client, String roomId, byte[] encryptedData, byte[] iv) {
-        log.info("serverBroadcast SYNC_MESSAGE roomId={}, ns={}, sessionId={}, addr={}", roomId, client.getNamespace().getName(),
-                client.getSessionId(), client.getRemoteAddress());
+        log.info("serverBroadcast SYNC_MESSAGE roomId={}, sessionId={}, ns={}, addr={}", roomId, client.getSessionId(),
+                client.getNamespace().getName(), client.getRemoteAddress());
 
         BroadcastOperations roomOperations = namespace.getRoomOperations(roomId);
         // 发送房间广播消息
@@ -268,8 +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 SYNC_MESSAGE roomId={}, ns={}, sessionId={}, addr={}", roomId, client.getNamespace().getName(),
-                client.getSessionId(), client.getRemoteAddress());
+        log.info("serverVolatileBroadcast SYNC_MESSAGE roomId={}, sessionId={}, ns={}, addr={}", roomId, client.getSessionId(),
+                client.getNamespace().getName(), client.getRemoteAddress());
 
         BroadcastOperations roomOperations = namespace.getRoomOperations(roomId);
         // 发送房间广播消息