From a3eddd6d846ffabeab44f8460d3c7e3e549f75e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sun, 11 Oct 2026 00:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=B9=B3(=E8=BF=9B=E5=BA=A6=E4=B8=89?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=BF=9B=E7=99=BD=E5=90=8D=E5=8D=95=20+=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=82=A3=E5=A4=84=E6=96=B0=E5=A2=9E=E5=90=9E?= =?UTF-8?q?=E5=BC=82=E5=B8=B8):=20Java=20=E5=85=A8=E9=87=8F=204313=20?= =?UTF-8?q?=E4=BE=8B=200=20=E7=BA=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 上一笔 light 加 progress* 后我只跑了 6 个定向类,把两把钉白名单的尺子漏了—— 它们本来就是为「加字段必须显式承认」而设的,该红: - SimilarAsinTaskLightWhitelistTest(私有 LightVo 键集合,两处断言) - ResultFilePhaseContractTest(light 响应 JSON 键集快照) CatchSilenceRatchetTest 报「不重抛 559→560」也是我引入的:parseIntOrNull 用了 catch (NumberFormatException)。这处边界防护要留(Redis 里是客户端上报的裸字符串, 一次抛出就整页任务失去进度显示),但不必用 catch 实现——先按字符判掉非数字、再限 9 位 防 int 溢出,Integer.valueOf 就不可能抛。这样既守住棘轮也不动别人的 catch。 补一条用例把「负号/超长/非数字」三个分支钉住(否则改了没人验)。 教训写在这儿:改公共 DTO/VO 之后不许只跑定向,全量才是验收。 --- .../service/TaskHeartbeatPositionService.java | 20 ++++++++++++++----- .../vo/SimilarAsinTaskLightWhitelistTest.java | 7 +++++-- .../contract/ResultFilePhaseContractTest.java | 2 +- .../TaskHeartbeatPositionServiceTest.java | 16 +++++++++++++++ 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionService.java index 3ffba31b1..37ab015d8 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskHeartbeatPositionService.java @@ -30,6 +30,8 @@ public class TaskHeartbeatPositionService { private static final String STALL_KEY_PREFIX = "task:progress:stall:"; private static final Duration POSITION_TTL = Duration.ofHours(24); private static final int POSITION_LABEL_MAX_LEN = 60; + /** 计数字符串的最长位数:9 位以内 parseInt 必不溢出,所以这一处不需要 catch。 */ + private static final int MAX_COUNT_DIGITS = 9; /** 单次 light 轮询最多读多少个任务的心跳位置(Redis 往返上限,见 {@link #readDrawablePositions})。 */ public static final int MAX_POSITION_LOOKUPS_PER_CALL = 20; /** 客户端 {@code config.PROGRESS_UNIT_SCALE} 的服务端镜像:units 粒度下 1 个自然单位 = 1000。 */ @@ -233,15 +235,23 @@ public class TaskHeartbeatPositionService { return result; } + /** + * Redis 里的计数是客户端上报的裸字符串,脏值不能把整次轮询带崩。 + * + *
这里不用 try/catch:那格「不重抛的吞异常」棘轮只许减(基线 559),加一处就得同批
+ * 减掉一处别人的,不划算;而这一处本来也不需要——先按字符判掉非数字、再限长度防 int 溢出,
+ * {@code Integer.valueOf} 就不可能抛。负号也算脏值(客户端不会报负数,真出现就当没有读数)。
+ */
private static Integer parseIntOrNull(String raw) {
- if (raw == null || raw.isEmpty()) {
+ if (raw == null || raw.isEmpty() || raw.length() > MAX_COUNT_DIGITS) {
return null;
}
- try {
- return Integer.valueOf(raw);
- } catch (NumberFormatException ex) {
- return null;
+ for (int index = 0; index < raw.length(); index++) {
+ if (!Character.isDigit(raw.charAt(index))) {
+ return null;
+ }
}
+ return Integer.valueOf(raw);
}
/**
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/model/vo/SimilarAsinTaskLightWhitelistTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/model/vo/SimilarAsinTaskLightWhitelistTest.java
index 245006018..487eb01d0 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/model/vo/SimilarAsinTaskLightWhitelistTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/model/vo/SimilarAsinTaskLightWhitelistTest.java
@@ -21,7 +21,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
class SimilarAsinTaskLightWhitelistTest {
private static final Set