feat(platform): 后管与桌面端菜单按用户平台隔离(2026-11-18 用户口径「隔离下除 admin 外,京东用户只看京东菜单、亚马逊看不了」)——AdminMenuPlatformScope 成为菜单 key→平台归属唯一出处(京东独占 admin_jd_database+app 三件;双侧六件=账号域基础三页+本笔补侧的菜单权限配置/密钥管理/密钥用量统计;未知 key 默认 amazon 与前端 platform-scope 同形;platform null/空白归一 amazon=列 DEFAULT 同口径,不把「没带」读成京东侧全拦),filterMenuVosByPlatform 扁平过滤保留祖先链保组树完整、分组节点按存活子项去留(与前端 filterMenuTreeNodesByPlatform 同形);裁剪只挂三个下发出口(current-user/menus 非站点超管按 users.platform 收窄+登录 VO adminColumns/appColumns 双树=后管+桌面端一起)与逐页门(requireConsolePageAccess 平台门置于 isAdmin 直通之前,越侧 key 一律 403),红线=不动 getUserColumnPermissions 本体(授权编辑读接口与整树替换保存语义不变、授权行保留);current-user 增 platform 键;前端 allowedPlatformsForUser(超管随菜单树分布、其余锁 users.platform 侧、未知/缺省兜底 amazon、交集空仍锁死本人平台)+AdminLayout watch clamp(localStorage 残留另一侧自动归位、当前页在被禁侧跳回本人平台第一可见页、单侧时 tab 条整个隐藏)+platform-tab.syncToAllowed;app 树 37 key 全集核对无平台无关 key(withdraw=取款挂品牌运营工具、erp/purchase 挂后勤工具)。判据:AdminMenuPlatformScopeTest 11+ConsolePageTest +5 平台门+AdminConsoleCurrentUserMenusPlatformTest 3+AuthServicePlatformMenuTest 3+CompanyTest +1 platform 键=43 例绿;前端 platform-menu-filter 9/9(+2)、mount admin-layout-platform-lock 4/4、授权树过滤对齐扩双侧;vue-tsc rc=0;node --test 1937/1938(唯一红=在册 B116-03 ENOENT);vitest mount 184/184;mvn -o test-compile rc=0;快检后端 2 红格=环境假红(缺 Git 工具链 PATH,前置后 30/30 绿)、四面可读棘轮红=PermissionMenuService 1661→1676 行随本笔点名记账(ops 仓同窗);桌面端界面随 appColumns 下发生效,客户端出包另窗
This commit is contained in:
+157
@@ -0,0 +1,157 @@
|
||||
package com.nanri.aiimage.common.service;
|
||||
|
||||
import com.nanri.aiimage.modules.permission.model.vo.PermissionMenuItemVo;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* 后台/桌面端菜单 key → 平台归属的唯一出处(2026-11-18 用户口径「隔离下除站点超管外,
|
||||
* 京东用户只看京东菜单、亚马逊看不了」)。字面量与 admin-frontend-vue
|
||||
* {@code src/config/platform-scope.ts} 同源同值:京东独占、双侧共用、其余(未知 key 在内)
|
||||
* 默认亚马逊——前端对未知 key 也是默认亚马逊,两端口径必须同形。
|
||||
*
|
||||
* <p>语义边界:平台裁剪只挂在「菜单下发出口」({@code /api/admin/current-user/menus} 与登录 VO
|
||||
* 的 adminColumns/appColumns)与逐页门 {@code requireConsolePageAccess};授权管理读/写接口
|
||||
* (/permission-users/{uid}/column-permissions 与整树替换保存)**不裁**——授权行保留,
|
||||
* 用户日后翻档(platform 改回另一侧)授权仍在,不因「打开编辑弹窗又保存」被静默清掉。</p>
|
||||
*
|
||||
* <p>过滤算法与前端 {@code filterMenuTreeNodesByPlatform} 同形:叶子按 key 归属保留;
|
||||
* 分组节点自身的 key 不参与平台判定,按「有存活的子项」去留——否则京东侧「账号与权限」
|
||||
* 这类混合分组(双侧页面 + 亚马逊页混编)会被整组误剪。扁平 VO 过滤会保留被保留节点的
|
||||
* 祖先链,保证下游 {@code AdminMenuTreeBuilder.build} 组树完整。</p>
|
||||
*/
|
||||
public final class AdminMenuPlatformScope {
|
||||
|
||||
/** 京东后台独占菜单 key(与前端 JD_MENU_KEYS 逐字一致,用例钉住)。 */
|
||||
public static final Set<String> JD_MENU_KEYS = Set.of("admin_jd_database");
|
||||
|
||||
/** 桌面端(app 树)京东菜单 key(与前端 JD_APP_MENU_KEYS 逐字一致,V209:组行 + 两工具子行)。 */
|
||||
public static final Set<String> JD_APP_MENU_KEYS = Set.of("jd_tools", "jd-collect", "jd-publish");
|
||||
|
||||
/**
|
||||
* 双侧共用菜单 key(与前端 BOTH_PLATFORM_MENU_KEYS 逐字一致):账号域基础三页 +
|
||||
* 2026-11-18 用户口径补进的三个账号域管理页(菜单权限配置/密钥管理/密钥用量统计)——
|
||||
* 它们是账号域功能而非亚马逊业务,京东侧公司超管被锁单侧后仍要能配菜单、管密钥。
|
||||
*/
|
||||
public static final Set<String> BOTH_MENU_KEYS = Set.of(
|
||||
"admin_users", "admin_group_manage", "admin_companies",
|
||||
"admin_columns", "admin_user_secrets", "admin_user_secret_usage");
|
||||
|
||||
private AdminMenuPlatformScope() {
|
||||
}
|
||||
|
||||
/**
|
||||
* 平台归一:null/空白按 {@code amazon}(与 users.platform 列 DEFAULT 'amazon' 同口径,
|
||||
* 也与前端 {@code user.platform === 'jd' ? 'jd' : 'amazon'} 同形)——实体没带平台值的
|
||||
* 账号一律按亚马逊侧放行,不得把「没带」读成「京东侧全拦」。
|
||||
*/
|
||||
public static String normalize(String platform) {
|
||||
return platform == null || platform.isBlank() ? AdminPlatformScope.AMAZON : platform;
|
||||
}
|
||||
|
||||
/**
|
||||
* menuKey → 平台归属:京东独占(后台或桌面端清单)→ {jd};双侧清单 → {amazon,jd};
|
||||
* 其余(未知 key 在内)默认 {amazon}。key 缺省(null/空白)同样默认亚马逊,与前端
|
||||
* {@code platformsOfMenuKey(node.key || '')} 对齐。
|
||||
*/
|
||||
public static Set<String> platformsOfMenuKey(String key) {
|
||||
if (key == null || key.isBlank()) {
|
||||
return Set.of(AdminPlatformScope.AMAZON);
|
||||
}
|
||||
if (JD_MENU_KEYS.contains(key) || JD_APP_MENU_KEYS.contains(key)) {
|
||||
return Set.of(AdminPlatformScope.JD);
|
||||
}
|
||||
if (BOTH_MENU_KEYS.contains(key)) {
|
||||
return Set.of(AdminPlatformScope.AMAZON, AdminPlatformScope.JD);
|
||||
}
|
||||
return Set.of(AdminPlatformScope.AMAZON);
|
||||
}
|
||||
|
||||
/**
|
||||
* 逐页门用:columnKeys 里是否存在「不归属该平台」的 key。双侧 key 两个平台都放行;
|
||||
* 空 keys 返回 false(不构成越侧证据,交给原有授权判定处理)。
|
||||
*/
|
||||
public static boolean hasCrossPlatformKey(List<String> columnKeys, String platform) {
|
||||
if (columnKeys == null || columnKeys.isEmpty()) {
|
||||
return false;
|
||||
}
|
||||
String own = normalize(platform);
|
||||
for (String key : columnKeys) {
|
||||
if (!platformsOfMenuKey(key).contains(own)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 扁平菜单 VO 按平台过滤(下发出口专用):叶子按 key 归属保留;分组节点(有子项者)
|
||||
* 按存活子项去留;被保留节点的祖先链一并保留,保证组树完整。null/空回空列表。
|
||||
* 入参不被修改。
|
||||
*/
|
||||
public static List<PermissionMenuItemVo> filterMenuVosByPlatform(List<PermissionMenuItemVo> menus,
|
||||
String platform) {
|
||||
if (menus == null || menus.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
String own = normalize(platform);
|
||||
Map<Long, PermissionMenuItemVo> byId = new HashMap<>();
|
||||
Map<Long, List<PermissionMenuItemVo>> childrenOf = new HashMap<>();
|
||||
for (PermissionMenuItemVo menu : menus) {
|
||||
if (menu == null || menu.getId() == null) {
|
||||
continue;
|
||||
}
|
||||
byId.put(menu.getId(), menu);
|
||||
if (menu.getParentId() != null) {
|
||||
childrenOf.computeIfAbsent(menu.getParentId(), k -> new ArrayList<>()).add(menu);
|
||||
}
|
||||
}
|
||||
Set<Long> keepIds = new LinkedHashSet<>();
|
||||
for (PermissionMenuItemVo menu : byId.values()) {
|
||||
if (subtreeHasPlatformLeaf(menu, childrenOf, own)) {
|
||||
keepWithAncestors(menu, byId, keepIds);
|
||||
}
|
||||
}
|
||||
if (keepIds.isEmpty()) {
|
||||
return List.of();
|
||||
}
|
||||
List<PermissionMenuItemVo> out = new ArrayList<>();
|
||||
for (PermissionMenuItemVo menu : menus) {
|
||||
if (menu != null && menu.getId() != null && keepIds.contains(menu.getId())) {
|
||||
out.add(menu);
|
||||
}
|
||||
}
|
||||
return List.copyOf(out);
|
||||
}
|
||||
|
||||
/** 叶子:key 归属判定;分组节点:任一子树存活即存活(孤儿/空分组随之被裁)。 */
|
||||
private static boolean subtreeHasPlatformLeaf(PermissionMenuItemVo menu,
|
||||
Map<Long, List<PermissionMenuItemVo>> childrenOf,
|
||||
String platform) {
|
||||
List<PermissionMenuItemVo> children = childrenOf.get(menu.getId());
|
||||
if (children == null || children.isEmpty()) {
|
||||
return platformsOfMenuKey(menu.getColumnKey()).contains(platform);
|
||||
}
|
||||
for (PermissionMenuItemVo child : children) {
|
||||
if (child != null && subtreeHasPlatformLeaf(child, childrenOf, platform)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static void keepWithAncestors(PermissionMenuItemVo menu,
|
||||
Map<Long, PermissionMenuItemVo> byId,
|
||||
Set<Long> keepIds) {
|
||||
PermissionMenuItemVo current = menu;
|
||||
while (current != null && current.getId() != null && keepIds.add(current.getId())) {
|
||||
Long parent = current.getParentId();
|
||||
current = parent == null ? null : byId.get(parent);
|
||||
}
|
||||
}
|
||||
}
|
||||
+12
@@ -3,7 +3,9 @@ package com.nanri.aiimage.modules.admin.controller;
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.security.AccountExpiryService;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.service.AdminMenuPlatformScope;
|
||||
import com.nanri.aiimage.modules.company.service.CompanyService;
|
||||
import com.nanri.aiimage.modules.permission.model.vo.PermissionMenuItemVo;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
@@ -76,6 +78,9 @@ public class AdminConsoleController {
|
||||
// 所以这些键要与既有 companyId/companyName 的形状一致(前端 || '' 兜底)
|
||||
item.put("companyId", operator.getCompanyId());
|
||||
item.put("companyName", companyService.nameOrEmpty(operator.getCompanyId()));
|
||||
// 所属平台(V206):前端据它把平台 tab 锁到本人一侧(2026-11-18 用户口径「隔离下
|
||||
// 非站点超管只看自己平台侧」);站点超管前端不限侧,此值对它只是标记。
|
||||
item.put("platform", operator.getPlatform());
|
||||
// 到期续费提醒(V146):只反映自身 expires_at,不级联——续费是账号自己的事。
|
||||
// expiresAt 为 yyyy-MM-dd HH:mm 或 null;daysToExpire 为剩余整天数或 null。
|
||||
item.put("expiresAt", operator.getExpiresAt() == null ? null
|
||||
@@ -93,6 +98,13 @@ public class AdminConsoleController {
|
||||
List<PermissionMenuItemVo> menus = permissionMenuService.getUserColumnPermissions(
|
||||
operator, operator.getId(), PermissionMenuService.MENU_TYPE_ADMIN, true);
|
||||
menus = AdminMenuTreeBuilder.filterByMenuType(menus, PermissionMenuService.MENU_TYPE_ADMIN);
|
||||
// 平台隔离(2026-11-18 用户口径「除站点超管外,京东用户只看京东菜单、亚马逊看不了」):
|
||||
// 非站点超管按自身 users.platform 收窄下发树(京东用户只留京东侧+双侧账号域,其余
|
||||
// 默认亚马逊侧裁掉;路由守卫随树拦截直达 URL)。只裁下发出口——授权管理读/写接口不裁,
|
||||
// 整树替换保存语义不变,授权行保留(AdminMenuPlatformScope 类注释)。
|
||||
if (!DeviceSessionPolicy.isSuperAdmin(operator.getRole(), operator.getIsAdmin(), operator.getCreatedById())) {
|
||||
menus = AdminMenuPlatformScope.filterMenuVosByPlatform(menus, operator.getPlatform());
|
||||
}
|
||||
List<Map<String, Object>> items = AdminMenuTreeBuilder.toMapList(AdminMenuTreeBuilder.build(menus));
|
||||
return ApiResponse.success(Map.of("items", items));
|
||||
}
|
||||
|
||||
@@ -10,8 +10,10 @@ import com.nanri.aiimage.modules.auth.model.dto.LoginRequest;
|
||||
import com.nanri.aiimage.modules.auth.model.entity.LoginUserEntity;
|
||||
import com.nanri.aiimage.modules.auth.model.vo.LoginResultVo;
|
||||
import com.nanri.aiimage.common.security.DeviceSessionPolicy;
|
||||
import com.nanri.aiimage.common.service.AdminMenuPlatformScope;
|
||||
import com.nanri.aiimage.modules.auth.util.WerkzeugPasswordEncoder;
|
||||
import com.nanri.aiimage.modules.company.service.CompanyService;
|
||||
import com.nanri.aiimage.modules.permission.model.vo.PermissionMenuItemVo;
|
||||
import com.nanri.aiimage.modules.permission.service.PermissionMenuService;
|
||||
import io.jsonwebtoken.Claims;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -23,6 +25,7 @@ import java.time.Duration;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import com.nanri.aiimage.common.security.JwtService;
|
||||
@@ -279,8 +282,19 @@ public class AuthService {
|
||||
vo.setDeviceId(deviceId);
|
||||
vo.setToken(token);
|
||||
vo.setExpiresIn(jwtService.ttlSeconds());
|
||||
vo.setAppColumns(permissionMenuService.getUserColumnPermissions(user.getId(), PermissionMenuService.MENU_TYPE_APP));
|
||||
vo.setAdminColumns(permissionMenuService.getUserColumnPermissions(user.getId(), PermissionMenuService.MENU_TYPE_ADMIN));
|
||||
// 平台隔离(2026-11-18 用户口径「后管+桌面端一起」):非站点超管按 users.platform 收窄
|
||||
// 登录下发菜单——adminColumns(后管)与 appColumns(桌面端)一并裁,京东用户的桌面端
|
||||
// 只见京东工具;站点超管不限侧全量。只裁下发出口,授权行不动(AdminMenuPlatformScope 类注释)。
|
||||
List<PermissionMenuItemVo> appColumns = permissionMenuService.getUserColumnPermissions(
|
||||
user.getId(), PermissionMenuService.MENU_TYPE_APP);
|
||||
List<PermissionMenuItemVo> adminColumns = permissionMenuService.getUserColumnPermissions(
|
||||
user.getId(), PermissionMenuService.MENU_TYPE_ADMIN);
|
||||
if (!DeviceSessionPolicy.isSuperAdmin(user.getRole(), user.getIsAdmin(), user.getCreatedById())) {
|
||||
appColumns = AdminMenuPlatformScope.filterMenuVosByPlatform(appColumns, user.getPlatform());
|
||||
adminColumns = AdminMenuPlatformScope.filterMenuVosByPlatform(adminColumns, user.getPlatform());
|
||||
}
|
||||
vo.setAppColumns(appColumns);
|
||||
vo.setAdminColumns(adminColumns);
|
||||
return vo;
|
||||
}
|
||||
|
||||
|
||||
+16
-1
@@ -11,6 +11,7 @@ import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuCreateReques
|
||||
import com.nanri.aiimage.modules.permission.model.dto.PermissionMenuUpdateRequest;
|
||||
import com.nanri.aiimage.modules.permission.model.dto.UserColumnPermissionUpdateRequest;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.service.AdminMenuPlatformScope;
|
||||
import com.nanri.aiimage.modules.permission.model.entity.PermissionMenuEntity;
|
||||
import com.nanri.aiimage.modules.permission.model.entity.UserColumnPermissionEntity;
|
||||
import com.nanri.aiimage.modules.permission.model.vo.ImageVideoDataPermissionUserVo;
|
||||
@@ -777,9 +778,23 @@ public class PermissionMenuService {
|
||||
* <p>入口放开不等于逐页放开。现网 46 个普通账号持有后台菜单授权(只读实查 2026-10-06),若逐页门只看入口,它们顺手就能读到同公司的密钥页与扣次数的 ASIN 查询页——勾菜单的人本意是给一页,不是给全部。
|
||||
* 判据与 {@link #hasAnyAdminMenu} 同一套(本公司树 + 直接授权递归展开),所以勾父分组
|
||||
* 覆盖后代的语义在这里照样成立。</p>
|
||||
*
|
||||
* <p>2026-11-18 平台隔离:管理员角色链的「恒可进」收窄为「恒可进<b>本人平台侧</b>」——
|
||||
* 非站点超管传入越侧 key 一律 403(见方法体平台门),下发树裁剪之外的第二道防线。</p>
|
||||
*/
|
||||
public void requireConsolePageAccess(AdminUserEntity operator, String denialMessage, String... columnKeys) {
|
||||
if (operator == null || isAdmin(operator)) {
|
||||
if (operator == null) {
|
||||
return;
|
||||
}
|
||||
// 平台门(2026-11-18 用户口径「隔离下非站点超管只看自己平台侧」):与下发树裁剪同口径——
|
||||
// 站点超管直通之外,其余角色(含公司超管/管理员,故须放在 isAdmin 直通之前)传入的页面
|
||||
// key 必须归属自身 users.platform;双侧 key 两平台都放行,越侧直调一律 403。
|
||||
if (!DeviceSessionPolicy.isSuperAdmin(operator.getRole(), operator.getIsAdmin(), operator.getCreatedById())
|
||||
&& columnKeys != null && columnKeys.length > 0
|
||||
&& AdminMenuPlatformScope.hasCrossPlatformKey(List.of(columnKeys), operator.getPlatform())) {
|
||||
throw new BusinessException(403, denialMessage);
|
||||
}
|
||||
if (isAdmin(operator)) {
|
||||
return;
|
||||
}
|
||||
if (columnKeys != null && columnKeys.length > 0
|
||||
|
||||
Reference in New Issue
Block a user