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 WHITELIST = new TreeSet<>(Set.of(
- "taskId", "status", "statusCode", "fileStatus", "fileError", "fileReady", "updatedAt"));
+ "taskId", "status", "statusCode", "fileStatus", "fileError", "fileReady", "updatedAt",
+ // progress*:客户端心跳上报的执行进度(2026-10-10 加入,三者同生同灭)
+ "progressCurrent", "progressTotal", "progressLabel"));
private final ObjectMapper objectMapper = new ObjectMapper();
@@ -103,7 +105,8 @@ class SimilarAsinTaskLightWhitelistTest {
@Test
void whitelistExtraKeysRejected() throws Exception {
// 回归门禁:白名单键集合与文档一致(新增键必须先更新本测试与 spec)
- assertEquals(List.of("fileError", "fileReady", "fileStatus", "status", "statusCode", "taskId", "updatedAt"),
+ assertEquals(List.of("fileError", "fileReady", "fileStatus", "progressCurrent", "progressLabel",
+ "progressTotal", "status", "statusCode", "taskId", "updatedAt"),
new java.util.ArrayList<>(WHITELIST));
}
diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/contract/ResultFilePhaseContractTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/contract/ResultFilePhaseContractTest.java
index 0fea0477d..d2b32f8bf 100644
--- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/contract/ResultFilePhaseContractTest.java
+++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/contract/ResultFilePhaseContractTest.java
@@ -121,7 +121,7 @@ class ResultFilePhaseContractTest {
@SuppressWarnings("unchecked")
Map first = ((java.util.List