feat(taskcenter): 13 个客户端任务创建入口记录 JWT 设备号
设备号只认 JWT 签名 claim(不接受客户端可控请求头),controller 读取、service 归一化落库;续跑任务由服务端发起,继承原任务设备号。品牌检测走独立 brand_crawl_tasks 表,同一口径。
This commit is contained in:
+2
-2
@@ -57,7 +57,7 @@ class SimilarAsinTaskLightControllerTest {
|
||||
// 归属过滤:请求不带 userId 时 filterOwnedTaskIds 直接返回原列表(不会触碰 mapper),
|
||||
// 故这里传 null mapper 即可,无需 mock
|
||||
mockMvc = MockMvcBuilders.standaloneSetup(
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null))).build();
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), null)).build();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -117,7 +117,7 @@ class SimilarAsinTaskLightControllerTest {
|
||||
// 归属过滤:请求不带 userId 时 filterOwnedTaskIds 直接返回原列表(不会触碰 mapper),
|
||||
// 故这里传 null mapper 即可,无需 mock
|
||||
mockMvc = MockMvcBuilders.standaloneSetup(
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null))).build();
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), null)).build();
|
||||
mockMvc.perform(post("/api/similar-asin/tasks/progress/batch")
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(objectMapper.writeValueAsString(request)))
|
||||
|
||||
+1
-1
@@ -141,7 +141,7 @@ class SimilarAsinTaskServiceGroupRefTest {
|
||||
|
||||
private SimilarAsinParseVo parse(File workbook, String fileKey) {
|
||||
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
|
||||
return service.parseAndCreateTask(request(fileKey));
|
||||
return service.parseAndCreateTask(request(fileKey), "test-device");
|
||||
}
|
||||
|
||||
private String storedPayloadJson() {
|
||||
|
||||
+8
-5
@@ -144,14 +144,17 @@ class SimilarAsinTaskServiceParseDelegationTest {
|
||||
|
||||
private SimilarAsinParseVo parse(File workbook, String fileKey) {
|
||||
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
|
||||
return service.parseAndCreateTask(request(fileKey));
|
||||
return service.parseAndCreateTask(request(fileKey), "test-device");
|
||||
}
|
||||
|
||||
@Test
|
||||
void test_parse_signature_unchanged() throws Exception {
|
||||
Method parseMethod = SimilarAsinTaskService.class.getMethod("parseAndCreateTask", SimilarAsinParseRequest.class);
|
||||
// 追加的 String 参数是服务端从 JWT 签名 claim 解析出的设备号(V138),
|
||||
// 请求体仍是 SimilarAsinParseRequest,客户端契约不变。
|
||||
Method parseMethod = SimilarAsinTaskService.class.getMethod("parseAndCreateTask",
|
||||
SimilarAsinParseRequest.class, String.class);
|
||||
assertEquals(SimilarAsinParseVo.class, parseMethod.getReturnType(), "返回类型一字不变");
|
||||
assertEquals(1, parseMethod.getParameterCount(), "参数个数一字不变");
|
||||
assertEquals(2, parseMethod.getParameterCount(), "仅追加设备号参数,请求体契约不变");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -175,7 +178,7 @@ class SimilarAsinTaskServiceParseDelegationTest {
|
||||
File workbook = buildWorkbook(List.<String[]>of(new String[]{"1", " B01A ", " US "}));
|
||||
when(localFileStorageService.findLocalSourceFile(" uploads/f1.xlsx ")).thenReturn(workbook);
|
||||
SimilarAsinParseRequest request = request(" uploads/f1.xlsx ");
|
||||
SimilarAsinParseVo vo = service.parseAndCreateTask(request);
|
||||
SimilarAsinParseVo vo = service.parseAndCreateTask(request, "test-device");
|
||||
|
||||
assertEquals("B01A", vo.getItems().get(0).getAsin(), "asin 去空格并大写");
|
||||
assertEquals("US", vo.getItems().get(0).getCountry(), "国家全角空格归一");
|
||||
@@ -245,7 +248,7 @@ class SimilarAsinTaskServiceParseDelegationTest {
|
||||
sourceB.setOriginalFilename("delegate-b.xlsx");
|
||||
request.setFiles(List.of(request.getFiles().get(0), sourceB));
|
||||
|
||||
SimilarAsinParseVo vo = service.parseAndCreateTask(request);
|
||||
SimilarAsinParseVo vo = service.parseAndCreateTask(request, "test-device");
|
||||
|
||||
assertEquals(5, vo.getTotalRows(), "3 + 2 行原始数据");
|
||||
assertEquals(1, vo.getDroppedRows(), "缺国家行被丢弃");
|
||||
|
||||
+2
-2
@@ -142,7 +142,7 @@ class SimilarAsinTaskServiceParseLimitsTest {
|
||||
|
||||
private SimilarAsinParseVo parse(File workbook, String fileKey) {
|
||||
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
|
||||
return service.parseAndCreateTask(request(fileKey));
|
||||
return service.parseAndCreateTask(request(fileKey), "test-device");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -170,7 +170,7 @@ class SimilarAsinTaskServiceParseLimitsTest {
|
||||
sourceB.setFileKey("uploads/20260829/limit-b.xlsx");
|
||||
sourceB.setOriginalFilename("limits-b.xlsx");
|
||||
request.setFiles(List.of(request.getFiles().get(0), sourceB));
|
||||
SimilarAsinParseVo vo = service.parseAndCreateTask(request);
|
||||
SimilarAsinParseVo vo = service.parseAndCreateTask(request, "test-device");
|
||||
assertEquals(70, vo.getAcceptedRows());
|
||||
assertEquals(70, vo.getTotalRows());
|
||||
assertNotNull(vo.getTaskId());
|
||||
|
||||
+26
-3
@@ -22,6 +22,7 @@ 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.ArgumentCaptor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.Spy;
|
||||
import org.mockito.junit.jupiter.MockitoExtension;
|
||||
@@ -40,6 +41,7 @@ import java.util.concurrent.atomic.AtomicLong;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
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;
|
||||
@@ -47,6 +49,7 @@ import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.doAnswer;
|
||||
import static org.mockito.Mockito.lenient;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
@@ -141,7 +144,7 @@ class SimilarAsinTaskServiceParsePreviewTest {
|
||||
|
||||
private SimilarAsinParseVo parse(File workbook, String fileKey) {
|
||||
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
|
||||
return service.parseAndCreateTask(request(fileKey));
|
||||
return service.parseAndCreateTask(request(fileKey), "test-device");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -162,6 +165,26 @@ class SimilarAsinTaskServiceParsePreviewTest {
|
||||
assertTrue(vo.getGroups().size() <= 100);
|
||||
}
|
||||
|
||||
@Test
|
||||
void task_device_id_recorded_on_create() throws Exception {
|
||||
// V138:创建任务时把 JWT 设备号显式落库(列表按设备筛选的数据来源)
|
||||
File workbook = buildWorkbook(3);
|
||||
parse(workbook, "uploads/20260928/device.xlsx");
|
||||
ArgumentCaptor<FileTaskEntity> captor = ArgumentCaptor.forClass(FileTaskEntity.class);
|
||||
verify(fileTaskMapper).insert(captor.capture());
|
||||
assertEquals("test-device", captor.getValue().getDeviceId());
|
||||
}
|
||||
|
||||
@Test
|
||||
void task_device_id_null_when_absent() throws Exception {
|
||||
File workbook = buildWorkbook(3);
|
||||
when(localFileStorageService.findLocalSourceFile("uploads/20260928/nodev.xlsx")).thenReturn(workbook);
|
||||
service.parseAndCreateTask(request("uploads/20260928/nodev.xlsx"), null);
|
||||
ArgumentCaptor<FileTaskEntity> captor = ArgumentCaptor.forClass(FileTaskEntity.class);
|
||||
verify(fileTaskMapper).insert(captor.capture());
|
||||
assertNull(captor.getValue().getDeviceId());
|
||||
}
|
||||
|
||||
@Test
|
||||
void test_task_004_preview_normal_multiple_items() throws Exception {
|
||||
// 5000 行大文件:响应预览行数量不随总行数增长
|
||||
@@ -233,11 +256,11 @@ class SimilarAsinTaskServiceParsePreviewTest {
|
||||
noFiles.setUserId(7L);
|
||||
noFiles.setFiles(List.of());
|
||||
noFiles.setApiKey("sk");
|
||||
assertThrows(BusinessException.class, () -> service.parseAndCreateTask(noFiles));
|
||||
assertThrows(BusinessException.class, () -> service.parseAndCreateTask(noFiles, "test-device"));
|
||||
// 非法 user_id
|
||||
SimilarAsinParseRequest badUser = request("uploads/20260829/preview.xlsx");
|
||||
badUser.setUserId(null);
|
||||
assertThrows(BusinessException.class, () -> service.parseAndCreateTask(badUser));
|
||||
assertThrows(BusinessException.class, () -> service.parseAndCreateTask(badUser, "test-device"));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+1
-1
@@ -135,7 +135,7 @@ class SimilarAsinTaskServicePreviewConfigTest {
|
||||
|
||||
private SimilarAsinParseVo parse(File workbook, String fileKey) {
|
||||
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
|
||||
return service.parseAndCreateTask(request(fileKey));
|
||||
return service.parseAndCreateTask(request(fileKey), "test-device");
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
+2
-2
@@ -142,7 +142,7 @@ class SimilarAsinTaskServiceWorkbookControlTest {
|
||||
|
||||
private SimilarAsinParseVo parse(File workbook, String fileKey) {
|
||||
when(localFileStorageService.findLocalSourceFile(fileKey)).thenReturn(workbook);
|
||||
return service.parseAndCreateTask(request(fileKey));
|
||||
return service.parseAndCreateTask(request(fileKey), "test-device");
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -168,7 +168,7 @@ class SimilarAsinTaskServiceWorkbookControlTest {
|
||||
sourceB.setFileKey("uploads/20260829/wb-b.xlsx");
|
||||
sourceB.setOriginalFilename("workbook-b.xlsx");
|
||||
request.setFiles(List.of(request.getFiles().get(0), sourceB));
|
||||
SimilarAsinParseVo vo = service.parseAndCreateTask(request);
|
||||
SimilarAsinParseVo vo = service.parseAndCreateTask(request, "test-device");
|
||||
assertEquals(60, vo.getAcceptedRows());
|
||||
assertEquals(60, vo.getTotalRows());
|
||||
assertNotNull(vo.getTaskId());
|
||||
|
||||
Reference in New Issue
Block a user