From 13665668ac8c931877c3516ea7c830c1f3853cdd Mon Sep 17 00:00:00 2001 From: luqingjie <544309509@qq.com> Date: Sat, 31 Oct 2026 06:53:16 -0400 Subject: [PATCH] =?UTF-8?q?1.=20rent-agent-java=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B0=83=E8=AF=95=E6=97=A5=E5=BF=97=E5=92=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=88=A0=E9=99=A4=E6=9C=AC=E5=9C=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AE=B0=E5=BD=95=202.=20=E5=BF=83=E8=B7=B3=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E4=B8=8D=E7=94=A8=E8=BF=99=E4=B9=88=E9=A2=91=E7=B9=81?= =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E6=94=B6=E8=AE=A2=E5=8D=95=E5=8D=B3=E4=BD=BF?= =?UTF-8?q?=E4=B8=80=E7=82=B9=E5=8D=B3=E5=8F=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ruoyi/system/rental/RentalSocket.java | 3 ++- .../test/java/com/ruoyi/system/rental/RentalBusinessTest.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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; }