fix(鉴权): 请求身份全量改走会话出口;公开默认 JWT 密钥从出厂件里摘掉
三件事都属"失败很安静"那一类:
1) 请求自带 user_id 当范围条件。cp-item2 只收了会改状态/花钱的出口,其余 28 支控制器
(进度/列表/详情,本支 18 支、另 10 支因与租户判定收口同文件而随 cp-item3 那笔)照旧把
"这单是谁的"交给调用方自报:A 传 B 的 user_id 就读到 B 的进度,
接口 200、日志无声。现在 190 支取请求身份的 handler 只经一个出口(写类 require/resolve、
读类 resolve),护栏 RequestSuppliedIdentityOutletTest 钉分母 126 写 + 63 读 + 1 豁免
(内部代理通道 InternalUserProxyController Get /user-proxy 按内部令牌放行)。DTO 形态
(控制器把整个 @RequestBody 递给 service)靠"该 DTO 是否声明 userId 字段"的索引识别,
少了这层判据会漏掉一半;进度类 28 支另由 ProgressQueryOwnershipOutletTest 单独钉。
桌面执行器 4.0.44 不带凭据是既定事实,[ownership-anonymous] 按 URI 计数留证据,
哪一支的匿名计数归零才允许把它从 resolve 换成 require。
2) 默认 JWT 密钥。application.yml 原本写的是
`${AIIMAGE_JWT_SECRET:please-change-this-secret-…}`,那个兜底默认值就是 2026-10-07
现网取证到的东西:两台都跑 profile server 且 env 里没有这个键,于是 JwtService 的启动闸门
看到的是公开字面量(非空)——既不拒绝启动也不告警,签出来的 token 任何读过源码的人都能伪造
(含超管)。现在占位符不带默认值、AuthProperties 缺省空串、isInsecure 同时认空串与该字面量,
server profile 缺密钥直接拒绝启动(宁可起不来)。JwtSecretFallbackGuardrailTest 五例钉
"资源文件里不许再出现那个字面量"与"两形都算不安全"。
发版顺序是硬约束:先在 A/B 两台 .env 配好与对方一致的 AIIMAGE_JWT_SECRET,再上新 jar;
轮换会把所有 web 会话退出登录。
3) 菜单写侧的无操作者重载(create/update/delete)删掉——三道闸门对 operator==null 的处置是
return(放行),src/main 里没人调用它们,但这条路在,下一支控制器接上去就是静默的跨公司改删。
读侧 list(String menuType) 是登录态自读与内部代理用的,故意保留,并被点名只许 1 处。
TaskProgressOwnershipSupport / SimilarAsinTaskLightControllerTest / ResultSuccessTimingContractTest
是 handler 加上 HttpServletRequest 之后的既有契约用例订正;SourceScan 补 withoutComments/methodBody
两支取文助手(源码守卫的匹配面必须剥注释,否则 javadoc 里提一句就能把"必须存在"那形喂绿)。
变异自证:RequestSuppliedIdentityOutletTest 4/4(M1 删参数形出口、M2 删 DTO 形出口、
M3 出口只写进注释、M4 isBound 恒真);JwtSecretFallbackGuardrailTest 4/4(J1 恢复 yml 默认值、
J2 恢复 AuthProperties 默认值、J3 闸门退回只判 isBlank、J4 isInsecure 恒真);
MenuWriteOutletOperatorTest 4/4。
This commit is contained in:
@@ -9,7 +9,8 @@ import org.springframework.stereotype.Component;
|
||||
@ConfigurationProperties(prefix = "aiimage.auth")
|
||||
public class AuthProperties {
|
||||
|
||||
private String jwtSecret = "please-change-this-secret-please-rotate-at-least-32-bytes";
|
||||
/** 空串=未配置。非 server profile 才会退回内置默认密钥(见 JwtService.signingKey)。 */
|
||||
private String jwtSecret = "";
|
||||
private long jwtTtlHours = 168L;
|
||||
private String cookieName = "aiimage_token";
|
||||
private boolean cookieSecure = false;
|
||||
|
||||
@@ -39,13 +39,21 @@ public class JwtService {
|
||||
@jakarta.annotation.PostConstruct
|
||||
void requireSecretInServerProfile() {
|
||||
boolean serverProfile = activeProfiles != null && activeProfiles.contains("server");
|
||||
if (serverProfile && (props.getJwtSecret() == null || props.getJwtSecret().isBlank())) {
|
||||
if (serverProfile && isInsecure(props.getJwtSecret())) {
|
||||
throw new IllegalStateException(
|
||||
"server profile 下必须配置 aiimage.auth.jwt-secret(环境变量 AIIMAGE_JWT_SECRET)——"
|
||||
+ "缺失时会回退到公开的默认密钥,token 可被任意伪造");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 未配置(空)与「配置成了那个公开字面量」是同一件事:后者正是 application.yml 的
|
||||
* 占位符默认值顶上来的,只判 isBlank() 拦不住 env 丢失那一种情况。
|
||||
*/
|
||||
static boolean isInsecure(String secret) {
|
||||
return secret == null || secret.isBlank() || INSECURE_DEFAULT_SECRET.equals(secret);
|
||||
}
|
||||
|
||||
private SecretKey signingKey() {
|
||||
SecretKey key = cachedKey;
|
||||
if (key == null) {
|
||||
|
||||
+28
-12
@@ -51,6 +51,7 @@ public class AppearancePatentController {
|
||||
@Operation(summary = "解析 Excel 并创建任务", description = "解析上传后的 Excel 文件,提取 id、ASIN、国家、URL、标题等字段。返回给前端的数据只包含整数 id 和 n_1 行;n_2、n_3 等子行会保存在 OSS 解析载荷中,用于最终结果补齐。创建后的任务状态为 PENDING,不会自动推送 Python。")
|
||||
public ApiResponse<AppearancePatentParseVo> parse(@Valid @RequestBody AppearancePatentParseRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(service.parseAndCreateTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -59,7 +60,9 @@ public class AppearancePatentController {
|
||||
@Operation(summary = "查询外观专利检测总览", description = "查询当前用户的运行中、成功、失败和已结束任务数量。页面进入时请求一次即可,不需要持续轮询。")
|
||||
public ApiResponse<AppearancePatentDashboardVo> dashboard(
|
||||
@Parameter(description = "当前用户 ID,用于隔离不同用户的任务和历史记录。", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.dashboard(userId));
|
||||
}
|
||||
|
||||
@@ -69,7 +72,9 @@ public class AppearancePatentController {
|
||||
@Parameter(description = "当前用户 ID,用于查询该用户自己的历史记录。", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Parameter(description = "历史记录条数,默认 50,最大 100", example = "50")
|
||||
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit) {
|
||||
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
// 上限钳制(2026-09):文档写"最大 100"但此前无实际校验
|
||||
int safeLimit = limit == null ? 100 : Math.min(Math.max(1, limit), 100);
|
||||
return ApiResponse.success(service.history(userId, safeLimit));
|
||||
@@ -77,19 +82,22 @@ public class AppearancePatentController {
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询任务进度", description = "前端只对活跃任务调用该接口,建议 6 秒一次。接口只返回轻量任务状态,不返回明细结果。")
|
||||
public ApiResponse<AppearancePatentTaskBatchVo> progress(@Valid @RequestBody AppearancePatentTaskBatchRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
public ApiResponse<AppearancePatentTaskBatchVo> progress(@Valid @RequestBody AppearancePatentTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(service.progressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(service.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(service.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/activate")
|
||||
@@ -98,7 +106,9 @@ public class AppearancePatentController {
|
||||
@Parameter(description = "外观专利检测任务 ID,即解析接口返回的 taskId。", required = true, example = "3938")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "当前用户 ID,必须与创建任务的用户一致。", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.activateTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -122,7 +132,9 @@ public class AppearancePatentController {
|
||||
@Parameter(description = "外观专利检测任务 ID。", required = true, example = "3938")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "当前用户 ID,必须与创建任务的用户一致。", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.deleteTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -133,7 +145,9 @@ public class AppearancePatentController {
|
||||
@Parameter(description = "历史结果记录 ID,即 history 接口返回的 resultId。", required = true, example = "1001")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(description = "当前用户 ID。", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -144,7 +158,9 @@ public class AppearancePatentController {
|
||||
@Parameter(description = "结果记录 ID", required = true, example = "1001")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String url = service.resolveResultDownloadUrl(resultId, userId);
|
||||
if (url == null || url.isBlank()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "暂无可下载结果");
|
||||
|
||||
+37
-15
@@ -47,6 +47,7 @@ public class CollectDataController {
|
||||
@Operation(summary = "解析 Excel 并创建任务", description = "解析上传后的 Excel 文件,按行入库到 biz_collect_data_item,并保存任务筛选条件。任务初始状态为 PENDING。")
|
||||
public ApiResponse<CollectDataParseVo> parse(@Valid @RequestBody CollectDataParseRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(service.parseAndCreateTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -57,7 +58,9 @@ public class CollectDataController {
|
||||
@Parameter(description = "采集任务 ID", required = true, example = "9001")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.activateTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -70,7 +73,9 @@ public class CollectDataController {
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Parameter(description = "失败原因")
|
||||
@RequestParam(value = "error", required = false) String error) {
|
||||
@RequestParam(value = "error", required = false) String error,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.failTask(taskId, userId, error);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -85,7 +90,9 @@ public class CollectDataController {
|
||||
@Parameter(description = "页码,从 1 开始", example = "1")
|
||||
@RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
|
||||
@Parameter(description = "每页条数,默认 50,最大 200", example = "50")
|
||||
@RequestParam(value = "page_size", required = false, defaultValue = "50") Integer pageSize) {
|
||||
@RequestParam(value = "page_size", required = false, defaultValue = "50") Integer pageSize,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.getItemsPage(taskId, userId, page, pageSize));
|
||||
}
|
||||
|
||||
@@ -102,7 +109,9 @@ public class CollectDataController {
|
||||
@Operation(summary = "查询采集任务总览")
|
||||
public ApiResponse<CollectDataDashboardVo> dashboard(
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.dashboard(userId));
|
||||
}
|
||||
|
||||
@@ -112,25 +121,30 @@ public class CollectDataController {
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Parameter(description = "返回数量上限,默认 50,最大 100", example = "50")
|
||||
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit) {
|
||||
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.history(userId, limit));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询任务进度")
|
||||
public ApiResponse<CollectDataTaskBatchVo> progressBatch(@Valid @RequestBody CollectDataTaskBatchRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
public ApiResponse<CollectDataTaskBatchVo> progressBatch(@Valid @RequestBody CollectDataTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(service.progressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(service.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(service.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
|
||||
@DeleteMapping("/tasks/{taskId}")
|
||||
@@ -139,7 +153,9 @@ public class CollectDataController {
|
||||
@Parameter(description = "采集任务 ID", required = true, example = "9001")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.deleteTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -150,7 +166,9 @@ public class CollectDataController {
|
||||
@Parameter(description = "结果记录 ID", required = true, example = "1001")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -159,14 +177,18 @@ public class CollectDataController {
|
||||
@Operation(summary = "查询国家处理顺序", description = "返回当前用户保存的国家代码列表,顺序即处理顺序。")
|
||||
public ApiResponse<CollectDataCountryPreferenceVo> getCountryPreference(
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.getCountryPreference(userId));
|
||||
}
|
||||
|
||||
@PutMapping("/country-preference")
|
||||
@Operation(summary = "保存国家处理顺序", description = "保存当前用户的国家勾选与处理顺序。")
|
||||
public ApiResponse<CollectDataCountryPreferenceVo> saveCountryPreference(
|
||||
@Valid @RequestBody CollectDataCountryPreferenceSaveRequest request) {
|
||||
@Valid @RequestBody CollectDataCountryPreferenceSaveRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(service.saveCountryPreference(request));
|
||||
}
|
||||
}
|
||||
|
||||
+15
-4
@@ -5,6 +5,7 @@ import com.nanri.aiimage.modules.convert.model.dto.ConvertRunRequest;
|
||||
import com.nanri.aiimage.modules.convert.model.vo.ConvertHistoryVo;
|
||||
import com.nanri.aiimage.modules.convert.model.vo.ConvertRunVo;
|
||||
import com.nanri.aiimage.modules.convert.service.ConvertRunService;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.enums.ParameterIn;
|
||||
@@ -14,6 +15,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
@@ -34,6 +36,7 @@ import java.net.URI;
|
||||
public class ConvertRunController {
|
||||
|
||||
private final ConvertRunService convertRunService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
|
||||
@PostMapping("/run")
|
||||
@Operation(
|
||||
@@ -58,7 +61,9 @@ public class ConvertRunController {
|
||||
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "请求参数不合法或模板不存在"),
|
||||
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "执行格式转换失败")
|
||||
})
|
||||
public ApiResponse<ConvertRunVo> run(@Valid @RequestBody ConvertRunRequest request) {
|
||||
public ApiResponse<ConvertRunVo> run(@Valid @RequestBody ConvertRunRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(convertRunService.run(request));
|
||||
}
|
||||
|
||||
@@ -69,7 +74,9 @@ public class ConvertRunController {
|
||||
})
|
||||
public ApiResponse<ConvertHistoryVo> history(
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
ConvertHistoryVo vo = new ConvertHistoryVo();
|
||||
vo.setItems(convertRunService.listHistory(userId));
|
||||
return ApiResponse.success(vo);
|
||||
@@ -84,7 +91,9 @@ public class ConvertRunController {
|
||||
public ApiResponse<Void> deleteHistory(
|
||||
@Parameter(description = "格式转换结果记录 ID", required = true) @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
convertRunService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -98,7 +107,9 @@ public class ConvertRunController {
|
||||
public ResponseEntity<Void> download(
|
||||
@Parameter(description = "格式转换结果记录 ID", required = true) @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String downloadUrl = convertRunService.getResultDownloadUrl(resultId, userId);
|
||||
return ResponseEntity.status(302)
|
||||
.location(URI.create(downloadUrl))
|
||||
|
||||
+15
-4
@@ -6,6 +6,7 @@ import com.nanri.aiimage.modules.dedupe.model.vo.DedupeHistoryVo;
|
||||
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeRunProgressVo;
|
||||
import com.nanri.aiimage.modules.dedupe.model.vo.DedupeRunVo;
|
||||
import com.nanri.aiimage.modules.dedupe.service.DedupeRunService;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.enums.ParameterIn;
|
||||
@@ -15,6 +16,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
@@ -35,6 +37,7 @@ import java.net.URI;
|
||||
public class DedupeRunController {
|
||||
|
||||
private final DedupeRunService dedupeRunService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
|
||||
@PostMapping("/run")
|
||||
@Operation(
|
||||
@@ -61,7 +64,9 @@ public class DedupeRunController {
|
||||
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "请求参数不合法或缺少必要字段"),
|
||||
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "提交数据去重任务失败")
|
||||
})
|
||||
public ApiResponse<DedupeRunProgressVo> run(@Valid @RequestBody DedupeRunRequest request) {
|
||||
public ApiResponse<DedupeRunProgressVo> run(@Valid @RequestBody DedupeRunRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(dedupeRunService.submitRun(request));
|
||||
}
|
||||
|
||||
@@ -88,7 +93,9 @@ public class DedupeRunController {
|
||||
})
|
||||
public ApiResponse<DedupeHistoryVo> history(
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
DedupeHistoryVo vo = new DedupeHistoryVo();
|
||||
vo.setItems(dedupeRunService.listHistory(userId));
|
||||
return ApiResponse.success(vo);
|
||||
@@ -103,7 +110,9 @@ public class DedupeRunController {
|
||||
public ApiResponse<Void> deleteHistory(
|
||||
@Parameter(description = "去重结果记录 ID", required = true) @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
dedupeRunService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -117,7 +126,9 @@ public class DedupeRunController {
|
||||
public ResponseEntity<Void> download(
|
||||
@Parameter(description = "去重结果记录 ID", required = true) @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String downloadUrl = dedupeRunService.getResultDownloadUrl(resultId, userId);
|
||||
return ResponseEntity.status(302)
|
||||
.location(URI.create(downloadUrl))
|
||||
|
||||
+27
-13
@@ -60,6 +60,7 @@ public class DeleteBrandRunController {
|
||||
})
|
||||
public ApiResponse<DeleteBrandRunVo> run(@Valid @RequestBody DeleteBrandRunRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(deleteBrandRunService.run(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -68,7 +69,9 @@ public class DeleteBrandRunController {
|
||||
@Operation(summary = "查询删除品牌历史", description = "按 user_id 查询删除品牌历史。")
|
||||
public ApiResponse<DeleteBrandHistoryVo> history(
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(deleteBrandRunService.listHistory(userId));
|
||||
}
|
||||
|
||||
@@ -77,7 +80,9 @@ public class DeleteBrandRunController {
|
||||
public ApiResponse<Void> deleteHistory(
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
deleteBrandRunService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -91,27 +96,32 @@ public class DeleteBrandRunController {
|
||||
|
||||
@PostMapping("/tasks/batch")
|
||||
@Operation(summary = "批量获取删除品牌任务详情", description = "合并多个 taskId 的详情查询,减少轮询期对 DB/Redis 的压力。")
|
||||
public ApiResponse<DeleteBrandTaskBatchVo> getTasksBatch(@Valid @RequestBody DeleteBrandTaskBatchRequest request) {
|
||||
// 归属过滤:/tasks/batch 同样按 userId 过滤(此前无校验,遍历 taskId 即可读他人任务详情)
|
||||
public ApiResponse<DeleteBrandTaskBatchVo> getTasksBatch(@Valid @RequestBody DeleteBrandTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// 归属以会话身份为准:user_id 由请求体说了算时,遍历 taskId 即可读他人任务详情
|
||||
return ApiResponse.success(deleteBrandRunService.getTaskDetails(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量获取删除品牌任务进度摘要", description = "仅返回任务基础状态和行进度摘要,用于前端轮询降载。")
|
||||
public ApiResponse<DeleteBrandTaskBatchVo> getTaskProgressBatch(@Valid @RequestBody DeleteBrandTaskBatchRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
public ApiResponse<DeleteBrandTaskBatchVo> getTaskProgressBatch(@Valid @RequestBody DeleteBrandTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(deleteBrandRunService.getTaskProgress(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(deleteBrandRunService.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(deleteBrandRunService.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
|
||||
@GetMapping("/tasks/{taskId}/deletion-status")
|
||||
@@ -119,7 +129,9 @@ public class DeleteBrandRunController {
|
||||
public ApiResponse<DeleteBrandTaskDeletionStatusVo> getTaskDeletionStatus(
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(deleteBrandRunService.getTaskDeletionStatus(taskId, userId));
|
||||
}
|
||||
|
||||
@@ -171,7 +183,9 @@ public class DeleteBrandRunController {
|
||||
public ResponseEntity<Void> downloadResult(
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String url = deleteBrandRunService.resolveResultDownloadUrl(resultId, userId);
|
||||
if (url == null || url.isBlank()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "结果无可下载");
|
||||
|
||||
+3
-1
@@ -39,7 +39,9 @@ public class ImageHistoryController {
|
||||
@RequestParam(name = "user_id", required = false) Long userId,
|
||||
@RequestParam(name = "time_start", required = false) String timeStart,
|
||||
@RequestParam(name = "time_end", required = false) String timeEnd,
|
||||
@RequestParam(name = "company_id", required = false) Long companyId) {
|
||||
@RequestParam(name = "company_id", required = false) Long companyId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
AdminUserEntity operator = adminAuthSupport.requireConsoleOperatorOrInternal(request);
|
||||
if (!permissionMenuService.hasAnyAdminMenu(operator, List.of("admin_history"))) {
|
||||
throw new BusinessException(403, "无权访问生成记录模块");
|
||||
|
||||
+3
-1
@@ -87,7 +87,9 @@ public class AdminImageVideoTaskController {
|
||||
@RequestParam(name = "submitted_from", required = false) String submittedFrom,
|
||||
@RequestParam(name = "submitted_to", required = false) String submittedTo,
|
||||
@RequestParam(name = "company_id", required = false) Long companyId,
|
||||
HttpServletRequest request) {
|
||||
HttpServletRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
AdminUserEntity operator = requireOperator(request);
|
||||
// 既有语义保留:显式传 user_id 时按那一个人筛;公司 tab 叠在它上面(交集)。
|
||||
List<Long> base = userId != null && userId > 0 ? List.of(userId) : null;
|
||||
|
||||
+46
-18
@@ -66,7 +66,9 @@ public class PatrolDeleteController {
|
||||
@Operation(summary = "查询备选店铺列表", description = "返回当前用户在巡店删除模块中已保存的备选店铺。")
|
||||
public ApiResponse<List<ProductRiskCandidateVo>> listCandidates(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(patrolDeleteResolveService.listCandidates(userId));
|
||||
}
|
||||
|
||||
@@ -87,7 +89,9 @@ public class PatrolDeleteController {
|
||||
"shop_name": "郭亚芳"
|
||||
}
|
||||
""")))
|
||||
@Valid @RequestBody ProductRiskCandidateAddRequest request) {
|
||||
@Valid @RequestBody ProductRiskCandidateAddRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(patrolDeleteResolveService.addCandidate(request));
|
||||
}
|
||||
|
||||
@@ -97,7 +101,9 @@ public class PatrolDeleteController {
|
||||
@Parameter(description = "备选店铺记录主键", example = "10")
|
||||
@PathVariable Long id,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
patrolDeleteResolveService.deleteCandidate(userId, id);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -106,14 +112,18 @@ public class PatrolDeleteController {
|
||||
@Operation(summary = "查询删除条件", description = "返回当前用户保存的巡店删除条件。")
|
||||
public ApiResponse<List<PatrolDeleteConditionVo>> listConditions(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(patrolDeleteResolveService.listConditions(userId));
|
||||
}
|
||||
|
||||
@PostMapping("/conditions")
|
||||
@Operation(summary = "新增删除条件", description = "保存一条当前用户可复用的巡店删除条件。")
|
||||
public ApiResponse<PatrolDeleteConditionVo> addCondition(
|
||||
@Valid @RequestBody PatrolDeleteConditionAddRequest request) {
|
||||
@Valid @RequestBody PatrolDeleteConditionAddRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(patrolDeleteResolveService.addCondition(request));
|
||||
}
|
||||
|
||||
@@ -123,7 +133,9 @@ public class PatrolDeleteController {
|
||||
@Parameter(description = "删除条件主键", example = "10")
|
||||
@PathVariable Long id,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
patrolDeleteResolveService.deleteCondition(userId, id);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -148,7 +160,9 @@ public class PatrolDeleteController {
|
||||
]
|
||||
}
|
||||
""")))
|
||||
@Valid @RequestBody ProductRiskMatchShopsRequest request) {
|
||||
@Valid @RequestBody ProductRiskMatchShopsRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(patrolDeleteResolveService.matchShops(request));
|
||||
}
|
||||
|
||||
@@ -156,7 +170,9 @@ public class PatrolDeleteController {
|
||||
@Operation(summary = "查询统计看板", description = "返回备选店铺数、已处理任务数、成功任务数和失败任务数。")
|
||||
public ApiResponse<ProductRiskDashboardVo> dashboard(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(patrolDeleteTaskService.dashboard(userId));
|
||||
}
|
||||
|
||||
@@ -166,25 +182,30 @@ public class PatrolDeleteController {
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Parameter(description = "历史记录条数,默认 30,最大 100", example = "30")
|
||||
@RequestParam(value = "limit", required = false) Integer limit) {
|
||||
@RequestParam(value = "limit", required = false) Integer limit,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(patrolDeleteTaskService.listHistory(userId, limit));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询巡店删除任务进度", description = "仅返回任务状态和店铺结果摘要,用于前端轮询降载。")
|
||||
public ApiResponse<PatrolDeleteTaskBatchVo> taskProgressBatch(@Valid @RequestBody PatrolDeleteTaskBatchRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
public ApiResponse<PatrolDeleteTaskBatchVo> taskProgressBatch(@Valid @RequestBody PatrolDeleteTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(patrolDeleteTaskService.getTaskProgressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(patrolDeleteTaskService.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(patrolDeleteTaskService.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks")
|
||||
@@ -235,6 +256,7 @@ public class PatrolDeleteController {
|
||||
""")))
|
||||
@Valid @RequestBody PatrolDeleteCreateTaskRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(patrolDeleteTaskService.createTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -373,7 +395,9 @@ public class PatrolDeleteController {
|
||||
@Parameter(description = "结果记录主键", example = "4599")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String url = patrolDeleteTaskService.resolveResultDownloadUrl(resultId, userId);
|
||||
if (url == null || url.isBlank()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "暂无可下载结果");
|
||||
@@ -393,7 +417,9 @@ public class PatrolDeleteController {
|
||||
@Parameter(description = "任务主键", example = "3089")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
patrolDeleteTaskService.deleteTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -404,7 +430,9 @@ public class PatrolDeleteController {
|
||||
@Parameter(description = "结果记录主键", example = "4599")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
patrolDeleteTaskService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
+69
-27
@@ -77,13 +77,17 @@ public class PriceTrackController {
|
||||
@Operation(summary = "查询备选店铺列表", description = "返回当前用户在跟价模块中保存的备选店铺。")
|
||||
public ApiResponse<List<PriceTrackCandidateVo>> listCandidates(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(priceTrackService.listCandidates(userId));
|
||||
}
|
||||
|
||||
@PostMapping("/candidates")
|
||||
@Operation(summary = "新增备选店铺", description = "新增一条备选店铺记录,供后续匹配和创建任务使用。")
|
||||
public ApiResponse<PriceTrackCandidateVo> addCandidate(@Valid @RequestBody PriceTrackCandidateAddRequest request) {
|
||||
public ApiResponse<PriceTrackCandidateVo> addCandidate(@Valid @RequestBody PriceTrackCandidateAddRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(priceTrackService.addCandidate(request));
|
||||
}
|
||||
|
||||
@@ -92,7 +96,9 @@ public class PriceTrackController {
|
||||
public ApiResponse<Void> deleteCandidate(
|
||||
@Parameter(description = "备选店铺记录主键", example = "10") @PathVariable Long id,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
priceTrackService.deleteCandidate(userId, id);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -101,20 +107,26 @@ public class PriceTrackController {
|
||||
@Operation(summary = "查询国家处理顺序", description = "返回当前用户保存的国家代码列表,顺序即跟价任务处理顺序。")
|
||||
public ApiResponse<PriceTrackCountryPreferenceVo> getCountryPreference(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(priceTrackService.getCountryPreference(userId));
|
||||
}
|
||||
|
||||
@PutMapping("/country-preference")
|
||||
@Operation(summary = "保存国家处理顺序", description = "保存当前用户在跟价模块中的国家勾选和处理顺序。")
|
||||
public ApiResponse<PriceTrackCountryPreferenceVo> saveCountryPreference(
|
||||
@Valid @RequestBody PriceTrackCountryPreferenceSaveRequest request) {
|
||||
@Valid @RequestBody PriceTrackCountryPreferenceSaveRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(priceTrackService.saveCountryPreference(request));
|
||||
}
|
||||
|
||||
@PostMapping("/match-shops")
|
||||
@Operation(summary = "批量匹配店铺", description = "按店铺名查询紫鸟索引,返回 shopId、platform、companyName、matchStatus 等信息。")
|
||||
public ApiResponse<PriceTrackMatchShopsVo> matchShops(@Valid @RequestBody PriceTrackMatchShopsRequest request) {
|
||||
public ApiResponse<PriceTrackMatchShopsVo> matchShops(@Valid @RequestBody PriceTrackMatchShopsRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(priceTrackService.matchShops(request));
|
||||
}
|
||||
|
||||
@@ -167,7 +179,9 @@ public class PriceTrackController {
|
||||
@Operation(summary = "统计看板", description = "返回备选店铺数、已结束任务数、成功任务数和失败任务数。")
|
||||
public ApiResponse<PriceTrackDashboardVo> dashboard(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(priceTrackTaskService.dashboard(userId));
|
||||
}
|
||||
|
||||
@@ -175,7 +189,9 @@ public class PriceTrackController {
|
||||
@Operation(summary = "处理记录列表", description = "返回当前用户跟价模块下各店铺结果记录,包含运行中和历史记录。")
|
||||
public ApiResponse<PriceTrackHistoryVo> history(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(priceTrackTaskService.listHistory(userId));
|
||||
}
|
||||
|
||||
@@ -184,7 +200,9 @@ public class PriceTrackController {
|
||||
public ApiResponse<Void> deleteHistory(
|
||||
@Parameter(description = "结果行主键 biz_file_result.id", example = "1001") @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
priceTrackTaskService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -193,6 +211,7 @@ public class PriceTrackController {
|
||||
@Operation(summary = "创建跟价任务", description = "落库 RUNNING 任务和各店铺占位结果,返回 taskId 和初始 items 快照。")
|
||||
public ApiResponse<PriceTrackCreateTaskVo> createTask(@Valid @RequestBody PriceTrackCreateTaskRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(priceTrackTaskService.createTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -202,14 +221,18 @@ public class PriceTrackController {
|
||||
public ApiResponse<Void> markDispatchFailed(
|
||||
@PathVariable Long taskId,
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Valid @RequestBody PriceTrackDispatchFailedRequest request) {
|
||||
@Valid @RequestBody PriceTrackDispatchFailedRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
priceTrackTaskService.markDispatchFailed(taskId, userId, request.getErrorMessage());
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
@PostMapping("/loop-runs")
|
||||
@Operation(summary = "创建跟价循环任务", description = "创建整批店铺的多轮循环主任务。")
|
||||
public ApiResponse<PriceTrackLoopRunVo> createLoopRun(@Valid @RequestBody PriceTrackLoopRunCreateRequest request) {
|
||||
public ApiResponse<PriceTrackLoopRunVo> createLoopRun(@Valid @RequestBody PriceTrackLoopRunCreateRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(priceTrackLoopRunService.createLoopRun(request));
|
||||
}
|
||||
|
||||
@@ -217,7 +240,9 @@ public class PriceTrackController {
|
||||
@Operation(summary = "查询跟价循环任务", description = "返回循环任务当前状态与进度。")
|
||||
public ApiResponse<PriceTrackLoopRunVo> getLoopRun(
|
||||
@PathVariable Long loopRunId,
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(priceTrackLoopRunService.getLoopRun(loopRunId, userId));
|
||||
}
|
||||
|
||||
@@ -225,7 +250,9 @@ public class PriceTrackController {
|
||||
@Operation(summary = "获取循环任务下一条派发信息", description = "当前无活跃子任务时调用,返回下一条应该创建并入队的子任务请求。")
|
||||
public ApiResponse<PriceTrackLoopRunDispatchVo> dispatchNext(
|
||||
@PathVariable Long loopRunId,
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(priceTrackLoopRunService.dispatchNext(loopRunId, userId));
|
||||
}
|
||||
|
||||
@@ -234,7 +261,9 @@ public class PriceTrackController {
|
||||
public ApiResponse<PriceTrackLoopRunVo> childFinished(
|
||||
@PathVariable Long loopRunId,
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Valid @RequestBody PriceTrackLoopRunChildFinishedRequest request) {
|
||||
@Valid @RequestBody PriceTrackLoopRunChildFinishedRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(priceTrackLoopRunService.childFinished(loopRunId, userId, request));
|
||||
}
|
||||
|
||||
@@ -242,7 +271,9 @@ public class PriceTrackController {
|
||||
@Operation(summary = "停止循环任务", description = "请求停止循环;若无活跃子任务则立即停止,否则等待当前子任务完成后收尾。")
|
||||
public ApiResponse<PriceTrackLoopRunVo> stopLoopRun(
|
||||
@PathVariable Long loopRunId,
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(priceTrackLoopRunService.requestStop(loopRunId, userId));
|
||||
}
|
||||
|
||||
@@ -251,7 +282,9 @@ public class PriceTrackController {
|
||||
public ApiResponse<Void> deleteTask(
|
||||
@Parameter(description = "任务主键 biz_file_task.id", example = "200") @PathVariable Long taskId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
priceTrackTaskService.deleteTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -262,33 +295,40 @@ public class PriceTrackController {
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Parameter(name = "shop_name", description = "店铺名称", required = true, in = ParameterIn.QUERY, example = "某某店铺")
|
||||
@RequestParam("shop_name") String shopName) {
|
||||
@RequestParam("shop_name") String shopName,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(priceTrackTaskService.deletePendingShopResult(userId, shopName));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/batch")
|
||||
@Operation(summary = "批量查询任务详情", description = "按 taskIds 返回任务概要和各店铺结果,供前端查询使用。")
|
||||
public ApiResponse<PriceTrackTaskBatchVo> tasksBatch(@Valid @RequestBody PriceTrackTaskBatchRequest request) {
|
||||
// 归属过滤:/tasks/batch 同样按 userId 过滤(此前无校验,遍历 taskId 即可读他人任务详情)
|
||||
public ApiResponse<PriceTrackTaskBatchVo> tasksBatch(@Valid @RequestBody PriceTrackTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// 归属以会话身份为准:user_id 由请求体说了算时,遍历 taskId 即可读他人任务详情
|
||||
return ApiResponse.success(priceTrackTaskService.getTaskDetailsBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询任务进度摘要", description = "仅返回任务状态、时间和错误等轻量信息,供前端轮询降载。")
|
||||
public ApiResponse<PriceTrackTaskBatchVo> taskProgressBatch(@Valid @RequestBody PriceTrackTaskBatchRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
public ApiResponse<PriceTrackTaskBatchVo> taskProgressBatch(@Valid @RequestBody PriceTrackTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(priceTrackTaskService.getTaskProgressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(priceTrackTaskService.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(priceTrackTaskService.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/result")
|
||||
@@ -319,7 +359,9 @@ public class PriceTrackController {
|
||||
public ResponseEntity<Void> downloadResult(
|
||||
@Parameter(description = "结果记录主键 biz_file_result.id", example = "1001") @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String url = priceTrackTaskService.resolveResultDownloadUrl(resultId, userId);
|
||||
if (url == null || url.isBlank()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "暂无可下载结果");
|
||||
|
||||
+51
-21
@@ -69,13 +69,17 @@ public class ProductRiskResolveController {
|
||||
@Operation(summary = "查询备选店铺列表", description = "返回当前用户在商品风险模块中已保存的备选店铺。")
|
||||
public ApiResponse<List<ProductRiskCandidateVo>> listCandidates(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(productRiskResolveService.listCandidates(userId));
|
||||
}
|
||||
|
||||
@PostMapping("/candidates")
|
||||
@Operation(summary = "新增备选店铺", description = "将店铺名写入用户备选表,用于前端勾选和匹配流程。")
|
||||
public ApiResponse<ProductRiskCandidateVo> addCandidate(@Valid @RequestBody ProductRiskCandidateAddRequest request) {
|
||||
public ApiResponse<ProductRiskCandidateVo> addCandidate(@Valid @RequestBody ProductRiskCandidateAddRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(productRiskResolveService.addCandidate(request));
|
||||
}
|
||||
|
||||
@@ -84,7 +88,9 @@ public class ProductRiskResolveController {
|
||||
public ApiResponse<Void> deleteCandidate(
|
||||
@Parameter(description = "备选店铺记录主键", example = "10") @PathVariable Long id,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
productRiskResolveService.deleteCandidate(userId, id);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -93,20 +99,26 @@ public class ProductRiskResolveController {
|
||||
@Operation(summary = "查询国家处理顺序", description = "返回当前用户保存的国家代码列表,顺序即处理顺序。")
|
||||
public ApiResponse<ProductRiskCountryPreferenceVo> getCountryPreference(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(productRiskResolveService.getCountryPreference(userId));
|
||||
}
|
||||
|
||||
@PutMapping("/country-preference")
|
||||
@Operation(summary = "保存国家处理顺序", description = "保存当前用户的国家勾选与处理顺序。")
|
||||
public ApiResponse<ProductRiskCountryPreferenceVo> saveCountryPreference(
|
||||
@Valid @RequestBody ProductRiskCountryPreferenceSaveRequest request) {
|
||||
@Valid @RequestBody ProductRiskCountryPreferenceSaveRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(productRiskResolveService.saveCountryPreference(request));
|
||||
}
|
||||
|
||||
@PostMapping("/match-shops")
|
||||
@Operation(summary = "批量匹配店铺", description = "按店名查询紫鸟索引,返回 shopId、platform、companyName、matchStatus 等。")
|
||||
public ApiResponse<ProductRiskMatchShopsVo> matchShops(@Valid @RequestBody ProductRiskMatchShopsRequest request) {
|
||||
public ApiResponse<ProductRiskMatchShopsVo> matchShops(@Valid @RequestBody ProductRiskMatchShopsRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(productRiskResolveService.matchShops(request));
|
||||
}
|
||||
|
||||
@@ -114,7 +126,9 @@ public class ProductRiskResolveController {
|
||||
@Operation(summary = "统计看板", description = "返回候选店铺数量、已结束任务数、成功任务数和失败任务数。")
|
||||
public ApiResponse<ProductRiskDashboardVo> dashboard(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(productRiskTaskService.dashboard(userId));
|
||||
}
|
||||
|
||||
@@ -122,7 +136,9 @@ public class ProductRiskResolveController {
|
||||
@Operation(summary = "处理记录列表", description = "返回当前用户商品风险模块下各店结果行,含运行中与历史记录。")
|
||||
public ApiResponse<ProductRiskHistoryVo> history(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(productRiskTaskService.listHistory(userId));
|
||||
}
|
||||
|
||||
@@ -131,7 +147,9 @@ public class ProductRiskResolveController {
|
||||
public ApiResponse<Void> deleteHistory(
|
||||
@Parameter(description = "结果行主键 biz_file_result.id", example = "1001") @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
productRiskTaskService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -140,6 +158,7 @@ public class ProductRiskResolveController {
|
||||
@Operation(summary = "创建商品风险处理任务", description = "落库 RUNNING 任务及各店占位结果,返回 taskId 与 items。")
|
||||
public ApiResponse<ProductRiskCreateTaskVo> createTask(@Valid @RequestBody ProductRiskCreateTaskRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(productRiskTaskService.createTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -149,7 +168,9 @@ public class ProductRiskResolveController {
|
||||
public ApiResponse<Void> deleteTask(
|
||||
@Parameter(description = "任务主键 biz_file_task.id", example = "200") @PathVariable Long taskId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
productRiskTaskService.deleteTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -160,33 +181,40 @@ public class ProductRiskResolveController {
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Parameter(name = "shop_name", description = "店铺名称", required = true, in = ParameterIn.QUERY, example = "某某店铺")
|
||||
@RequestParam("shop_name") String shopName) {
|
||||
@RequestParam("shop_name") String shopName,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(productRiskTaskService.deletePendingShopResult(userId, shopName));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/batch")
|
||||
@Operation(summary = "批量查询任务详情", description = "按 taskIds 返回任务概览与各店结果,供前端轮询使用。")
|
||||
public ApiResponse<ProductRiskTaskBatchVo> tasksBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request) {
|
||||
// 归属过滤:/tasks/batch 同样按 userId 过滤(此前无校验,遍历 taskId 即可读他人任务详情)
|
||||
public ApiResponse<ProductRiskTaskBatchVo> tasksBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// 归属以会话身份为准:user_id 由请求体说了算时,遍历 taskId 即可读他人任务详情
|
||||
return ApiResponse.success(productRiskTaskService.getTaskDetailsBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询任务进度摘要", description = "仅返回任务状态、时间和错误等轻量信息,供前端轮询降载。")
|
||||
public ApiResponse<ProductRiskTaskBatchVo> taskProgressBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
public ApiResponse<ProductRiskTaskBatchVo> taskProgressBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(productRiskTaskService.getTaskProgressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(productRiskTaskService.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(productRiskTaskService.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/result")
|
||||
@@ -266,7 +294,9 @@ public class ProductRiskResolveController {
|
||||
public ResponseEntity<Void> downloadResult(
|
||||
@Parameter(description = "结果行主键 biz_file_result.id", example = "1001") @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String url;
|
||||
try {
|
||||
url = productRiskTaskService.resolveResultDownloadUrl(resultId, userId);
|
||||
|
||||
+37
-15
@@ -64,7 +64,9 @@ public class QueryAsinTaskController {
|
||||
@Operation(summary = "查询备选店铺列表", description = "返回当前用户在查询 ASIN 模块中已保存的备选店铺。")
|
||||
public ApiResponse<List<ProductRiskCandidateVo>> listCandidates(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(queryAsinResolveService.listCandidates(userId));
|
||||
}
|
||||
|
||||
@@ -85,7 +87,9 @@ public class QueryAsinTaskController {
|
||||
"shop_name": "郭亚芳"
|
||||
}
|
||||
""")))
|
||||
@Valid @RequestBody ProductRiskCandidateAddRequest request) {
|
||||
@Valid @RequestBody ProductRiskCandidateAddRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(queryAsinResolveService.addCandidate(request));
|
||||
}
|
||||
|
||||
@@ -95,7 +99,9 @@ public class QueryAsinTaskController {
|
||||
@Parameter(description = "备选店铺记录主键", example = "10")
|
||||
@PathVariable Long id,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
queryAsinResolveService.deleteCandidate(userId, id);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -120,7 +126,9 @@ public class QueryAsinTaskController {
|
||||
]
|
||||
}
|
||||
""")))
|
||||
@Valid @RequestBody ProductRiskMatchShopsRequest request) {
|
||||
@Valid @RequestBody ProductRiskMatchShopsRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(queryAsinResolveService.matchShops(request));
|
||||
}
|
||||
|
||||
@@ -128,7 +136,9 @@ public class QueryAsinTaskController {
|
||||
@Operation(summary = "查询统计看板", description = "返回备选店铺数、已处理任务数、成功任务数和失败任务数。")
|
||||
public ApiResponse<ProductRiskDashboardVo> dashboard(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(queryAsinTaskService.dashboard(userId));
|
||||
}
|
||||
|
||||
@@ -136,25 +146,30 @@ public class QueryAsinTaskController {
|
||||
@Operation(summary = "查询任务记录", description = "返回当前用户在查询 ASIN 模块中的当前任务和历史任务记录。")
|
||||
public ApiResponse<QueryAsinHistoryVo> history(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(queryAsinTaskService.listHistory(userId));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询查询 ASIN 任务进度", description = "仅返回任务状态和店铺结果摘要,用于前端轮询降载。")
|
||||
public ApiResponse<QueryAsinTaskBatchVo> taskProgressBatch(@Valid @RequestBody QueryAsinTaskBatchRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
public ApiResponse<QueryAsinTaskBatchVo> taskProgressBatch(@Valid @RequestBody QueryAsinTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(queryAsinTaskService.getTaskProgressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(queryAsinTaskService.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(queryAsinTaskService.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks")
|
||||
@@ -196,6 +211,7 @@ public class QueryAsinTaskController {
|
||||
""")))
|
||||
@Valid @RequestBody QueryAsinCreateTaskRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(queryAsinTaskService.createTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -282,7 +298,9 @@ public class QueryAsinTaskController {
|
||||
@Parameter(description = "结果记录主键", example = "4599")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String url = queryAsinTaskService.resolveResultDownloadUrl(resultId, userId);
|
||||
if (url == null || url.isBlank()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "暂无可下载结果");
|
||||
@@ -302,7 +320,9 @@ public class QueryAsinTaskController {
|
||||
@Parameter(description = "任务主键", example = "3089")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
queryAsinTaskService.deleteTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -313,7 +333,9 @@ public class QueryAsinTaskController {
|
||||
@Parameter(description = "结果记录主键", example = "4599")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
queryAsinTaskService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
+42
-17
@@ -61,7 +61,9 @@ public class ShopDataCrawlTaskController {
|
||||
public ApiResponse<List<ProductRiskCandidateVo>> candidates(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID,店铺数据按用户隔离", required = true,
|
||||
in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(resolveService.listCandidates(userId));
|
||||
}
|
||||
|
||||
@@ -71,7 +73,9 @@ public class ShopDataCrawlTaskController {
|
||||
description = "先校验店铺已在后台管理中维护且能够命中紫鸟店铺索引,再添加到当前用户的管理区;重复添加时返回已有记录。",
|
||||
responses = @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "添加成功"))
|
||||
public ApiResponse<ProductRiskCandidateVo> addCandidate(
|
||||
@Valid @RequestBody ProductRiskCandidateAddRequest request) {
|
||||
@Valid @RequestBody ProductRiskCandidateAddRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(resolveService.addCandidate(request));
|
||||
}
|
||||
|
||||
@@ -85,7 +89,9 @@ public class ShopDataCrawlTaskController {
|
||||
@PathVariable Long id,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID,用于校验记录归属", required = true,
|
||||
in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
resolveService.deleteCandidate(userId, id);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -98,7 +104,9 @@ public class ShopDataCrawlTaskController {
|
||||
public ApiResponse<ProductRiskCountryPreferenceVo> countryPreference(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true,
|
||||
in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(resolveService.getCountryPreference(userId));
|
||||
}
|
||||
|
||||
@@ -108,7 +116,9 @@ public class ShopDataCrawlTaskController {
|
||||
description = "保存当前用户勾选并排序后的国家列表。支持 DE、FR、ES、IT、UK,至少选择 1 个且不能重复。",
|
||||
responses = @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "保存成功"))
|
||||
public ApiResponse<ProductRiskCountryPreferenceVo> saveCountryPreference(
|
||||
@Valid @RequestBody ProductRiskCountryPreferenceSaveRequest request) {
|
||||
@Valid @RequestBody ProductRiskCountryPreferenceSaveRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(resolveService.saveCountryPreference(request));
|
||||
}
|
||||
|
||||
@@ -118,7 +128,9 @@ public class ShopDataCrawlTaskController {
|
||||
description = "店铺名称规范化、去重后逐一匹配。先确认店铺已在后台管理中维护,再查询紫鸟店铺索引,返回店铺 ID、平台、公司名称和匹配状态。",
|
||||
responses = @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "匹配完成"))
|
||||
public ApiResponse<ProductRiskMatchShopsVo> matchShops(
|
||||
@Valid @RequestBody ProductRiskMatchShopsRequest request) {
|
||||
@Valid @RequestBody ProductRiskMatchShopsRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(resolveService.matchShops(request));
|
||||
}
|
||||
|
||||
@@ -130,7 +142,9 @@ public class ShopDataCrawlTaskController {
|
||||
public ApiResponse<ProductRiskDashboardVo> dashboard(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true,
|
||||
in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(taskService.dashboard(userId));
|
||||
}
|
||||
|
||||
@@ -146,7 +160,9 @@ public class ShopDataCrawlTaskController {
|
||||
@Parameter(name = "page", description = "页号,从 1 开始", in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam(value = "page", defaultValue = "1") int page,
|
||||
@Parameter(name = "limit", description = "每页条数,最大 100;默认 100 与旧版返回最近 100 条的行为一致", in = ParameterIn.QUERY, example = "20")
|
||||
@RequestParam(value = "limit", defaultValue = "100") int limit) {
|
||||
@RequestParam(value = "limit", defaultValue = "100") int limit,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(taskService.listHistory(userId, page, limit));
|
||||
}
|
||||
|
||||
@@ -156,19 +172,21 @@ public class ShopDataCrawlTaskController {
|
||||
description = "供前端轮询任务队列。对有效正数 taskId 去重后最多查询前 50 个;不存在、无结果或非本模块的任务写入 missingTaskIds。",
|
||||
responses = @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "查询成功"))
|
||||
public ApiResponse<ShopDataCrawlTaskBatchVo> progress(
|
||||
@Valid @RequestBody ShopDataCrawlTaskBatchRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
@Valid @RequestBody ShopDataCrawlTaskBatchRequest request, HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(taskService.getTaskProgressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(taskService.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(taskService.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks")
|
||||
@@ -179,6 +197,7 @@ public class ShopDataCrawlTaskController {
|
||||
public ApiResponse<ShopDataCrawlCreateTaskVo> createTask(
|
||||
@Valid @RequestBody ShopDataCrawlCreateTaskRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(taskService.createTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -285,7 +304,9 @@ public class ShopDataCrawlTaskController {
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID,用于校验结果归属", required = true,
|
||||
in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String url = taskService.resolveResultDownloadUrl(resultId, userId);
|
||||
if (url == null || url.isBlank()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "暂无可下载结果");
|
||||
@@ -309,7 +330,9 @@ public class ShopDataCrawlTaskController {
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID,用于校验任务归属", required = true,
|
||||
in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
taskService.deleteTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -324,7 +347,9 @@ public class ShopDataCrawlTaskController {
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID,用于校验结果归属", required = true,
|
||||
in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
taskService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
+56
-21
@@ -64,13 +64,17 @@ public class ShopMatchController {
|
||||
@Operation(summary = "查询候选店铺", description = "返回当前用户在匹配店铺模块下保存的候选店铺列表。")
|
||||
public ApiResponse<List<ProductRiskCandidateVo>> listCandidates(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(shopMatchResolveService.listCandidates(userId));
|
||||
}
|
||||
|
||||
@PostMapping("/candidates")
|
||||
@Operation(summary = "新增候选店铺", description = "新增一条候选店铺记录,供前端后续匹配与创建任务使用。")
|
||||
public ApiResponse<ProductRiskCandidateVo> addCandidate(@Valid @RequestBody ProductRiskCandidateAddRequest request) {
|
||||
public ApiResponse<ProductRiskCandidateVo> addCandidate(@Valid @RequestBody ProductRiskCandidateAddRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(shopMatchResolveService.addCandidate(request));
|
||||
}
|
||||
|
||||
@@ -79,7 +83,9 @@ public class ShopMatchController {
|
||||
public ApiResponse<Void> deleteCandidate(
|
||||
@Parameter(description = "候选店铺记录主键", example = "10") @PathVariable Long id,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
shopMatchResolveService.deleteCandidate(userId, id);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -88,19 +94,25 @@ public class ShopMatchController {
|
||||
@Operation(summary = "查询国家配置顺序", description = "返回当前用户保存的国家勾选与执行顺序。")
|
||||
public ApiResponse<ProductRiskCountryPreferenceVo> getCountryPreference(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(shopMatchResolveService.getCountryPreference(userId));
|
||||
}
|
||||
|
||||
@PutMapping("/country-preference")
|
||||
@Operation(summary = "保存国家配置顺序", description = "保存当前用户在匹配店铺模块中的国家勾选与执行顺序。")
|
||||
public ApiResponse<ProductRiskCountryPreferenceVo> saveCountryPreference(@Valid @RequestBody ProductRiskCountryPreferenceSaveRequest request) {
|
||||
public ApiResponse<ProductRiskCountryPreferenceVo> saveCountryPreference(@Valid @RequestBody ProductRiskCountryPreferenceSaveRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(shopMatchResolveService.saveCountryPreference(request));
|
||||
}
|
||||
|
||||
@PostMapping("/match-shops")
|
||||
@Operation(summary = "批量匹配店铺", description = "按店铺名批量匹配紫鸟索引,返回店铺 ID、平台、公司与匹配状态。")
|
||||
public ApiResponse<ProductRiskMatchShopsVo> matchShops(@Valid @RequestBody ProductRiskMatchShopsRequest request) {
|
||||
public ApiResponse<ProductRiskMatchShopsVo> matchShops(@Valid @RequestBody ProductRiskMatchShopsRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(shopMatchResolveService.matchShops(request));
|
||||
}
|
||||
|
||||
@@ -108,7 +120,9 @@ public class ShopMatchController {
|
||||
@Operation(summary = "统计看板", description = "返回候选店铺数、已结束任务数、成功数和失败数。")
|
||||
public ApiResponse<ProductRiskDashboardVo> dashboard(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(shopMatchTaskService.dashboard(userId));
|
||||
}
|
||||
|
||||
@@ -116,7 +130,9 @@ public class ShopMatchController {
|
||||
@Operation(summary = "查询任务记录", description = "返回当前用户的运行中与历史任务记录。")
|
||||
public ApiResponse<ProductRiskHistoryVo> history(
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(shopMatchTaskService.listHistory(userId));
|
||||
}
|
||||
|
||||
@@ -125,7 +141,9 @@ public class ShopMatchController {
|
||||
public ApiResponse<Void> deleteHistory(
|
||||
@Parameter(description = "结果记录主键", example = "1001") @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
shopMatchTaskService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -134,6 +152,7 @@ public class ShopMatchController {
|
||||
@Operation(summary = "创建匹配店铺任务", description = "创建任务与各店铺占位结果,支持立即执行或多时间点定时执行。")
|
||||
public ApiResponse<ShopMatchCreateTaskVo> createTask(@Valid @RequestBody ShopMatchCreateTaskRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(shopMatchTaskService.createTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -143,7 +162,9 @@ public class ShopMatchController {
|
||||
public ApiResponse<Void> deleteTask(
|
||||
@Parameter(description = "任务主键", example = "200") @PathVariable Long taskId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
shopMatchTaskService.deleteTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -153,7 +174,9 @@ public class ShopMatchController {
|
||||
public ApiResponse<Void> activateTask(
|
||||
@Parameter(description = "任务主键", example = "200") @PathVariable Long taskId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId,
|
||||
@Parameter(name = "stage_index", description = "阶段下标,从 0 开始", required = true, in = ParameterIn.QUERY, example = "0") @RequestParam("stage_index") Integer stageIndex) {
|
||||
@Parameter(name = "stage_index", description = "阶段下标,从 0 开始", required = true, in = ParameterIn.QUERY, example = "0") @RequestParam("stage_index") Integer stageIndex,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
shopMatchTaskService.activateTask(taskId, userId, stageIndex);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -185,32 +208,42 @@ public class ShopMatchController {
|
||||
public ApiResponse<Void> completeStage(
|
||||
@Parameter(description = "任务主键", example = "200") @PathVariable Long taskId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId,
|
||||
@Valid @RequestBody ShopMatchStageCompleteRequest request) {
|
||||
@Valid @RequestBody ShopMatchStageCompleteRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
shopMatchTaskService.completeStage(taskId, userId, request);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/batch")
|
||||
@Operation(summary = "批量查询任务详情", description = "供前端轮询任务状态与阶段进度使用。")
|
||||
public ApiResponse<ProductRiskTaskBatchVo> tasksBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request) {
|
||||
// 归属过滤:/tasks/batch 同样按 userId 过滤(此前无校验,遍历 taskId 即可读他人任务详情)
|
||||
public ApiResponse<ProductRiskTaskBatchVo> tasksBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// 归属以会话身份为准:user_id 由请求体说了算时,遍历 taskId 即可读他人任务详情
|
||||
return ApiResponse.success(shopMatchTaskService.getTaskDetailsBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询任务进度摘要", description = "仅返回任务状态、阶段信息与时间等轻量字段,供前端轮询降载。")
|
||||
public ApiResponse<ProductRiskTaskBatchVo> taskProgressBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request) {
|
||||
return ApiResponse.success(shopMatchTaskService.getTaskProgressBatch(request.getTaskIds()));
|
||||
public ApiResponse<ProductRiskTaskBatchVo> taskProgressBatch(@Valid @RequestBody ProductRiskTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// 这一支此前连归属过滤都没有(taskIds 直接进 service),与同族 progress/batch 不同形。
|
||||
return ApiResponse.success(shopMatchTaskService.getTaskProgressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(shopMatchTaskService.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(shopMatchTaskService.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/result")
|
||||
@@ -229,7 +262,9 @@ public class ShopMatchController {
|
||||
@Operation(summary = "下载结果文件", description = "按结果记录 302 重定向到后端已生成的 Excel 直链。")
|
||||
public ResponseEntity<Void> downloadResult(
|
||||
@Parameter(description = "结果记录主键", example = "1001") @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId) {
|
||||
@Parameter(name = "user_id", description = "当前用户 ID", required = true, in = ParameterIn.QUERY, example = "1") @RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String url = shopMatchTaskService.resolveResultDownloadUrl(resultId, userId);
|
||||
if (url == null || url.isBlank()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "No downloadable result");
|
||||
|
||||
+40
-16
@@ -58,14 +58,18 @@ public class SimilarAsinController {
|
||||
@Operation(summary = "查询货源查询筛选条件")
|
||||
public ApiResponse<List<SimilarAsinFilterConditionVo>> listFilterConditions(
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.listFilterConditions(userId));
|
||||
}
|
||||
|
||||
@PostMapping("/filter-conditions")
|
||||
@Operation(summary = "保存货源查询筛选条件")
|
||||
public ApiResponse<SimilarAsinFilterConditionVo> addFilterCondition(
|
||||
@Valid @RequestBody SimilarAsinFilterConditionAddRequest request) {
|
||||
@Valid @RequestBody SimilarAsinFilterConditionAddRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(service.addFilterCondition(request));
|
||||
}
|
||||
|
||||
@@ -75,7 +79,9 @@ public class SimilarAsinController {
|
||||
@Parameter(description = "筛选条件主键", example = "10")
|
||||
@PathVariable Long id,
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.deleteFilterCondition(userId, id);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -87,6 +93,7 @@ public class SimilarAsinController {
|
||||
)
|
||||
public ApiResponse<SimilarAsinParseVo> parse(@Valid @RequestBody SimilarAsinParseRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(service.parseAndCreateTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -100,7 +107,9 @@ public class SimilarAsinController {
|
||||
@Parameter(description = "货源查询任务 ID", required = true, example = "7004")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.parsedPayload(taskId, userId));
|
||||
}
|
||||
|
||||
@@ -108,7 +117,9 @@ public class SimilarAsinController {
|
||||
@Operation(summary = "查询相似 ASIN 检测总览", description = "查询当前用户的运行中、成功、失败和已结束任务数量。")
|
||||
public ApiResponse<SimilarAsinDashboardVo> dashboard(
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.dashboard(userId));
|
||||
}
|
||||
|
||||
@@ -118,26 +129,31 @@ public class SimilarAsinController {
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId,
|
||||
@Parameter(description = "历史记录条数,默认 50,最大 100", example = "50")
|
||||
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit) {
|
||||
@RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.history(userId, limit));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询任务进度", description = "前端仅对活跃任务轮询该接口,返回轻量任务状态。")
|
||||
public ApiResponse<SimilarAsinTaskBatchVo> progress(@Valid @RequestBody SimilarAsinTaskBatchRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
public ApiResponse<SimilarAsinTaskBatchVo> progress(@Valid @RequestBody SimilarAsinTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(service.progressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileReady/updatedAt),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<SimilarAsinTaskLightBatchVo> progressLight(@Valid @RequestBody SimilarAsinTaskLightRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
public ApiResponse<SimilarAsinTaskLightBatchVo> progressLight(@Valid @RequestBody SimilarAsinTaskLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(service.progressLight(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/{taskId}/activate")
|
||||
@@ -146,7 +162,9 @@ public class SimilarAsinController {
|
||||
@Parameter(description = "相似 ASIN 检测任务 ID", required = true, example = "3938")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.activateTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -173,7 +191,9 @@ public class SimilarAsinController {
|
||||
@Parameter(description = "相似 ASIN 检测任务 ID", required = true, example = "3938")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.deleteTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -184,7 +204,9 @@ public class SimilarAsinController {
|
||||
@Parameter(description = "历史结果记录 ID", required = true, example = "1001")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
service.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -195,7 +217,9 @@ public class SimilarAsinController {
|
||||
@Parameter(description = "结果记录 ID", required = true, example = "1001")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(description = "当前用户 ID", required = true, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
ResultDownloadInfo download = service.resolveResultDownloadInfo(resultId, userId);
|
||||
if (download.url() == null || download.url().isBlank()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "暂无可下载结果");
|
||||
|
||||
+15
-4
@@ -5,6 +5,7 @@ import com.nanri.aiimage.modules.split.model.dto.SplitRunRequest;
|
||||
import com.nanri.aiimage.modules.split.model.vo.SplitHistoryVo;
|
||||
import com.nanri.aiimage.modules.split.model.vo.SplitRunVo;
|
||||
import com.nanri.aiimage.modules.split.service.SplitRunService;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.enums.ParameterIn;
|
||||
@@ -14,6 +15,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
||||
@@ -34,6 +36,7 @@ import java.net.URI;
|
||||
public class SplitRunController {
|
||||
|
||||
private final SplitRunService splitRunService;
|
||||
private final AdminAuthSupport adminAuthSupport;
|
||||
|
||||
@PostMapping("/run")
|
||||
@Operation(
|
||||
@@ -56,7 +59,9 @@ public class SplitRunController {
|
||||
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "请求参数不合法或拆分模式错误"),
|
||||
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "500", description = "执行数据拆分失败")
|
||||
})
|
||||
public ApiResponse<SplitRunVo> run(@Valid @RequestBody SplitRunRequest request) {
|
||||
public ApiResponse<SplitRunVo> run(@Valid @RequestBody SplitRunRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(splitRunService.run(request));
|
||||
}
|
||||
|
||||
@@ -67,7 +72,9 @@ public class SplitRunController {
|
||||
})
|
||||
public ApiResponse<SplitHistoryVo> history(
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
SplitHistoryVo vo = new SplitHistoryVo();
|
||||
vo.setItems(splitRunService.listHistory(userId));
|
||||
return ApiResponse.success(vo);
|
||||
@@ -82,7 +89,9 @@ public class SplitRunController {
|
||||
public ApiResponse<Void> deleteHistory(
|
||||
@Parameter(description = "数据拆分结果记录 ID", required = true) @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
splitRunService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -96,7 +105,9 @@ public class SplitRunController {
|
||||
public ResponseEntity<Void> download(
|
||||
@Parameter(description = "数据拆分结果记录 ID", required = true) @PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID", required = true, in = ParameterIn.QUERY)
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String downloadUrl = splitRunService.getResultDownloadUrl(resultId, userId);
|
||||
return ResponseEntity.status(302)
|
||||
.location(URI.create(downloadUrl))
|
||||
|
||||
+4
-3
@@ -16,9 +16,10 @@ import java.util.List;
|
||||
* 服务端此前不做任何归属校验 —— 匿名遍历自增 taskId 即可读取他人任务的状态、
|
||||
* 错误信息与结果文件状态。
|
||||
*
|
||||
* <p>渐进式收紧:<b>仅在调用方传入 userId 时过滤</b>,未传则保持原行为。
|
||||
* 这样不会因前端/客户端某一处漏传就把结果过滤成空(表现为「任务进度全部消失」),
|
||||
* 待各端都完成传参后再改为强制校验。
|
||||
* <p>归属口径(2026-10-07 收口):这里的 {@code userId} <b>不再直接来自请求体</b>——28 支轮询 handler
|
||||
* 一律先过 {@code AdminAuthSupport#requireOwnershipUserId}(解析不出会话身份即 401,普通账号带别人的
|
||||
* id 即 403)。所以 {@code userId == null} 现在只有一种来源:已认证的 admin / 超管(出口对管理角色
|
||||
* 原样返回参数,后台按客户看任务是本职)。把它当成"匿名也走得通"来依赖就是回归:那正是收口前的洞。
|
||||
*/
|
||||
@Slf4j
|
||||
@Component
|
||||
|
||||
+3
-1
@@ -34,7 +34,9 @@ public class InternalUserSecretUsageController {
|
||||
@Operation(summary = "上报用户密钥调用计次",
|
||||
description = "按 userId + module 累加当日调用次数;模块非法返回 success=false。")
|
||||
public ApiResponse<Map<String, Object>> report(HttpServletRequest request,
|
||||
@RequestBody UserSecretUsageReportRequest body) {
|
||||
@RequestBody UserSecretUsageReportRequest body,
|
||||
HttpServletRequest httpRequest) {
|
||||
body.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, body.getUserId()));
|
||||
if (!adminAuthSupport.isTrustedInternalToken(request)) {
|
||||
log.warn("[internal-usage] 拒绝未携带可信内部令牌的计次上报 userId={} remoteAddr={}",
|
||||
body == null ? null : body.getUserId(), request.getRemoteAddr());
|
||||
|
||||
+40
-16
@@ -60,13 +60,17 @@ public class WithdrawTaskController {
|
||||
@Operation(summary = "查询取款备选店铺", description = "按当前用户查询已保存的取款备选店铺列表,用于前端勾选后进行匹配和创建取款任务。")
|
||||
public ApiResponse<List<ProductRiskCandidateVo>> listCandidates(
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID,数据按用户隔离。", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(withdrawResolveService.listCandidates(userId));
|
||||
}
|
||||
|
||||
@PostMapping("/candidates")
|
||||
@Operation(summary = "新增取款备选店铺", description = "新增一个待处理店铺名到当前用户的取款备选列表;同一用户下店铺名会规范化去重。")
|
||||
public ApiResponse<ProductRiskCandidateVo> addCandidate(@Valid @RequestBody ProductRiskCandidateAddRequest request) {
|
||||
public ApiResponse<ProductRiskCandidateVo> addCandidate(@Valid @RequestBody ProductRiskCandidateAddRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(withdrawResolveService.addCandidate(request));
|
||||
}
|
||||
|
||||
@@ -76,21 +80,27 @@ public class WithdrawTaskController {
|
||||
@Parameter(description = "备选店铺记录主键,即 candidates 接口返回的 id。", required = true, example = "100")
|
||||
@PathVariable Long id,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID。", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
withdrawResolveService.deleteCandidate(userId, id);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
@PostMapping("/candidates/clear")
|
||||
@Operation(summary = "批量清空取款备选店铺", description = "按店铺名批量删除当前用户的备选记录;通常在店铺成功推送到 Python 队列后清理已匹配数据。")
|
||||
public ApiResponse<Void> clearCandidates(@Valid @RequestBody WithdrawCandidateClearRequest request) {
|
||||
public ApiResponse<Void> clearCandidates(@Valid @RequestBody WithdrawCandidateClearRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
withdrawResolveService.deleteCandidatesByShopNames(request.getUserId(), request.getShopNames());
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
@PostMapping("/match-shops")
|
||||
@Operation(summary = "匹配取款店铺", description = "根据店铺名称批量查询紫鸟索引,返回店铺 ID、平台、公司名、匹配状态等信息;只有 matched=true 的店铺可创建任务。")
|
||||
public ApiResponse<ProductRiskMatchShopsVo> matchShops(@Valid @RequestBody ProductRiskMatchShopsRequest request) {
|
||||
public ApiResponse<ProductRiskMatchShopsVo> matchShops(@Valid @RequestBody ProductRiskMatchShopsRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(withdrawResolveService.matchShops(request));
|
||||
}
|
||||
|
||||
@@ -98,7 +108,9 @@ public class WithdrawTaskController {
|
||||
@Operation(summary = "查询取款看板统计", description = "返回当前用户的备选店铺数量、已结束任务数、成功任务数、失败任务数。")
|
||||
public ApiResponse<ProductRiskDashboardVo> dashboard(
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID。", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(withdrawTaskService.dashboard(userId));
|
||||
}
|
||||
|
||||
@@ -106,31 +118,37 @@ public class WithdrawTaskController {
|
||||
@Operation(summary = "查询取款任务记录", description = "查询当前用户取款模块的运行中和历史结果记录,包含任务状态、下载地址、店铺结果和明细行。")
|
||||
public ApiResponse<WithdrawHistoryVo> history(
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID。", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(withdrawTaskService.listHistory(userId));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
@Operation(summary = "批量查询取款任务进度", description = "前端轮询使用。按任务 ID 批量查询轻量进度和结果快照;不存在的任务 ID 会返回在 missingTaskIds 中。")
|
||||
public ApiResponse<WithdrawTaskBatchVo> taskProgressBatch(@Valid @RequestBody WithdrawTaskBatchRequest request) {
|
||||
// 归属过滤:只查询属于该用户的任务(userId 未传时保持原行为,兼容未升级调用方)
|
||||
public ApiResponse<WithdrawTaskBatchVo> taskProgressBatch(@Valid @RequestBody WithdrawTaskBatchRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(withdrawTaskService.getTaskProgressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks/progress/light")
|
||||
@Operation(summary = "批量查询任务轻量进度(前端轮询专用)",
|
||||
description = "与 progress/batch 同输入,只返回轻量字段(taskId/status/statusCode/fileStatus/fileError/fileReady/updatedAt/rowsVersion),"
|
||||
+ "不返回行明细内容(仅多一次结果行版本聚合查询),响应体更小;旧 progress/batch 端点保留不动。")
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request) {
|
||||
// 透传 userId:此前传 null = 不过滤归属,匿名遍历 taskId 即可读他人任务状态(2026-09 审查)
|
||||
return ApiResponse.success(withdrawTaskService.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
public ApiResponse<TaskProgressLightBatchVo> progressLight(@Valid @RequestBody TaskProgressLightRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
// user_id 不再由请求体说了算:解析不出会话身份就 401(fail-closed,2026-10-07 收口)
|
||||
return ApiResponse.success(withdrawTaskService.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
|
||||
@PostMapping("/tasks")
|
||||
@Operation(summary = "创建取款任务", description = "为一批已匹配店铺创建一个取款任务,写入任务记录和店铺结果占位记录,并返回 taskId 及初始店铺快照。")
|
||||
public ApiResponse<WithdrawCreateTaskVo> createTask(@Valid @RequestBody WithdrawCreateTaskRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(withdrawTaskService.createTask(request,
|
||||
adminAuthSupport.currentDeviceId(httpRequest)));
|
||||
}
|
||||
@@ -154,7 +172,9 @@ public class WithdrawTaskController {
|
||||
@Parameter(description = "结果记录 ID,即 history/items 中的 resultId。", required = true, example = "1001")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID。", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
String url = withdrawTaskService.resolveResultDownloadUrl(resultId, userId);
|
||||
if (url == null || url.isBlank()) {
|
||||
throw new ResponseStatusException(HttpStatus.NOT_FOUND, "暂无可下载结果");
|
||||
@@ -174,7 +194,9 @@ public class WithdrawTaskController {
|
||||
@Parameter(description = "取款任务 ID。", required = true, example = "200")
|
||||
@PathVariable Long taskId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID。", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
withdrawTaskService.deleteTask(taskId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
@@ -185,7 +207,9 @@ public class WithdrawTaskController {
|
||||
@Parameter(description = "结果记录 ID,即 history/items 中的 resultId。", required = true, example = "1001")
|
||||
@PathVariable Long resultId,
|
||||
@Parameter(name = "user_id", description = "当前登录用户 ID。", required = true, in = ParameterIn.QUERY, example = "1")
|
||||
@RequestParam("user_id") Long userId) {
|
||||
@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
withdrawTaskService.deleteHistory(resultId, userId);
|
||||
return ApiResponse.success(null);
|
||||
}
|
||||
|
||||
+3
-1
@@ -98,7 +98,9 @@ public class ZiniaoAuthController {
|
||||
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "打开链接生成成功", content = @Content(schema = @Schema(implementation = ZiniaoOpenShopVo.class)))
|
||||
})
|
||||
public ApiResponse<ZiniaoOpenShopVo> openShop(HttpServletRequest request,
|
||||
@Valid @RequestBody ZiniaoOpenShopRequest openShopRequest) {
|
||||
@Valid @RequestBody ZiniaoOpenShopRequest openShopRequest,
|
||||
HttpServletRequest httpRequest) {
|
||||
openShopRequest.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, openShopRequest.getUserId()));
|
||||
// 该接口返回员工级店铺登录令牌:匿名可达等于可接管任意员工卖家后台,必须管理员鉴权
|
||||
adminAuthSupport.requireAdmin(request);
|
||||
return ApiResponse.success(ziniaoAuthService.openShop(openShopRequest));
|
||||
|
||||
@@ -485,7 +485,9 @@ aiimage:
|
||||
internal-token-previous: ${AIIMAGE_INTERNAL_TOKEN_PREVIOUS:}
|
||||
internal-token-file: ${AIIMAGE_INTERNAL_TOKEN_FILE:}
|
||||
auth:
|
||||
jwt-secret: ${AIIMAGE_JWT_SECRET:please-change-this-secret-please-rotate-at-least-32-bytes}
|
||||
# 占位符不许带默认值:带上的话「env 丢了」在 Java 侧读到的是那个公开字面量而不是空串,
|
||||
# JwtService 的 server profile 启动闸门就永远不触发(静默用公开密钥签 token)。
|
||||
jwt-secret: ${AIIMAGE_JWT_SECRET:}
|
||||
jwt-ttl-hours: ${AIIMAGE_AUTH_JWT_TTL_HOURS:168}
|
||||
cookie-name: ${AIIMAGE_AUTH_COOKIE_NAME:aiimage_token}
|
||||
cookie-secure: ${AIIMAGE_AUTH_COOKIE_SECURE:false}
|
||||
|
||||
+146
@@ -0,0 +1,146 @@
|
||||
package com.nanri.aiimage.common.security;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatCode;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Stream;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
/**
|
||||
* 「JWT 密钥不许悄悄回退到公开默认值」这一族的绊线(2026-10-07 架构三期,缺陷 (f) 收口)。
|
||||
*
|
||||
* <p>改之前的形状不是「没做检查」而是「检查够不着」:{@code JwtService} 早在 2026-09 就加了
|
||||
* 「server profile 未配置密钥即拒绝启动」,判据是 {@code isBlank()};而 application.yml 写的是
|
||||
* {@code ${AIIMAGE_JWT_SECRET:please-change-this-...}} —— 占位符自带默认值,env 丢失时
|
||||
* {@code getJwtSecret()} 拿到的是那个<b>公开字面量</b>而不是空串,闸门于是不触发,
|
||||
* 全站继续用一把写在源码里的密钥签 token(任何人可伪造)。同一条链路 2026-09-14 已经在
|
||||
* 主机 A 的 15126 Flask 上挂过一次:真实用户 token 全 401,用默认密钥自签的反而 200。</p>
|
||||
*
|
||||
* <p>现在的口径:默认值从占位符里摘掉 ⇒ 未配置就是空串 ⇒ 闸门真能拦住;并且闸门改成
|
||||
* 「空 或 等于那把公开密钥」都不许启动,这样即使有人在别的 profile 文件里把字面量抄回来,
|
||||
* server profile 仍然起不来。非 server profile(本地开发/测试)保持宽松,否则无法启动。</p>
|
||||
*/
|
||||
class JwtSecretFallbackGuardrailTest {
|
||||
|
||||
private static final String PUBLIC_SECRET =
|
||||
"please-change-this-secret-please-rotate-at-least-32-bytes";
|
||||
|
||||
/** 占位符的正确形状:冒号后必须什么都没有。 */
|
||||
private static final Pattern JWT_PLACEHOLDER =
|
||||
Pattern.compile("\\$\\{AIIMAGE_JWT_SECRET:([^}]*)\\}");
|
||||
|
||||
@Test
|
||||
void noResourceFileShipsThePublicSecretAsADefault() {
|
||||
List<String> offenders = new ArrayList<>();
|
||||
for (Path file : resources()) {
|
||||
String name = file.getFileName().toString();
|
||||
if (!name.endsWith(".yml") && !name.endsWith(".yaml") && !name.endsWith(".properties")) {
|
||||
continue;
|
||||
}
|
||||
String text = read(file);
|
||||
Matcher m = JWT_PLACEHOLDER.matcher(text);
|
||||
while (m.find()) {
|
||||
if (!m.group(1).isEmpty()) {
|
||||
offenders.add(name + " 占位符带了默认值 →" + m.group(1));
|
||||
}
|
||||
}
|
||||
if (text.contains(PUBLIC_SECRET)) {
|
||||
offenders.add(name + " 直接写入了那把公开密钥");
|
||||
}
|
||||
}
|
||||
assertThat(offenders)
|
||||
.as("resources 里 AIIMAGE_JWT_SECRET 的兜底值 —— 有兜底值时 server profile 的启动闸门就够不着")
|
||||
.isEmpty();
|
||||
// 反向:占位符本身还得在,否则「摘掉默认值」会变成「整行删掉」,配置通道就断了
|
||||
assertThat(resources().stream().map(this::read).anyMatch(t -> t.contains("${AIIMAGE_JWT_SECRET:}")))
|
||||
.as("必须仍从 AIIMAGE_JWT_SECRET 读取").isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
void unconfiguredPropertiesYieldABlankSecret() {
|
||||
// 这条是「闸门够得着」的前提:字段默认值一旦还是那把公开密钥,yml 摘干净也没用
|
||||
assertThat(new AuthProperties().getJwtSecret()).as("AuthProperties 的字段默认值").isBlank();
|
||||
}
|
||||
|
||||
@Test
|
||||
void theBlankAndThePublicLiteralAreBothInsecureWhileARealKeyIsNot() {
|
||||
assertThat(JwtService.isInsecure(null)).isTrue();
|
||||
assertThat(JwtService.isInsecure("")).isTrue();
|
||||
assertThat(JwtService.isInsecure(" ")).as("空白串").isTrue();
|
||||
assertThat(JwtService.isInsecure(PUBLIC_SECRET)).as("公开默认值必须算不安全").isTrue();
|
||||
assertThat(JwtService.isInsecure(PUBLIC_SECRET + "x")).as("差一个字符就不是那把公开密钥").isFalse();
|
||||
assertThat(JwtService.isInsecure("a-real-rotated-secret-of-plenty-of-length-32plus")).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void serverProfileRefusesToStartOnEitherInsecureShape() {
|
||||
for (String secret : List.of("", PUBLIC_SECRET)) {
|
||||
assertThatThrownBy(() -> bootWith("server", secret))
|
||||
.as("server profile + jwt-secret=[" + secret + "]")
|
||||
.isInstanceOf(IllegalStateException.class)
|
||||
.hasMessageContaining("AIIMAGE_JWT_SECRET");
|
||||
}
|
||||
assertThatCode(() -> bootWith("server", "a-real-rotated-secret-of-plenty-of-length-32plus"))
|
||||
.as("server profile + 真密钥:不许误伤正常启动").doesNotThrowAnyException();
|
||||
}
|
||||
|
||||
/** 本地/测试 profile 保持宽松:否则每个开发机和每例集成测试都起不来,只会被绕过。 */
|
||||
@Test
|
||||
void nonServerProfileStillBootsWithoutASecret() {
|
||||
assertThatCode(() -> bootWith("local", "")).doesNotThrowAnyException();
|
||||
assertThatCode(() -> bootWith("", PUBLIC_SECRET)).doesNotThrowAnyException();
|
||||
}
|
||||
|
||||
// ---- 夹具 ----
|
||||
|
||||
private static void bootWith(String activeProfile, String jwtSecret) {
|
||||
AuthProperties props = new AuthProperties();
|
||||
props.setJwtSecret(jwtSecret);
|
||||
JwtService service = new JwtService(props);
|
||||
ReflectionTestUtils.setField(service, "activeProfiles", activeProfile);
|
||||
service.requireSecretInServerProfile();
|
||||
}
|
||||
|
||||
private static List<Path> resources() {
|
||||
Path dir = mainRoot().resolve("main").resolve("resources");
|
||||
if (!Files.isDirectory(dir)) {
|
||||
dir = Path.of("src", "main", "resources");
|
||||
}
|
||||
List<Path> out = new ArrayList<>();
|
||||
try (Stream<Path> stream = Files.walk(dir, 2)) {
|
||||
stream.filter(Files::isRegularFile).forEach(out::add);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("遍历 resources 失败: " + dir, e);
|
||||
}
|
||||
assertThat(out).as("resources 文件数过少说明扫描根走错了").hasSizeGreaterThan(5);
|
||||
return out;
|
||||
}
|
||||
|
||||
private String read(Path file) {
|
||||
try {
|
||||
return Files.readString(file, StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("读取失败: " + file, e);
|
||||
}
|
||||
}
|
||||
|
||||
/** src 目录(test 类与 main 同级,surefire 的 cwd 是模块根)。 */
|
||||
private static Path mainRoot() {
|
||||
Path here = Path.of("").toAbsolutePath();
|
||||
Path direct = here.resolve("src");
|
||||
if (Files.isDirectory(direct)) {
|
||||
return direct;
|
||||
}
|
||||
return here.resolve("backend-java").resolve("src");
|
||||
}
|
||||
}
|
||||
+334
@@ -0,0 +1,334 @@
|
||||
package com.nanri.aiimage.common.security;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.fail;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
|
||||
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.modules.queryasin.controller.QueryAsinTaskController;
|
||||
import com.nanri.aiimage.modules.queryasin.service.QueryAsinResolveService;
|
||||
import com.nanri.aiimage.modules.queryasin.service.QueryAsinTaskService;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.model.dto.TaskProgressLightRequest;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressOwnershipSupport;
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.test.web.servlet.MockMvc;
|
||||
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
|
||||
|
||||
/**
|
||||
* 「轮询类端点的归属只能由会话说了算」这一族的绊线(2026-10-07 架构三期,缺陷 (d) 收口)。
|
||||
*
|
||||
* <p>改之前的形状:12 个模块的 {@code /tasks/progress/batch} + {@code /tasks/progress/light} 与
|
||||
* 4 个模块的 {@code /tasks/batch}(共 28 支 handler)里,归属用的 {@code user_id} <b>全部取自请求体</b>。
|
||||
* 请求体里的 id 不是身份,是参数——它有两种坏用法,而且都不报错:</p>
|
||||
* <ol>
|
||||
* <li>带上<b>别人的</b> user_id:{@code filterOwnedTaskIds} 与 {@code TaskProgressLightAssembler}
|
||||
* 都是 {@code user_id = ?} 的正向匹配 ⇒ 匹配的就是别人那一堆任务,越权读命中;</li>
|
||||
* <li>不带 user_id:{@code filterOwnedTaskIds} 见 null 原样返回、assembler 见 null 不加条件 ⇒
|
||||
* 匿名遍历自增 taskId 就能读他人任务的状态、错误信息与结果文件就绪标记。</li>
|
||||
* </ol>
|
||||
*
|
||||
* <p>现在的口径:这 28 支一律把请求体 id 交给 {@link AdminAuthSupport#requireOwnershipUserId}
|
||||
* (解析不出会话身份即 401),网页端恒带 JWT({@code frontend-vue/src/shared/api/http.ts} 的
|
||||
* cookie + Bearer 两路),而这批端点的调用方<b>只有网页端</b>——桌面执行器不轮询进度
|
||||
* (2026-10-07 全树 grep:{@code app_client} 里 0 个 {@code tasks/progress} 调用点,只有我自己那支
|
||||
* live 冒烟脚本)。管理身份仍看得到全部(出口对管理角色返回原参数=不加归属条件),所以后台没被挡。</p>
|
||||
*
|
||||
* <p>每支判据都带能红/能绿两向探针,且判据打在<b>剥掉注释的源码</b>上:本类的分母与计数都是
|
||||
* 「必须等于 N」那一形,吃原文的话谁在注释里提一句 {@code requireOwnershipUserId(} 就能把它喂饱。</p>
|
||||
*/
|
||||
class ProgressQueryOwnershipOutletTest {
|
||||
|
||||
/** 这一族的全部宿主:12 个模块控制器。少一支就是有人把端点挪去了别处,多一支就是新开了页。 */
|
||||
private static final List<String> FAMILY_CONTROLLERS = List.of(
|
||||
"modules/appearancepatent/controller/AppearancePatentController.java",
|
||||
"modules/collectdata/controller/CollectDataController.java",
|
||||
"modules/deletebrand/controller/DeleteBrandRunController.java",
|
||||
"modules/patroldelete/controller/PatrolDeleteController.java",
|
||||
"modules/pricetrack/controller/PriceTrackController.java",
|
||||
"modules/productrisk/controller/ProductRiskResolveController.java",
|
||||
"modules/publish/controller/PublishController.java",
|
||||
"modules/queryasin/controller/QueryAsinTaskController.java",
|
||||
"modules/shopdatacrawl/controller/ShopDataCrawlTaskController.java",
|
||||
"modules/shopmatch/controller/ShopMatchController.java",
|
||||
"modules/similarasin/controller/SimilarAsinController.java",
|
||||
"modules/withdraw/controller/WithdrawTaskController.java");
|
||||
|
||||
private static final String OUTLET = "requireOwnershipUserId(httpRequest, request.getUserId()";
|
||||
private static final String WRITE_BACK = "request.setUserId(adminAuthSupport." + OUTLET + "))";
|
||||
private static final String BODY_USER_ID = "request.getUserId()";
|
||||
|
||||
/**
|
||||
* {@link #nullMeansAuthenticatedAdminWhileAnyUserIdFilters} 走的是真 {@code LambdaQueryWrapper},
|
||||
* 而纯单测没有 Spring 启动去建 TableInfo 缓存 ⇒ 列名解析会抛 "can not find lambda cache"。
|
||||
* 同 {@code CompanyScopeSupportTest} 的既有做法:手工注册实体。
|
||||
*/
|
||||
@BeforeAll
|
||||
static void initMybatisPlusTableInfo() {
|
||||
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
FileTaskEntity.class);
|
||||
}
|
||||
|
||||
@Test
|
||||
void everyPollingHandlerBindsTheBodyUserIdToTheSession() {
|
||||
List<String> offenders = new ArrayList<>();
|
||||
int handlers = 0;
|
||||
for (String rel : FAMILY_CONTROLLERS) {
|
||||
String source = SourceScan.withoutComments(read(mainRoot().resolve(rel)));
|
||||
for (String mapping : List.of("/tasks/progress/batch", "/tasks/progress/light", "/tasks/batch")) {
|
||||
for (String segment : handlerSegments(source, mapping)) {
|
||||
handlers++;
|
||||
if (!isBoundToSession(segment)) {
|
||||
offenders.add(rel + " " + mapping + " → " + segment.replace('\n', ' ').trim());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// 分母先钉死:28 = 12 progress/batch + 12 progress/light + 4 tasks/batch。
|
||||
// 扫描坏掉(切不出 handler)与「真的没人漏接」在这一步就会分岔,不会一起恒绿。
|
||||
assertThat(handlers).as("轮询族 handler 总数").isEqualTo(28);
|
||||
assertThat(offenders)
|
||||
.as("归属仍取自请求体(没走会话出口)的 handler")
|
||||
.isEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
void eachMappingKeepsItsOwnDenominator() {
|
||||
// 三条分母各钉一个数:整批漏接与某一族整批消失是两种不同的事故,红因要能分开说。
|
||||
assertThat(countHandlers("/tasks/progress/batch")).as("progress/batch 端点数").isEqualTo(12);
|
||||
assertThat(countHandlers("/tasks/progress/light")).as("progress/light 端点数").isEqualTo(12);
|
||||
assertThat(countHandlers("/tasks/batch")).as("tasks/batch(任务详情批量)端点数").isEqualTo(4);
|
||||
}
|
||||
|
||||
/**
|
||||
* 出口绑定的<b>值</b>必须真的进到查询里,而不是绑完丢掉。
|
||||
*
|
||||
* <p>这一支是 {@link #everyPollingHandlerBindsTheBodyUserIdToTheSession} 抓不到的那一形:
|
||||
* 文本上 {@code requireOwnershipUserId(} 还在(甚至结果被赋给一个没人读的局部变量),
|
||||
* 但传给 service 的仍是请求体原值 ⇒ 归属等于没改。这里用真 MockMvc 走一遍 HTTP,
|
||||
* 打桩出口返回一个与请求体不同的 id(4242 ≠ 7),要求 service 收到的必须是 4242。</p>
|
||||
*/
|
||||
@Test
|
||||
void theBoundUserIdIsWhatActuallyReachesTheQuery() throws Exception {
|
||||
QueryAsinTaskService taskService = mock(QueryAsinTaskService.class);
|
||||
AdminAuthSupport auth = mock(AdminAuthSupport.class);
|
||||
when(auth.requireOwnershipUserId(any(), eq(7L))).thenReturn(4242L);
|
||||
MockMvc mockMvc = MockMvcBuilders.standaloneSetup(new QueryAsinTaskController(
|
||||
mock(QueryAsinResolveService.class), taskService,
|
||||
new TaskProgressOwnershipSupport(null), auth)).build();
|
||||
|
||||
mockMvc.perform(post("/api/query-asin/tasks/progress/light")
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(new ObjectMapper().writeValueAsString(
|
||||
new TaskProgressLightRequest(List.of(3938L), 7L))))
|
||||
.andExpect(status().isOk());
|
||||
|
||||
verify(taskService).progressLight(List.of(3938L), 4242L);
|
||||
}
|
||||
|
||||
/**
|
||||
* 判据本身要能红:三种坏形状必须判不通过,两种好形状必须判通过。
|
||||
*
|
||||
* <p>缺了负样本,{@link #isBoundToSession} 写成 {@code return true} 也会一路绿。</p>
|
||||
*/
|
||||
@Test
|
||||
void theBindingPredicateIsNotVacuous() {
|
||||
String unboundInline = """
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
public ApiResponse<Void> x(@RequestBody R request) {
|
||||
return ApiResponse.success(service.progressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(), request.getUserId())));
|
||||
}
|
||||
""";
|
||||
String noFilterAtAll = """
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
public ApiResponse<Void> x(@RequestBody R request) {
|
||||
return ApiResponse.success(service.getTaskProgressBatch(request.getTaskIds()));
|
||||
}
|
||||
""";
|
||||
String boundButDiscarded = """
|
||||
@PostMapping("/tasks/progress/light")
|
||||
public ApiResponse<Void> x(@RequestBody R request, HttpServletRequest httpRequest) {
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId());
|
||||
return ApiResponse.success(service.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
}
|
||||
""";
|
||||
for (String bad : List.of(unboundInline, noFilterAtAll, boundButDiscarded)) {
|
||||
assertThat(isBoundToSession(bad)).as("坏形状必须判不通过:" + bad.trim()).isFalse();
|
||||
}
|
||||
|
||||
String goodInline = """
|
||||
@PostMapping("/tasks/progress/batch")
|
||||
public ApiResponse<Void> x(@RequestBody R request, HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(service.progressBatch(progressOwnershipSupport
|
||||
.filterOwnedTaskIds(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()))));
|
||||
}
|
||||
""";
|
||||
assertThat(isBoundToSession(goodInline)).as("内联写法(族内 22 支的形状)").isTrue();
|
||||
String goodWriteBack = """
|
||||
@PostMapping("/tasks/progress/light")
|
||||
public ApiResponse<Void> x(@RequestBody R request, HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()));
|
||||
return ApiResponse.success(service.progressLight(request.getUserId(), request.getTaskIds()));
|
||||
}
|
||||
""";
|
||||
assertThat(isBoundToSession(goodWriteBack)).as("写回 DTO 再取用的写法(Publish 那两支的形状)").isTrue();
|
||||
// 注释里提一句出口名,不许把判据喂饱(本类扫的是剥完注释的源码)
|
||||
assertThat(isBoundToSession(SourceScan.withoutComments("""
|
||||
@PostMapping("/tasks/progress/light")
|
||||
public ApiResponse<Void> x(@RequestBody R request) {
|
||||
// adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId()) 早就接上了
|
||||
return ApiResponse.success(service.progressLight(request.getTaskIds(), request.getUserId()));
|
||||
}
|
||||
"""))).as("注释不得算作已接线").isFalse();
|
||||
}
|
||||
|
||||
/**
|
||||
* 放宽只剩一条通路:null=已认证的管理身份,不是匿名。
|
||||
*
|
||||
* <p>{@code filterOwnedTaskIds} 见 null 原样返回、{@code TaskProgressLightAssembler} 见 null 不加
|
||||
* 条件,这两处<b>故意</b>留给管理角色(后台按客户看任务是本职)。收口之后它们只可能由
|
||||
* {@link AdminAuthSupport#requireOwnershipUserId} 交出 null(出口对管理角色返回原参数),
|
||||
* 匿名请求在出口就 401。这里钉住这条通路的两个方向:null 不过滤、非 null 必须过滤掉别人的 id。</p>
|
||||
*/
|
||||
@Test
|
||||
void nullMeansAuthenticatedAdminWhileAnyUserIdFilters() {
|
||||
FileTaskMapper mapper = mock(FileTaskMapper.class);
|
||||
when(mapper.selectList(any())).thenReturn(List.of(task(3938L)));
|
||||
TaskProgressOwnershipSupport support = new TaskProgressOwnershipSupport(mapper);
|
||||
|
||||
// null(管理身份):原样返回,且不发 SQL —— 否则后台每一页轮询都多打一次任务表
|
||||
List<Long> all = List.of(3938L, 3939L);
|
||||
assertThat(support.filterOwnedTaskIds(all, null)).isEqualTo(all);
|
||||
verify(mapper, never()).selectList(any());
|
||||
|
||||
// 非 null:只有真属于它的 id 留下,别人的被剔掉
|
||||
assertThat(support.filterOwnedTaskIds(List.of(3938L, 3939L), 7L)).containsExactly(3938L);
|
||||
// 光看返回值抓不到「打了 SQL 但没带归属条件」——mock 的 selectList 是无条件回桩的。
|
||||
// 所以必须把 wrapper 抓出来,钉住 user_id 这一列和会话推出来的那个值。
|
||||
ArgumentCaptor<LambdaQueryWrapper<FileTaskEntity>> captor =
|
||||
ArgumentCaptor.forClass(LambdaQueryWrapper.class);
|
||||
verify(mapper).selectList(captor.capture());
|
||||
captor.getValue().getSqlSegment(); // MP 惯例:先求值一次才铺出参数
|
||||
assertThat(captor.getValue().getSqlSegment()).contains("user_id");
|
||||
assertThat(captor.getValue().getParamNameValuePairs().values()).contains(7L);
|
||||
}
|
||||
|
||||
// ---- 判据 ----
|
||||
|
||||
/** 一支 handler 的归属是不是从会话来的(两种合规写法见 {@link #theBindingPredicateIsNotVacuous})。 */
|
||||
private static boolean isBoundToSession(String handlerSegment) {
|
||||
if (!handlerSegment.contains("HttpServletRequest httpRequest")) {
|
||||
return false;
|
||||
}
|
||||
int outlet = count(handlerSegment, OUTLET);
|
||||
int uses = count(handlerSegment, BODY_USER_ID);
|
||||
if (outlet == 0) {
|
||||
return false;
|
||||
}
|
||||
if (uses == outlet) {
|
||||
return true; // 内联:每一次取 body id 都在出口实参里
|
||||
}
|
||||
return handlerSegment.contains(WRITE_BACK) && uses == 2 * outlet; // 写回 DTO 后复用
|
||||
}
|
||||
|
||||
private static int countHandlers(String mapping) {
|
||||
int n = 0;
|
||||
for (String rel : FAMILY_CONTROLLERS) {
|
||||
n += handlerSegments(SourceScan.withoutComments(read(mainRoot().resolve(rel))), mapping).size();
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
/** 从 {@code @PostMapping("<mapping>")} 起,按大括号配平取到该方法收尾(含签名,签名里有 httpRequest 参数)。 */
|
||||
private static List<String> handlerSegments(String source, String mapping) {
|
||||
String anchor = "@PostMapping(\"" + mapping + "\")";
|
||||
List<String> out = new ArrayList<>();
|
||||
for (int i = source.indexOf(anchor); i >= 0; i = source.indexOf(anchor, i + anchor.length())) {
|
||||
int body = source.indexOf('{', i);
|
||||
int end = matchBraces(source, body);
|
||||
if (end < 0) {
|
||||
continue;
|
||||
}
|
||||
out.add(source.substring(i, end + 1));
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
private static int matchBraces(String source, int open) {
|
||||
if (open < 0) {
|
||||
return -1;
|
||||
}
|
||||
int depth = 0;
|
||||
for (int i = open; i < source.length(); i++) {
|
||||
char c = source.charAt(i);
|
||||
if (c == '{') {
|
||||
depth++;
|
||||
} else if (c == '}' && --depth == 0) {
|
||||
return i;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
private static FileTaskEntity task(Long id) {
|
||||
FileTaskEntity entity = new FileTaskEntity();
|
||||
entity.setId(id);
|
||||
return entity;
|
||||
}
|
||||
|
||||
private static int count(String text, String needle) {
|
||||
int n = 0;
|
||||
for (int i = text.indexOf(needle); i >= 0; i = text.indexOf(needle, i + needle.length())) {
|
||||
n++;
|
||||
}
|
||||
return n;
|
||||
}
|
||||
|
||||
private static Path mainRoot() {
|
||||
Path here = Path.of("").toAbsolutePath();
|
||||
Path direct = here.resolve("src/main/java/com/nanri/aiimage");
|
||||
if (Files.isDirectory(direct)) {
|
||||
return direct;
|
||||
}
|
||||
Path nested = here.resolve("backend-java").resolve("src/main/java/com/nanri/aiimage");
|
||||
if (Files.isDirectory(nested)) {
|
||||
return nested;
|
||||
}
|
||||
throw new IllegalStateException("无法定位 backend-java 源码目录(cwd=" + here + ")");
|
||||
}
|
||||
|
||||
private static String read(Path file) {
|
||||
if (!Files.isRegularFile(file)) {
|
||||
fail("找不到 " + file + " —— 本族有控制器被改名/挪走了,护栏要红在这里而不是跳过");
|
||||
}
|
||||
try {
|
||||
return Files.readString(file, StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("读取失败: " + file, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
+298
@@ -0,0 +1,298 @@
|
||||
package com.nanri.aiimage.common.security;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.fail;
|
||||
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
import java.util.stream.Stream;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
/**
|
||||
* 「操作者身份不许由请求参数说了算」的全族绊线(2026-10-07 架构三期,缺陷 (d)/(g) 收口)。
|
||||
*
|
||||
* <p>收口前的形状:模块控制器里 <b>190 支</b> handler 把 {@code user_id}(query 参数、请求体字段,
|
||||
* 或"控制器把带 userId 的 DTO 整个交给 service")直接当身份交给下游做归属比对。请求参数不是身份,
|
||||
* 它有两种坏用法,而且都不报错:</p>
|
||||
* <ol>
|
||||
* <li>带<b>别人的</b> user_id ⇒ 归属比对拿它去匹配别人的行,越权读/越权改(删除历史行、
|
||||
* 停止别人的循环跟价、清空别人的备选店铺);</li>
|
||||
* <li>不带 ⇒ 归属条件多半写成 {@code userId != null && ...},匿名请求即"不加过滤"。</li>
|
||||
* </ol>
|
||||
*
|
||||
* <p>现在的口径:这类 handler 一律先把请求里的 id 交给 {@code resolveOwnershipUserId} /
|
||||
* {@code requireOwnershipUserId}。前者对<b>已认证</b>调用方做校验(缺省用会话 id、不一致 403、
|
||||
* 管理角色豁免),对解析不出身份的调用方原样透传并计入 {@code [ownership-anonymous]};
|
||||
* fail-closed 的 require 只用在已取证"没有匿名调用方"的进度轮询族(见
|
||||
* {@link ProgressQueryOwnershipOutletTest})——桌面执行器 4.0.44 出厂版还不带登录 JWT,
|
||||
* 把写类端点一起翻成 require 会把执行器整批打成 401,所以这一步走的是日志归零再翻。</p>
|
||||
*
|
||||
* <p>扫描一律打在 {@link SourceScan#withoutComments} 剥掉注释的源码上,且判据是"必须存在/等于 N"
|
||||
* 那一形:不剥注释的话,谁在 {@code @Operation} 描述或行尾注释里提一句出口名,就能把护栏喂饱。
|
||||
* 分母(写 126 / 读 63,另有 1 支在册豁免)同样钉死,扫描器坏掉与"真的没人漏接"不会一起恒绿。
|
||||
* 这 190 支里有 39 支是 DTO 形态——只 grep 文本上的 {@code getUserId()} 会把它们整批看漏,
|
||||
* 所以 {@link #dtoTypesWithUserId()} 必须先建一遍"哪些请求类声明了 userId 字段"的索引。</p>
|
||||
*/
|
||||
class RequestSuppliedIdentityOutletTest {
|
||||
|
||||
/** 一支 handler 只要从请求里取身份,就必须落到这三个出口之一(第三个是各控制器的本人 id 取法)。 */
|
||||
private static final List<String> OUTLETS = List.of(
|
||||
"resolveOwnershipUserId(httpRequest",
|
||||
"requireOwnershipUserId(httpRequest",
|
||||
"currentUserId(httpRequest");
|
||||
|
||||
private static final Pattern MAPPING =
|
||||
Pattern.compile("@(Post|Put|Delete|Patch|Get|RequestMapping)Mapping(?:\\(([^)]*)\\))?");
|
||||
private static final Pattern PARAM_UID = Pattern.compile(
|
||||
"@RequestParam\\(\\s*(?:(?:value|name)\\s*=\\s*)?\"(?:user_id|userId)\"[^)]*\\)"
|
||||
+ "\\s+(?:@[^,)]+\\s+)*Long\\s+\\w+");
|
||||
private static final List<String> WRITE_VERBS = List.of("Post", "Put", "Delete", "Patch");
|
||||
|
||||
/** Spring 的 @RequestBody(前面是 @,不含 swagger 那个纯文档注解)里的 DTO 类型名。 */
|
||||
private static final Pattern BODY_DTO =
|
||||
Pattern.compile("@RequestBody\\s+(?:@[^,)]+\\s+)*([A-Z]\\w*)\\s+\\w+");
|
||||
|
||||
/** 自带 userId 字段的请求 DTO:控制器只是把它转交下去,真正读 userId 的是 service。 */
|
||||
private static final Set<String> DTO_TYPES_WITH_USER_ID = dtoTypesWithUserId();
|
||||
|
||||
/**
|
||||
* 登记在册的豁免:命中 {@code X-Internal-Token} 才可达的服务间查询(方法体内 fail-closed 401),
|
||||
* 参数是"被查询的用户"而不是"操作者",套归属出口反而会把 Flask 后台的查询打成空值。
|
||||
*
|
||||
* <p>这一条必须<b>同时</b>满足:出现在豁免表里、且现在仍然没有接出口。哪天有人把它接上了,
|
||||
* {@link #allowlistEntriesAreStillNeeded()} 会红,要求把这条从这里删掉——豁免表只许变小。</p>
|
||||
*/
|
||||
private static final List<String> ALLOWED_WITHOUT_OUTLET = List.of(
|
||||
"modules/usersecret/controller/InternalUserProxyController.java Get /user-proxy");
|
||||
|
||||
@Test
|
||||
void everyHandlerReadingARequestSuppliedUserIdRoutesItThroughAnOutlet() {
|
||||
List<String> violations = new ArrayList<>();
|
||||
Scan scan = scanAll();
|
||||
for (String entry : scan.unbound()) {
|
||||
if (!ALLOWED_WITHOUT_OUTLET.contains(entry)) {
|
||||
violations.add(entry);
|
||||
}
|
||||
}
|
||||
assertThat(violations)
|
||||
.as("身份仍取自请求参数(没走会话出口)的 handler —— 带别人的 user_id 就能越权读写")
|
||||
.isEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
void theScanCoversBothVerbsWithPinnedDenominators() {
|
||||
Scan scan = scanAll();
|
||||
// 28 支进度轮询走 require,其余写类/读类走 resolve;两边都算"已接出口"。
|
||||
assertThat(scan.boundWrite()).as("取请求身份且已接出口的写类 handler 数").isEqualTo(126);
|
||||
assertThat(scan.boundRead()).as("取请求身份且已接出口的读类 handler 数").isEqualTo(63);
|
||||
assertThat(scan.unbound()).as("取请求身份但未接出口的 handler:只剩豁免那一条")
|
||||
.containsExactlyElementsOf(ALLOWED_WITHOUT_OUTLET);
|
||||
}
|
||||
|
||||
/** 豁免不是永久产权:条目自己失效(端点已接上出口或已下线)就必须从表里删掉。 */
|
||||
@Test
|
||||
void allowlistEntriesAreStillNeeded() {
|
||||
Scan scan = scanAll();
|
||||
assertThat(scan.unbound())
|
||||
.as("豁免表里的每一条必须仍然处于未接出口状态")
|
||||
.containsExactlyElementsOf(ALLOWED_WITHOUT_OUTLET);
|
||||
}
|
||||
|
||||
/**
|
||||
* 判据本身要能红:没接出口的必须被判出来,接上的、以及只在注释里提一句的都不许算数。
|
||||
*
|
||||
* <p>缺这一支,{@link #scanAll} 的"已接出口"写成恒真也会一路绿。</p>
|
||||
*/
|
||||
@Test
|
||||
void theOutletDetectionIsNotVacuous() {
|
||||
String unbound = """
|
||||
@GetMapping("/dashboard")
|
||||
public ApiResponse<Void> dashboard(@RequestParam("user_id") Long userId) {
|
||||
return ApiResponse.success(service.dashboard(userId));
|
||||
}
|
||||
""";
|
||||
assertThat(isBound(unbound)).as("裸转发请求里的 user_id 必须判为未接出口").isFalse();
|
||||
assertThat(readsRequestIdentity(unbound)).isTrue();
|
||||
|
||||
String boundResolve = """
|
||||
@GetMapping("/dashboard")
|
||||
public ApiResponse<Void> dashboard(@RequestParam("user_id") Long userId,
|
||||
HttpServletRequest httpRequest) {
|
||||
userId = adminAuthSupport.resolveOwnershipUserId(httpRequest, userId);
|
||||
return ApiResponse.success(service.dashboard(userId));
|
||||
}
|
||||
""";
|
||||
assertThat(isBound(boundResolve)).as("resolve 写法(写类/读类收口后的形状)").isTrue();
|
||||
String boundRequire = """
|
||||
@PostMapping("/tasks/progress/light")
|
||||
public ApiResponse<Void> light(@RequestBody R request, HttpServletRequest httpRequest) {
|
||||
return ApiResponse.success(service.progressLight(request.getTaskIds(),
|
||||
adminAuthSupport.requireOwnershipUserId(httpRequest, request.getUserId())));
|
||||
}
|
||||
""";
|
||||
assertThat(isBound(boundRequire)).as("require 写法(进度轮询族)").isTrue();
|
||||
|
||||
// 注释里把出口名写全,也不许把判据喂饱——这正是本类扫剥注释源码的理由
|
||||
String commentOnly = SourceScan.withoutComments("""
|
||||
@GetMapping("/history")
|
||||
public ApiResponse<Void> history(@RequestParam("user_id") Long userId) {
|
||||
// adminAuthSupport.resolveOwnershipUserId(httpRequest, userId) 已经接好了
|
||||
return ApiResponse.success(service.history(userId));
|
||||
}
|
||||
""");
|
||||
assertThat(isBound(commentOnly)).as("注释不得算作已接出口").isFalse();
|
||||
assertThat(readsRequestIdentity(commentOnly)).as("但请求里的身份仍要被扫出来,否则漏网端点隐身").isTrue();
|
||||
}
|
||||
|
||||
/** DTO 形态:控制器不显式取 getUserId(),而是把 request 整个交给 service,由 service 读里面的 userId。 */
|
||||
@Test
|
||||
void dtoCarryingHandlersAreCountedToo() {
|
||||
String dtoHandler = """
|
||||
@PostMapping("/candidates")
|
||||
public ApiResponse<Void> add(@RequestBody ProductRiskCandidateAddRequest request) {
|
||||
withdrawResolveService.addCandidate(request);
|
||||
}
|
||||
""";
|
||||
// 文本上没有 getUserId(),靠的是「DTO 里声明了 userId 字段」这一层;
|
||||
// 识别不出来的话,新建的 DTO 型端点会整批隐身在本护栏之外
|
||||
assertThat(readsRequestIdentity(dtoHandler))
|
||||
.as("ProductRiskCandidateAddRequest 带 userId 字段,改造前就该被扫出来")
|
||||
.isTrue();
|
||||
String boundDto = """
|
||||
@PostMapping("/candidates")
|
||||
public ApiResponse<Void> add(@RequestBody ProductRiskCandidateAddRequest request,
|
||||
HttpServletRequest httpRequest) {
|
||||
request.setUserId(adminAuthSupport.resolveOwnershipUserId(httpRequest, request.getUserId()));
|
||||
withdrawResolveService.addCandidate(request);
|
||||
}
|
||||
""";
|
||||
assertThat(readsRequestIdentity(boundDto)).isTrue();
|
||||
assertThat(isBound(boundDto)).isTrue();
|
||||
}
|
||||
|
||||
// ---- 扫描 ----
|
||||
|
||||
private record Scan(List<String> unbound, int boundWrite, int boundRead) {
|
||||
}
|
||||
|
||||
private static Scan scanAll() {
|
||||
List<String> unbound = new ArrayList<>();
|
||||
int boundWrite = 0;
|
||||
int boundRead = 0;
|
||||
Path controllers = mainRoot().resolve("modules");
|
||||
List<Path> files = new ArrayList<>();
|
||||
try (Stream<Path> stream = Files.walk(controllers)) {
|
||||
stream.filter(p -> p.getFileName().toString().endsWith("Controller.java")).forEach(files::add);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("遍历模块控制器失败", e);
|
||||
}
|
||||
assertThat(files).as("模块控制器数量少于 20 说明扫描根走错了").hasSizeGreaterThan(20);
|
||||
for (Path file : files) {
|
||||
String source = SourceScan.withoutComments(read(file));
|
||||
String rel = mainRoot().relativize(file).toString().replace('\\', '/');
|
||||
Matcher current = MAPPING.matcher(source);
|
||||
List<int[]> anchors = new ArrayList<>();
|
||||
List<String> verbs = new ArrayList<>();
|
||||
List<String> paths = new ArrayList<>();
|
||||
while (current.find()) {
|
||||
if ("RequestMapping".equals(current.group(1))) {
|
||||
continue; // 类级前缀不是 handler
|
||||
}
|
||||
anchors.add(new int[]{current.start(), current.end()});
|
||||
verbs.add(current.group(1));
|
||||
Matcher vm = Pattern.compile("\"([^\"]+)\"").matcher(current.group(2) == null ? "" : current.group(2));
|
||||
paths.add(vm.find() ? vm.group(1) : "");
|
||||
}
|
||||
for (int i = 0; i < anchors.size(); i++) {
|
||||
int from = anchors.get(i)[0];
|
||||
int to = i + 1 < anchors.size() ? anchors.get(i + 1)[0] : source.length();
|
||||
String region = source.substring(from, to);
|
||||
if (!readsRequestIdentity(region)) {
|
||||
continue;
|
||||
}
|
||||
if (isBound(region)) {
|
||||
if (WRITE_VERBS.contains(verbs.get(i))) {
|
||||
boundWrite++;
|
||||
} else {
|
||||
boundRead++;
|
||||
}
|
||||
} else {
|
||||
unbound.add(rel + " " + verbs.get(i) + " " + paths.get(i));
|
||||
}
|
||||
}
|
||||
}
|
||||
return new Scan(unbound, boundWrite, boundRead);
|
||||
}
|
||||
|
||||
private static boolean readsRequestIdentity(String region) {
|
||||
if (PARAM_UID.matcher(region).find() || region.contains(".getUserId()")) {
|
||||
return true;
|
||||
}
|
||||
// 只看文本上的 getUserId() 会漏掉「控制器把 DTO 整个交给 service」那一形——
|
||||
// 新建端点正是这个形状,漏了它本类就成了「只保护已收口的」。
|
||||
Matcher dto = BODY_DTO.matcher(region);
|
||||
while (dto.find()) {
|
||||
if (DTO_TYPES_WITH_USER_ID.contains(dto.group(1))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private static Set<String> dtoTypesWithUserId() {
|
||||
List<Path> files = new ArrayList<>();
|
||||
try (Stream<Path> stream = Files.walk(mainRoot())) {
|
||||
stream.filter(p -> p.getFileName().toString().endsWith(".java")).forEach(files::add);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("遍历源码求 DTO 索引失败", e);
|
||||
}
|
||||
Set<String> out = new java.util.HashSet<>();
|
||||
Pattern field = Pattern.compile("private\\s+Long\\s+userId\\b");
|
||||
for (Path file : files) {
|
||||
try {
|
||||
String text = SourceScan.withoutComments(Files.readString(file, StandardCharsets.UTF_8));
|
||||
if (field.matcher(text).find()) {
|
||||
String name = file.getFileName().toString();
|
||||
out.add(name.substring(0, name.length() - ".java".length()));
|
||||
}
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("读取失败: " + file, e);
|
||||
}
|
||||
}
|
||||
assertThat(out).as("带 userId 的请求/实体类索引不应为空(空=扫描根走错了)").isNotEmpty();
|
||||
return out;
|
||||
}
|
||||
|
||||
private static boolean isBound(String region) {
|
||||
return OUTLETS.stream().anyMatch(region::contains);
|
||||
}
|
||||
|
||||
private static Path mainRoot() {
|
||||
Path here = Path.of("").toAbsolutePath();
|
||||
Path direct = here.resolve("src/main/java/com/nanri/aiimage");
|
||||
if (Files.isDirectory(direct)) {
|
||||
return direct;
|
||||
}
|
||||
return here.resolve("backend-java").resolve("src/main/java/com/nanri/aiimage");
|
||||
}
|
||||
|
||||
private static String read(Path file) {
|
||||
if (!Files.isRegularFile(file)) {
|
||||
fail("找不到 " + file + " —— 扫描根不对,护栏的分母会静默变成 0");
|
||||
}
|
||||
try {
|
||||
return Files.readString(file, StandardCharsets.UTF_8);
|
||||
} catch (IOException e) {
|
||||
throw new IllegalStateException("读取失败: " + file, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
+108
@@ -0,0 +1,108 @@
|
||||
package com.nanri.aiimage.modules.permission.service;
|
||||
|
||||
import com.nanri.aiimage.testutil.SourceScan;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
/**
|
||||
* 菜单写侧的「操作者只能是真人」护栏。
|
||||
*
|
||||
* <p>2026-10-07 数富AI 架构评审收口时发现:{@code PermissionMenuService} 上有四个不带操作者的重载
|
||||
* ({@code create(request)}/{@code update(id, request)}/{@code delete(id)}/
|
||||
* {@code updateUserColumnPermissions(userId, request)}),它们一律把 {@code operator = null}
|
||||
* 递给闸门,而三道闸门对 null 的处置都是 {@code return}(放行)。今天 src/main 里没人调用它们,
|
||||
* 但"调用方传 null 就等于跳过归属校验"这条路只要存在,下一支控制器接上去就是静默的跨公司改删——
|
||||
* 表现是别家菜单少一行,两边都不报错。</p>
|
||||
*
|
||||
* <p>本批把四个无操作者<b>写</b>出口删掉(删出口胜过写注释),并把它钉住:
|
||||
* 写方法各自只剩"第一个参数是操作者"的那一种形状,文件里不再出现把 null 当操作者递进去的委托。
|
||||
* <b>读侧的 {@code list(String menuType)} 故意保留</b>:它是登录态自读与内部代理用的
|
||||
* 无 tab 目录查询,{@code PermissionCompanyMenuHiddenTest} 已经把它当作口径钉过,
|
||||
* 删它等于改语义而不是收口子,所以这里只做点名,不许扩大。</p>
|
||||
*/
|
||||
class MenuWriteOutletOperatorTest {
|
||||
|
||||
private static final String SRC = SourceScan.withoutComments(
|
||||
SourceScan.sourceText("PermissionMenuService.java"));
|
||||
|
||||
/**
|
||||
* 把 null 当操作者递进写方法:{@code delete(null, id);}/{@code return create(null, null, request);}
|
||||
*
|
||||
* <p>左边必须排掉 {@code .}:MyBatis-Plus 的 {@code mapper.update(null, wrapper)} 第一个参数是
|
||||
* entity 而不是操作者,撞上来就是假红(这个文件里真有两处)。同一条理由要求判据是"裸调用"。</p>
|
||||
*/
|
||||
private static final Pattern ANONYMOUS_WRITE_DELEGATION = Pattern.compile(
|
||||
"(?<![A-Za-z0-9_.])(?:create|update|delete|updateUserColumnPermissions)\\s*\\(\\s*null\\b");
|
||||
|
||||
@Test
|
||||
void noWriteMethodIsDelegatedWithANullOperator() {
|
||||
assertThat(ANONYMOUS_WRITE_DELEGATION.matcher(SRC).find())
|
||||
.as("菜单写侧不许再有「operator 传 null」的委托;读侧那条走 "
|
||||
+ "anonymousReadIsStillTheSingleNullOperatorPath")
|
||||
.isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
void anonymousReadOutletIsStillExactlyOneAndNamed() {
|
||||
// 保留不等于放开:唯一的 null 操作者路径必须是 list(String),多的一个都不许有。
|
||||
Matcher read = Pattern.compile("\\blist\\s*\\(\\s*null\\b").matcher(SRC);
|
||||
int hits = 0;
|
||||
while (read.find()) {
|
||||
hits++;
|
||||
}
|
||||
assertThat(hits).as("无操作者的目录读只许 1 处").isEqualTo(1);
|
||||
assertThat(SourceScan.methodBody(SRC, "list"))
|
||||
.as("那 1 处必须还在 list(String menuType) 里,挪进写方法就红")
|
||||
.contains("return list(null, menuType, false);");
|
||||
}
|
||||
|
||||
@Test
|
||||
void eachWriteEntryPointKeepsItsSingleOperatorFirstShape() {
|
||||
assertThat(count(SRC, "public PermissionMenuItemVo create("))
|
||||
.as("新增菜单只留 (operator, requestedCompanyId, request) 一种形状").isEqualTo(1);
|
||||
assertThat(count(SRC, "public PermissionMenuItemVo update("))
|
||||
.as("编辑菜单只留 (operator, id, request) 一种形状").isEqualTo(1);
|
||||
assertThat(count(SRC, "public void delete("))
|
||||
.as("删除菜单只留 (operator, id) 一种形状").isEqualTo(1);
|
||||
assertThat(count(SRC, "public void updateUserColumnPermissions("))
|
||||
.as("授权落库三种形状都必须以 operator 开头").isEqualTo(3);
|
||||
assertThat(count(SRC, "public void reorder(")).isEqualTo(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* 上面三支都是「不存在」与「等于 N」两形,都会被恒绿的扫描器喂出来:正则写错、剥注释把整段
|
||||
* 吃掉、sourceText 抓到另一份同名文件,读数一样是绿的。所以每条判据都配一次"能红"取样。
|
||||
*/
|
||||
@Test
|
||||
void thePatternsFireOnTheShapesTheyClaimToCatch() {
|
||||
assertThat(ANONYMOUS_WRITE_DELEGATION
|
||||
.matcher(" public void delete(Long id) {\n delete(null, id);\n }").find())
|
||||
.as("匿名写委托的判据必须抓得到 delete(null, id)")
|
||||
.isTrue();
|
||||
assertThat(ANONYMOUS_WRITE_DELEGATION.matcher(" permissionMenuMapper.update(null, wrapper);")
|
||||
.find())
|
||||
.as("MyBatis 的 update(null, wrapper) 不是操作者,不许被抓成假红")
|
||||
.isFalse();
|
||||
assertThat(count(" public void delete(AdminUserEntity operator, Long id) {\n"
|
||||
+ " public void delete(Long id) {\n", "public void delete("))
|
||||
.as("签名计数必须真数得出重载,两个就报两个")
|
||||
.isEqualTo(2);
|
||||
assertThat(count(SRC, "public void delete("))
|
||||
.as("取样自检与本文件对照:本文件只剩一种形状")
|
||||
.isEqualTo(1);
|
||||
}
|
||||
|
||||
private static int count(String haystack, String needle) {
|
||||
int n = 0;
|
||||
int i = haystack.indexOf(needle);
|
||||
while (i >= 0) {
|
||||
n++;
|
||||
i = haystack.indexOf(needle, i + needle.length());
|
||||
}
|
||||
return n;
|
||||
}
|
||||
}
|
||||
+11
-11
@@ -62,7 +62,7 @@ class PermissionMenuServiceTest {
|
||||
|
||||
UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
|
||||
request.setColumnIds(List.of(2L));
|
||||
service.updateUserColumnPermissions(7L, request);
|
||||
service.updateUserColumnPermissions(null, 7L, request);
|
||||
|
||||
ArgumentCaptor<UserColumnPermissionEntity> captor = ArgumentCaptor.forClass(UserColumnPermissionEntity.class);
|
||||
verify(permissionMapper, times(2)).insert(captor.capture());
|
||||
@@ -84,7 +84,7 @@ class PermissionMenuServiceTest {
|
||||
|
||||
UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
|
||||
request.setColumnIds(List.of(75L));
|
||||
service.updateUserColumnPermissions(8L, request);
|
||||
service.updateUserColumnPermissions(null, 8L, request);
|
||||
|
||||
verify(permissionMapper, times(0)).insert(any(UserColumnPermissionEntity.class));
|
||||
}
|
||||
@@ -102,7 +102,7 @@ class PermissionMenuServiceTest {
|
||||
|
||||
UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
|
||||
request.setColumnIds(List.of(2L));
|
||||
service.updateUserColumnPermissions(7L, request);
|
||||
service.updateUserColumnPermissions(null, 7L, request);
|
||||
|
||||
ArgumentCaptor<UserColumnPermissionEntity> captor = ArgumentCaptor.forClass(UserColumnPermissionEntity.class);
|
||||
verify(permissionMapper, times(3)).insert(captor.capture());
|
||||
@@ -346,7 +346,7 @@ class PermissionMenuServiceTest {
|
||||
when(menuMapper.selectById(7L)).thenReturn(parent);
|
||||
PermissionMenuCreateRequest request = createRequest(7L, "app");
|
||||
|
||||
assertThatThrownBy(() -> service.create(request))
|
||||
assertThatThrownBy(() -> service.create(user(1L, "super_admin", 1), null, request))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("同一类型");
|
||||
verify(menuMapper, never()).insert(any(PermissionMenuEntity.class));
|
||||
@@ -373,7 +373,7 @@ class PermissionMenuServiceTest {
|
||||
request.setRoutePath("changed");
|
||||
request.setParentId(2L);
|
||||
|
||||
assertThatThrownBy(() -> service.update(1L, request))
|
||||
assertThatThrownBy(() -> service.update(user(1L, "super_admin", 1), 1L, request))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("自己的子级");
|
||||
verify(menuMapper, never()).updateById(any(PermissionMenuEntity.class));
|
||||
@@ -394,7 +394,7 @@ class PermissionMenuServiceTest {
|
||||
request.setMenuType("admin");
|
||||
request.setRoutePath("changed");
|
||||
|
||||
assertThatThrownBy(() -> service.update(1L, request))
|
||||
assertThatThrownBy(() -> service.update(user(1L, "super_admin", 1), 1L, request))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("子菜单");
|
||||
verify(menuMapper, never()).updateById(any(PermissionMenuEntity.class));
|
||||
@@ -410,7 +410,7 @@ class PermissionMenuServiceTest {
|
||||
when(menuMapper.selectById(1L)).thenReturn(menu(1L, null, "app", 1));
|
||||
when(menuMapper.selectCount(any())).thenReturn(1L);
|
||||
|
||||
assertThatThrownBy(() -> service.delete(1L))
|
||||
assertThatThrownBy(() -> service.delete(user(1L, "super_admin", 1), 1L))
|
||||
.isInstanceOf(BusinessException.class)
|
||||
.hasMessageContaining("子菜单");
|
||||
verify(menuMapper, never()).deleteById(any(Long.class));
|
||||
@@ -658,7 +658,7 @@ class PermissionMenuServiceTest {
|
||||
UserColumnPermissionUpdateRequest request = new UserColumnPermissionUpdateRequest();
|
||||
request.setColumnIds(List.of(1L));
|
||||
|
||||
service.updateUserColumnPermissions(9L, request);
|
||||
service.updateUserColumnPermissions(null, 9L, request);
|
||||
|
||||
ArgumentCaptor<UserColumnPermissionEntity> captor = ArgumentCaptor.forClass(UserColumnPermissionEntity.class);
|
||||
verify(permissionMapper).insert(captor.capture());
|
||||
@@ -1144,7 +1144,7 @@ class PermissionMenuServiceTest {
|
||||
request.setColumnKey("new_admin_menu");
|
||||
request.setRoutePath("new-admin-menu");
|
||||
|
||||
service.create(request);
|
||||
service.create(user(1L, "super_admin", 1), null, request);
|
||||
|
||||
ArgumentCaptor<PermissionMenuEntity> inserted = ArgumentCaptor.forClass(PermissionMenuEntity.class);
|
||||
verify(menuMapper).insert(inserted.capture());
|
||||
@@ -1169,7 +1169,7 @@ class PermissionMenuServiceTest {
|
||||
request.setMenuType("admin");
|
||||
// 不传 columnKey / routePath:由后台自动生成。
|
||||
|
||||
service.create(request);
|
||||
service.create(user(1L, "super_admin", 1), null, request);
|
||||
|
||||
ArgumentCaptor<PermissionMenuEntity> inserted = ArgumentCaptor.forClass(PermissionMenuEntity.class);
|
||||
verify(menuMapper).insert(inserted.capture());
|
||||
@@ -1195,7 +1195,7 @@ class PermissionMenuServiceTest {
|
||||
request.setMenuType("admin");
|
||||
// 不传 columnKey / routePath:保持原值。
|
||||
|
||||
service.update(1L, request);
|
||||
service.update(user(1L, "super_admin", 1), 1L, request);
|
||||
|
||||
ArgumentCaptor<PermissionMenuEntity> updated = ArgumentCaptor.forClass(PermissionMenuEntity.class);
|
||||
verify(menuMapper).updateById(updated.capture());
|
||||
|
||||
+19
-2
@@ -35,6 +35,23 @@ class SimilarAsinTaskLightControllerTest {
|
||||
private SimilarAsinTaskService service;
|
||||
private MockMvc mockMvc;
|
||||
|
||||
/**
|
||||
* 进度端点从 2026-10-07 起把 body 里的 user_id 交给 {@code AdminAuthSupport#requireOwnershipUserId}
|
||||
* 绑到会话身份上(fail-closed)。这一支用例测的是<b>轻量响应的字段形状</b>,不是归属,
|
||||
* 所以这里给一把"参数与会话一致"的回显桩:原样返回第二个入参,等于已认证用户带着自己的 id。
|
||||
*
|
||||
* <p>⚠️ 别把它换成 {@code new AdminAuthSupport(...)} 的真身,也别删掉:真身会走 JWT 解析 ⇒ 用例
|
||||
* 变成鉴权用例;返回 null 则归属被放宽,恰好把这一支要钉的"绑定值要传下去"糊掉。
|
||||
* 归属接线本身由 {@code ProgressQueryOwnershipOutletTest} 钉。</p>
|
||||
*/
|
||||
private static com.nanri.aiimage.common.security.AdminAuthSupport sessionBoundAuth() {
|
||||
com.nanri.aiimage.common.security.AdminAuthSupport auth =
|
||||
mock(com.nanri.aiimage.common.security.AdminAuthSupport.class);
|
||||
when(auth.requireOwnershipUserId(any(), any()))
|
||||
.thenAnswer(invocation -> invocation.getArgument(1));
|
||||
return auth;
|
||||
}
|
||||
|
||||
private SimilarAsinTaskLightBatchVo lightBatch(SimilarAsinTaskLightVo... items) {
|
||||
SimilarAsinTaskLightBatchVo vo = new SimilarAsinTaskLightBatchVo();
|
||||
vo.getItems().addAll(List.of(items));
|
||||
@@ -57,7 +74,7 @@ class SimilarAsinTaskLightControllerTest {
|
||||
// 归属过滤:请求不带 userId 时 filterOwnedTaskIds 直接返回原列表(不会触碰 mapper),
|
||||
// 故这里传 null mapper 即可,无需 mock
|
||||
mockMvc = MockMvcBuilders.standaloneSetup(
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), null)).build();
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), sessionBoundAuth())).build();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -117,7 +134,7 @@ class SimilarAsinTaskLightControllerTest {
|
||||
// 归属过滤:请求不带 userId 时 filterOwnedTaskIds 直接返回原列表(不会触碰 mapper),
|
||||
// 故这里传 null mapper 即可,无需 mock
|
||||
mockMvc = MockMvcBuilders.standaloneSetup(
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), null)).build();
|
||||
new SimilarAsinController(service, new TaskProgressOwnershipSupport(null), sessionBoundAuth())).build();
|
||||
mockMvc.perform(post("/api/similar-asin/tasks/progress/batch")
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(objectMapper.writeValueAsString(request)))
|
||||
|
||||
+7
-4
@@ -2,6 +2,7 @@ package com.nanri.aiimage.modules.task.contract;
|
||||
|
||||
import com.nanri.aiimage.common.api.ApiResponse;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.security.AdminAuthSupport;
|
||||
import com.nanri.aiimage.modules.appearancepatent.controller.AppearancePatentController;
|
||||
import com.nanri.aiimage.modules.appearancepatent.model.dto.AppearancePatentSubmitResultRequest;
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService;
|
||||
@@ -16,6 +17,7 @@ import com.nanri.aiimage.modules.similarasin.controller.SimilarAsinController;
|
||||
import com.nanri.aiimage.modules.similarasin.model.dto.SimilarAsinSubmitResultRequest;
|
||||
import com.nanri.aiimage.modules.similarasin.service.SimilarAsinTaskService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressOwnershipSupport;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.extension.ExtendWith;
|
||||
@@ -107,10 +109,11 @@ class ResultSuccessTimingContractTest {
|
||||
doAnswer(invocation -> null)
|
||||
.when(publishTaskService).submitResult(eq(TASK_ID), any(PublishSubmitResultRequest.class));
|
||||
|
||||
// 第二个构造参数是 AdminAuthSupport(activateFile 取设备号用),本用例只测 submitResult,
|
||||
// 不经过该依赖,故传 null(同文件其它 controller 用例亦有传 null 的先例)。
|
||||
ApiResponse<Void> response = new PublishController(publishTaskService, null)
|
||||
.submitResult(TASK_ID, new PublishSubmitResultRequest());
|
||||
// 第二个构造参数是 AdminAuthSupport:submitResult 现在要把请求体里的 user_id 交给会话出口,
|
||||
// 桩返回 null 即「按会话身份改写归属」,本用例只测「service 提交成功后才回 success」。
|
||||
AdminAuthSupport adminAuthSupport = mock(AdminAuthSupport.class);
|
||||
ApiResponse<Void> response = new PublishController(publishTaskService, adminAuthSupport)
|
||||
.submitResult(TASK_ID, new PublishSubmitResultRequest(), mock(HttpServletRequest.class));
|
||||
|
||||
assertTrue(response.isSuccess(), "success=true");
|
||||
verify(publishTaskService).submitResult(eq(TASK_ID), any(PublishSubmitResultRequest.class));
|
||||
|
||||
@@ -28,6 +28,79 @@ public final class SourceScan {
|
||||
"src/main/java 下找不到 " + fileName + " —— 文件改名/挪目录了,护栏要红在这里"));
|
||||
}
|
||||
|
||||
/**
|
||||
* 剥掉注释,<b>偏移不变</b>:注释字符换成空格、换行原样保留,所以 {@link #methodBody} 这类
|
||||
* 按位置切片的助手在剥前剥后切出同一段。
|
||||
*
|
||||
* <p>为什么护栏必须打在它上面:源码守卫的两种断言都会被<b>文字</b>喂到——
|
||||
* 「必须不存在」那一形会被注释里提一句顶红(假红,还能忍),
|
||||
* 「必须存在/次数等于 N」那一形会被 javadoc 里提一句<b>喂饱</b>(假绿,等于护栏没写)。
|
||||
* 2026-10-07 实测:{@code AdminTaskCenterController} 的类注释里有 1 处 {@code readScope(},
|
||||
* 整份原文 {@code readScope(} 数=1、剥完=0——文件级判据吃原文就会读出这种数。</p>
|
||||
*
|
||||
* <p>口径:{@code //} 到行尾、{@code /* … *}{@code /} 整段、字符串与字符字面量里的斜杠不算注释、
|
||||
* 三个双引号的文本块按字面量整段保留。</p>
|
||||
*/
|
||||
public static String withoutComments(String java) {
|
||||
StringBuilder out = new StringBuilder(java.length());
|
||||
int i = 0;
|
||||
int n = java.length();
|
||||
while (i < n) {
|
||||
char c = java.charAt(i);
|
||||
char next = i + 1 < n ? java.charAt(i + 1) : '\0';
|
||||
if (c == '/' && next == '/') {
|
||||
while (i < n && java.charAt(i) != '\n') {
|
||||
out.append(' ');
|
||||
i++;
|
||||
}
|
||||
} else if (c == '/' && next == '*') {
|
||||
out.append(" ");
|
||||
i += 2;
|
||||
while (i < n) {
|
||||
if (java.charAt(i) == '*' && i + 1 < n && java.charAt(i + 1) == '/') {
|
||||
out.append(" ");
|
||||
i += 2;
|
||||
break;
|
||||
}
|
||||
out.append(java.charAt(i) == '\n' ? '\n' : ' ');
|
||||
i++;
|
||||
}
|
||||
} else if (java.startsWith("\"\"\"", i)) {
|
||||
out.append("\"\"\"");
|
||||
i += 3;
|
||||
while (i < n && !java.startsWith("\"\"\"", i)) {
|
||||
out.append(java.charAt(i));
|
||||
i++;
|
||||
}
|
||||
out.append("\"\"\"");
|
||||
i += 3;
|
||||
} else if (c == '"' || c == '\'') {
|
||||
out.append(c);
|
||||
i++;
|
||||
while (i < n) {
|
||||
if (java.charAt(i) == '\\' && i + 1 < n) {
|
||||
out.append(java.charAt(i)).append(java.charAt(i + 1));
|
||||
i += 2;
|
||||
continue;
|
||||
}
|
||||
if (java.charAt(i) == '\n') {
|
||||
break;
|
||||
}
|
||||
out.append(java.charAt(i));
|
||||
boolean closing = java.charAt(i) == c;
|
||||
i++;
|
||||
if (closing) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
out.append(c);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
return out.toString();
|
||||
}
|
||||
|
||||
/** 大括号配平切出「某个方法」的源码:<b>从它的签名行往前一直含到注解</b>,到方法收尾的 `}` 为止。
|
||||
*
|
||||
* <p>两条它必须自己防住的坑,都写在用例里过:</p>
|
||||
|
||||
Reference in New Issue
Block a user