From 7f5437d012b3efbd6fe249a63470ae432c8beab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 2 Nov 2026 00:33:58 +0800 Subject: [PATCH] =?UTF-8?q?feat(submit-gate):=20=E7=BC=BA=20LLM=20?= =?UTF-8?q?=E5=AF=86=E9=92=A5=E7=9A=84=E5=A4=96=E8=A7=82=E4=B8=93=E5=88=A9?= =?UTF-8?q?/=E7=9B=B8=E4=BC=BCASIN=20=E5=8D=95=E5=9C=A8=E5=BB=BA=E5=8D=95?= =?UTF-8?q?=E5=8F=A3=E5=BD=93=E5=9C=BA=E6=8B=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 用户口径(2026-11-01):「没配置代理的不止是变体采集要拦,其他任务也是一样,包括 llm 密钥。」 这一支是服务端那半边——两把 LLM 密钥此前是**静默降级**:readApiKey 读空只打一条 log.warn,然后「保留原始行」把单子跑完、把表出出来,整列检测结论却是空的。 用户买到一张没检测过的结果表却看不出来,比一句「没配密钥」的失败更难发现; 而 UserSecretModule 早就把这两把密钥登记成 required=true(用户端必填),闸门只是把 这句声明变成会拦事的代码。 - UserApiSecretService#requireSubmitSecret:请求体带的密钥与库里存的那把,有一个非空即放行; 两侧都空当场 BusinessException(文案点名是哪把密钥、去哪配) - 外观专利 AppearancePatentTaskService.parseAndCreateTask / 相似ASIN SimilarAsinTaskService.parseAndCreateTask:闸门排在 Excel 解析与建单四段**之前**, 不解析、不落库、不占配额;userId 校验仍在最前(先判身份再判凭据) - 用例:UserApiSecretServiceTest 3 支(两侧都空拒 / 带值放行且不读库 / 库存量放行)、 两支建单快照各 2 支(缺密钥不碰源文件不落库;正向对照验模块与请求密钥同值) - 六支 SimilarAsinTaskService*Test 补 @Mock UserApiSecretService:@InjectMocks 缺该类型 会注进 null,闸门调用直接 NPE——这是把闸门接真后必须显式登记的依赖 - RequestSuppliedIdentityOutletTest 写类分母 126→128:2026-11-01「原任务重试」新增的两支 POST 端点(TaskRetryController / AppearancePatentController)都已接 resolveOwnershipUserId, 覆盖面变大不是放宽判据;该红是当时只跑四面闸门、没点后端整量留下的陈旧分母 后端整量 mvn -o test:5164 例(本笔改动 0 红;唯一一处红即上述陈旧分母,已随本笔抬正) --- .../service/AppearancePatentTaskService.java | 5 +++ .../service/SimilarAsinTaskService.java | 5 +++ .../service/UserApiSecretService.java | 22 ++++++++++ .../RequestSuppliedIdentityOutletTest.java | 7 +++- ...ppearancePatentCreateTaskSnapshotTest.java | 39 +++++++++++++++++- .../SimilarAsinTaskServiceGroupRefTest.java | 4 ++ ...larAsinTaskServiceParseDelegationTest.java | 4 ++ ...SimilarAsinTaskServiceParseLimitsTest.java | 4 ++ ...imilarAsinTaskServiceParsePreviewTest.java | 4 ++ ...milarAsinTaskServicePreviewConfigTest.java | 4 ++ ...larAsinTaskServiceWorkbookControlTest.java | 4 ++ .../SimilarAsinCreateTaskSnapshotTest.java | 36 +++++++++++++++- .../service/UserApiSecretServiceTest.java | 41 +++++++++++++++++++ 13 files changed, 174 insertions(+), 5 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java index b9a1d2bce..df1a0819a 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/service/AppearancePatentTaskService.java @@ -180,6 +180,11 @@ public class AppearancePatentTaskService extends AbstractFileTaskPipeline都为空必须当场拒。 + * + *

