feat(credential): 凭据不可自愈 ⇒ 行失败 + 整单终态 + 用户端弹窗(服务端五面)
用户口径(2026-11-12,34061 取证后):没余额要退成失败、直接中断任务、并弹窗提示; 所有涉及代理 IP / LLM 密钥的特性都一样。范围=服务端全部特性,客户端下批。 - 判据唯一出处 common/retry/CredentialFatalClassifier(致命:LLM 欠费/密钥失效、 代理未配置/套餐到期/余额不足/密钥无效;非致命:channel_busy、无空闲通道、冷却、 超时、5xx、限流、出口被拒、技术性、上游不可用);落终态唯一出口 modules/task/service/CredentialFatalTaskCloser(重读现状态、拒碰 TERMINAL、可重入)。 外观专利与相似ASIN 原先逐字重复的 terminalizeOnFatalLlmFailure 改为委托,不留第二份。 - 五面接线:外观专利/相似ASIN、跟价 updateTaskStatusFromLatestRows、 店铺采集 tryFinalizeTask、采集数据 submitResult。判死后回执一律回读库里状态 (采集数据内存 task 停在 RUNNING 会让采集端继续为死路买出口 IP)。 - 行级诚实:凭据致命行不计入已判,回退路不再拿原始标题伪造「侵权/成功」。 - 用户端:credential-fatal-notice.ts(判据)+ credential-fatal-alert.ts(按 taskId:kind 去重)+ CredentialFatalAlert.vue 挂 App.vue;轻量轮询不带文案 ⇒ 跟价/采集数据在失败 终态补一次重型 batch,店铺 batch 补任务级 taskErrorMessage(只给 FAILED、截断 300 字)。 - 三处真死日志按巡检签名正形写「改判死」(scripts/_prod_watch.py 只认 改判死|接管判死), 否则判死数不进账本。 - TaskFailureCategoryGuardrailTest:写点搬进收口器 ⇒ 登记 CredentialFatalTaskCloser, 下限 47→46、updateById 总量 160→159(搬点,不是新增写法)。 判据:CredentialFatalClassifierTest(16)、CollectDataCredentialFatalTest(3)、 PriceTrackTaskServiceTest(8)、ShopDataCrawlScopeMergeTest(11)、 ShopDataCrawlProgressQueryTest(9)、credential-fatal-notice.test.ts(9)、 credential-fatal-alert.test.ts(6)。后端整量 5,464 例 / 0 失败 / 19 skipped。 未纳入本笔:BrandAppearancePatentTab.vue、BrandSimilarAsinTab.vue、TaskItemCard.vue 与两个 Tab 里的按钮/徽章 CSS —— 另一路会话在飞改动,按并发纪律不卷进来。
This commit is contained in:
+168
@@ -0,0 +1,168 @@
|
||||
package com.nanri.aiimage.common.retry;
|
||||
|
||||
import com.nanri.aiimage.modules.brand.client.BrandCheckClient;
|
||||
import com.nanri.aiimage.modules.task.service.TaskResumeService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* 凭据致命档的判据台账(2026-11-12,34061 取证后用户口径)。
|
||||
*
|
||||
* <p>这一档决定三件事:行落失败并写真实原因、任务立即中断、用户端弹窗。判宽了用户整单给一次
|
||||
* 网络抖动陪葬;判窄了 34061 那种"余额见底 → 整单跑完 → 交付表只有一句没头没脑的异常"就会重演。
|
||||
* 所以两条边界都要有正本:
|
||||
* <ul>
|
||||
* <li>欠费/密钥/未配置代理 → 致命,且分得清是哪一面(给的动作不同);</li>
|
||||
* <li>通道被占、冷却、出口被拒、解密失败、上游不可用、超时、5xx、限流 → 不致命。</li>
|
||||
* </ul>
|
||||
*/
|
||||
class CredentialFatalClassifierTest {
|
||||
|
||||
/** 现网 403 原文(外部世界的字符串,不是本仓文案)。 */
|
||||
private static final String QUOTA_403_BODY = "{\"error\":{\"message\":\"预扣费额度失败, 用户[151502]剩余额度: "
|
||||
+ "฿0.030492, 需要预扣费额度: ฿0.032412\",\"code\":\"insufficient_user_quota\"}}";
|
||||
|
||||
// ===== 致命:LLM 侧 =====
|
||||
|
||||
@Test
|
||||
void upstreamQuotaBodyIsLlmCredential() {
|
||||
assertThat(CredentialFatalClassifier.kind(QUOTA_403_BODY))
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.LLM_CREDENTIAL);
|
||||
}
|
||||
|
||||
@Test
|
||||
void producerCopyWrappedByTheClientIsStillLlmCredential() {
|
||||
String producer = LlmBalanceGuard.REASON_LLM_BALANCE_DUE + ";lastErr=" + QUOTA_403_BODY;
|
||||
|
||||
assertThat(CredentialFatalClassifier.kind(producer))
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.LLM_CREDENTIAL);
|
||||
}
|
||||
|
||||
@Test
|
||||
void invalidLlmKeyIsLlmCredential() {
|
||||
assertThat(CredentialFatalClassifier.kind("LLM http 401: invalid api key"))
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.LLM_CREDENTIAL);
|
||||
assertThat(CredentialFatalClassifier.kind("密钥无效(401)"))
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.LLM_CREDENTIAL);
|
||||
}
|
||||
|
||||
/** 2026-11-11 现网的钱包型欠费:与 {@code insufficient_user_quota} 拼写完全不同,不能漏。 */
|
||||
@Test
|
||||
void walletStyleArrearsIsAlsoFatal() {
|
||||
assertThat(CredentialFatalClassifier.kind("LLM 402: {\"code\":\"insufficient_funds\"}"))
|
||||
.as("钱包型欠费")
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.LLM_CREDENTIAL);
|
||||
assertThat(CredentialFatalClassifier.kind("wallet balance insufficient"))
|
||||
.as("钱包型欠费的另一种拼写(没有连续 insufficient balance)")
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.LLM_CREDENTIAL);
|
||||
}
|
||||
|
||||
// ===== 致命:代理侧(品牌检测的原始原因分六档,只有前两档判死) =====
|
||||
|
||||
@Test
|
||||
void missingProxyConfigurationIsProxyCredential() {
|
||||
assertThat(CredentialFatalClassifier.kind(BrandCheckClient.NO_PROXY_REASON))
|
||||
.as("没配代理=根本没得查,重跑一万次都一样")
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.PROXY_CREDENTIAL);
|
||||
}
|
||||
|
||||
@Test
|
||||
void proxyPackageExhaustedIsProxyCredential() {
|
||||
assertThat(CredentialFatalClassifier.kind("提取失败:套餐已过期"))
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.PROXY_CREDENTIAL);
|
||||
assertThat(CredentialFatalClassifier.kind("供应商拒付:余额不足"))
|
||||
.as("同一句「余额不足」在品牌侧是代理套餐,不能按 LLM 欠费解释")
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.PROXY_CREDENTIAL);
|
||||
}
|
||||
|
||||
@Test
|
||||
void qingguoAuthDenyIsProxyCredential() {
|
||||
assertThat(CredentialFatalClassifier.kind("青果提取失败 API_AUTH_DENY"))
|
||||
.as("账密档没填或鉴权被切走:用户必须去改链接")
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.PROXY_CREDENTIAL);
|
||||
}
|
||||
|
||||
// ===== 不致命:短时/技术性/上游(这条半边与致命半边同等重要) =====
|
||||
|
||||
@Test
|
||||
void channelBusyIsNotFatalEvenThoughItsCopyMentionsThePackage() {
|
||||
String copy = com.nanri.aiimage.modules.usersecret.service.UserApiSecretCheckService.CHANNEL_BUSY_MESSAGE;
|
||||
|
||||
assertThat(copy).contains("套餐到期");
|
||||
assertThat(CredentialFatalClassifier.kind(copy))
|
||||
.as("通道被占是「等几分钟再来」,同句里的「套餐到期」是排查建议,不是结论")
|
||||
.isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void brandCooldownAndEgressRejectedAreNotFatal() {
|
||||
assertThat(CredentialFatalClassifier.kind("该 key 处于冷却窗口")).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind("拒绝代理出口,请换 IP 重试")).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void brandTechnicalFailuresAreNotFatal() {
|
||||
assertThat(CredentialFatalClassifier.kind("解密失败: Malformed UTF-8 data")).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind("代理请求失败")).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind("未返回可用 IP")).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void upstreamUnavailableAndServiceDownAreNotFatal() {
|
||||
assertThat(CredentialFatalClassifier.kind("品牌库上游整体不可用(本批待查词无一返回结果)")).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind("LLM http 502: Bad Gateway")).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind("LLM 服务不可达(连接未建立):Connection refused")).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind("LLM http 429: Too Many Requests")).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind("任务心跳超时,已自动失败")).isNull();
|
||||
}
|
||||
|
||||
/**
|
||||
* 任何一条 LLM 报错都带 {@code LLM} 三个字母:拿这个裸词当凭据判据,一次网关抖动就会判死整单
|
||||
* (2026-11-12 实现当天就被 {@code AppearancePatentRowMarkTimingTest} 撞出来,NPE 在终态闸上)。
|
||||
*/
|
||||
@Test
|
||||
void bareLlmWordingIsNotACredentialVerdict() {
|
||||
assertThat(CredentialFatalClassifier.kind("LLM 网关无应答")).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind("LLM 检测失败")).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind("LLM http 500: internal error")).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void deliveryAndStoppedCopiesAreNotCredentialFatal() {
|
||||
assertThat(CredentialFatalClassifier.kind("结果文件生成多次失败")).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind(TaskResumeService.DUPLICATE_STOP_REASON)).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
void blankMessageIsNeverFatal() {
|
||||
assertThat(CredentialFatalClassifier.kind(null)).isNull();
|
||||
assertThat(CredentialFatalClassifier.kind(" ")).isNull();
|
||||
assertThat(CredentialFatalClassifier.isFatal("")).isFalse();
|
||||
}
|
||||
|
||||
// ===== 本仓自己写下的终态句:重读时不许在两面之间翻 =====
|
||||
|
||||
@Test
|
||||
void ownTerminalSentencesKeepTheirSideOnReread() {
|
||||
String llmStored = QUOTA_403_BODY + ";" + LlmBalanceGuard.TASK_TERMINAL_GUIDANCE;
|
||||
String proxyStored = "用户未配置代理;" + CredentialFatalClassifier.PROXY_TERMINAL_GUIDANCE;
|
||||
|
||||
assertThat(CredentialFatalClassifier.kind(llmStored))
|
||||
.as("LLM 终态句里也提到「代理出口额度」,重读必须仍判 LLM")
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.LLM_CREDENTIAL);
|
||||
assertThat(CredentialFatalClassifier.kind(proxyStored))
|
||||
.as("代理终态句里也提到「密钥无效」,重读必须仍判代理")
|
||||
.isEqualTo(CredentialFatalClassifier.Kind.PROXY_CREDENTIAL);
|
||||
}
|
||||
|
||||
@Test
|
||||
void guidanceFollowsTheKindAndNeverSaysRetryLater() {
|
||||
for (CredentialFatalClassifier.Kind kind : CredentialFatalClassifier.Kind.values()) {
|
||||
String guidance = CredentialFatalClassifier.guidance(kind);
|
||||
assertThat(guidance).as("%s 的终态动作句", kind)
|
||||
.contains("任务已终止")
|
||||
.doesNotContain("稍后重试");
|
||||
}
|
||||
}
|
||||
}
|
||||
+14
@@ -68,6 +68,20 @@ import static org.mockito.Mockito.when;
|
||||
*/
|
||||
class AppearancePatentTaskServiceDelegationTest {
|
||||
|
||||
/**
|
||||
* 「继续」复位现在会经 {@code LambdaUpdateWrapper<FileResultEntity>} 清直链,用得到 MyBatis 的
|
||||
* lambda 缓存。此前这一格只在别的用例类先把 {@code FileResultEntity} 登记进 TableInfo 时才绿
|
||||
* (整包跑绿、单类跑红=假绿,2026-11-12 实测),所以本类自己登记一次,不再靠收集顺序。
|
||||
*/
|
||||
@org.junit.jupiter.api.BeforeAll
|
||||
static void initializeMybatisMetadata() {
|
||||
org.apache.ibatis.builder.MapperBuilderAssistant assistant =
|
||||
new org.apache.ibatis.builder.MapperBuilderAssistant(
|
||||
new com.baomidou.mybatisplus.core.MybatisConfiguration(), "");
|
||||
com.baomidou.mybatisplus.core.metadata.TableInfoHelper.initTableInfo(
|
||||
assistant, com.nanri.aiimage.modules.task.model.entity.FileResultEntity.class);
|
||||
}
|
||||
|
||||
private FileTaskMapper fileTaskMapper = mock(FileTaskMapper.class);
|
||||
private FileResultMapper fileResultMapper = mock(FileResultMapper.class);
|
||||
private TaskScopeStateMapper taskScopeStateMapper = mock(TaskScopeStateMapper.class);
|
||||
|
||||
+33
@@ -175,6 +175,39 @@ class AppearancePatentRowOutcomeTest {
|
||||
assertFalse(AppearancePatentRowOutcome.isUsableField("request timeout"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 凭据坏掉的三族文案都不是判定:商标查询失败、外观没跑、外观异常。
|
||||
*
|
||||
* <p>2026-11-12 任务 34061 里三处各判各的——覆盖率算满(这三族被当"有结论")、
|
||||
* 状态列还可能写「成功」——用户口径是「没余额要退成失败」,所以三处必须同一句话。
|
||||
*/
|
||||
@Test
|
||||
void credentialFailureTextsAreNotJudgements() {
|
||||
for (String text : java.util.List.of(
|
||||
AppearancePatentRowOutcome.BRAND_QUERY_FAILED,
|
||||
AppearancePatentRowOutcome.BRAND_QUERY_FAILED + ":品牌库上游整体不可用",
|
||||
AppearancePatentRowOutcome.APPEARANCE_NOT_RUN,
|
||||
AppearancePatentRowOutcome.APPEARANCE_ANOMALY,
|
||||
AppearancePatentSheetBuilder.NO_RESULT_TEXT,
|
||||
AppearancePatentRowOutcome.NOT_INSPECTED_TEXT)) {
|
||||
assertTrue(AppearancePatentRowOutcome.isNoVerdictText(text), "应判为没结论: " + text);
|
||||
assertFalse(AppearancePatentRowOutcome.isUsableField(text), "不许算进已判: " + text);
|
||||
}
|
||||
}
|
||||
|
||||
/** 回退行:商标维命中、外观维没跑 → 不算判定(覆盖率掉下去),而不是"齐了"。 */
|
||||
@Test
|
||||
void fallbackRowWithOnlyBrandHitIsNotJudged() {
|
||||
AppearancePatentParsedRowVo parsed = sheetRowWithData("1", "B0A", "阿凡达 玩具", "https://img/1.jpg");
|
||||
AppearancePatentResultRowDto row = judgedRow("1", "B0A", "阿凡达 玩具", "https://img/1.jpg");
|
||||
row.setTitleRisk("侵权");
|
||||
row.setAppearanceRisk(AppearancePatentRowOutcome.APPEARANCE_NOT_RUN);
|
||||
row.setConclusion("商标侵权·外观维未执行");
|
||||
|
||||
assertEquals(AppearancePatentRowOutcome.Kind.NOT_INSPECTED,
|
||||
AppearancePatentRowOutcome.classify(parsed, row));
|
||||
}
|
||||
|
||||
// ---------- 2. 三句文案不许互相顶替 ----------
|
||||
|
||||
@Test
|
||||
|
||||
+37
-1
@@ -366,9 +366,45 @@ class AppearancePatentSheetBuilderTest {
|
||||
assertEquals("失败", AppearancePatentSheetBuilder.resolveResultStatus("外观无侵权·商标待复核"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 图片识别一步都没跑的行,状态列不许写「成功」——哪怕商标维命中了侵权词。
|
||||
*
|
||||
* <p>2026-11-12 任务 34061:上游 LLM 余额见底,外观维一次没发出去,回退路却拿整条原始标题
|
||||
* 去品牌库蒙到「侵权」,结论列写成侵权、状态列写成成功(1000 行里 158 行)。
|
||||
*/
|
||||
@Test
|
||||
void test_sheet_builder_blank_asin_reason_row_skipped() throws Exception {
|
||||
void test_sheet_builder_success_requires_the_image_step_to_have_run() throws Exception {
|
||||
try (Workbook wb = new XSSFWorkbook()) {
|
||||
AppearancePatentParsedRowVo p = parsedRow("2_1", "B01A", "US", "阿凡达 玩具", "https://img/1.jpg", "");
|
||||
AppearancePatentResultRowDto r = resultRow("2_1", "B01A", "US");
|
||||
r.setTitleRisk("侵权");
|
||||
r.setAppearanceRisk(AppearancePatentRowOutcome.APPEARANCE_NOT_RUN);
|
||||
r.setConclusion("商标侵权·外观维未执行");
|
||||
r.setTitleReason("LLM 服务余额欠费(上游账户额度不足,非本行数据问题)");
|
||||
AppearancePatentSheetBuilder.buildResultSheet(wb, List.of(p), Map.of(
|
||||
AppearancePatentSheetBuilder.rowKey(r), r));
|
||||
|
||||
Row data = wb.getSheet("外观专利检测结果").getRow(1);
|
||||
assertEquals(AppearancePatentRowOutcome.APPEARANCE_NOT_RUN,
|
||||
data.getCell(10).getStringCellValue(), "外观维如实写「没跑」");
|
||||
assertEquals("失败", data.getCell(12).getStringCellValue(),
|
||||
"图片识别没做,一行就不许算成功: " + data.getCell(11).getStringCellValue());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void test_sheet_builder_status_gate_reads_the_appearance_column() {
|
||||
assertEquals("成功", AppearancePatentSheetBuilder.resolveResultStatus("侵权", "无侵权"));
|
||||
assertEquals("失败", AppearancePatentSheetBuilder.resolveResultStatus("侵权", AppearancePatentRowOutcome.APPEARANCE_NOT_RUN));
|
||||
assertEquals("失败", AppearancePatentSheetBuilder.resolveResultStatus("侵权", AppearancePatentRowOutcome.APPEARANCE_ANOMALY));
|
||||
assertEquals("失败", AppearancePatentSheetBuilder.resolveResultStatus("侵权", AppearancePatentSheetBuilder.NO_RESULT_TEXT));
|
||||
assertEquals("失败", AppearancePatentSheetBuilder.resolveResultStatus("侵权", "LLM http 503: overloaded"));
|
||||
// 单参历史口径不变:只拿到结论串时仍按结论判
|
||||
assertEquals("成功", AppearancePatentSheetBuilder.resolveResultStatus("侵权"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void test_sheet_builder_blank_asin_reason_row_skipped() throws Exception { try (Workbook wb = new XSSFWorkbook()) {
|
||||
AppearancePatentParsedRowVo p = parsedRow("2_1", " ", "US", "t", "", "");
|
||||
AppearancePatentSheetBuilder.buildResultSheet(wb, List.of(p), Map.of());
|
||||
|
||||
|
||||
+186
@@ -0,0 +1,186 @@
|
||||
package com.nanri.aiimage.modules.collectdata.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.modules.asincache.service.AsinResultCacheService;
|
||||
import com.nanri.aiimage.modules.collectdata.model.dto.CollectDataSubmitResultRequest;
|
||||
import com.nanri.aiimage.modules.collectdata.model.dto.CollectDataSubmitRowDto;
|
||||
import com.nanri.aiimage.modules.collectdata.model.vo.CollectDataResultRowVo;
|
||||
import com.nanri.aiimage.modules.collectdata.model.vo.CollectDataSubmitResultVo;
|
||||
import com.nanri.aiimage.modules.collectdata.util.CollectDataBatchQuery;
|
||||
import com.nanri.aiimage.modules.collectdata.util.CollectDataBrandBatchFilter;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.common.retry.CredentialFatalClassifier;
|
||||
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
|
||||
import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService;
|
||||
import com.nanri.aiimage.modules.usersecret.service.UserApiSecretCheckService;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
import org.mockito.InjectMocks;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Spy;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.lenient;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* 采集数据:品牌校验整批查不了且原因<b>不可自愈</b>时,整单立即判死(2026-11-12 用户口径
|
||||
* 「没余额要退成失败,且直接中断任务」)。
|
||||
*
|
||||
* <p>为什么必须整单判死而不是只记 {@code brandQueryFailedCount}:这些行既不进结果、也不算无效品牌,
|
||||
* 用户拿到的是一张空表加一句「补测轮会重试」;而补测轮对「未配置代理/套餐到期/密钥无效」重跑
|
||||
* 一万次都是同一句话(现网 32573 两轮 0 净增)。判宽了会把一次供应商抖动变成整单失败,
|
||||
* 所以本类成对钉住:{@code 未配置代理} 判死、{@code 通道被占} 照旧继续。
|
||||
*
|
||||
* <p>夹具走 {@code service.submitResult} 这条生产接线,不反射调私有方法——判据要证明的是
|
||||
* 「守卫挂在回传路径上」,不是「私有方法自己会写库」。
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class CollectDataCredentialFatalTest {
|
||||
|
||||
private static final Long TASK_ID = 32601L;
|
||||
private static final Long RESULT_ID = 42601L;
|
||||
|
||||
@Mock private FileTaskMapper fileTaskMapper;
|
||||
@Mock private FileResultMapper fileResultMapper;
|
||||
@Mock private TaskChunkMapper taskChunkMapper;
|
||||
@Mock private TaskScopeStateMapper taskScopeStateMapper;
|
||||
@Mock private TaskDistributedLockService taskDistributedLockService;
|
||||
@Mock private TaskDistributedLockService.LockHandle lockHandle;
|
||||
@Mock private TransientPayloadStorageService transientPayloadStorageService;
|
||||
@Mock private CollectDataBatchQuery collectDataBatchQuery;
|
||||
@Mock private CollectDataBrandBatchFilter brandBatchFilter;
|
||||
@Mock private AsinResultCacheService asinResultCacheService;
|
||||
@Mock private CollectDataBrandRecheckService collectDataBrandRecheckService;
|
||||
|
||||
@Spy private ObjectMapper objectMapper = new ObjectMapper();
|
||||
|
||||
@InjectMocks private CollectDataService service;
|
||||
|
||||
@BeforeAll
|
||||
static void initializeMybatisMetadata() {
|
||||
MapperBuilderAssistant assistant = new MapperBuilderAssistant(new MybatisConfiguration(), "");
|
||||
TableInfoHelper.initTableInfo(assistant, FileTaskEntity.class);
|
||||
TableInfoHelper.initTableInfo(assistant, FileResultEntity.class);
|
||||
}
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
ReflectionTestUtils.setField(service, "staleTimeoutMinutes", 30L);
|
||||
lenient().when(transientPayloadStorageService.isSharedWriteEnabled()).thenReturn(true);
|
||||
// 分片落 RustFS:本类只观察凭据判据,指针形状给最小可过的一份
|
||||
lenient().when(transientPayloadStorageService.storeChunkPayloadVersioned(
|
||||
anyString(), anyLong(), anyString(), any(), anyString())).thenReturn("rustfs:chunk-1");
|
||||
lenient().when(transientPayloadStorageService.extractPointer(anyString())).thenReturn("rustfs:chunk-1");
|
||||
lenient().when(taskDistributedLockService.acquire(eq(CollectDataService.MODULE_TYPE), anyLong(), anyLong()))
|
||||
.thenReturn(lockHandle);
|
||||
lenient().when(fileTaskMapper.selectById(TASK_ID)).thenAnswer(invocation -> task);
|
||||
lenient().when(fileResultMapper.selectOne(any())).thenAnswer(invocation -> result);
|
||||
lenient().when(fileResultMapper.updateById(any(FileResultEntity.class))).thenReturn(1);
|
||||
lenient().when(fileTaskMapper.updateById(any(FileTaskEntity.class))).thenReturn(1);
|
||||
// 去重闸原样放行本批:真正要观察的是品牌检测那一格
|
||||
lenient().when(collectDataBatchQuery.filter(any(), any())).thenAnswer(invocation ->
|
||||
new CollectDataBatchQuery.FilterResult(invocation.getArgument(0), 0, 0, List.of()));
|
||||
}
|
||||
|
||||
@Test
|
||||
void unconfiguredProxyMakesTheWholeTaskFailInsteadOfEndingAsAnEmptySuccess() {
|
||||
calledBackWith("用户未配置代理");
|
||||
|
||||
assertThat(task.getStatus())
|
||||
.as("凭据不可自愈必须整单判死,不许跑成一张空表")
|
||||
.isEqualTo("FAILED");
|
||||
assertThat(task.getFinishedAt()).isNotNull();
|
||||
assertThat(task.getSuccessFileCount()).isZero();
|
||||
assertThat(task.getFailedFileCount()).isEqualTo(1);
|
||||
assertThat(task.getErrorMessage()).contains(CredentialFatalClassifier.PROXY_TERMINAL_GUIDANCE);
|
||||
verify(fileTaskMapper).updateById(task);
|
||||
}
|
||||
|
||||
@Test
|
||||
void proxyPackageExhaustedAlsoFailsTheTask() {
|
||||
calledBackWith("代理套餐已过期");
|
||||
|
||||
assertThat(task.getStatus()).isEqualTo("FAILED");
|
||||
assertThat(task.getErrorMessage()).contains(CredentialFatalClassifier.PROXY_TERMINAL_GUIDANCE);
|
||||
}
|
||||
|
||||
/**
|
||||
* 反向半边:通道被占(青果 {@code NO_AVAILABLE_CHANNEL} 那一族)是可自愈的供应商状态,
|
||||
* 句子本身含「套餐」字样,绝不能因此判死整单(铁律 25② 的边界)。
|
||||
*/
|
||||
@Test
|
||||
void channelBusyKeepsTheTaskRunningAndOnlyCountsTheMissedRows() {
|
||||
calledBackWith(UserApiSecretCheckService.CHANNEL_BUSY_MESSAGE);
|
||||
|
||||
assertThat(task.getStatus()).as("通道被占是可自愈的,不许判死").isEqualTo("RUNNING");
|
||||
assertThat(task.getFinishedAt()).isNull();
|
||||
assertThat(task.getErrorMessage()).isNull();
|
||||
// 走上来的仍是普通进度落库那一格(同一个实体、RUNNING),不是收口器那笔终态写
|
||||
verify(fileTaskMapper).updateById(task);
|
||||
}
|
||||
|
||||
// ===== 夹具 =====
|
||||
|
||||
private FileTaskEntity task;
|
||||
private FileResultEntity result;
|
||||
|
||||
private void calledBackWith(String brandQueryFailedReason) {
|
||||
task = new FileTaskEntity();
|
||||
task.setId(TASK_ID);
|
||||
task.setUserId(7L);
|
||||
task.setModuleType(CollectDataService.MODULE_TYPE);
|
||||
task.setStatus("RUNNING");
|
||||
task.setResultJson("{\"totalRows\":1,\"receivedRows\":0}");
|
||||
task.setCreatedAt(LocalDateTime.now());
|
||||
task.setUpdatedAt(LocalDateTime.now());
|
||||
|
||||
result = new FileResultEntity();
|
||||
result.setId(RESULT_ID);
|
||||
result.setTaskId(TASK_ID);
|
||||
result.setUserId(7L);
|
||||
result.setModuleType(CollectDataService.MODULE_TYPE);
|
||||
|
||||
CollectDataResultRowVo row = new CollectDataResultRowVo();
|
||||
row.setAsin("B0A0000001");
|
||||
row.setBrand("NIKE");
|
||||
when(brandBatchFilter.filter(any(), any())).thenReturn(
|
||||
new CollectDataBrandBatchFilter.BrandBatchOutcome(
|
||||
List.of(), List.of(row), List.of(), brandQueryFailedReason));
|
||||
|
||||
CollectDataSubmitRowDto submitted = new CollectDataSubmitRowDto();
|
||||
submitted.setAsin("B0A0000001");
|
||||
submitted.setBrand("NIKE");
|
||||
CollectDataSubmitResultRequest request = new CollectDataSubmitResultRequest();
|
||||
request.setItems(List.of(submitted));
|
||||
request.setChunkIndex(1);
|
||||
request.setChunkTotal(1);
|
||||
|
||||
CollectDataSubmitResultVo vo = service.submitResult(TASK_ID, request);
|
||||
|
||||
// 回执里的状态是采集端决定「还要不要下一批」的唯一信号,必须是判死后的那条
|
||||
assertThat(vo.getTaskId()).isEqualTo(TASK_ID);
|
||||
verify(collectDataBrandRecheckService).enqueue(any(FileTaskEntity.class), any());
|
||||
verify(lockHandle).close();
|
||||
}
|
||||
}
|
||||
+99
@@ -11,9 +11,11 @@ import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskFileJobEntity;
|
||||
import com.nanri.aiimage.common.retry.CredentialFatalClassifier;
|
||||
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskResultPayloadService;
|
||||
import com.nanri.aiimage.modules.usersecret.service.UserApiSecretCheckService;
|
||||
import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
@@ -34,6 +36,7 @@ import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.lenient;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
@@ -352,6 +355,102 @@ class PriceTrackTaskServiceTest {
|
||||
assertTrue(task.getErrorMessage() != null && task.getErrorMessage().contains("未跑完"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 凭据不可自愈(用户没配代理 / 代理套餐到期 / LLM 欠费)⇒ 整单立刻判死,不再等剩下的店铺。
|
||||
*
|
||||
* <p>2026-11-12 用户口径「没余额要退成失败,且直接中断任务」。判宽了会把一次抖动变成整单失败,
|
||||
* 判窄了客户端会继续为每一家店铺买出口 IP——所以这条与下一条 {@code channelBusy...} 必须成对存在。
|
||||
*/
|
||||
@Test
|
||||
void fatalCredentialShopErrorClosesTheWholeTaskInsteadOfWaitingForTheRestOfTheShops() throws Exception {
|
||||
long taskId = 28501L;
|
||||
String shopName = "林芳";
|
||||
String error = "用户未配置代理";
|
||||
|
||||
FileTaskEntity task = runningTask(taskId);
|
||||
FileResultEntity result = pendingResult(taskId, shopName);
|
||||
|
||||
PriceTrackSubmitResultRequest.ShopResult shopResult = shopResult(
|
||||
shopName, Map.of("UK", List.of(asinRow("B0DWX8WJF8", "改价成功", "改价成功"))));
|
||||
shopResult.setError(error);
|
||||
PriceTrackSubmitResultRequest request = new PriceTrackSubmitResultRequest();
|
||||
request.setShops(List.of(shopResult));
|
||||
|
||||
TaskFileJobEntity pendingJob = new TaskFileJobEntity();
|
||||
pendingJob.setTaskId(taskId);
|
||||
pendingJob.setResultId(result.getId());
|
||||
pendingJob.setScopeKey(shopName);
|
||||
pendingJob.setStatus("PENDING");
|
||||
|
||||
TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class);
|
||||
when(taskDistributedLockService.acquire("PRICE_TRACK", taskId)).thenReturn(lock);
|
||||
when(priceTrackTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task));
|
||||
when(fileResultMapper.selectList(any())).thenReturn(List.of(result));
|
||||
when(ziniaoShopSwitchService.normalizeShopName(shopName)).thenReturn(shopName);
|
||||
when(excelAssemblyService.normalizeCountriesMap(any())).thenAnswer(invocation -> invocation.getArgument(0));
|
||||
lenient().when(excelAssemblyService.countRows(any())).thenReturn(1);
|
||||
// 判死分支在行账/文件组装之前返回,这两支只在本用例的反向半边被走到
|
||||
lenient().when(taskFileJobService.findAssembleJobsByResultIds(anyString(), any()))
|
||||
.thenReturn(Map.of(result.getId(), pendingJob));
|
||||
lenient().when(objectMapper.writeValueAsString(any())).thenReturn("[]");
|
||||
|
||||
service.submitResult(taskId, request);
|
||||
|
||||
assertEquals("FAILED", task.getStatus(), "凭据不可自愈必须整单判死,不许停在 RUNNING 等别的店铺");
|
||||
assertNotNull(task.getFinishedAt());
|
||||
assertEquals(0, task.getSuccessFileCount());
|
||||
assertEquals(1, task.getFailedFileCount());
|
||||
assertTrue(task.getErrorMessage().contains(CredentialFatalClassifier.PROXY_TERMINAL_GUIDANCE),
|
||||
"实际: " + task.getErrorMessage());
|
||||
verify(priceTrackTaskCacheService).deleteTaskCache(taskId);
|
||||
verify(priceTrackLoopRunService).syncLoopRunAfterChildTerminal(taskId);
|
||||
verify(lock).close();
|
||||
}
|
||||
|
||||
/**
|
||||
* 反向半边:通道被占(青果 {@code NO_AVAILABLE_CHANNEL} 那一族)是可自愈的供应商状态,
|
||||
* 句子本身含「套餐」字样,绝不能因此把整单判死(铁律 25② 的边界)。
|
||||
*/
|
||||
@Test
|
||||
void channelBusyErrorKeepsTaskRunningBecauseItHealsByItself() throws Exception {
|
||||
long taskId = 28502L;
|
||||
String shopName = "林芳";
|
||||
String error = UserApiSecretCheckService.CHANNEL_BUSY_MESSAGE;
|
||||
|
||||
FileTaskEntity task = runningTask(taskId);
|
||||
FileResultEntity result = pendingResult(taskId, shopName);
|
||||
|
||||
PriceTrackSubmitResultRequest.ShopResult shopResult = shopResult(
|
||||
shopName, Map.of("UK", List.of(asinRow("B0DWX8WJF8", "改价成功", "改价成功"))));
|
||||
shopResult.setError(error);
|
||||
PriceTrackSubmitResultRequest request = new PriceTrackSubmitResultRequest();
|
||||
request.setShops(List.of(shopResult));
|
||||
|
||||
TaskFileJobEntity pendingJob = new TaskFileJobEntity();
|
||||
pendingJob.setTaskId(taskId);
|
||||
pendingJob.setResultId(result.getId());
|
||||
pendingJob.setScopeKey(shopName);
|
||||
pendingJob.setStatus("PENDING");
|
||||
|
||||
TaskDistributedLockService.LockHandle lock = mock(TaskDistributedLockService.LockHandle.class);
|
||||
when(taskDistributedLockService.acquire("PRICE_TRACK", taskId)).thenReturn(lock);
|
||||
when(priceTrackTaskCacheService.getTaskCacheBatch(List.of(taskId))).thenReturn(Map.of(taskId, task));
|
||||
when(fileResultMapper.selectList(any())).thenReturn(List.of(result));
|
||||
when(ziniaoShopSwitchService.normalizeShopName(shopName)).thenReturn(shopName);
|
||||
when(excelAssemblyService.normalizeCountriesMap(any())).thenAnswer(invocation -> invocation.getArgument(0));
|
||||
when(excelAssemblyService.countRows(any())).thenReturn(1);
|
||||
when(taskFileJobService.findAssembleJobsByResultIds(anyString(), any()))
|
||||
.thenReturn(Map.of(result.getId(), pendingJob));
|
||||
when(objectMapper.writeValueAsString(any())).thenReturn("[]");
|
||||
|
||||
service.submitResult(taskId, request);
|
||||
|
||||
assertEquals("RUNNING", task.getStatus(), "通道被占是可自愈的,不许判死");
|
||||
assertNull(task.getFinishedAt());
|
||||
verify(priceTrackTaskCacheService, never()).deleteTaskCache(taskId);
|
||||
verify(lock).close();
|
||||
}
|
||||
|
||||
private FileTaskEntity runningTask(long taskId) {
|
||||
FileTaskEntity task = new FileTaskEntity();
|
||||
task.setId(taskId);
|
||||
|
||||
+31
@@ -50,6 +50,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
@@ -386,6 +387,36 @@ class ShopDataCrawlProgressQueryTest {
|
||||
verify(taskDistributedLockService, never()).acquire(anyString(), anyLong());
|
||||
}
|
||||
|
||||
/**
|
||||
* 任务级失败原因只给已 FAILED 的任务带,且截断 300 字。
|
||||
*
|
||||
* <p>为什么进度批量必须有这一格:整单判死(未配置代理/套餐到期/LLM 欠费)只写
|
||||
* `biz_file_task.error_message`,每个店铺行本身没被标失败,行级 `error` 是空的。
|
||||
* 用户端在终态那刻靠这一格弹「去哪改」,缺了就是一句原因都没有的静默失败。
|
||||
*/
|
||||
@Test
|
||||
void progressBatchCarriesTheTaskLevelFailureReasonOnlyWhenTheTaskFailed() {
|
||||
seedHistoryData(2);
|
||||
String longReason = "任务已终止:代理 IP 套餐已到期或余额不足,请到密钥设置里充值或更换提取链接。".repeat(20);
|
||||
FileTaskEntity failed = taskStore.get(8101L);
|
||||
failed.setStatus("FAILED");
|
||||
failed.setErrorMessage(longReason);
|
||||
FileTaskEntity running = taskStore.get(8102L);
|
||||
running.setStatus("RUNNING");
|
||||
running.setErrorMessage("运行中不该把这句话带出去");
|
||||
|
||||
ShopDataCrawlTaskBatchVo batch = service.getTaskProgressBatch(List.of(8101L, 8102L));
|
||||
|
||||
Map<Long, ShopDataCrawlResultItemVo> byResultId = new LinkedHashMap<>();
|
||||
for (ShopDataCrawlResultItemVo item : batch.getItems()) {
|
||||
byResultId.put(item.getResultId(), item);
|
||||
}
|
||||
String failedReason = byResultId.get(8101L).getTaskErrorMessage();
|
||||
assertEquals(300, failedReason.length(), "截断到 300 字:够说清去哪改,又不撑大轮询响应体");
|
||||
assertTrue(longReason.startsWith(failedReason), "截断是前缀,不是重写");
|
||||
assertNull(byResultId.get(8102L).getTaskErrorMessage(), "没落终态的任务不带任务级失败原因");
|
||||
}
|
||||
|
||||
// ---- helpers ----
|
||||
|
||||
/** 仿真 fileResultMapper.selectList:按 wrapper 条件查询 task_result 内存表,可注入底层失败。 */
|
||||
|
||||
+48
@@ -20,12 +20,14 @@ import com.nanri.aiimage.modules.task.model.entity.FileResultEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskChunkEntity;
|
||||
import com.nanri.aiimage.modules.task.model.entity.TaskScopeStateEntity;
|
||||
import com.nanri.aiimage.common.retry.CredentialFatalClassifier;
|
||||
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler;
|
||||
import com.nanri.aiimage.modules.task.service.TaskResultItemService;
|
||||
import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService;
|
||||
import com.nanri.aiimage.modules.usersecret.service.UserApiSecretCheckService;
|
||||
import com.nanri.aiimage.modules.ziniao.service.ZiniaoShopSwitchService;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.apache.ibatis.session.Configuration;
|
||||
@@ -406,6 +408,52 @@ class ShopDataCrawlScopeMergeTest {
|
||||
verify(taskScopeStateMapper, times(2)).updateById(any(TaskScopeStateEntity.class));
|
||||
}
|
||||
|
||||
/**
|
||||
* 店铺回传带「不可自愈的凭据故障」⇒ 整单立刻判死,不再等其余店铺。
|
||||
*
|
||||
* <p>2026-11-12 用户口径「没余额要退成失败,且直接中断任务」:剩下的每一家都会在同一条死路上
|
||||
* 各跑一遍,白等还白烧出口。判据共用 {@code CredentialFatalClassifier}。
|
||||
*/
|
||||
@Test
|
||||
void fatalCredentialShopErrorClosesTaskInsteadOfWaitingForTheRestOfTheShops() {
|
||||
givenRunningTask(1301L, 2301L);
|
||||
ShopDataCrawlShopPayloadDto payload = legacyChunk(true, "DE", row("2026-07-25", "B001"));
|
||||
payload.setError("用户未配置代理");
|
||||
when(taskCacheService.getAllShopMergedPayload(task.getId())).thenReturn(Map.of(SHOP_NAME, payload));
|
||||
|
||||
boolean finalized = service.tryFinalizeTask(task.getId(), true);
|
||||
|
||||
assertTrue(finalized);
|
||||
assertEquals("FAILED", task.getStatus());
|
||||
assertEquals(0, task.getSuccessFileCount());
|
||||
assertEquals(1, task.getFailedFileCount());
|
||||
assertTrue(task.getErrorMessage().contains(CredentialFatalClassifier.PROXY_TERMINAL_GUIDANCE),
|
||||
"实际: " + task.getErrorMessage());
|
||||
assertTrue(task.getFinishedAt() != null, "终态必须带 finished_at");
|
||||
assertEquals(-1, result.getSuccess(), "凭据故障的行不许被洗成成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 反向半边:通道被占是可自愈的供应商状态(句子本身含「套餐」字样),不许判死整单。
|
||||
*/
|
||||
@Test
|
||||
void channelBusyShopErrorKeepsTaskRunningAndMarksOnlyThatShopFailed() {
|
||||
givenRunningTask(1302L, 2302L);
|
||||
ShopDataCrawlShopPayloadDto payload = legacyChunk(true, "DE", row("2026-07-25", "B001"));
|
||||
payload.setError(UserApiSecretCheckService.CHANNEL_BUSY_MESSAGE);
|
||||
when(taskCacheService.getAllShopMergedPayload(task.getId())).thenReturn(Map.of(SHOP_NAME, payload));
|
||||
|
||||
service.tryFinalizeTask(task.getId(), true);
|
||||
|
||||
assertEquals("FAILED", task.getStatus(), "只有这一家店铺失败,任务本身该照旧收口成失败");
|
||||
assertTrue(task.getErrorMessage().contains("青果") || task.getErrorMessage().contains("空闲通道"),
|
||||
"原因原样进任务文案: " + task.getErrorMessage());
|
||||
// 关键反向判据:不是被「凭据不可自愈」那条早退路径判死的(该路径会写固定指引句)
|
||||
assertTrue(!task.getErrorMessage().contains(CredentialFatalClassifier.PROXY_TERMINAL_GUIDANCE),
|
||||
"通道被占被误判成凭据不可自愈: " + task.getErrorMessage());
|
||||
assertEquals(0, task.getSuccessFileCount());
|
||||
}
|
||||
|
||||
private void configureTransientPayloadStorage() {
|
||||
lenient().when(transientPayloadStorageService.isSharedWriteEnabled()).thenReturn(true);
|
||||
lenient().when(transientPayloadStorageService.storeChunkPayloadVersioned(
|
||||
|
||||
+26
@@ -113,6 +113,32 @@ class SimilarAsinResultTextSupportTest {
|
||||
assertThat(detail).endsWith("…");
|
||||
}
|
||||
|
||||
/**
|
||||
* 凭据不可自愈的行,图片采到了也不许算「成功」:它一次都没进 LLM。
|
||||
*
|
||||
* <p>2026-11-12 用户口径「没余额要退成失败,且直接中断任务」。这条与
|
||||
* {@link SimilarAsinResultTextSupport#resolveResultStatus} 的图片优先判据相反,顺序不能反。
|
||||
*/
|
||||
@Test
|
||||
void credentialFatalRowIsFailedEvenWhenImagesWereCollected() {
|
||||
SimilarAsinResultRowDto quota = row("LLM 服务余额欠费;lastErr={\"code\":\"insufficient_user_quota\"}", "");
|
||||
quota.setMainUrl("https://img.example.com/1.jpg");
|
||||
SimilarAsinResultRowDto noProxy = row("", "用户未配置代理");
|
||||
noProxy.setPuzzleImg1("https://img.example.com/2.jpg");
|
||||
|
||||
assertThat(SimilarAsinResultTextSupport.resolveResultStatus(quota))
|
||||
.as("LLM 欠费")
|
||||
.isEqualTo("失败");
|
||||
assertThat(SimilarAsinResultTextSupport.resolveResultStatus(noProxy))
|
||||
.as("没配代理")
|
||||
.isEqualTo("失败");
|
||||
|
||||
// 反向半边:可自愈的失败照旧按图片算成功(判宽了就是拿整单给抖动陪葬)
|
||||
SimilarAsinResultRowDto timeout = row("商品页抓取超时", "");
|
||||
timeout.setMainUrl("https://img.example.com/3.jpg");
|
||||
assertThat(SimilarAsinResultTextSupport.resolveResultStatus(timeout)).isEqualTo("成功");
|
||||
}
|
||||
|
||||
private static SimilarAsinResultRowDto row(String error, String reason) {
|
||||
SimilarAsinResultRowDto row = new SimilarAsinResultRowDto();
|
||||
row.setError(error);
|
||||
|
||||
+12
-4
@@ -61,10 +61,14 @@ class TaskFailureCategoryGuardrailTest {
|
||||
"WithdrawTaskService.java",
|
||||
"PatrolDeleteTaskService.java",
|
||||
"ShopDataCrawlTaskService.java",
|
||||
"DeleteBrandRunService.java");
|
||||
"DeleteBrandRunService.java",
|
||||
// 2026-11-12:外观专利/相似ASIN 原来各自内联的那一处「写文案+派生写列」搬进了共用收口器
|
||||
// (凭据不可自愈 ⇒ 整单终态,铁律 31)。它现在是这一族写点的唯一出口,不登记=最常走的那一处免检;
|
||||
// 名单上下限随之各减 2、加 1。
|
||||
"CredentialFatalTaskCloser.java");
|
||||
|
||||
/** 名单内在册写点数(第二批 15 +第三批 32:风险 8/店铺匹配 5/查ASIN 3/提现 3/巡删 3/店铺采集 4/巡删品牌 6)。 */
|
||||
private static final int ENTITY_FACE_MIN_WRITE_SITES = 47;
|
||||
/** 名单内在册写点数(第二批 15 +第三批 32:风险 8/店铺匹配 5/查ASIN 3/提现 3/巡删 3/店铺采集 4/巡删品牌 6;2026-11-12 收口器 −2+1=46)。 */
|
||||
private static final int ENTITY_FACE_MIN_WRITE_SITES = 46;
|
||||
|
||||
/**
|
||||
* {@code .updateById(} 写法总量的在册棘轮(B82-01 收口时的换算值:改前 173,本笔把 12 处
|
||||
@@ -77,8 +81,12 @@ class TaskFailureCategoryGuardrailTest {
|
||||
* {@code updateById},都值得先审一遍「实体里有没有 ALWAYS 字段、传进去的是不是新鲜实体」。
|
||||
* 部分字段落库的正本形状是 {@code update(null, wrapper)} 显式 {@code .set}
|
||||
* ({@code CollectDataService} 结果文件组装的条件更新)。
|
||||
*
|
||||
* <p>2026-11-12:外观专利/相似ASIN 两处实体式落库搬进 {@code CredentialFatalTaskCloser},
|
||||
* 总量 160 − 2 + 1(收口器自己那一处,实体取自 {@code selectById} 的新鲜行,不涉 ALWAYS 抹列)= 159。
|
||||
* 这是"在册写点被挪走"那一支,不是新增写法。
|
||||
*/
|
||||
private static final int REGISTERED_UPDATE_BY_ID_SITES = 160;
|
||||
private static final int REGISTERED_UPDATE_BY_ID_SITES = 159;
|
||||
|
||||
@Test
|
||||
void 任务失败文案写点必须同笔写分类列() {
|
||||
|
||||
+6
-3
@@ -46,9 +46,12 @@ class TaskRetryEligibilityMarkersSnapshotTest {
|
||||
@Test
|
||||
void 六组markers逐字快照() {
|
||||
assertThat(markers("BALANCE_MARKERS")).containsExactly(
|
||||
"余额不足", "欠费", "套餐不存在", "套餐已过期", "套餐过期", "未开通",
|
||||
"insufficient_user_quota", "insufficient_quota", "quota exceeded",
|
||||
"预扣费额度");
|
||||
"余额不足", "欠费", "套餐不存在", "套餐已过期", "套餐过期", "套餐到期", "未开通",
|
||||
"insufficient_user_quota", "insufficient_quota", "insufficient_funds",
|
||||
"wallet balance insufficient", "quota exceeded",
|
||||
"预扣费额度",
|
||||
// 2026-11-12:没配代理也是「不修外部条件重跑必然同结果」,不登记就会被自动重试反复复位
|
||||
"未配置代理", "代理地址为空", "代理链接为空");
|
||||
assertThat(markers("KEY_MARKERS")).containsExactly(
|
||||
"密钥无效", "密钥失效", "无效的密钥", "密钥不可用",
|
||||
"invalid api key", "invalid_api_key", "api key 无效", "apikey 无效");
|
||||
|
||||
Reference in New Issue
Block a user