From 28ad13d2d0e843f3589bdc83588c4c9435c27f65 Mon Sep 17 00:00:00 2001
From: xiaoxia <dev@xiaoxiajianji.com>
Date: Sun, 27 Sep 2026 21:31:33 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(deploy):=20=E5=9B=BA=E5=8C=96=20GPU=5FE?=
 =?UTF-8?q?NCODE=5F*=20=E5=88=B0=20.env.staging=20=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=20CI=20=E6=B8=B2=E6=9F=93=E6=97=B6?=
 =?UTF-8?q?=E8=A2=AB=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/configs/.env.staging | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/deploy/configs/.env.staging b/deploy/configs/.env.staging
index 63ee299da..54aa8e2f5 100644
--- a/deploy/configs/.env.staging
+++ b/deploy/configs/.env.staging
@@ -280,3 +280,18 @@ USE_GPU_LIPSYNC=true
 GPU_LIPSYNC_POLL_INTERVAL=5
 GPU_LIPSYNC_WAIT_TIMEOUT=1200
 GPU_WORKER_STALE_SECONDS=300
+
+# ==================== P4000 NVENC 硬件编码（GPU mezzanine relay）====================
+# 注意：这些值必须写死在模板里（不是 CI Secret），否则每次 CI 重新渲染 .env 都会被丢弃，
+# 导致 staging 发版后 GPU 编码静默降级到 CPU（P0 防复发）。
+ENABLE_GPU_ENCODE=true
+GPU_ENCODE_ENDPOINT=http://100.105.75.67:8900
+GPU_ENCODE_RELAY_BASE_URL=http://100.125.116.43:8092
+GPU_ENCODE_RELAY_INTERNAL_BASE_URL=http://xiaoxia-api-staging:8000
+GPU_ENCODE_RELAY_SECRET=0e1a8f0626438564a8b3fa92f3f2aac29e3c69bc02f2f85c
+GPU_ENCODE_VCODEC=h264_nvenc
+GPU_ENCODE_PRESET=p4
+GPU_ENCODE_CRF=23
+GPU_ENCODE_FALLBACK_CPU=true
+GPU_ENCODE_MEZZANINE_TRANSPORT=relay
+GPU_ENCODE_OSS_TMP_PREFIX=tmp/gpu-mezzanine/
-- 
2.54.0


From 135e63049225fcb74c39950193720421032e9f20 Mon Sep 17 00:00:00 2001
From: xiaoxia <dev@xiaoxiajianji.com>
Date: Sun, 27 Sep 2026 21:31:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(worker/oss):=20=E5=A2=9E=E5=8A=A0=20de?=
 =?UTF-8?q?lete=5Ffrom=5Foss=20=E6=B8=85=E7=90=86=E5=87=BD=E6=95=B0?=
 =?UTF-8?q?=EF=BC=8C=E4=BE=9B=20thumbnail=5Fgenerator=20=E7=AD=89=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=E6=96=87=E4=BB=B6=E6=B8=85=E7=90=86=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/worker/video_processing/oss_helpers.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/apps/worker/video_processing/oss_helpers.py b/apps/worker/video_processing/oss_helpers.py
index b042e5aa7..72284b0f9 100755
--- a/apps/worker/video_processing/oss_helpers.py
+++ b/apps/worker/video_processing/oss_helpers.py
@@ -337,3 +337,24 @@ def resolve_asset_ids_to_paths(
         if local_path:
             result[aid] = local_path
     return result
+
+
+def delete_from_oss(storage_key_or_url: str) -> bool:
+    """从 OSS 删除对象（best-effort 清理临时文件，失败不抛异常）。
+
+    Args:
+        storage_key_or_url: 存储键或完整 URL
+
+    Returns:
+        True 删除成功，False 删除失败或未配置。
+    """
+    bucket = oss_bucket()
+    if bucket is None:
+        return False
+    try:
+        key = normalize_storage_key(storage_key_or_url)
+        bucket.delete_object(key)
+        return True
+    except Exception:
+        logger.exception("删除OSS对象失败: %s", storage_key_or_url[:80])
+        return False
-- 
2.54.0


From 7705c3c0fbbe62fd485bf4f0bec605f0abbce79c Mon Sep 17 00:00:00 2001
From: xiaoxia <dev@xiaoxiajianji.com>
Date: Sun, 27 Sep 2026 21:32:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(worker/thumbnail):=20MediaKit=20?=
 =?UTF-8?q?=E6=8A=BD=E5=B8=A7=E6=94=B9=E7=94=A8=E9=A2=84=E7=AD=BE=E5=90=8D?=
 =?UTF-8?q?=20URL=EF=BC=8C=E9=81=BF=E5=85=8D=E7=A7=81=E6=9C=89=20bucket=20?=
 =?UTF-8?q?=E5=85=AC=E7=BD=91=20URL=20=E8=BF=94=E5=9B=9E=20403=20=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=8A=BD=E5=B8=A7=E9=99=8D=E7=BA=A7=20ffmpeg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/worker/video_processing/thumbnail_generator.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/worker/video_processing/thumbnail_generator.py b/apps/worker/video_processing/thumbnail_generator.py
index a0d4b9dcc..f57a6b684 100755
--- a/apps/worker/video_processing/thumbnail_generator.py
+++ b/apps/worker/video_processing/thumbnail_generator.py
@@ -221,7 +221,7 @@ def _extract_frames_via_mediakit(
     """
     import uuid
 
-    from video_processing.oss_helpers import upload_to_oss
+    from video_processing.oss_helpers import get_signed_download_url, upload_to_oss
 
     from packages.shared.mediakit_client import get_mediakit_client
 
@@ -230,14 +230,17 @@ def _extract_frames_via_mediakit(
         logger.info("[thumbnail] MediaKit 未配置，跳过智能抽帧")
         return None
 
-    # 1. 上传视频到 OSS 获取 URL
+    video_storage_key: str = ""
+    # 1. 上传视频到 OSS，并生成预签名下载 URL（bucket 私有读，公网 URL 会 403）
     try:
         video_storage_key = f"temp/{plan_id}/{uuid.uuid4().hex[:8]}_{Path(video_path).name}"
-        video_url = upload_to_oss(video_path, video_storage_key)
-        if not video_url:
+        public_url = upload_to_oss(video_path, video_storage_key)
+        if not public_url:
             logger.warning("[thumbnail] 视频上传 OSS 失败，无法使用 MediaKit")
             return None
-        logger.info("[thumbnail] 视频已上传 OSS: %s", video_url[:80])
+        # MediaKit 从公网拉取视频，必须使用预签名 URL；签名 1h 足够完成抽帧
+        video_url = get_signed_download_url(video_storage_key, expires_seconds=3600) or public_url
+        logger.info("[thumbnail] 视频已上传 OSS 并生成签名 URL: key=%s", video_storage_key[:80])
     except Exception as e:
         logger.warning("[thumbnail] 视频上传 OSS 异常: %s，降级到 ffmpeg", e)
         return None
-- 
2.54.0