From cd1f6f6b34760f65293b91c0cf7488b93fedd810 Mon Sep 17 00:00:00 2001
From: CI Bot <ci-bot@xiaoxiajianji.com>
Date: Fri, 17 Jul 2026 14:40:09 +0800
Subject: [PATCH] =?UTF-8?q?fix(worker):=20=E7=BB=9F=E4=B8=80OSS=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=AF=BB=E5=8F=96=E4=B8=BASharedSettings=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3oss=5Fhelpers=E8=AF=BB=E4=B8=8D=E5=88=B0.env?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/worker/video_processing/oss_helpers.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/worker/video_processing/oss_helpers.py b/apps/worker/video_processing/oss_helpers.py
index 3e486ed51..6ba88ac7a 100755
--- a/apps/worker/video_processing/oss_helpers.py
+++ b/apps/worker/video_processing/oss_helpers.py
@@ -15,6 +15,8 @@ from urllib.parse import urlparse
 
 import oss2
 
+from packages.shared.config import get_shared_settings
+
 logger = logging.getLogger(__name__)
 
 # OSS 上传配置
@@ -31,14 +33,18 @@ OSS_MULTIPART_NUM_THREADS = 3  # 分片上传并发数
 def oss_settings() -> tuple[str, str, str, str] | None:
     """获取 OSS 配置。
 
+    统一使用 SharedSettings 读取配置，与 SharedStorageService 保持一致，
+    支持从 .env 文件加载，避免两套配置路径不一致。
+
     Returns:
         (access_key_id, access_key_secret, endpoint, bucket_name) 元组，
         配置缺失时返回 None。
     """
-    access_key_id = os.getenv("OSS_ACCESS_KEY_ID")
-    access_key_secret = os.getenv("OSS_ACCESS_KEY_SECRET")
-    endpoint = os.getenv("OSS_ENDPOINT")
-    bucket_name = os.getenv("OSS_BUCKET_NAME")
+    settings = get_shared_settings()
+    access_key_id = settings.oss_access_key_id
+    access_key_secret = settings.oss_access_key_secret
+    endpoint = settings.oss_endpoint
+    bucket_name = settings.oss_bucket_name
     if not all([access_key_id, access_key_secret, endpoint, bucket_name]):
         return None
     return access_key_id, access_key_secret, endpoint, bucket_name