为什么不能放过去:执行侧读到空密钥走的是「保留原始行」的静默降级 + * ({@code AppearancePatentLlmSubmissionSupport#readApiKey} 那两条 log.warn)——单子照样跑完、 + * 表照样出、行数照样扣,只是整列 LLM 结论是空的。用户买到一张没有检测过的结果表却看不出来, + * 比一句「没配密钥」的失败更难发现。 + * + *

调用方须先校验 userId(各模块自己的入口文案为准),这里不重复判。 + */ + public void requireSubmitSecret(Long userId, UserSecretModule module, String callerSuppliedValue) { + if (hasText(callerSuppliedValue)) { + return; + } + if (!findPlainValue(userId, module.key()).isEmpty()) { + return; + } + throw new BusinessException("该账号还没有配置" + module.label() + ":这一单要用它跑 LLM 检测," + + "缺了只会得到一张没有检测结论的结果表。请先在「密钥设置」里填好并保存。"); + } + /** * 任务执行兜底读取「货源」:未配置返回空串(调用方按模块默认值处理)。 * 代理模块额外做链接域名识别,兜住老数据(只有链接、没有供应商列)的存量行。 diff --git a/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java b/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java index 11b71a279..ec861a044 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/common/security/RequestSuppliedIdentityOutletTest.java @@ -38,7 +38,7 @@ import org.junit.jupiter.api.Test; * *

扫描一律打在 {@link SourceScan#withoutComments} 剥掉注释的源码上,且判据是"必须存在/等于 N" * 那一形:不剥注释的话,谁在 {@code @Operation} 描述或行尾注释里提一句出口名,就能把护栏喂饱。 - * 分母(写 126 / 读 63,另有 1 支在册豁免)同样钉死,扫描器坏掉与"真的没人漏接"不会一起恒绿。 + * 分母(写 128 / 读 64,另有 1 支在册豁免)同样钉死,扫描器坏掉与"真的没人漏接"不会一起恒绿。 * 这 190 支里有 39 支是 DTO 形态——只 grep 文本上的 {@code getUserId()} 会把它们整批看漏, * 所以 {@link #dtoTypesWithUserId()} 必须先建一遍"哪些请求类声明了 userId 字段"的索引。

*/ @@ -92,7 +92,10 @@ class RequestSuppliedIdentityOutletTest { void theScanCoversBothVerbsWithPinnedDenominators() { Scan scan = scanAll(); // 28 支进度轮询走 require,其余写类/读类走 resolve;两边都算"已接出口"。 - assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(126); + // 128 而不是 126:2026-11-01「失败任务在原任务上重试」新增两支写类端点(TaskRetryController + // POST /api/tasks/{taskId}/retry + AppearancePatentController POST /tasks/{taskId}/retry), + // 两边都是 @RequestParam("user_id") 先过 resolveOwnershipUserId——记账变大是覆盖面变大,不是放宽分母。 + assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(128); // 64 而不是 63:2026-10-29 随本地采集开关恢复 GET /tasks/{taskId}/queue-payload, // 该 handler 同时接上 resolveOwnershipUserId(不是放宽分母)。 assertThat(scan.boundRead()).as("取请求身份且已接出口的读类 handler 数").isEqualTo(64); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentCreateTaskSnapshotTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentCreateTaskSnapshotTest.java index 3acf3aa0c..b5ccafcb0 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentCreateTaskSnapshotTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/appearancepatent/service/support/AppearancePatentCreateTaskSnapshotTest.java @@ -33,6 +33,7 @@ import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler; import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService; +import com.nanri.aiimage.modules.usersecret.support.UserSecretModule; import org.apache.ibatis.builder.MapperBuilderAssistant; import org.apache.ibatis.session.Configuration; import org.apache.poi.ss.usermodel.Row; @@ -60,8 +61,11 @@ import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** @@ -135,6 +139,8 @@ class AppearancePatentCreateTaskSnapshotTest { final TransientPayloadStorageService transientPayloadStorageService = mock(TransientPayloadStorageService.class); final AppearancePatentProperties properties = mock(AppearancePatentProperties.class); final InstanceMetadata instanceMetadata = mock(InstanceMetadata.class); + /** 密钥闸门所在的协作者:默认空转(放行),拒单用例显式把它改成抛。 */ + final UserApiSecretService userApiSecretService = mock(UserApiSecretService.class); boolean sharedWriteEnabled = true; AppearancePatentTaskService service() { @@ -227,7 +233,7 @@ class AppearancePatentCreateTaskSnapshotTest { mock(TaskDistributedLockService.class), instanceMetadata, mock(TaskProgressLightAssembler.class), - mock(UserApiSecretService.class)); + userApiSecretService); } } @@ -486,6 +492,37 @@ class AppearancePatentCreateTaskSnapshotTest { assertTrue(harness.events.isEmpty(), "user_id 不合法时不得有任何落库"); } + /** + * 缺 LLM 密钥的单必须在建单口拒掉:执行侧读到空密钥是「保留原始行」的静默降级, + * 单子跑完、表也出,只是整列检测结论是空的——用户买到一张没检测过的结果却看不出来。 + * 判据是「闸门排在解析之前」:源文件一次都不该被打开,更不该落库。 + */ + @Test + void 缺密钥的单不解析也不建单() throws Exception { + Harness harness = harnessWithFiles("uploads/main.xlsx", mixedWorkbook(), null, null); + doThrow(new com.nanri.aiimage.common.exception.BusinessException("该账号还没有配置外观专利密钥")) + .when(harness.userApiSecretService) + .requireSubmitSecret(any(), any(), any()); + + assertThrows(com.nanri.aiimage.common.exception.BusinessException.class, + () -> harness.service().parseAndCreateTask( + request(7L, List.of(source("uploads/main.xlsx", "17.xlsx"))), "d")); + + verify(harness.localFileStorageService, never()).findLocalSourceFile(any()); + assertTrue(harness.events.isEmpty(), "缺密钥不得解析 Excel、不得建单:" + harness.events); + } + + /** 正向对照(防改过头):请求体自带密钥的老形状照常放行,且按本模块的密钥问闸门。 */ + @Test + void 建单前按模块与请求密钥问一次闸门() throws Exception { + Harness harness = harnessWithFiles("uploads/main.xlsx", mixedWorkbook(), null, null); + + harness.service().parseAndCreateTask(request(7L, List.of(source("uploads/main.xlsx", "17.xlsx"))), "d"); + + verify(harness.userApiSecretService).requireSubmitSecret(7L, + UserSecretModule.APPEARANCE_PATENT, "sk-test-0001"); + } + @Test void golden文件已入库且非空() { assertNotNull(GOLDEN_CREATE); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceGroupRefTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceGroupRefTest.java index a11d206fc..2a0ec09c7 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceGroupRefTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceGroupRefTest.java @@ -18,6 +18,7 @@ import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper; import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; +import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.jupiter.api.AfterEach; @@ -73,6 +74,9 @@ class SimilarAsinTaskServiceGroupRefTest { @Mock private TransientPayloadStorageService transientPayloadStorageService; @Mock private SimilarAsinImageEmbedder imageEmbedder; + /** 建单口的 LLM 密钥闸门所在协作者:不声明就注入不进(默认 null ⇒ 闸门调用直接 NPE)。 */ + @Mock private UserApiSecretService userApiSecretService; + @InjectMocks private SimilarAsinTaskService service; @BeforeAll diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParseDelegationTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParseDelegationTest.java index 460dc62ee..b757c1feb 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParseDelegationTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParseDelegationTest.java @@ -16,6 +16,7 @@ import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper; import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; +import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.jupiter.api.AfterEach; @@ -77,6 +78,9 @@ class SimilarAsinTaskServiceParseDelegationTest { @Mock private TransientPayloadStorageService transientPayloadStorageService; @Mock private SimilarAsinImageEmbedder imageEmbedder; + /** 建单口的 LLM 密钥闸门所在协作者:不声明就注入不进(默认 null ⇒ 闸门调用直接 NPE)。 */ + @Mock private UserApiSecretService userApiSecretService; + @InjectMocks private SimilarAsinTaskService service; @BeforeAll diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParseLimitsTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParseLimitsTest.java index b352d4f62..c8d2d2051 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParseLimitsTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParseLimitsTest.java @@ -15,6 +15,7 @@ import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper; import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; +import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.jupiter.api.AfterEach; @@ -68,6 +69,9 @@ class SimilarAsinTaskServiceParseLimitsTest { @Mock private TransientPayloadStorageService transientPayloadStorageService; @Mock private SimilarAsinImageEmbedder imageEmbedder; + /** 建单口的 LLM 密钥闸门所在协作者:不声明就注入不进(默认 null ⇒ 闸门调用直接 NPE)。 */ + @Mock private UserApiSecretService userApiSecretService; + @InjectMocks private SimilarAsinTaskService service; @BeforeAll diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParsePreviewTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParsePreviewTest.java index aae7a407e..a6e7f2e27 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParsePreviewTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceParsePreviewTest.java @@ -15,6 +15,7 @@ import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper; import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; +import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.jupiter.api.AfterEach; @@ -73,6 +74,9 @@ class SimilarAsinTaskServiceParsePreviewTest { @Mock private TransientPayloadStorageService transientPayloadStorageService; @Mock private SimilarAsinImageEmbedder imageEmbedder; + /** 建单口的 LLM 密钥闸门所在协作者:不声明就注入不进(默认 null ⇒ 闸门调用直接 NPE)。 */ + @Mock private UserApiSecretService userApiSecretService; + @InjectMocks private SimilarAsinTaskService service; @BeforeAll diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServicePreviewConfigTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServicePreviewConfigTest.java index 6c2b51501..b18079c63 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServicePreviewConfigTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServicePreviewConfigTest.java @@ -15,6 +15,7 @@ import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper; import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; +import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.jupiter.api.AfterEach; @@ -69,6 +70,9 @@ class SimilarAsinTaskServicePreviewConfigTest { @Mock private TransientPayloadStorageService transientPayloadStorageService; @Mock private SimilarAsinImageEmbedder imageEmbedder; + /** 建单口的 LLM 密钥闸门所在协作者:不声明就注入不进(默认 null ⇒ 闸门调用直接 NPE)。 */ + @Mock private UserApiSecretService userApiSecretService; + @InjectMocks private SimilarAsinTaskService service; @BeforeAll diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceWorkbookControlTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceWorkbookControlTest.java index cc47f3f7d..42c7b0aa3 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceWorkbookControlTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceWorkbookControlTest.java @@ -15,6 +15,7 @@ import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper; import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper; import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; +import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.jupiter.api.AfterEach; @@ -70,6 +71,9 @@ class SimilarAsinTaskServiceWorkbookControlTest { @Mock private TransientPayloadStorageService transientPayloadStorageService; @Mock private SimilarAsinImageEmbedder imageEmbedder; + /** 建单口的 LLM 密钥闸门所在协作者:不声明就注入不进(默认 null ⇒ 闸门调用直接 NPE)。 */ + @Mock private UserApiSecretService userApiSecretService; + @InjectMocks private SimilarAsinTaskService service; @BeforeAll diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinCreateTaskSnapshotTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinCreateTaskSnapshotTest.java index afa6c831a..4e4e226b2 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinCreateTaskSnapshotTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/support/SimilarAsinCreateTaskSnapshotTest.java @@ -3,6 +3,7 @@ package com.nanri.aiimage.modules.similarasin.service.support; import com.baomidou.mybatisplus.core.MybatisConfiguration; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.fasterxml.jackson.databind.ObjectMapper; +import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.config.InstanceMetadata; import com.nanri.aiimage.config.SimilarAsinProperties; import com.nanri.aiimage.modules.file.service.LocalFileStorageService; @@ -30,6 +31,7 @@ import com.nanri.aiimage.modules.task.service.TaskHeartbeatPositionService; import com.nanri.aiimage.modules.task.service.TaskProgressSnapshotService; import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService; import com.nanri.aiimage.modules.usersecret.service.UserApiSecretService; +import com.nanri.aiimage.modules.usersecret.support.UserSecretModule; import org.apache.ibatis.builder.MapperBuilderAssistant; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -53,6 +55,7 @@ import java.util.ArrayList; import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -60,7 +63,10 @@ import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; /** * 相似 ASIN 建单段的现网行为快照(重构蓝图 Phase 4 开工前置)。 @@ -394,11 +400,37 @@ class SimilarAsinCreateTaskSnapshotTest { assertEquals(original, read(GOLDEN_CREATE), "恢复原始 golden"); } + /** + * 缺 LLM 密钥的单必须在建单口拒掉:执行侧读到空密钥走的是「保留原始行」的静默降级 + * (单子跑完、表也出,只是整列检测结论是空的),用户买到一张没检测过的结果却看不出来。 + * 判据是「闸门排在解析之前」:源文件一次都不该被打开,头行一次都不该落库。 + */ + @Test + void missingSecretRejectsBeforeParse() { + doThrow(new BusinessException("该账号还没有配置货源查询密钥")) + .when(userApiSecretService).requireSubmitSecret(any(), any(), any()); + + assertThrows(BusinessException.class, () -> service.parseAndCreateTask( + request(List.of(source("uploads/20261023/one.xlsx", "one.xlsx"))), "snapshot-device")); + + verify(localFileStorageService, never()).findLocalSourceFile(any()); + verify(fileTaskMapper, never()).insert(any(FileTaskEntity.class)); + } + + /** 正向对照(防改过头):请求体自带密钥的老形状照样问闸门,且带的是这一单的值。 */ + @Test + void parseAsksGateWithModuleAndRequestKey() { + // 不 stub 源文件:闸门之后第一道就是「源文件不存在」,正好证明闸门排在解析之前 + assertThrows(BusinessException.class, () -> service.parseAndCreateTask( + request(List.of(source("uploads/20261023/one.xlsx", "one.xlsx"))), "snapshot-device")); + + verify(userApiSecretService).requireSubmitSecret(9L, UserSecretModule.SIMILAR_ASIN, "unit-test-key"); + } + /** 只在显式点名时写 golden:默认跑测试永远不许改是非源。 */ @Test @EnabledIfEnvironmentVariable(named = "SHUFU_SNAPSHOT_WRITE", matches = "true") - void write_golden_on_demand() throws Exception { - Files.createDirectories(GOLDEN_CREATE.getParentFile().toPath()); + void write_golden_on_demand() throws Exception { Files.createDirectories(GOLDEN_CREATE.getParentFile().toPath()); Files.writeString(GOLDEN_CREATE.toPath(), runAll(), StandardCharsets.UTF_8); } } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java index b689ac069..91bcb3439 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/usersecret/service/UserApiSecretServiceTest.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.ibatis.builder.MapperBuilderAssistant; +import com.nanri.aiimage.common.exception.BusinessException; import com.nanri.aiimage.common.security.ShopCredentialCryptoService; import com.nanri.aiimage.config.UserSecretProperties; import com.nanri.aiimage.config.AppearancePatentProperties; @@ -29,6 +30,7 @@ import com.nanri.aiimage.modules.usersecret.model.entity.UserApiSecretEntity; import com.nanri.aiimage.modules.usersecret.model.entity.UserProxyPlanEntity; import com.nanri.aiimage.modules.usersecret.model.vo.AdminUserSecretModuleVo; import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBalanceVo; +import com.nanri.aiimage.modules.usersecret.support.UserSecretModule; import com.nanri.aiimage.modules.usersecret.model.vo.UserApiSecretBundleVo; import com.nanri.aiimage.modules.notification.service.NotificationService; import org.junit.jupiter.api.AfterEach; @@ -50,6 +52,7 @@ import java.util.Map; import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyString; @@ -325,6 +328,44 @@ class UserApiSecretServiceTest { verify(mapper, never()).selectOne(any()); } + /** + * 建单闸门:这一单要拿谁的密钥跑 LLM。两侧都空必须当场拒——放过去就是 + * 「保留原始行」的静默降级:表照出、行数照扣,只是整列检测结论是空的。 + */ + @Test + void requireSubmitSecretRejectsWhenNeitherSideHasKey() { + UserApiSecretService service = newService(); + when(mapper.selectOne(any())).thenReturn(null); + + BusinessException error = assertThrows(BusinessException.class, + () -> service.requireSubmitSecret(7L, UserSecretModule.SIMILAR_ASIN, " ")); + + // 空白 caller 值不算「带了密钥」;文案要说清缺哪把、去哪配 + assertThat(error.getMessage()).contains("货源查询密钥").contains("密钥设置"); + } + + @Test + void requireSubmitSecretPassesWhenCallerCarriesKey() { + UserApiSecretService service = newService(); + + service.requireSubmitSecret(7L, UserSecretModule.APPEARANCE_PATENT, "sk-caller"); + + // 显式带密钥的形状(老任务/覆盖提交)不得被拦,连库都不该读 + verify(mapper, never()).selectOne(any()); + } + + @Test + void requireSubmitSecretPassesWhenUserHasStoredKey() { + UserApiSecretService service = newService(); + UserApiSecretEntity row = new UserApiSecretEntity(); + row.setUserId(7L); + row.setModuleKey("appearance-patent"); + row.setSecretValue("enc:sk-stored"); + when(mapper.selectOne(any())).thenReturn(row); + + service.requireSubmitSecret(7L, UserSecretModule.APPEARANCE_PATENT, null); + } + @Test void migrateSkipsWhenServerValueExists() { UserApiSecretService service = newService();