fix: GET /lipsync/jobs/{id} 改为非阻塞 — 先返回缓存，后台异步刷新

上次修复让 GET 同步调 MediaKit，MediaKit 偶尔慢 60s 直接拖死轮询。
改为 BackgroundTasks 异步刷新：响应立即返回 DB 缓存状态，
MediaKit 刷新在 response 发送后后台执行，不阻塞前端。
最坏情况：某次轮询拿到旧状态，3 秒后下次轮询拿到新状态。

.gitea/workflows/ci-pipeline.yml

@@ -20,6 +20,7 @@ on:
         default: "手动触发 - CI漏触发补跑"
 permissions:
   contents: read
+  pull-requests: read
 concurrency:
   group: ci-pipeline-${{ gitea.ref }}
   cancel-in-progress: true
@@ -88,9 +89,22 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
       run: |
         set -eu
+        # 优先用 git diff 判断 PR 改动范围（比 API 稳定）
         PR_NUMBER=$(echo "$GITHUB_REF" | sed 's|refs/pull/||; s|/.*||')
-        API_URL="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files?limit=300"
-        FILES=$(curl -s -H "Authorization: token ${GITHUB_TOKEN}" "$API_URL" | python3 -c "import sys,json; [print(f['filename']) for f in json.load(sys.stdin)]")
+        if command -v git >/dev/null 2>&1 && [ -d .git ]; then
+          FILES=$(git diff --name-only origin/develop...HEAD 2>/dev/null || true)
+        fi
+        if [ -z "${FILES:-}" ]; then
+          # fallback 到 API
+          API_URL="${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/pulls/${PR_NUMBER}/files?limit=300"
+          FILES=$(curl -sf -H "Authorization: token ${GITHUB_TOKEN}" "$API_URL" | python3 -c "import sys,json; [print(f['filename']) for f in json.load(sys.stdin)]" 2>/dev/null || true)
+        fi
+        if [ -z "${FILES:-}" ]; then
+          echo "⚠️ 无法获取变更文件列表，保守运行完整 CI"
+          echo "skip_backend=false" >> $GITHUB_OUTPUT
+          echo "skip_frontend=false" >> $GITHUB_OUTPUT
+          exit 0
+        fi
         FRONTEND_COUNT=$(echo "$FILES" | grep -c '^apps/web/' || true)
         BACKEND_COUNT=$(echo "$FILES" | grep -cv '^apps/web/' || true)
         TOTAL=$(echo "$FILES" | grep -cv '^$' || true)

apps/api/app/api/routes/ai_avatar_render.py

