|
|
@@ -68,7 +68,7 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
|
|
|
}
|
|
|
WebsocketResult register = createWebsocketResult(null, "register", map);
|
|
|
WebSocketUtils.sendMessage(session, JacksonUtils.toJSONString(register));
|
|
|
- LogUtils.WEBSOCKET_MSG.info("[建立注册连接] sessionId: {},registerCode:{}", session.getId(), registerCode);
|
|
|
+ LogUtils.WEBSOCKET_MSG.info("[建立注册连接],registerCode:{}", registerCode);
|
|
|
session.close();
|
|
|
return;
|
|
|
}
|
|
|
@@ -87,7 +87,7 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
|
|
|
map.put("statusCode", WebsocketStatus.SUCCESS.getStatusCode());
|
|
|
WebsocketResult result = createWebsocketResult(null, "login", map);
|
|
|
WebSocketUtils.sendMessage(session, JacksonUtils.toJSONString(result));
|
|
|
- LogUtils.WEBSOCKET_MSG.info("[建立连接] sessionId: {},token:{}", session.getId(), token);
|
|
|
+ LogUtils.WEBSOCKET_MSG.info("[建立连接],token:{}", token);
|
|
|
return;
|
|
|
}
|
|
|
session.close();
|
|
|
@@ -202,7 +202,7 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
|
|
|
@Override
|
|
|
public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
|
|
|
WebSocketSessionHolder.updateToken(session);
|
|
|
- LogUtils.WEBSOCKET_MSG.error("[传输错误] sessionId: {} , exception:{}", session.getId(), exception.getMessage());
|
|
|
+ LogUtils.WEBSOCKET_MSG.error("[传输错误], exception:{}", exception.getMessage());
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -213,14 +213,14 @@ public class SocWebSocketHandler extends AbstractWebSocketHandler {
|
|
|
*/
|
|
|
@Override
|
|
|
public void afterConnectionClosed(WebSocketSession session, CloseStatus status) {
|
|
|
- String token = (String) session.getAttributes().get("token");
|
|
|
+ String token = WebSocketSessionHolder.getSessionKey(session);
|
|
|
WebSocketSessionHolder.removeSession(token);
|
|
|
if (StringUtils.isNotEmpty(token)) {
|
|
|
IotServerInfo serverInfo = iotServerInfoService.selectByToken(token);
|
|
|
serverInfo.setIotStatus(IotServerConnectStatus.OFFLINE.getIdx());
|
|
|
iotServerInfoService.updateByToken(serverInfo);
|
|
|
}
|
|
|
- LogUtils.WEBSOCKET_MSG.info("[断开连接] sessionId: {},token:{}", session.getId(), token);
|
|
|
+ LogUtils.WEBSOCKET_MSG.info("[断开连接],token:{}", token);
|
|
|
}
|
|
|
|
|
|
/**
|