From 226b062ef301b61260efac126e1db373ace85b87 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Fri, 16 Jan 2026 09:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java b/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
index c8873a4..f719a7f 100644
--- a/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
+++ b/ard-work/src/main/java/com/ard/work/component/websocket/handler/TyMessageHandler.java
@@ -337,7 +337,7 @@
// 延迟10秒删除token（若期间没重连）
CompletableFuture.runAsync(() -> {
try {
- Thread.sleep(3_000); // 延迟3秒
+ Thread.sleep(5_000); // 延迟5秒
} catch (InterruptedException ignored) {
}
// 如果版本号不一致，说明用户曾重连 → 不执行删除
@@ -345,14 +345,14 @@
return;
}
if (!WebSocketSessionManager.containsUser(userId)) {
+ uavControlService.releaseAllControls(userId);
+ uavStreamManager.stopAllPullStreamByUser(userId);
+ uavStateManager.removeSubscribe(userId);
+ uavTelemetryManager.removeSubscribe(userId);
+ uavSignalManager.removeSubscribe(userId);
+ uavControlManager.removeSubscribe(userId);
LoginUser loginUser = tokenService.getLoginUserByUserId(userId);
if (loginUser != null) {
- uavControlService.releaseAllControls(userId);
- uavStreamManager.stopAllPullStreamByUser(userId);
- uavStateManager.removeSubscribe(userId);
- uavTelemetryManager.removeSubscribe(userId);
- uavSignalManager.removeSubscribe(userId);
- uavControlManager.removeSubscribe(userId);
tokenService.delLoginUser(loginUser.getToken(), userId);
log.info("【cmd】用户 [{}] 超时未重连，已删除 token", userId);
}
--
Gitblit v1.9.3