diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalSocket.java b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalSocket.java index 8e5d24a..b2a7688 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalSocket.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/rental/RentalSocket.java @@ -309,7 +309,8 @@ public class RentalSocket extends TextWebSocketHandler { c.socket.close(CloseStatus.POLICY_VIOLATION); continue; } - if (c.ping == null) { + // 快速扫描订单不等于快速发心跳;距离最近PONG至少15秒才主动探活。 + if (c.ping == null && System.currentTimeMillis() - c.pong >= 15000) { send(c, "PING", map()); } if (!c.ready) { diff --git a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java index 7e6871c..298a36d 100644 --- a/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java +++ b/ruoyi-system/src/test/java/com/ruoyi/system/rental/RentalBusinessTest.java @@ -1307,6 +1307,7 @@ public class RentalBusinessTest { continue; // 首个CHALLENGE不是签名业务帧。 } Map frame = json.readValue(text(envelope, "body"), Map.class); + assertFalse("快速推送扫描不应立即发送额外心跳", "PING".equals(text(frame, "type"))); if ("TASK_PUSH".equals(text(frame, "type"))) { taskFrameFound = true; }