Websocket解析代码提交

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/websocket/handler/SocWebSocketHandler.java

@@ -126,7 +126,7 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
         // 从WebSocket会话中获取登录用户信息
         String token = WebSocketSessionHolder.updateToken(session);
         String payload = message.getPayload();
-        LogUtils.WEBSOCKET_MSG.info("接收到消息：{}", message.getPayload());
+        LogUtils.WEBSOCKET_MSG.info("token:{},接收到消息：{}", token, message.getPayload());
         if (payload.isEmpty()) {
             LogUtils.WEBSOCKET_MSG.error("消息内容为空,token:{}", token);
             return;
@@ -148,7 +148,7 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
             //上报消息内容
             final Object args = payloadResolve.getData();
             WebsocketExecuteReq executeReq = new WebsocketExecuteReq(payloadResolve.getRoutingKey(), args, token, websocketResult.getId(), topic, payloadResolve.getHeader(), typeEnums.getProductName(), typeEnums.getDeviceName());
-            WebsocketResult result = WebsocketResult.of(websocketResult.getTopic(), websocketResult.getId());
+            WebsocketResult result = null;
             switch (typeEnums) {
                 //系统通知
                 case SYS_NOTICE:

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/websocket/utils/WebSocketUtils.java

@@ -111,10 +111,16 @@ public class WebSocketUtils {
      * @param message 要发送的文本消息内容
      */
     public static void sendMessage(WebSocketSession session, String message) {
+        if (message == null) {
+            return;
+        }
         sendMessage(session, new TextMessage(message));
     }
 
     public static void sendMessage(WebSocketSession session, WebsocketResult message) {
+        if (message == null) {
+            return;
+        }
         sendMessage(session, new TextMessage(JacksonUtils.toJSONString(message)));
     }
 
@@ -138,6 +144,7 @@ public class WebSocketUtils {
 
     /**
      * 解析websocket topic 路径参数
+     *
      * @param url
      * @return
      */