From fe479262e6936a3a81dc2525dee1388391d63a9c 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, 22 Nov 2026 01:36:08 +0800 Subject: [PATCH] =?UTF-8?q?fix(jd):=20B188-02=20=E7=9B=B4=E6=8E=A8?= =?UTF-8?q?=E8=BD=BD=E8=8D=B7=E5=B8=A6=20userId,=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E5=88=A4=E5=AE=9A=E5=88=86=E5=B1=82=E6=B6=88=E6=AF=8F?= =?UTF-8?q?=E5=8D=95=E8=AF=AF=E6=8A=A5=20WARNING?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/jd/service/JdTaskPullSpiImpl.java | 4 ++++ .../jd/service/JdTaskPullSpiImplTest.java | 12 ++++++---- frontend-vue/src/pages/jd/JdCollectTab.vue | 18 ++++++++++++-- frontend-vue/tests/jd-collect-tab.test.ts | 24 +++++++++++++++++-- 4 files changed, 50 insertions(+), 8 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImpl.java b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImpl.java index 4d113e17f..56e77780f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImpl.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImpl.java @@ -45,6 +45,10 @@ public class JdTaskPullSpiImpl implements ClientTaskPullSpi { JdCollectTaskCreateRequest create = collectTaskService.readCreateRequest(task); Map data = new LinkedHashMap<>(); data.put("taskId", task.getId()); + // 任务归属账号(B188-02):兜底拉取/重试直推的载荷带上 userId,客户端据此与 + // 执行时刻登录身份对撞(不一致走 interrupted 判死)。未带=老形状的合法常态, + // 客户端静默回落,不得把「没带」读成「带了非法值」(铁律 30 同形)。 + data.put("userId", task.getUserId()); data.put("shopName", create.getShopName()); data.put("listTabs", create.getListTabs()); data.put("maxProducts", create.getMaxProducts()); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImplTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImplTest.java index 739f41780..236a39a91 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImplTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/service/JdTaskPullSpiImplTest.java @@ -65,6 +65,10 @@ class JdTaskPullSpiImplTest { @SuppressWarnings("unchecked") Map data = (Map) payload.get("data"); assertThat(data.get("taskId")).isEqualTo(33890L); + assertThat(data.get("userId")) + .as("任务归属账号随载荷(B188-02):客户端与执行时刻登录身份对撞," + + "不一致走 interrupted 判死;未带=老形状合法常态静默回落") + .isEqualTo(7L); assertThat(data.get("shopName")).isEqualTo("测试旗舰店"); assertThat(data.get("listTabs")).isEqualTo(List.of("ONSALE", "OFFSALE")); assertThat(data.get("maxProducts")).isEqualTo(0); @@ -75,11 +79,11 @@ class JdTaskPullSpiImplTest { .as("建单没选店内分类时派空列表(2026-11-16 双键契约,同 categoryPaths 口径)") .isEqualTo(List.of()); assertThat(data.get("shopCategoryIds")).isEqualTo(List.of()); - // 客户端 process_task 只读这七键:多键无害,缺键即空跑——所以逐键钉 + // 客户端 process_task 只读这八键:多键无害,缺键即空跑——所以逐键钉 assertThat(data.keySet()) - .as("data 键集与客户端 jd_base.process_task 读取契约同键(taskId/shopName/listTabs/" - + "maxProducts/categoryPaths/shopCategoryNames/shopCategoryIds)") - .containsExactlyInAnyOrder("taskId", "shopName", "listTabs", "maxProducts", + .as("data 键集与客户端 jd_base.process_task 读取契约同键(taskId/userId/" + + "shopName/listTabs/maxProducts/categoryPaths/shopCategoryNames/shopCategoryIds)") + .containsExactlyInAnyOrder("taskId", "userId", "shopName", "listTabs", "maxProducts", "categoryPaths", "shopCategoryNames", "shopCategoryIds"); } diff --git a/frontend-vue/src/pages/jd/JdCollectTab.vue b/frontend-vue/src/pages/jd/JdCollectTab.vue index fd1715c57..0b86332f2 100644 --- a/frontend-vue/src/pages/jd/JdCollectTab.vue +++ b/frontend-vue/src/pages/jd/JdCollectTab.vue @@ -525,7 +525,9 @@ const PUSH_FALLBACK_NOTE = /** 建单成功后推送本机队列;返回 null 表示已推送成功,返回 string 表示要展示的提示文案 * (含浏览器无桥环境——任务仍会由在线客户端兜底认领,不是失败)。 * shopCategoryNames/Ids 是建单时选的京麦店内分类(重试/继续从历史行同源带回)——推送载荷 - * 与建单请求体、客户端兜底拉取(request_json)三处同键,缺一处客户端就按全店采集跑。 */ + * 与建单请求体、客户端兜底拉取(request_json)三处同键,缺一处客户端就按全店采集跑。 + * userId 是任务归属账号(B188-02):客户端拿它与执行时刻登录身份对撞,不一致显式判死; + * 读不到 uid(localStorage 未登录形状 '0')就不带——「没带」是合法常态,客户端静默回落。 */ async function pushToClientQueue( id: number, shop: string, @@ -537,10 +539,22 @@ async function pushToClientQueue( if (!api?.enqueue_json) { return '当前在浏览器中打开,无法直接推送本机队列。任务已创建,将由在线的本机客户端自动领取;如需本机立即执行,请在本机客户端中打开本页' } + const ownerUid = Number.parseInt(uidForStorage(), 10) + const data: Record = { + taskId: id, + shopName: shop, + listTabs: tabs, + maxProducts: 0, + shopCategoryNames, + shopCategoryIds, + } + if (Number.isFinite(ownerUid) && ownerUid > 0) { + data.userId = ownerUid + } const payload = { type: 'jd-shop-collect-run', ts: Date.now(), - data: { taskId: id, shopName: shop, listTabs: tabs, maxProducts: 0, shopCategoryNames, shopCategoryIds }, + data, } const pushResult = await api.enqueue_json(payload) if (pushResult?.success) { diff --git a/frontend-vue/tests/jd-collect-tab.test.ts b/frontend-vue/tests/jd-collect-tab.test.ts index d2dab49fc..2b39b1793 100644 --- a/frontend-vue/tests/jd-collect-tab.test.ts +++ b/frontend-vue/tests/jd-collect-tab.test.ts @@ -136,12 +136,32 @@ test('建单请求体与推送载荷都带店内分类双键', () => { join(process.cwd(), 'src', 'pages', 'jd', 'JdCollectTab.vue'), 'JdCollectTab.vue', ) - assert.ok(page.includes('maxProducts: 0, shopCategoryNames, shopCategoryIds }'), - '推送载荷 data 必须带店内分类双键(与后端 JdTaskPullSpiImplTest 键集断言同键)') + assert.ok(page.includes('maxProducts: 0,') && page.includes('shopCategoryNames,') + && page.includes('shopCategoryIds,'), + '推送载荷 data 必须带店内分类双键(与后端 JdTaskPullSpiImplTest 键集断言同键;' + + 'B188-01 起 data 改 Record 逐键构造,断言按键名钉不再钉整行字面量)') assert.ok(page.includes('createJdCollectTask(shop, tabs, 0, [], shopNames, shopIds)'), 'startCollect 建单必须把选中的分类(names+ids)传给 createJdCollectTask') }) +/** B188-02(2026-11-22):推送载荷带任务归属 userId——客户端拿它与执行时刻登录身份 + * 对撞,不一致显式判死;localStorage 读不到 uid('0'/NaN)就不带,「没带」是合法 + * 常态、客户端静默回落(铁律 30 同形:不得把「没带」读成「带了非法值」)。 + * 摘掉守卫或无条件恒带(含 '0')即红。 */ +test('推送载荷带任务归属 userId,uid>0 才带', () => { + const page = readIfExists( + join(process.cwd(), 'src', 'pages', 'jd', 'JdCollectTab.vue'), + 'JdCollectTab.vue', + ) + const pushAt = page.indexOf('async function pushToClientQueue') + assert.ok(pushAt > 0, 'JdCollectTab.vue 缺 pushToClientQueue') + const body = page.slice(pushAt, page.indexOf('const isRunning')) + assert.ok(/data\.userId = ownerUid/.test(body), + '推送载荷 data 必须带 userId(客户端据此与登录身份对撞)') + assert.ok(/ownerUid > 0/.test(body), + 'uid 读不到(localStorage 0/NaN)不得带 userId——没带是合法常态') +}) + test('重试/继续从历史行同源带回店内分类双键', () => { const page = readIfExists( join(process.cwd(), 'src', 'pages', 'jd', 'JdCollectTab.vue'),