From b8d3f3aa161c63e092c6f941be9d9b71c6961a4e Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Wed, 2 Sep 2026 17:12:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=20PR=20#1630=20?= =?UTF-8?q?=E4=B8=89=E5=A4=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Production 模板 SMTP_HOST 改为空值（与实际一致） 2. ci-pipeline.yml MinIO Bucket Secret 名称修正为 STAGING_MINIO_BUCKET - render_env.sh 增加特殊映射：STAGING_MINIO_BUCKET → MINIO_BUCKET_NAME 3. 修正模板中与实际运行不一致的配置值： Staging: JWT_ACCESS_TOKEN_EXPIRE_MINUTES=1440, COSYVOICE_VOICE=longxiaoxia_v3, COSYVOICE_FORMAT=wav, CORS_ORIGINS_RAW 使用 staging-api Production: COSYVOICE_VOICE=longxiaoxia_v3, COSYVOICE_FORMAT=wav, CORS_ORIGINS_RAW 使用 api（非 www） --- .gitea/workflows/ci-pipeline.yml | 2 +- deploy/configs/.env.production | 8 ++++---- deploy/configs/.env.staging | 8 ++++---- scripts/render_env.sh | 10 +++++++++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/ci-pipeline.yml b/.gitea/workflows/ci-pipeline.yml index 162e0a3d3..e34885632 100755 --- a/.gitea/workflows/ci-pipeline.yml +++ b/.gitea/workflows/ci-pipeline.yml @@ -1180,7 +1180,7 @@ jobs: STAGING_MINIO_ENDPOINT: ${{ secrets.STAGING_MINIO_ENDPOINT }} STAGING_MINIO_ACCESS_KEY: ${{ secrets.STAGING_MINIO_ACCESS_KEY }} STAGING_MINIO_SECRET_KEY: ${{ secrets.STAGING_MINIO_SECRET_KEY }} - STAGING_MINIO_BUCKET_NAME: ${{ secrets.STAGING_MINIO_BUCKET_NAME }} + STAGING_MINIO_BUCKET: ${{ secrets.STAGING_MINIO_BUCKET }} OSS_ACCESS_KEY_ID: ${{ secrets.OSS_ACCESS_KEY_ID }} OSS_ACCESS_KEY_SECRET: ${{ secrets.OSS_ACCESS_KEY_SECRET }} COSYVOICE_API_KEY: ${{ secrets.COSYVOICE_API_KEY }} diff --git a/deploy/configs/.env.production b/deploy/configs/.env.production index d4d1bf1f7..55ab74ff3 100644 --- a/deploy/configs/.env.production +++ b/deploy/configs/.env.production @@ -108,7 +108,7 @@ JWT_REFRESH_TOKEN_EXPIRE_DAYS=30 ENABLE_EMAIL_DELIVERY=false # SMTP 服务器地址 -SMTP_HOST=smtp.gmail.com +SMTP_HOST= # SMTP 端口 SMTP_PORT=587 @@ -155,7 +155,7 @@ OSS_DIRECT_UPLOAD_EXPIRE_SECONDS=900 # ==================== CORS 配置 ==================== # 允许跨域的前端域名列表，逗号分隔 -CORS_ORIGINS_RAW=https://xiaoxiajianji.com,https://www.xiaoxiajianji.com +CORS_ORIGINS_RAW=https://xiaoxiajianji.com,https://api.xiaoxiajianji.com # ==================== 生成文件路径 ==================== @@ -189,13 +189,13 @@ COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1 COSYVOICE_MODEL=cosyvoice-v3-flash # 音色：v3 系列系统音色带 _v3 后缀 -COSYVOICE_VOICE=longxiaochun_v3 +COSYVOICE_VOICE=longxiaoxia_v3 # 采样率 COSYVOICE_SAMPLE_RATE=22050 # 输出格式 -COSYVOICE_FORMAT=mp3 +COSYVOICE_FORMAT=wav # 音色克隆模型名（固定值） COSYVOICE_CLONE_MODEL=voice-enrollment diff --git a/deploy/configs/.env.staging b/deploy/configs/.env.staging index 6c58cf85a..538417191 100644 --- a/deploy/configs/.env.staging +++ b/deploy/configs/.env.staging @@ -96,7 +96,7 @@ JWT_SECRET_KEY=${JWT_SECRET_KEY} JWT_ALGORITHM=HS256 # Access Token 过期时间（分钟） -JWT_ACCESS_TOKEN_EXPIRE_MINUTES=30 +JWT_ACCESS_TOKEN_EXPIRE_MINUTES=1440 # Refresh Token 过期时间（天） JWT_REFRESH_TOKEN_EXPIRE_DAYS=30 @@ -177,7 +177,7 @@ MINIO_USE_SSL=false # ==================== CORS 配置 ==================== # 允许跨域的前端域名列表，逗号分隔 -CORS_ORIGINS_RAW=https://staging.xiaoxiajianji.com,https://staging-web.xiaoxiajianji.com +CORS_ORIGINS_RAW=https://staging.xiaoxiajianji.com,https://staging-api.xiaoxiajianji.com # ==================== 生成文件路径 ==================== @@ -211,13 +211,13 @@ COSYVOICE_BASE_URL=https://dashscope.aliyuncs.com/api/v1 COSYVOICE_MODEL=cosyvoice-v3-flash # 音色：v3 系列系统音色带 _v3 后缀 -COSYVOICE_VOICE=longxiaochun_v3 +COSYVOICE_VOICE=longxiaoxia_v3 # 采样率 COSYVOICE_SAMPLE_RATE=22050 # 输出格式 -COSYVOICE_FORMAT=mp3 +COSYVOICE_FORMAT=wav # 音色克隆模型名（固定值） COSYVOICE_CLONE_MODEL=voice-enrollment diff --git a/scripts/render_env.sh b/scripts/render_env.sh index 84724325a..42930f6e1 100644 --- a/scripts/render_env.sh +++ b/scripts/render_env.sh @@ -36,7 +36,7 @@ MAPPED_VARS="DATABASE_URL REDIS_URL CELERY_BROKER_URL CELERY_RESULT_BACKEND JWT_ # Staging 独有的 MinIO 变量 if [ "$TARGET_ENV" = "staging" ]; then - MAPPED_VARS="$MAPPED_VARS MINIO_ENDPOINT MINIO_ACCESS_KEY MINIO_SECRET_KEY MINIO_BUCKET_NAME" + MAPPED_VARS="$MAPPED_VARS MINIO_ENDPOINT MINIO_ACCESS_KEY MINIO_SECRET_KEY" fi # 将带前缀的 secrets 导出为无前缀的环境变量 @@ -48,6 +48,14 @@ for var in $MAPPED_VARS; do fi done +# 特殊映射：CI secret 名称与模板占位符不一致的变量 +# STAGING_MINIO_BUCKET → MINIO_BUCKET_NAME +if [ "$TARGET_ENV" = "staging" ]; then + if [ -n "${STAGING_MINIO_BUCKET:-}" ]; then + export "MINIO_BUCKET_NAME=$STAGING_MINIO_BUCKET" + fi +fi + # 共用 secrets 直接导出（如果存在） SHARED_SECRETS="OSS_ACCESS_KEY_ID OSS_ACCESS_KEY_SECRET COSYVOICE_API_KEY DASHSCOPE_API_KEY MEDIAKIT_API_KEY" for var in $SHARED_SECRETS; do