fix(鉴权): 到期级联改标量聚合,后台入口按菜单授权放开
三件事同源于 10-06「非默认公司账号进不了数富后台」这条事故链,四种死法在界面上长得一样。 1) AccountExpiryService 读本公司公司超管的 expires_at 时把单列投影成实体列表再遍历—— MyBatis 对所选列全为 NULL 的行交出的是 null 元素,而"没设到期"是绝大多数公司的常态, 于是只要有一个永不过期的公司超管,该公司所有账号的登录与每个鉴权请求全部 500。 改成 mapper 侧一条 MIN(expires_at) 标量聚合;AuthChainQueryShapeTest 扫鉴权链路的 "单列投影"形状——这个判据落在 mock 边界外,单测挡不住,只能做源码扫描。 2) 后台入口放开:requireConsoleOperator = 管理员角色链 或 本公司树里 >=1 条后台菜单授权 (探针是带 company_id 条件的标量 COUNT,与下发口径一致,否则进得来而菜单树是空的)。 逐页另设 requireConsolePageAccess 锚住本页 key,勾父分组覆盖后代的既有语义照旧。 管理类 10 支控制器继续 requireAdmin,并且出口 2 不再把这些页下发给普通账号—— 下发出去就是一排点了必 403 的死链。内部令牌通道绕过到期与会话校验,不随入口放宽。 护栏 ConsoleWideningGuardrailTest 双向钉:管理页不得被授权打开、入口落点恰好那 13 支。 3) 前端:后端失败一律 HTTP 200 + success=false,登录页从未解包,所以"什么都不提示"。 补 login-feedback 归一文案(技术串不外露、兜底不再伪装成用户名或密码错误), 并修 isLoginLocation 拿路由内路径比 location.pathname——生产实际是 /admin-vue/login, 那条"已在登录页就别整页重刷"的守卫一次都没生效过。 验证:后端 mvn -o -B test 3924 例 0 红(457 支类);前端 node --test 1738 例 0 红; vue-tsc --noEmit rc=0;入口探针 SQL 已在生产库只读三档空跑(本公司 1 / 错公司 0 / 无授权 0)。
This commit is contained in:
@@ -3,7 +3,52 @@ package com.nanri.aiimage.common.mapper;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.apache.ibatis.annotations.Select;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Mapper
|
||||
public interface AdminUserMapper extends BaseMapper<AdminUserEntity> {
|
||||
|
||||
/**
|
||||
* 本公司「公司超级管理员」里最早的到期时间;返回 null = 本公司无此约束(没有公司超管,
|
||||
* 或它们全部永不过期)。到期级联判据见 {@code AccountExpiryService}。
|
||||
*
|
||||
* <p>刻意用聚合标量而不是 {@code selectList(.select(expiresAt))}:MyBatis 对「所选列全为
|
||||
* NULL」的行返回 null 元素,一家公司只要有任意一个公司超管没设到期,那条列表里就混着 null,
|
||||
* 遍历时解引用即 NPE,而这里正是每次登录与每个鉴权请求都要走的读出口。MIN 忽略 NULL,
|
||||
* 无行时结果集仍是单行单列,直接映射成 null。</p>
|
||||
*/
|
||||
@Select("""
|
||||
SELECT MIN(expires_at)
|
||||
FROM users
|
||||
WHERE role = 'company_super_admin'
|
||||
AND company_id = #{companyId}
|
||||
""")
|
||||
LocalDateTime selectCompanySuperAdminEarliestExpiry(@Param("companyId") Long companyId);
|
||||
|
||||
/**
|
||||
* 该账号在<b>本公司那棵树</b>里被授了几条后台(menu_type='admin')菜单;>0 即允许进管理后台。
|
||||
*
|
||||
* <p>刻意用标量 COUNT 而不是 {@code selectList(.select(columnId))}:与上面那条同样的投影陷阱
|
||||
* (见 {@code AuthChainQueryShapeTest}),而这里是每个后台入口请求都要走的鉴权读。</p>
|
||||
*
|
||||
* <p>必须带 {@code cm.company_id} 条件:每家公司一套树之后,{@code column_id} 指向别家树的
|
||||
* 残留授权行会让账号"进得了后台、菜单树却是空的"——入口门与 {@code getUserColumnPermissions}
|
||||
* 的下发集要用同一个公司口径,否则两处各判一次就留下静默死链。</p>
|
||||
*/
|
||||
@Select("""
|
||||
<script>
|
||||
SELECT COUNT(1)
|
||||
FROM user_column_permission ucp
|
||||
JOIN columns cm ON cm.id = ucp.column_id
|
||||
WHERE ucp.user_id = #{userId}
|
||||
AND cm.menu_type = 'admin'
|
||||
<if test="companyId != null">
|
||||
AND cm.company_id = #{companyId}
|
||||
</if>
|
||||
</script>
|
||||
""")
|
||||
Long countAdminMenuGrants(@Param("userId") Long userId, @Param("companyId") Long companyId);
|
||||
}
|
||||
|
||||
+1
-11
@@ -1,6 +1,5 @@
|
||||
package com.nanri.aiimage.common.security;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.mapper.AdminUserMapper;
|
||||
import com.nanri.aiimage.common.mapper.ShopManageGroupMapper;
|
||||
@@ -11,7 +10,6 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 账号到期(expires_at,V146)的级联判定与拦截。
|
||||
@@ -113,15 +111,7 @@ public class AccountExpiryService {
|
||||
if (companyId == null || companyId <= 0) {
|
||||
return null;
|
||||
}
|
||||
List<AdminUserEntity> csas = adminUserMapper.selectList(new LambdaQueryWrapper<AdminUserEntity>()
|
||||
.select(AdminUserEntity::getExpiresAt)
|
||||
.eq(AdminUserEntity::getRole, "company_super_admin")
|
||||
.eq(AdminUserEntity::getCompanyId, companyId));
|
||||
LocalDateTime earliest = null;
|
||||
for (AdminUserEntity csa : csas) {
|
||||
earliest = min(earliest, csa.getExpiresAt());
|
||||
}
|
||||
return earliest;
|
||||
return adminUserMapper.selectCompanySuperAdminEarliestExpiry(companyId);
|
||||
}
|
||||
|
||||
/** 组级:该用户所属分组(成员表)的组长(created_by_id/user_id)若是管理员,取其最早 expires_at。 */
|
||||
|
||||
@@ -114,6 +114,51 @@ public class AdminAuthSupport {
|
||||
return user;
|
||||
}
|
||||
|
||||
/**
|
||||
* 后台入口门:管理员角色恒可进;普通账号持有本公司任意后台菜单授权也可进。
|
||||
*
|
||||
* <p>2026-10-06 放开。此前"进后台"与"有管理员角色"绑死,超管在权限页给普通账号勾了
|
||||
* 后台菜单也照样 403——授权动作做了,门没跟着开,界面上表现为点了没反应。放开只针对
|
||||
* <b>入口</b>:每一页仍由该页自己的门把关({@code PermissionMenuService.requireConsolePageAccess}
|
||||
* 按该页菜单键判定),管理类出口(用户/菜单/分组/密钥/公司/版本)一律继续走
|
||||
* {@link #requireAdmin},不在这里放宽。</p>
|
||||
*/
|
||||
public AdminUserEntity requireConsoleOperator(HttpServletRequest request) {
|
||||
AdminUserEntity user = requireUser(request);
|
||||
if (!isConsoleOperator(user)) {
|
||||
throw new BusinessException(403, "需要管理员权限");
|
||||
}
|
||||
return user;
|
||||
}
|
||||
|
||||
/** JWT 优先走入口门;内部令牌通道仍要求管理员角色——它绕过到期与会话校验,不随入口一起放宽。 */
|
||||
public AdminUserEntity requireConsoleOperatorOrInternal(HttpServletRequest request) {
|
||||
try {
|
||||
return requireConsoleOperator(request);
|
||||
} catch (BusinessException authFailure) {
|
||||
AdminUserEntity internalOperator = resolveInternalOperator(request, true);
|
||||
if (internalOperator != null) {
|
||||
return internalOperator;
|
||||
}
|
||||
throw authFailure;
|
||||
}
|
||||
}
|
||||
|
||||
/** 入口判定:角色链(super_admin / admin / company_super_admin)或本公司任意一条后台菜单授权。 */
|
||||
public boolean isConsoleOperator(AdminUserEntity user) {
|
||||
if (user == null) {
|
||||
return false;
|
||||
}
|
||||
if (currentRole(user) != null) {
|
||||
return true;
|
||||
}
|
||||
if (user.getId() == null || user.getId() <= 0) {
|
||||
return false;
|
||||
}
|
||||
Long grants = adminUserMapper.countAdminMenuGrants(user.getId(), user.getCompanyId());
|
||||
return grants != null && grants > 0;
|
||||
}
|
||||
|
||||
/** 计算当前用户的管理角色:super_admin / admin / null。 */
|
||||
public String currentRole(AdminUserEntity user) {
|
||||
if (user == null) {
|
||||
|
||||
+2
-2
@@ -67,7 +67,7 @@ public class AdminConsoleController {
|
||||
@GetMapping("/api/admin/current-user")
|
||||
@Operation(summary = "获取当前管理员信息")
|
||||
public ApiResponse<Map<String, Object>> currentUser(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
Map<String, Object> item = new LinkedHashMap<>();
|
||||
item.put("id", operator.getId());
|
||||
item.put("username", operator.getUsername() == null ? "" : operator.getUsername());
|
||||
@@ -87,7 +87,7 @@ public class AdminConsoleController {
|
||||
@GetMapping("/api/admin/current-user/menus")
|
||||
@Operation(summary = "当前登录管理员的可见后台菜单树")
|
||||
public ApiResponse<Map<String, Object>> currentUserMenus(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
// 补全祖先分组:部分授权用户(只授权了子页面)也要看到「一级分组 + 子页面」层级,
|
||||
// 与超管的菜单组织顺序一致;分组节点无页面路由,不构成权限扩展。
|
||||
List<PermissionMenuItemVo> menus = permissionMenuService.getUserColumnPermissions(
|
||||
|
||||
+2
-2
@@ -40,7 +40,7 @@ public class ImageHistoryController {
|
||||
@RequestParam(name = "time_start", required = false) String timeStart,
|
||||
@RequestParam(name = "time_end", required = false) String timeEnd,
|
||||
@RequestParam(name = "company_id", required = false) Long companyId) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
if (!permissionMenuService.hasAnyAdminMenu(operator, List.of("admin_history"))) {
|
||||
throw new BusinessException(403, "无权访问生成记录模块");
|
||||
}
|
||||
@@ -54,7 +54,7 @@ public class ImageHistoryController {
|
||||
@DeleteMapping("/history")
|
||||
@Operation(summary = "清空全部生成记录")
|
||||
public ApiResponse<Long> clearHistory(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
if (!permissionMenuService.hasAnyAdminMenu(operator, List.of("admin_history"))) {
|
||||
throw new BusinessException(403, "无权访问生成记录模块");
|
||||
}
|
||||
|
||||
+11
-3
@@ -66,6 +66,14 @@ public class AdminImageVideoTaskController {
|
||||
private final ImageVideoAdminTaskService adminTaskService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
private final DataReadScope dataReadScope;
|
||||
private final com.nanri.aiimage.modules.permission.service.PermissionMenuService permissionMenuService;
|
||||
|
||||
/** 过「视频任务记录」这一页的门:管理员角色行为不变,普通账号须被授了该菜单(2026-10-06 入口放开)。 */
|
||||
private AdminUserEntity requireOperator(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
permissionMenuService.requireConsolePageAccess(operator, "无权访问视频任务记录", "admin_image_video_tasks");
|
||||
return operator;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "分页查询图生视频任务", description = "管理端按用户/任务状态/提交时间等条件分页查询近 3 天的工作流任务")
|
||||
@@ -80,7 +88,7 @@ public class AdminImageVideoTaskController {
|
||||
@RequestParam(name = "submitted_to", required = false) String submittedTo,
|
||||
@RequestParam(name = "company_id", required = false) Long companyId,
|
||||
HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = requireOperator(request);
|
||||
// 既有语义保留:显式传 user_id 时按那一个人筛;公司 tab 叠在它上面(交集)。
|
||||
List<Long> base = userId != null && userId > 0 ? List.of(userId) : null;
|
||||
List<Long> scoped = dataReadScope.readScope(operator, companyId).userIdsOr(base);
|
||||
@@ -100,7 +108,7 @@ public class AdminImageVideoTaskController {
|
||||
@GetMapping("/{taskId}")
|
||||
@Operation(summary = "查询图生视频任务详情", description = "返回单个任务详情(含脱敏后的请求参数与结果 JSON)")
|
||||
public ApiResponse<Map<String, Object>> detail(@PathVariable Long taskId, HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = requireOperator(request);
|
||||
return ApiResponse.success(adminTaskService.detail(taskId, scopeOf(operator)));
|
||||
}
|
||||
|
||||
@@ -108,7 +116,7 @@ public class AdminImageVideoTaskController {
|
||||
@Operation(summary = "批量打包下载视频", description = "按任务+视频下标批量打包 zip;部分失败通过响应头 X-Archive-Error-Count 提示")
|
||||
public ResponseEntity<StreamingResponseBody> downloadZip(@RequestBody(required = false) Map<String, Object> body,
|
||||
HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = requireOperator(request);
|
||||
List<VideoSelection> selections = parseSelections(body);
|
||||
ZipBundle bundle = adminTaskService.buildZip(selections, scopeOf(operator));
|
||||
String filename = "video-tasks-" + LocalDateTime.now().format(ZIP_FILENAME_FORMATTER) + ".zip";
|
||||
|
||||
+3
-1
@@ -82,7 +82,9 @@ public class AdminNotificationController {
|
||||
}
|
||||
|
||||
private Long currentAdminId(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdmin(request);
|
||||
// 通知是"自己看自己的"(userId 由会话推导),后台的铃铛在每个进得来后台的人面前都会轮询,
|
||||
// 所以出口跟着入口门走;留 requireAdmin 会让刚放开的普通账号每 30s 吃一次 403。
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperator(request);
|
||||
return operator.getId();
|
||||
}
|
||||
}
|
||||
|
||||
+39
-2
@@ -55,6 +55,21 @@ public class PermissionMenuService {
|
||||
* 与前端 src/config/company-scope.ts 的 SUPER_ADMIN_ONLY_MENU_KEYS 必须同值,由 Task 7 的跨端用例钉住。 */
|
||||
private static final Set<String> SUPER_ADMIN_ONLY_KEYS = Set.of("admin_companies");
|
||||
|
||||
/**
|
||||
* 管理/平台配置类菜单:出口仍是 {@code requireAdmin}(用户、菜单、分组、密钥、公司、版本、教程、
|
||||
* 日志),普通账号即使被勾了也用不了。
|
||||
*
|
||||
* <p>2026-10-06 入口放开后必须与下发集一起剪:现网实查有 13 个普通账号带着 {@code admin_users}、
|
||||
* 11 个带 {@code admin_user_secrets}、9 个带 {@code admin_version} 的授权行,只在出口拦而照常下发
|
||||
* 侧边栏,等于给刚放进来的人画一排必 403 的死链(显示比权限宽)。剪掉只是不再显示,
|
||||
* 授权行本身不动——这些账号本来就进不去那些页。</p>
|
||||
*/
|
||||
private static final Set<String> ADMIN_ONLY_MENU_KEYS = Set.of(
|
||||
"admin_users", "admin_columns", "admin_group_manage",
|
||||
"admin_user_secrets", "admin_user_secret_usage",
|
||||
"admin_version", "digital_human_version", "admin_tutorial",
|
||||
"admin_device_logs");
|
||||
|
||||
private final PermissionMenuMapper permissionMenuMapper;
|
||||
private final UserColumnPermissionMapper userColumnPermissionMapper;
|
||||
private final AdminUserMapper adminUserMapper;
|
||||
@@ -549,6 +564,9 @@ public class PermissionMenuService {
|
||||
// 换成剪过的集合会让只勾了子页面的用户解析不出父分组,等于把「用户管理」一起弄红。
|
||||
List<PermissionMenuEntity> visibleMenus = effectiveMenus.stream()
|
||||
.filter(menu -> !SUPER_ADMIN_ONLY_KEYS.contains(menu.getColumnKey()))
|
||||
// 出口 2 的第二道剪枝(与上一行同一批语义):管理/平台页对普通账号不下发——
|
||||
// 它们的后端出口仍是 requireAdmin,下发出去就是一条点了必 403 的死链。
|
||||
.filter(menu -> isAdmin(user) || !ADMIN_ONLY_MENU_KEYS.contains(menu.getColumnKey()))
|
||||
.toList();
|
||||
return toItemVos(visibleMenus, menus);
|
||||
}
|
||||
@@ -722,7 +740,8 @@ public class PermissionMenuService {
|
||||
* 不应再被 403 拒绝。</p>
|
||||
*/
|
||||
public void requireShopDataCrawlTaskAccess(AdminUserEntity operator) {
|
||||
ensureAdminOperatorIfPresent(operator);
|
||||
// 不再前置判"是不是管理员角色":2026-10-06 入口放开后,那道角色门会把下面按授权判的门
|
||||
// 变成普通账号永远走不到的死代码(菜单勾了、页里仍然 403)。真正的门就是下面那三行授权命中。
|
||||
if (operator == null || operator.getId() == null || operator.getId() <= 0) {
|
||||
throw new BusinessException(403, "需要管理员权限");
|
||||
}
|
||||
@@ -752,7 +771,6 @@ public class PermissionMenuService {
|
||||
* 授权记录即拒绝,因此新菜单默认只有超管可见。</p>
|
||||
*/
|
||||
public void requireClientTaskCenterAccess(AdminUserEntity operator) {
|
||||
ensureAdminOperatorIfPresent(operator);
|
||||
if (operator == null || operator.getId() == null || operator.getId() <= 0) {
|
||||
throw new BusinessException(403, "需要管理员权限");
|
||||
}
|
||||
@@ -766,6 +784,25 @@ public class PermissionMenuService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 后台页面门(2026-10-06):管理员角色链行为不变恒可进;普通账号必须持有<b>这一页</b>的后台菜单
|
||||
* 授权才放行。
|
||||
*
|
||||
* <p>入口放开不等于逐页放开。现网 46 个普通账号持有后台菜单授权(只读实查 2026-10-06),若逐页门只看入口,它们顺手就能读到同公司的密钥页与扣次数的 ASIN 查询页——勾菜单的人本意是给一页,不是给全部。
|
||||
* 判据与 {@link #hasAnyAdminMenu} 同一套(本公司树 + 直接授权递归展开),所以勾父分组
|
||||
* 覆盖后代的语义在这里照样成立。</p>
|
||||
*/
|
||||
public void requireConsolePageAccess(AdminUserEntity operator, String denialMessage, String... columnKeys) {
|
||||
if (operator == null || isAdmin(operator)) {
|
||||
return;
|
||||
}
|
||||
if (columnKeys != null && columnKeys.length > 0
|
||||
&& hasAnyAdminMenu(operator, List.of(columnKeys))) {
|
||||
return;
|
||||
}
|
||||
throw new BusinessException(403, denialMessage);
|
||||
}
|
||||
|
||||
/**
|
||||
* 判断操作者是否可见任一所给后台菜单(按 column_key,限定 admin 菜单类型)。
|
||||
* 超管直通;其余取直接授权递归展开后的有效菜单做交集。
|
||||
|
||||
+15
-7
@@ -1,6 +1,7 @@
|
||||
package com.nanri.aiimage.modules.productcategory.controller;
|
||||
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.model.entity.AdminUserEntity;
|
||||
import com.nanri.aiimage.common.util.DownloadHeaderUtil;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.productcategory.model.dto.ProductCategorySaveRequest;
|
||||
@@ -38,13 +39,20 @@ public class ProductCategoryController {
|
||||
|
||||
private final ProductCategoryService productCategoryService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
private final com.nanri.aiimage.modules.permission.service.PermissionMenuService permissionMenuService;
|
||||
|
||||
/** 过「商品类目」这一页的门:管理员角色行为不变,普通账号须被授了该菜单(2026-10-06 入口放开)。 */
|
||||
private void requireOperator(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
permissionMenuService.requireConsolePageAccess(operator, "无权访问商品类目", "admin_product_categories");
|
||||
}
|
||||
|
||||
@GetMapping("/product-categories")
|
||||
@Operation(summary = "查询商品类目树")
|
||||
public ApiResponse<ProductCategoryListVo> list(
|
||||
HttpServletRequest request,
|
||||
@RequestParam(value = "keyword", required = false) String keyword) {
|
||||
adminAuthSupport.requireAdminOrInternal(request);
|
||||
requireOperator(request);
|
||||
return ApiResponse.success(productCategoryService.list(keyword));
|
||||
}
|
||||
|
||||
@@ -55,7 +63,7 @@ public class ProductCategoryController {
|
||||
@RequestParam(value = "parent_id", required = false) Long parentId,
|
||||
@RequestParam(value = "page", defaultValue = "1") Long page,
|
||||
@RequestParam(value = "page_size", defaultValue = "20") Long pageSize) {
|
||||
adminAuthSupport.requireAdminOrInternal(request);
|
||||
requireOperator(request);
|
||||
return ApiResponse.success(productCategoryService.children(parentId, page, pageSize));
|
||||
}
|
||||
|
||||
@@ -66,7 +74,7 @@ public class ProductCategoryController {
|
||||
@RequestParam(value = "keyword", required = false) String keyword,
|
||||
@RequestParam(value = "page", defaultValue = "1") Long page,
|
||||
@RequestParam(value = "page_size", defaultValue = "20") Long pageSize) {
|
||||
adminAuthSupport.requireAdminOrInternal(request);
|
||||
requireOperator(request);
|
||||
return ApiResponse.success(productCategoryService.search(keyword, page, pageSize));
|
||||
}
|
||||
|
||||
@@ -75,7 +83,7 @@ public class ProductCategoryController {
|
||||
public ResponseEntity<byte[]> export(
|
||||
HttpServletRequest request,
|
||||
@RequestParam(value = "keyword", required = false) String keyword) {
|
||||
adminAuthSupport.requireAdminOrInternal(request);
|
||||
requireOperator(request);
|
||||
byte[] bytes = productCategoryService.export(keyword);
|
||||
String filename = "product-categories-" + LocalDateTime.now().format(EXPORT_FILENAME_FORMATTER) + ".xlsx";
|
||||
return ResponseEntity.ok()
|
||||
@@ -90,7 +98,7 @@ public class ProductCategoryController {
|
||||
public ApiResponse<ProductCategoryItemVo> create(
|
||||
HttpServletRequest request,
|
||||
@Valid @RequestBody ProductCategorySaveRequest body) {
|
||||
adminAuthSupport.requireAdminOrInternal(request);
|
||||
requireOperator(request);
|
||||
return ApiResponse.success("创建成功", productCategoryService.create(body));
|
||||
}
|
||||
|
||||
@@ -100,7 +108,7 @@ public class ProductCategoryController {
|
||||
HttpServletRequest request,
|
||||
@PathVariable Long id,
|
||||
@Valid @RequestBody ProductCategorySaveRequest body) {
|
||||
adminAuthSupport.requireAdminOrInternal(request);
|
||||
requireOperator(request);
|
||||
return ApiResponse.success("保存成功", productCategoryService.update(id, body));
|
||||
}
|
||||
|
||||
@@ -109,7 +117,7 @@ public class ProductCategoryController {
|
||||
public ApiResponse<Void> delete(
|
||||
HttpServletRequest request,
|
||||
@PathVariable Long id) {
|
||||
adminAuthSupport.requireAdminOrInternal(request);
|
||||
requireOperator(request);
|
||||
productCategoryService.delete(id);
|
||||
return ApiResponse.success("删除成功", null);
|
||||
}
|
||||
|
||||
+3
-1
@@ -79,7 +79,9 @@ public class AdminShopDataCrawlTaskController {
|
||||
private void requireShopDataCrawlTaskAccess(HttpServletRequest request) {
|
||||
AdminUserEntity operator;
|
||||
try {
|
||||
operator = adminAuthSupport.requireAdmin(request);
|
||||
// 入口门随 2026-10-06 的放开一起换:普通账号能否进这一页由下面
|
||||
// permissionMenuService.requireShopDataCrawlTaskAccess 按授权判定,这里不再抢跑判角色。
|
||||
operator = adminAuthSupport.requireConsoleOperator(request);
|
||||
} catch (BusinessException authFailure) {
|
||||
operator = resolveInternalOperator(request);
|
||||
if (operator == null) {
|
||||
|
||||
+3
-1
@@ -280,7 +280,9 @@ public class AdminShopDataCrawlTasksController {
|
||||
private AdminUserEntity requireShopDataCrawlTaskAccess(HttpServletRequest request) {
|
||||
AdminUserEntity operator;
|
||||
try {
|
||||
operator = adminAuthSupport.requireAdmin(request);
|
||||
// 入口门随 2026-10-06 的放开一起换:普通账号能否进这一页由下面
|
||||
// permissionMenuService.requireShopDataCrawlTaskAccess 按授权判定,这里不再抢跑判角色。
|
||||
operator = adminAuthSupport.requireConsoleOperator(request);
|
||||
} catch (BusinessException authFailure) {
|
||||
operator = resolveInternalOperator(request);
|
||||
if (operator == null) {
|
||||
|
||||
+2
-1
@@ -289,7 +289,8 @@ public class AdminShopDataDuplicateCheckController {
|
||||
private RequestOperator requireDuplicateCheckAccess(HttpServletRequest request) {
|
||||
AdminUserEntity operator;
|
||||
try {
|
||||
operator = adminAuthSupport.requireAdmin(request);
|
||||
// 入口门随 2026-10-06 的放开一起换:这一页能不能进由下面按授权判定,这里不再抢跑判角色。
|
||||
operator = adminAuthSupport.requireConsoleOperator(request);
|
||||
} catch (BusinessException authFailure) {
|
||||
operator = resolveInternalOperator(request);
|
||||
if (operator == null) {
|
||||
|
||||
+5
-1
@@ -45,10 +45,14 @@ public class QueryAsinController {
|
||||
private final QueryAsinService queryAsinService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
private final com.nanri.aiimage.common.service.DataReadScope dataReadScope;
|
||||
private final com.nanri.aiimage.modules.permission.service.PermissionMenuService permissionMenuService;
|
||||
|
||||
/** 解析当前操作者(JWT 或内部令牌通道),权限与数据范围一律以该身份为准。 */
|
||||
private AdminUserEntity requireOperator(HttpServletRequest request) {
|
||||
return adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
// 查询 ASIN 是扣次数的出口:入口放开后仍要按这一页的菜单授权把关,不能让人顺手烧别家的额度。
|
||||
permissionMenuService.requireConsolePageAccess(operator, "无权访问查询ASIN", "admin_query_asin");
|
||||
return operator;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
|
||||
+16
-5
@@ -37,6 +37,17 @@ public class ShopKeyController {
|
||||
private final ShopKeyService shopKeyService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
private final DataReadScope dataReadScope;
|
||||
private final com.nanri.aiimage.modules.permission.service.PermissionMenuService permissionMenuService;
|
||||
|
||||
/**
|
||||
* 解析当前操作者并过「店铺密钥管理」这一页的门:管理员角色行为不变,普通账号须被授了该菜单。
|
||||
* 密钥是每家公司的敏感配置,入口放开不能顺手把它对全体进后台的人打开。
|
||||
*/
|
||||
private AdminUserEntity requireOperator(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
permissionMenuService.requireConsolePageAccess(operator, "无权访问店铺密钥管理", "admin_shop_keys");
|
||||
return operator;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@Operation(summary = "分页查询店铺密钥", description = "分页查询店铺密钥列表。company_id 只收窄可见集、不放大:"
|
||||
@@ -50,7 +61,7 @@ public class ShopKeyController {
|
||||
@Parameter(description = "每页数量") @RequestParam(defaultValue = "15") Long pageSize,
|
||||
@Parameter(description = "按公司筛选(仅超管生效;非超管一律按会话公司裁剪)")
|
||||
@RequestParam(name = "company_id", required = false) Long companyId) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = requireOperator(request);
|
||||
Long scopedCompanyId = dataReadScope.readCompanyIdOrOwn(operator, companyId);
|
||||
return ApiResponse.success(shopKeyService.page(page, pageSize, scopedCompanyId));
|
||||
}
|
||||
@@ -64,7 +75,7 @@ public class ShopKeyController {
|
||||
public ApiResponse<ShopKeyItemVo> create(
|
||||
HttpServletRequest request,
|
||||
@Valid @RequestBody ShopKeyCreateRequest body) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = requireOperator(request);
|
||||
return ApiResponse.success("创建成功", shopKeyService.create(body, operator.getId()));
|
||||
}
|
||||
|
||||
@@ -80,7 +91,7 @@ public class ShopKeyController {
|
||||
HttpServletRequest request,
|
||||
@Parameter(description = "主键ID", required = true) @PathVariable Long id,
|
||||
@Valid @RequestBody ShopKeyUpdateRequest body) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = requireOperator(request);
|
||||
return ApiResponse.success("更新成功", shopKeyService.update(id, body, dataReadScope.writeCompanyId(operator)));
|
||||
}
|
||||
|
||||
@@ -94,7 +105,7 @@ public class ShopKeyController {
|
||||
public ApiResponse<Void> delete(
|
||||
HttpServletRequest request,
|
||||
@Parameter(description = "主键ID", required = true) @PathVariable Long id) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = requireOperator(request);
|
||||
shopKeyService.delete(id, dataReadScope.writeCompanyId(operator));
|
||||
return ApiResponse.success("删除成功", null);
|
||||
}
|
||||
@@ -112,7 +123,7 @@ public class ShopKeyController {
|
||||
public ApiResponse<ShopKeyItemVo> checkWhitelist(
|
||||
HttpServletRequest request,
|
||||
@Parameter(description = "主键ID", required = true) @PathVariable Long id) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = requireOperator(request);
|
||||
return ApiResponse.success("检测完成", shopKeyService.checkWhitelist(id, dataReadScope.writeCompanyId(operator)));
|
||||
}
|
||||
}
|
||||
|
||||
+10
-2
@@ -49,10 +49,18 @@ public class ShopManageController {
|
||||
private final ShopManageGroupService shopManageGroupService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
private final DataReadScope dataReadScope;
|
||||
private final com.nanri.aiimage.modules.permission.service.PermissionMenuService permissionMenuService;
|
||||
|
||||
/** 解析当前操作者(JWT 或内部令牌通道),数据范围一律以该身份为准,不信任调用方传入的 operatorId/superAdmin。 */
|
||||
/**
|
||||
* 解析当前操作者(JWT 或内部令牌通道),数据范围一律以该身份为准,不信任调用方传入的 operatorId/superAdmin。
|
||||
*
|
||||
* <p>2026-10-06:入口门放开后补这一页自己的门——管理员角色行为不变,普通账号必须被授了
|
||||
* 「店铺管理」菜单才读得到店铺与分组。</p>
|
||||
*/
|
||||
private AdminUserEntity requireOperator(HttpServletRequest request) {
|
||||
return adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
permissionMenuService.requireConsolePageAccess(operator, "无权访问店铺管理", "admin_shop_manage");
|
||||
return operator;
|
||||
}
|
||||
|
||||
private boolean isSuper(AdminUserEntity operator) {
|
||||
|
||||
+4
-1
@@ -46,10 +46,13 @@ public class SkipPriceAsinController {
|
||||
private final SkipPriceAsinService skipPriceAsinService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
private final com.nanri.aiimage.common.service.DataReadScope dataReadScope;
|
||||
private final com.nanri.aiimage.modules.permission.service.PermissionMenuService permissionMenuService;
|
||||
|
||||
/** 解析当前操作者(JWT 或内部令牌通道),权限与数据范围一律以该身份为准。 */
|
||||
private AdminUserEntity requireOperator(HttpServletRequest request) {
|
||||
return adminAuthSupport.requireAdminOrInternal(request);
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
permissionMenuService.requireConsolePageAccess(operator, "无权访问最低价ASIN", "admin_skip_price_asin");
|
||||
return operator;
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
|
||||
+2
-1
@@ -147,7 +147,8 @@ public class AdminTaskCenterController {
|
||||
|
||||
/** 会话闸门(登录态 + 菜单权限),五个端点同一把;service 只认算好的 operatorId。 */
|
||||
private AdminUserEntity authorizedOperator(HttpServletRequest request) {
|
||||
AdminUserEntity operator = adminAuthSupport.requireAdminOrInternal(request);
|
||||
// 入口门换成"管理员角色或持有后台授权",是否能看到这一页仍由下一行的菜单授权判定。
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
permissionMenuService.requireClientTaskCenterAccess(operator);
|
||||
return operator;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user