@@ -49,7 +49,7 @@ def create_render_job(
     """
     try:
         job = svc.create_render_job(
-            user_id=current_user.id,
+            user_id=current_user.user.id,
             lipsync_job_id=body.lipsync_job_id,
             script_id=body.script_id,
             b_roll_segments=[s.model_dump() for s in body.b_roll_segments],
@@ -94,7 +94,7 @@ def list_render_jobs(
 ):
     """获取 AI 数字人渲染任务列表."""
     items, total = svc.list_render_jobs(
-        user_id=current_user.id,
+        user_id=current_user.user.id,
         project_id=project_id,
         status=status,
         offset=offset,
@@ -118,7 +118,7 @@ def get_render_job(
     svc: AiAvatarRenderService = Depends(_get_service),
 ):
     """获取渲染任务详情."""
-    job = svc.get_render_job(job_id, current_user.id)
+    job = svc.get_render_job(job_id, current_user.user.id)
     if job is None:
         raise HTTPException(status_code=404, detail="渲染任务不存在")
     return job
@@ -134,7 +134,7 @@ def cancel_render_job(
     svc: AiAvatarRenderService = Depends(_get_service),
 ):
     """取消渲染任务（仅 pending 状态可取消）."""
-    job = svc.cancel_render_job(job_id, current_user.id)
+    job = svc.cancel_render_job(job_id, current_user.user.id)
     if job is None:
         raise HTTPException(status_code=404, detail="渲染任务不存在")
     if job.status != "cancelled":
@@ -155,7 +155,7 @@ def retry_render_job(
     svc: AiAvatarRenderService = Depends(_get_service),
 ):
     """重试失败的渲染任务."""
-    job = svc.retry_render_job(job_id, current_user.id)
+    job = svc.retry_render_job(job_id, current_user.user.id)
     if job is None:
         raise HTTPException(status_code=404, detail="渲染任务不存在")
     if job.status != "pending":

apps/api/app/api/routes/lipsync.py

@@ -17,7 +17,7 @@ from app.dependencies import get_cosyvoice_service, get_db_session, get_voice_cl
 from app.schemas.lipsync import CreateLipsyncJobRequest, LipsyncJobResponse
 from app.services.lipsync_service import LipsyncService
 from app.services.mediakit_client import MediaKitError
-from fastapi import APIRouter, Depends, HTTPException, Query
+from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Query
 from sqlalchemy.orm import Session
 
 from packages.application.cosyvoice_service import CosyVoiceError, CosyVoiceService
@@ -76,11 +76,11 @@ def create_lipsync_job(
     后端内部调 TTS 合成音频，再提交 MediaKit。
     """
     # 解析 voice_id（支持克隆音色 profile UUID）
-    actual_voice_id = _resolve_voice_id(body.voice_id, current_user.id, voice_clone_repo)
+    actual_voice_id = _resolve_voice_id(body.voice_id, current_user.user.id, voice_clone_repo)
 
     try:
         job = svc.create_job(
-            user_id=current_user.id,
+            user_id=current_user.user.id,
             video_url=body.video_url,
             voice_id=actual_voice_id,
             script_text=body.script_text,
@@ -130,7 +130,7 @@ def list_lipsync_jobs(
 ):
     """获取对口型任务列表."""
     items, total = svc.list_jobs(
-        user_id=current_user.id,
+        user_id=current_user.user.id,
         project_id=project_id,
         status=status,
         offset=offset,
@@ -150,13 +150,21 @@ def list_lipsync_jobs(
 @router.get("/jobs/{job_id}", response_model=LipsyncJobResponse)
 def get_lipsync_job(
     job_id: str,
+    background: BackgroundTasks,
     current_user: AuthenticatedUser = Depends(get_current_user),
     svc: LipsyncService = Depends(_get_service),
 ):
-    """获取对口型任务详情."""
-    job = svc.get_job(job_id, current_user.id)
+    """获取对口型任务详情.
+
+    非终态任务：先返回 DB 缓存，挂后台刷新（下次轮询拿到新状态）。
+    """
+    job = svc.get_job(job_id, current_user.user.id)
     if job is None:
         raise HTTPException(status_code=404, detail="任务不存在")
+
+    if job.status not in ("completed", "failed"):
+        background.add_task(svc.refresh_job_status, job_id, current_user.user.id)
+
     return job
 
 
@@ -170,7 +178,7 @@ def refresh_lipsync_job(
     svc: LipsyncService = Depends(_get_service),
 ):
     """从 MediaKit 拉取最新状态并更新."""
-    job = svc.refresh_job_status(job_id, current_user.id)
+    job = svc.refresh_job_status(job_id, current_user.user.id)
     if job is None:
         raise HTTPException(status_code=404, detail="任务不存在")
     return job
@@ -186,7 +194,7 @@ def cancel_lipsync_job(
     svc: LipsyncService = Depends(_get_service),
 ):
     """取消对口型任务（仅 pending/submitted 状态可取消）."""
-    job = svc.cancel_job(job_id, current_user.id)
+    job = svc.cancel_job(job_id, current_user.user.id)
     if job is None:
         raise HTTPException(status_code=404, detail="任务不存在")
     if job.status != "cancelled":

apps/web/src/pages/ai-avatar/AiAvatar.css

@@ -1150,3 +1150,29 @@
   flex-direction: column;
   gap: 4px;
 }
+
+/* ─ 对口型生成弹窗 Spinner ── */
+.aa-lipsync-spinner {
+  width: 48px;
+  height: 48px;
+  border: 4px solid #f0f0f5;
+  border-top-color: #6366f1;
+  border-radius: 50%;
+  animation: aa-spin 0.8s linear infinite;
+}
+
+@keyframes aa-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.aa-btn--danger {
+  background: #ff4d4f;
+  color: #fff;
+  border: none;
+}
+
+.aa-btn--danger:hover {
+  background: #ff7875;
+}

apps/web/src/pages/ai-avatar/AiAvatarPage.tsx

@@ -34,6 +34,11 @@ const AiAvatarPage: React.FC = () => {
     cover: false,
   })
 
+  /* ── 对口型生成弹窗 ── */
+  const [showLipsyncModal, setShowLipsyncModal] = useState(false)
+  const [lipsyncStatus, setLipsyncStatus] = useState<"generating" | "completed" | "failed">("generating")
+  const [lipsyncErrorMessage, setLipsyncErrorMessage] = useState("")
+
   /* ── 对口型轮询 ── */
   const lipsyncTimerRef = useRef<ReturnType<typeof setInterval> | null>(null)
 
@@ -56,47 +61,85 @@ const AiAvatarPage: React.FC = () => {
       return
     }
     try {
+      // 显示生成弹窗
+      setShowLipsyncModal(true)
+      setLipsyncStatus("generating")
+      setLipsyncErrorMessage("")
+      
       // ① 先按素材 id 拿 file_url（#1809 补充：对齐后端新参数 video_url）
+      console.log("[对口型] 开始生成:", {
+        videoId: video.id,
+        voiceId: voice.voice_id,
+        voiceType: voice.type,
+        textLen: state.scriptText.length,
+      })
       const asset = await getAssetById(video.id)
+      console.log("[对口型] getAssetById 响应:", {
+        id: asset?.id,
+        file_url: asset?.file_url?.substring(0, 100),
+      })
       const videoUrl = asset?.file_url
       if (!videoUrl) {
+        console.error("[对口型] file_url 为空，asset:", asset)
+        setShowLipsyncModal(false)
         message.error("获取出镜视频播放地址失败，请重新选择素材")
         return
       }
       // ② voice_id（预设/克隆 UUID 均由后端内部调 TTS）+ script_text + video_url
-      const job = await createLipsyncJob({
+      const payload = {
         voice_id: voice.voice_id,
         script_text: state.scriptText,
         video_url: videoUrl,
-      })
+      }
+      console.log("[对口型] createLipsyncJob 请求:", payload)
+      const job = await createLipsyncJob(payload)
+      console.log("[对口型] createLipsyncJob 响应:", { id: job.id, status: job.status })
       state.setLipsyncJob(job)
-      message.success("对口型任务已提交，生成中…")
       // 开始轮询
       if (lipsyncTimerRef.current) clearInterval(lipsyncTimerRef.current)
       lipsyncTimerRef.current = setInterval(async () => {
         try {
           const updated = await getLipsyncJob(job.id)
           state.setLipsyncJob(updated)
-          if (updated.status === "completed" || updated.status === "failed") {
+          if (updated.status === "completed") {
             if (lipsyncTimerRef.current) clearInterval(lipsyncTimerRef.current)
-            if (updated.status === "completed") {
+            setLipsyncStatus("completed")
+            setTimeout(() => {
+              setShowLipsyncModal(false)
               message.success("对口型视频生成完成")
-            } else {
-              message.error(updated.error_message || "对口型生成失败")
-            }
+            }, 1000)
+          } else if (updated.status === "failed") {
+            if (lipsyncTimerRef.current) clearInterval(lipsyncTimerRef.current)
+            setLipsyncStatus("failed")
+            setLipsyncErrorMessage(updated.error_message || "对口型生成失败")
           }
         } catch {
           // 忽略轮询错误（轮询期间不打扰用户）
         }
       }, 3000)
     } catch (err) {
-      // ② 接口失败弹错误提示，不只 console
-      console.error("对口型任务创建失败:", err)
+      console.error("[对口型] 创建失败:", {
+        status: (err as { response?: { status?: number } })?.response?.status,
+        data: (err as { response?: { data?: unknown } })?.response?.data,
+        message: err instanceof Error ? err.message : String(err),
+      })
+      setShowLipsyncModal(false)
       message.error(err instanceof Error ? err.message : "对口型任务提交失败，请重试")
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [state.selectedVideo, state.selectedVoice, state.scriptText])
 
+  // 取消对口型生成
+  const handleCancelLipsync = useCallback(() => {
+    if (lipsyncTimerRef.current) {
+      clearInterval(lipsyncTimerRef.current)
+      lipsyncTimerRef.current = null
+    }
+    setShowLipsyncModal(false)
+    setLipsyncStatus("generating")
+    setLipsyncErrorMessage("")
+  }, [])
+
   // 清理轮询
   useEffect(() => {
     return () => {
@@ -276,6 +319,56 @@ const AiAvatarPage: React.FC = () => {
           onRemove={state.removeBRollSegment}
         />
       )}
+
+      {/* 对口型生成弹窗 */}
+      {showLipsyncModal && (
+        <div className="aa-modal-overlay">
+          <div className="aa-modal" onClick={(e) => e.stopPropagation()}>
+            <div className="aa-modal__header">
+              <span className="aa-modal__title">对口型生成</span>
+              <button className="aa-modal__close" onClick={handleCancelLipsync}>
+                ✕
+              </button>
+            </div>
+            <div className="aa-modal__body" style={{ display: "flex", flexDirection: "column", alignItems: "center", padding: "40px 20px" }}>
+              {lipsyncStatus === "generating" && (
+                <>
+                  <div className="aa-lipsync-spinner" />
+                  <div style={{ marginTop: 20, fontSize: 15, color: "#1a1a2e" }}>对口型视频生成中…</div>
+                  <div style={{ marginTop: 8, fontSize: 13, color: "#8c8ca1" }}>请勿关闭页面，完成后将自动提示</div>
+                </>
+              )}
+              {lipsyncStatus === "completed" && (
+                <>
+                  <div style={{ fontSize: 48 }}>✅</div>
+                  <div style={{ marginTop: 16, fontSize: 15, color: "#1a1a2e" }}>对口型视频生成完成</div>
+                </>
+              )}
+              {lipsyncStatus === "failed" && (
+                <>
+                  <div style={{ fontSize: 48 }}>❌</div>
+                  <div style={{ marginTop: 16, fontSize: 15, color: "#1a1a2e" }}>对口型生成失败</div>
+                  {lipsyncErrorMessage && (
+                    <div style={{ marginTop: 8, fontSize: 13, color: "#ff4d4f" }}>{lipsyncErrorMessage}</div>
+                  )}
+                </>
+              )}
+            </div>
+            <div className="aa-modal__footer">
+              {lipsyncStatus === "generating" && (
+                <button className="aa-btn aa-btn--danger" onClick={handleCancelLipsync}>
+                  取消生成
+                </button>
+              )}
+              {lipsyncStatus !== "generating" && (
+                <button className="aa-btn" onClick={handleCancelLipsync}>
+                  关闭
+                </button>
+              )}
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   )
 }

apps/web/src/pages/ai-avatar/components/PanelVoiceSelector.tsx

@@ -92,11 +92,14 @@ export function PanelVoiceSelector({
 
   /** 用指定 URL 真实播放（抽取公共） */
   const playAudioUrl = (voiceId: string, url: string) => {
+    // 临时兼容：后端 /tts/preview 返回 HTTP URL，staging 是 HTTPS，Mixed Content 会阻止加载
+    // OSS 同时支持 HTTP/HTTPS，直接替换协议即可
+    const safeUrl = url.startsWith("http://") ? url.replace("http://", "https://") : url
     if (audioRef.current) {
       audioRef.current.pause()
       audioRef.current = null
     }
-    const audio = new Audio(url)
+    const audio = new Audio(safeUrl)
     audioRef.current = audio
     setPreviewingId(voiceId)
     audio.onended = () => {
@@ -247,7 +250,7 @@ export function PanelVoiceSelector({
                   type="button"
                   className="aa-voice-card__preview"
                   title={previewingId === voice.id ? "停止试听" : "试听"}
-                  disabled={!previewUrl}
+                  disabled={voice.type === "preset" && !previewUrl}
                   onClick={(e) => {
                     e.stopPropagation()
                     handlePreview(voice)

apps/web/src/pages/generate/GeneratePage.tsx

@@ -548,10 +548,21 @@ const GeneratePage: React.FC = () => {
             <div
               style={{
                 display: "flex",
-                justifyContent: "center",
+                flexDirection: "column",
+                alignItems: "center",
                 marginTop: 16,
               }}
             >
+              <h2
+                style={{
+                  textAlign: "center",
+                  marginBottom: 12,
+                  fontSize: "1.5rem",
+                  fontWeight: 600,
+                }}
+              >
+                🎬 确认生成
+              </h2>
               <div
                 style={{
                   display: "flex",

packages/application/cosyvoice_service.py

@@ -490,6 +490,10 @@ class CosyVoiceService:
         if not audio_url:
             raise CosyVoiceError(f"CosyVoice API 未返回 audio_url: {response}")
 
+        # DashScope 返回 http://，统一升级为 https://
+        if audio_url.startswith("http://"):
+            audio_url = audio_url.replace("http://", "https://", 1)
+
         return {
             "task_id": "",  # 同步接口无 task_id，兼容旧接口
             "audio_url": audio_url,