Compare commits

..

2 Commits

Author SHA1 Message Date
CI Bot 5e1ed9ecc5 fix: createGenerationTask 返回值取 items[0],ID 前缀逻辑修正
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 2m15s
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 6m39s
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
- createGenerationTask 返回 BatchGenerationTaskResponse {items, total},
  之前错误地直接用 res.id(undefined),改为 res.items[0].id
- 后端返回裸 UUID,任务中心 getTask 需要 generation: 前缀,
  创建后补前缀再查询;轮询/重试直接用 genTask.id(已带前缀)
- 新增空数组保护,无任务时抛出明确错误
2026-07-16 00:00:13 +08:00
CI Bot b2136b966e fix: 修复生成任务轮询 404 — Task ID 缺少 generation: 前缀
CI/CD Pipeline / Frontend Lint (pull_request) Failing after 3m11s
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 6m17s
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Has been skipped
CI/CD Pipeline / Build Production Runtime Images (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
根因:createGenerationTask 返回裸 UUID(如 0388178063d2...),
但 Tasks API 使用带前缀的 ID(generation:xxx)。
getTask(rawId) 永远 404,轮询 catch 静默忽略 → 弹窗卡死 0%。

修复:
- handleGenerate 中补上 generation: 前缀再调 getTask
- 轮询 catch 块改为 console.warn 便于排查

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-07-15 21:02:43 +08:00
5 changed files with 40 additions and 29 deletions
-11
View File
@@ -192,7 +192,6 @@ jobs:
frontend-lint:
name: Frontend Lint
runs-on: ubuntu-22.04
timeout-minutes: 20
steps:
- name: Checkout code
@@ -218,17 +217,7 @@ jobs:
tar -xzf /tmp/repo.tar.gz --strip-components=1 -C .
rm -f /tmp/repo.tar.gz
- name: Cache node_modules
id: cache-node-modules
uses: actions/cache@v4
with:
path: apps/web/node_modules
key: ${{ runner.os }}-node-web-${{ hashFiles('apps/web/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-web-
- name: Install dependencies
if: steps.cache-node-modules.outputs.cache-hit != 'true'
shell: sh
run: |
set -eu
Regular → Executable
+12 -3
View File
@@ -35,7 +35,7 @@ export interface CreateGenerationTaskRequest {
}
/** 创建生成任务响应(对齐后端 GenerationTaskResponse */
export interface CreateGenerationTaskResponse {
export interface GenerationTaskItem {
id: string;
project_id: string;
asset_library_id: string;
@@ -51,13 +51,22 @@ export interface CreateGenerationTaskResponse {
error_message: string;
}
/** 批量创建响应(对齐后端 BatchGenerationTaskResponse */
export interface BatchGenerationTaskResponse {
items: GenerationTaskItem[];
total: number;
}
/** @deprecated 请使用 GenerationTaskItem */
export type CreateGenerationTaskResponse = GenerationTaskItem;
/* ──────────── API 函数 ──────────── */
/** 创建生成任务(一键生成) */
export const createGenerationTask = async (
params: CreateGenerationTaskRequest,
): Promise<CreateGenerationTaskResponse> => {
const { data } = await apiClient.post<CreateGenerationTaskResponse>(
): Promise<BatchGenerationTaskResponse> => {
const { data } = await apiClient.post<BatchGenerationTaskResponse>(
"/generation/tasks",
params,
);
@@ -505,8 +505,20 @@ const EditingPlanner: React.FC = () => {
title_ids: [],
voice_ids: voiceIds,
});
/*
* createGenerationTask 返回批量响应 {items, total}
* 取第一个任务的 ID。后端返回裸 UUID,
* 但任务中心 API(getTask)使用带前缀的 IDgeneration:xxx),
* 需补前缀后再查询。
*/
const firstTask = res.items?.[0];
if (!firstTask) {
throw new Error("创建生成任务失败:无返回任务");
}
const rawId = firstTask.id;
const taskId = rawId.includes(":") ? rawId : `generation:${rawId}`;
/* 创建接口返回的是精简响应,需查询完整 TaskItem 用于轮询 */
const task = await getTask(res.id);
const task = await getTask(taskId);
setGenTask(task);
setGenPhase("progress");
message.info("生成任务已创建");
@@ -535,8 +547,8 @@ const EditingPlanner: React.FC = () => {
setGenPhase("failed");
clearInterval(timer);
}
} catch {
/* ignore */
} catch (err) {
console.warn("[生成轮询] 查询任务状态失败", err);
}
}, 3000);
return () => clearInterval(timer);
+1 -3
View File
@@ -5,9 +5,7 @@ ARG VITE_API_URL=https://saas-api.xiaoxiajianji.com
ENV VITE_API_URL=$VITE_API_URL
COPY apps/web/package.json apps/web/package-lock.json ./apps/web/
WORKDIR /app/apps/web
RUN \
--mount=type=cache,target=/root/.npm \
npm config set registry https://registry.npmmirror.com \
RUN npm config set registry https://registry.npmmirror.com \
&& npm ci
COPY apps/web/ ./
RUN npm run build
+12 -9
View File
@@ -72,25 +72,28 @@ else
fi
echo "=== Building Web image (with buildx cache) ==="
# 使用多阶段 Dockerfile 构建,配合 buildx cache 缓存 npm 安装和构建产物
WEB_NGINX_CONF="${WEB_NGINX_CONF:-infra/docker/nginx-production.conf}"
WEB_API_URL="${VITE_API_URL:-https://saas-api.xiaoxiajianji.com}"
# 先构建前端产物
docker run --rm \
-v "$PWD:/workspace" \
-w /workspace/apps/web \
docker.m.daocloud.io/library/node:20 \
sh -lc "npm ci && npm run build"
test -f apps/web/dist/index.html
if [ "$USE_CACHE" -eq 1 ]; then
docker buildx build \
--cache-from "type=registry,ref=${CACHE_REGISTRY}/web-cache:${CACHE_TAG},ignore-error=true" \
--cache-to "type=registry,ref=${CACHE_REGISTRY}/web-cache:${CACHE_TAG},mode=max" \
-f infra/docker/web.Dockerfile \
--build-arg NGINX_CONF="${WEB_NGINX_CONF}" \
--build-arg VITE_API_URL="${WEB_API_URL}" \
-f infra/docker/web-artifact.Dockerfile \
--build-arg NGINX_CONF=infra/docker/nginx-production.conf \
-t "$WEB_IMAGE" \
--load \
.
else
docker build --pull=false \
-f infra/docker/web.Dockerfile \
--build-arg NGINX_CONF="${WEB_NGINX_CONF}" \
--build-arg VITE_API_URL="${WEB_API_URL}" \
-f infra/docker/web-artifact.Dockerfile \
--build-arg NGINX_CONF=infra/docker/nginx-production.conf \
-t "$WEB_IMAGE" \
.
fi