From 20ee73349eba32a0c998d9eb94e43d3f933b7ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Tue, 17 Nov 2026 16:05:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(jd):=20=E4=BA=AC=E4=B8=9C=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E5=8F=B0=E7=BA=B3=E5=85=A5=E5=90=8E=E5=8F=B0=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=9D=83=E9=99=90=E2=80=94=E2=80=94V209=20app?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=BB=84jd=5Ftools+=E4=B8=A4=E5=AD=90?= =?UTF-8?q?=E8=A1=8C,=20=E9=A2=84=E6=8E=88=E6=9D=83=E6=B2=BFV163=E5=85=A8?= =?UTF-8?q?=E6=8E=88=E7=BB=84=E8=A1=8C;=20=E7=94=A8=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8F=B0=E5=8D=A1=E7=89=87/=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E5=85=A5=E5=8F=A3=E6=8C=89=E6=9D=83=E9=99=90=E6=98=BE?= =?UTF-8?q?=E9=9A=90(=E6=8E=A5=E5=8F=A3=E5=A4=B1=E8=B4=A5=E5=85=9C?= =?UTF-8?q?=E5=BA=95=E5=85=A8=E6=98=BE,=20=E5=90=8C=E4=BA=9A=E9=A9=AC?= =?UTF-8?q?=E9=80=8A=E5=BD=A2=E7=8A=B6);=20=E9=A6=96=E9=A1=B5computePermis?= =?UTF-8?q?sionState=E6=8A=BD=E8=96=84home-permission.ts=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E5=8F=AA=E6=8E=88=E4=BA=AC=E4=B8=9C=E8=AF=AF=E4=BA=AE=E4=BA=9A?= =?UTF-8?q?=E9=A9=AC=E9=80=8A=E7=9A=84=E5=85=9C=E5=BA=95=E7=BC=BA=E9=99=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/V209__jd_app_menu.sql | 149 ++++++++++++++++++ .../modules/jd/JdSchemaContractTest.java | 30 ++++ .../src/pages/home/DesktopHomePage.vue | 46 ++---- .../src/pages/home/home-permission.ts | 53 +++++++ frontend-vue/src/pages/jd/JdConsolePage.vue | 24 ++- frontend-vue/src/pages/jd/tool-catalog.ts | 29 ++++ .../tests/desktop-home-permission.test.ts | 58 +++++++ .../tests/jd-console-tool-catalog.test.ts | 44 +++++- .../mount/jd-console-permission.mount.test.ts | 86 ++++++++++ 9 files changed, 477 insertions(+), 42 deletions(-) create mode 100644 backend-java/src/main/resources/db/V209__jd_app_menu.sql create mode 100644 frontend-vue/src/pages/home/home-permission.ts create mode 100644 frontend-vue/tests/desktop-home-permission.test.ts create mode 100644 frontend-vue/tests/mount/jd-console-permission.mount.test.ts diff --git a/backend-java/src/main/resources/db/V209__jd_app_menu.sql b/backend-java/src/main/resources/db/V209__jd_app_menu.sql new file mode 100644 index 000000000..16f885d17 --- /dev/null +++ b/backend-java/src/main/resources/db/V209__jd_app_menu.sql @@ -0,0 +1,149 @@ +-- 迁移 V209:用户端京东功能纳入 app 菜单权限(「后台京东这边也要加菜单权限」2026-11-17) +-- ============================================================= +-- 1. 变更目的:亚马逊/视频侧的用户端功能早已被 columns(menu_type='app') 树 + 逐用户勾授 +-- 管控(后管授权页勾选 → 用户端首页入口/工具台卡片按权限显隐),京东侧整条链缺失: +-- app 树无任何京东行、京东工具台卡片不走过滤。本迁移补数据入口——新增「京东工具台」 +-- app 组行(jd_tools)+两个工具子行(jd-collect 获取店铺数据 / jd-publish 商品上架, +-- 上架卡转正前占位,v1.5 Phase 4 无需再发迁移)。 +-- 【与 V190/V196 不预授权口径的偏离(有意,非漏写)】那是 admin 页面菜单——不预插时 +-- 默认仅超管可见,收紧不伤及现用人;app 行若不预授权,上线当天所有非超管账号立刻 +-- 失去现在人人可见的京东工具台,"隐藏"变成了静默断供。故预授权段逐字沿 V163 先例: +-- 全表账号按所属公司授本公司【组行】(读侧 PermissionMenuService 展开子孙 ⇒ 两工具随组 +-- 可见;子行不预授,管理员收组后可按工具单独放)。停用账号照授(登录即拦,不构成可见 +-- 入口,避免解禁后菜单凭空消失——V163 头注 §2 同一口径)。 +-- +-- 2. 形状口径(V163 逐形,每公司一棵树按 V149 模型): +-- - company_id=1 为模板树(CompanyService.create → copyTreeFromTemplate 的源头), +-- 其余公司(含停用公司)逐家复制;子行 parent_id 认本公司组行,严禁跨公司认父。 +-- - 组行挂 app 根(parent_id=NULL,V80 组行形状),排序 140 接后勤工具(130) 之后; +-- 子行 141/142。route_path=组 slug/前端 item key(V80/V90 形状), +-- column_key 与前端 permissionKeys 逐字一致(jd_tools / jd-collect / jd-publish)。 +-- - 幂等守卫按 (company_id, column_key) 判存,同时防 +-- uk_company_menu_type_route_path(company_id, menu_type, route_path) 撞行。 +-- - 预授权 INSERT IGNORE 必须钉 col.column_key='jd_tools'——V163 第 4 段 JOIN 只按 +-- company_id 匹配(当时新键行天然唯一),照抄会让账号获得其本公司【全部】菜单行的 +-- 重复授权,属静默数据污染,此处按 key 收紧。 +-- +-- 3. 影响表与数据量:columns +3N 行(N=公司数),user_column_permission +账号数(只授组行); +-- 字典/授权小表,毫秒级,不碰锁热点表。 +-- +-- 4. 可重跑性:三段 INSERT 都带 NOT EXISTS / INSERT IGNORE 守卫,重跑逐条 no-op; +-- 自检闸门只读。 +-- +-- 5. 回滚(人工补丁,写成注释以免落在 Flyway 扫描路径里被当迁移执行;顺序照 V165: +-- 先删授权,再删子行,最后删组行——parent_id 外键 ON DELETE RESTRICT): +-- DELETE g FROM user_column_permission g JOIN columns c ON c.id=g.column_id +-- WHERE c.column_key IN ('jd_tools','jd-collect','jd-publish'); +-- DELETE FROM columns WHERE column_key IN ('jd-collect','jd-publish'); +-- DELETE FROM columns WHERE column_key = 'jd_tools'; +-- DELETE FROM flyway_schema_history WHERE version='209'; +-- ============================================================= + +-- ---------- 1. 公司 1 模板树:组行 ---------- +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '京东工具台', 'jd_tools', 'app', 'jd-tools', 140, NULL, 1 +WHERE NOT EXISTS ( + SELECT 1 FROM `columns` + WHERE `company_id` = 1 + AND (`column_key` = 'jd_tools' + OR (`menu_type` = 'app' AND `route_path` = 'jd-tools')) +); + +-- ---------- 2. 组行复制到其余公司(含停用公司) ---------- +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '京东工具台', 'jd_tools', 'app', 'jd-tools', 140, NULL, c.`id` +FROM `company` c +WHERE c.`id` <> 1 + AND NOT EXISTS ( + SELECT 1 FROM `columns` col + WHERE col.`company_id` = c.`id` + AND (col.`column_key` = 'jd_tools' + OR (col.`menu_type` = 'app' AND col.`route_path` = 'jd-tools')) + ); + +-- ---------- 3. 两个工具子行(每家公司认本公司组行) ---------- +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '京东店铺数据采集', 'jd-collect', 'app', 'jd-collect', 141, grp.`id`, grp.`company_id` +FROM `columns` grp +WHERE grp.`column_key` = 'jd_tools' + AND NOT EXISTS ( + SELECT 1 FROM `columns` col + WHERE col.`company_id` = grp.`company_id` + AND (col.`column_key` = 'jd-collect' + OR (col.`menu_type` = 'app' AND col.`route_path` = 'jd-collect')) + ); + +INSERT INTO `columns` (`name`, `column_key`, `menu_type`, `route_path`, `sort_order`, `parent_id`, `company_id`) +SELECT '京东商品上架', 'jd-publish', 'app', 'jd-publish', 142, grp.`id`, grp.`company_id` +FROM `columns` grp +WHERE grp.`column_key` = 'jd_tools' + AND NOT EXISTS ( + SELECT 1 FROM `columns` col + WHERE col.`company_id` = grp.`company_id` + AND (col.`column_key` = 'jd-publish' + OR (col.`menu_type` = 'app' AND col.`route_path` = 'jd-publish')) + ); + +-- ---------- 4. 全量账号默认授权组行(按账号所属公司授本公司的 jd_tools 行) ---------- +-- 必须钉 column_key:不钉就是"每账号获得本公司全部菜单行的重复授权"(见头注 §2)。 +INSERT IGNORE INTO `user_column_permission` (`user_id`, `column_id`) +SELECT u.`id`, col.`id` +FROM `users` u +JOIN `columns` col + ON col.`company_id` = u.`company_id` + AND col.`column_key` = 'jd_tools'; + +-- ---------- 5. 自检闸门:不为 0 就抛 1048(列 must_be_zero NOT NULL,V143/V149/V163 家族) ---------- +CREATE TEMPORARY TABLE IF NOT EXISTS `_v209_gate` (`must_be_zero` INT NOT NULL); + +-- 闸门 1:每家公司恰好 组行+子行 各一行,子行父指本公司组行、排序 140/141/142—— +-- 专防 INSERT 段被 NOT EXISTS 守卫"一声不响少一家树"(V149 闸门 1 同一形态)。 +INSERT INTO `_v209_gate` +SELECT IF(COUNT(*) = 0, 0, NULL) +FROM ( + SELECT c.`id` + FROM `company` c + LEFT JOIN `columns` grp ON grp.`company_id` = c.`id` AND grp.`column_key` = 'jd_tools' + LEFT JOIN `columns` kid ON kid.`company_id` = c.`id` + AND kid.`column_key` IN ('jd-collect', 'jd-publish') AND kid.`parent_id` = grp.`id` + GROUP BY c.`id` + HAVING COUNT(DISTINCT grp.`id`) <> 1 + OR COUNT(DISTINCT kid.`id`) <> 2 + OR MAX(grp.`sort_order`) <> 140 + OR MIN(kid.`sort_order`) <> 141 + OR MAX(kid.`sort_order`) <> 142 +) bad; + +-- 闸门 2:三条 app 路由不允许被别的 column_key 占行(防 uk_company_menu_type_route_path 语义被顶)。 +INSERT INTO `_v209_gate` +SELECT IF(COUNT(*) = 0, 0, NULL) +FROM `columns` col +WHERE col.`menu_type` = 'app' + AND col.`route_path` IN ('jd-tools', 'jd-collect', 'jd-publish') + AND col.`column_key` NOT IN ('jd_tools', 'jd-collect', 'jd-publish'); + +-- 闸门 3:每只账号都必须持有本公司 jd_tools 直授(第 4 段漏一行 = 该账号当天丢京东入口, +-- 正是本迁移要防的"静默断供"形状)。 +INSERT INTO `_v209_gate` +SELECT IF(COUNT(*) = 0, 0, NULL) +FROM ( + SELECT u.`id` + FROM `users` u + JOIN `columns` grp ON grp.`company_id` = u.`company_id` AND grp.`column_key` = 'jd_tools' + LEFT JOIN `user_column_permission` g ON g.`user_id` = u.`id` AND g.`column_id` = grp.`id` + WHERE g.`user_id` IS NULL +) bad; + +-- 闸门 4:jd_tools 的授权绝不指向别公司的组行(V163 闸门 2 同形,给手工插错留复验位)。 +INSERT INTO `_v209_gate` +SELECT IF(COUNT(*) = 0, 0, NULL) +FROM ( + SELECT g.`user_id` + FROM `user_column_permission` g + JOIN `users` u ON u.`id` = g.`user_id` + JOIN `columns` col ON col.`id` = g.`column_id` + WHERE col.`column_key` = 'jd_tools' + AND col.`company_id` <> u.`company_id` +) bad; + +DROP TEMPORARY TABLE `_v209_gate`; diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdSchemaContractTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdSchemaContractTest.java index 79a88a386..bdfed307e 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdSchemaContractTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/jd/JdSchemaContractTest.java @@ -105,6 +105,36 @@ class JdSchemaContractTest { assertTrue(sql.contains("迁移 V203"), "头注释必须是 `-- 迁移 V203…`(MigrationInventoryTest 口径)"); } + @Test + void V209_app菜单_京东工具台三行与全量组行预授权() { + String sql = read(DB_DIR.resolve("V209__jd_app_menu.sql")); + assertTrue(sql.contains("迁移 V209"), "头注释必须是 `-- 迁移 V209…`(MigrationInventoryTest 口径)"); + for (String key : List.of("jd_tools", "jd-collect", "jd-publish")) { + assertTrue(sql.contains("'" + key + "'"), "缺 app column_key: " + key); + } + assertTrue(sql.contains("京东工具台") && sql.contains("京东店铺数据采集") && sql.contains("京东商品上架"), + "缺菜单名(组/采集/上架)"); + for (String route : List.of("jd-tools", "jd-collect", "jd-publish")) { + assertTrue(sql.contains("'" + route + "'"), "缺 route_path: " + route); + } + assertTrue(sql.contains("'app'"), "三行必须是 menu_type='app'(用户端权限树)"); + assertTrue(sql.contains("NOT EXISTS"), "必须带幂等守卫"); + // 预授权段:与 V190/V196(admin 页不预插)不同,app 行不预授权=现用人当天丢功能, + // 口径沿 V163——全量账号按公司授【组行】,且必须钉 column_key。 + assertTrue(sql.contains("INSERT IGNORE INTO `user_column_permission`"), "缺预授权段(V163 口径:默认全授组行)"); + assertTrue(sql.indexOf("INSERT IGNORE INTO `user_column_permission`") < sql.indexOf("_v209_gate"), + "预授权段必须落在自检闸门之前"); + String grantSection = sql.substring(sql.indexOf("INSERT IGNORE INTO `user_column_permission`")); + assertTrue(grantSection.lines().limit(15).anyMatch(line -> line.contains("col.`column_key` = 'jd_tools'")), + "预授权 JOIN 必须钉 column_key='jd_tools'——不钉就是每账号获得本公司全部菜单行的重复授权(V163 隐患,本笔收紧)"); + // 四道自检闸门(形状/路由占位/无漏授/无跨公司授权)都要在。 + assertTrue(sql.contains("_v209_gate"), "缺自检闸门"); + long gates = sql.lines().filter(line -> line.startsWith("-- 闸门")).count(); + assertTrue(gates >= 4, "闸门不足四道(V163 只有两道,本笔必须多一道『无账号漏授』)"); + // 回滚写成注释(不进 Flyway 扫描),顺序照 V165:授权→子行→组行。 + assertTrue(sql.contains("flyway_schema_history WHERE version='209'"), "缺回滚注释"); + } + @Test void 配置_独立图片桶不落默认桶() { String appYml = read(RESOURCES.resolve("application.yml")); diff --git a/frontend-vue/src/pages/home/DesktopHomePage.vue b/frontend-vue/src/pages/home/DesktopHomePage.vue index 1bea04a41..fe03ce235 100644 --- a/frontend-vue/src/pages/home/DesktopHomePage.vue +++ b/frontend-vue/src/pages/home/DesktopHomePage.vue @@ -64,9 +64,10 @@ data-column-key="wb" >视频 - + import { computed, onMounted, ref } from 'vue' import { restoreLoginUser } from '@/shared/auth/ensure-auth' -import { getCurrentUserAppColumnRaw, readCachedAppColumnPermissions, type PermissionMenuItem } from '@/shared/api/permission' +import { getCurrentUserAppColumnRaw, readCachedAppColumnPermissions } from '@/shared/api/permission' +import { computePermissionState, type PermissionState } from './home-permission' import { useVersionUpdate } from '@/shared/composables/useVersionUpdate' import UpdateProgressBar from '@/shared/components/UpdateProgressBar.vue' import UpdateLogList from '@/shared/components/UpdateLogList.vue' @@ -116,10 +118,10 @@ const { // 桌面端原 Flask /logout 已随瘦身下线:统一跳登录页并清本地 token(/login?logout=1) const logoutHref = computed(() => `${resolvePageHref('/new_web_source/login.html')}?logout=1`) -// 桌面端首页仅保留一级入口:亚马逊 / 视频;图片已收进视频页(/image-video)二级菜单。 +// 桌面端首页仅保留一级入口:亚马逊 / 视频 / 京东;图片已收进视频页(/image-video)二级菜单。 // 入口先乐观显示(接口返回后按权限隐藏),避免权限接口慢时首页入口空白"点不了"。 -type PermissionState = { amazon: boolean; video: boolean } -const permissionState = ref({ amazon: true, video: true }) +// 权限计算在 ./home-permission(纯函数,tests/desktop-home-permission.test.ts 直测)。 +const permissionState = ref({ amazon: true, video: true, jd: true }) const permissionUnavailable = ref(false) const amazonHref = computed(() => resolvePageHref('/new_web_source/amazon-console.html')) @@ -128,7 +130,7 @@ const videoHref = computed(() => resolvePageHref('/new_web_source/image-video.ht const jdHref = computed(() => resolvePageHref('/new_web_source/jd-console.html')) const canShow = computed(() => - permissionUnavailable.value ? { amazon: true, video: true } : permissionState.value, + permissionUnavailable.value ? { amazon: true, video: true, jd: true } : permissionState.value, ) function getUid() { @@ -137,36 +139,6 @@ function getUid() { return Number.isFinite(numeric) && numeric > 0 ? String(numeric) : '' } -function computePermissionState(items: PermissionMenuItem[]): PermissionState { - const allowedKeys: string[] = [] - const allowedColumnKeys: string[] = [] - const allowedRootKeys: string[] = [] - let hasRootMetadata = false - const push = (list: string[], value: unknown) => { - const key = String(value || '').trim().toLowerCase() - if (key && list.indexOf(key) < 0) list.push(key) - } - ;(items || []).forEach((item) => { - push(allowedColumnKeys, item.columnKey) - push(allowedColumnKeys, item.column_key) - const root = item.rootColumnKey || item.root_column_key - if (root) { - hasRootMetadata = true - push(allowedRootKeys, root) - } - ;[item.columnKey, item.column_key, item.routePath, item.route_path].forEach((v) => push(allowedKeys, v)) - }) - const videoVisible = allowedKeys.indexOf('wb') >= 0 - let amazonVisible = - allowedRootKeys.indexOf('brand_front_tools') >= 0 || - allowedRootKeys.indexOf('brand_operation_tools') >= 0 || - allowedRootKeys.indexOf('brand_logistics_tools') >= 0 - if (!hasRootMetadata) { - amazonVisible = allowedColumnKeys.some((key) => key !== 'wb') - } - return { amazon: amazonVisible, video: videoVisible } -} - async function loadPermissions() { const currentUid = getUid() if (!currentUid) { diff --git a/frontend-vue/src/pages/home/home-permission.ts b/frontend-vue/src/pages/home/home-permission.ts new file mode 100644 index 000000000..5a6f3ec81 --- /dev/null +++ b/frontend-vue/src/pages/home/home-permission.ts @@ -0,0 +1,53 @@ +/** + * 桌面首页一级入口的权限计算(亚马逊 / 视频 / 京东)。 + * + * 2026-11-17 自 DesktopHomePage.vue 原样抽薄(逻辑逐字未动):这段判据此前只活在 SFC 里、 + * 零测试;V209 把京东纳入 app 菜单权限并顺手收紧"只授京东的账号被误判亚马逊可见"的兜底, + * 必须有用例钉住,故抽成纯函数模块由 tests/desktop-home-permission.test.ts 直测。 + * 数据源不变:shared/api/permission 的原始菜单项(含 localStorage 缓存路径),页面不得直连 /newApi。 + */ +import type { PermissionMenuItem } from '@/shared/api/permission' + +/** 京东侧权限键(V209 app 菜单):组行 jd_tools + 子行 jd-collect/jd-publish(route slug jd-tools)。 */ +export const JD_PERMISSION_KEYS: ReadonlySet = new Set([ + 'jd_tools', + 'jd-tools', + 'jd-collect', + 'jd-publish', +]) + +export type PermissionState = { amazon: boolean; video: boolean; jd: boolean } + +export function computePermissionState(items: PermissionMenuItem[]): PermissionState { + const allowedKeys: string[] = [] + const allowedColumnKeys: string[] = [] + const allowedRootKeys: string[] = [] + let hasRootMetadata = false + const push = (list: string[], value: unknown) => { + const key = String(value || '').trim().toLowerCase() + if (key && list.indexOf(key) < 0) list.push(key) + } + ;(items || []).forEach((item) => { + push(allowedColumnKeys, item.columnKey) + push(allowedColumnKeys, item.column_key) + const root = item.rootColumnKey || item.root_column_key + if (root) { + hasRootMetadata = true + push(allowedRootKeys, root) + } + ;[item.columnKey, item.column_key, item.routePath, item.route_path].forEach((v) => push(allowedKeys, v)) + }) + const videoVisible = allowedKeys.indexOf('wb') >= 0 + // 京东入口:组键命中(V209 预授权授的就是组行),或只授了子项时靠行的 root_column_key 祖先元数据命中。 + const jdVisible = allowedKeys.indexOf('jd_tools') >= 0 || allowedRootKeys.indexOf('jd_tools') >= 0 + let amazonVisible = + allowedRootKeys.indexOf('brand_front_tools') >= 0 || + allowedRootKeys.indexOf('brand_operation_tools') >= 0 || + allowedRootKeys.indexOf('brand_logistics_tools') >= 0 + if (!hasRootMetadata) { + // 旧权限接口不带 root 元数据时的兜底。原式只排除 'wb':V209 后"只授了京东"的账号会 + // 在这里被误判亚马逊可见(进去是空卡片墙),顺手把京东键一并排除——同形债不再留第二份。 + amazonVisible = allowedColumnKeys.some((key) => key !== 'wb' && !JD_PERMISSION_KEYS.has(key)) + } + return { amazon: amazonVisible, video: videoVisible, jd: jdVisible } +} diff --git a/frontend-vue/src/pages/jd/JdConsolePage.vue b/frontend-vue/src/pages/jd/JdConsolePage.vue index 57a83d620..0736d0ef5 100644 --- a/frontend-vue/src/pages/jd/JdConsolePage.vue +++ b/frontend-vue/src/pages/jd/JdConsolePage.vue @@ -31,11 +31,11 @@ 京东工具 采集与上架,两条主线 - {{ JD_TOOLS.length }} 个工具 + {{ visibleTools.length }} 个工具
-