From 599dcd62d929dc667c2b88bd592a22adffca3895 Mon Sep 17 00:00:00 2001
From: xiaoxia <dev@xiaoxiajianji.com>
Date: Fri, 24 Jul 2026 20:26:19 +0800
Subject: [PATCH] =?UTF-8?q?chore(ci):=20=E7=AB=AF=E5=8F=A3=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F=E5=91=BD=E5=90=8D=E7=BB=9F=E4=B8=80=20(#799)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

统一 .gitea/workflows/ 和 scripts/ci/ 下的端口变量命名规范：

1. CI_PG_PORT → CI_LOCAL_PG_PORT
   - 与 ci_env.sh 中的命名对齐，明确区分本地PG vs 共享PG
   - 修改：ci-pipeline.yml 顶层env及2处DATABASE_URL引用

2. WEBHOOK_PORT → CHATOPS_WEBHOOK_PORT
   - chatops内部变量名与外部环境变量名统一
   - 减少命名混淆，全局搜索时能定位所有引用
   - 修改：chatops/config.py + webhook_server.py

命名规范：{服务/场景}_{资源}_PORT
只改CI配置和脚本，不动业务代码。
---
 .gitea/workflows/ci-pipeline.yml     | 6 +++---
 scripts/ci/chatops/config.py         | 2 +-
 scripts/ci/chatops/webhook_server.py | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitea/workflows/ci-pipeline.yml b/.gitea/workflows/ci-pipeline.yml
index b0b3d7eb3..a801eaf24 100755
--- a/.gitea/workflows/ci-pipeline.yml
+++ b/.gitea/workflows/ci-pipeline.yml
@@ -26,7 +26,7 @@ concurrency:
   cancel-in-progress: ${{ gitea.event_name == 'pull_request' }}
 env:
   CI_PG_HOST: host.docker.internal
-  CI_PG_PORT: "5432"
+  CI_LOCAL_PG_PORT: "5432"
   CI_PG_USER: postgres
   CI_PG_PASSWORD: postgres
   CI_PG_DB: xiaoxia_saas
@@ -262,7 +262,7 @@ jobs:
     permissions:
       contents: read
     env:
-      DATABASE_URL: postgresql+psycopg://${{ env.CI_PG_USER }}:${{ env.CI_PG_PASSWORD }}@${{ env.CI_PG_HOST }}:${{ env.CI_PG_PORT }}/${{ env.CI_PG_DB }}
+      DATABASE_URL: postgresql+psycopg://${{ env.CI_PG_USER }}:${{ env.CI_PG_PASSWORD }}@${{ env.CI_PG_HOST }}:${{ env.CI_LOCAL_PG_PORT }}/${{ env.CI_PG_DB }}
       USE_IN_MEMORY_DB: 'false'
       CI_USE_SHARED_PG: 'true'
     steps:
@@ -411,7 +411,7 @@ jobs:
       - validate-type-check
       - validate-migration
     env:
-      DATABASE_URL: postgresql+psycopg://${{ env.CI_PG_USER }}:${{ env.CI_PG_PASSWORD }}@${{ env.CI_PG_HOST }}:${{ env.CI_PG_PORT }}/${{ env.CI_PG_DB }}
+      DATABASE_URL: postgresql+psycopg://${{ env.CI_PG_USER }}:${{ env.CI_PG_PASSWORD }}@${{ env.CI_PG_HOST }}:${{ env.CI_LOCAL_PG_PORT }}/${{ env.CI_PG_DB }}
       USE_IN_MEMORY_DB: 'false'
       CI_USE_SHARED_PG: 'true'
       OSS_ACCESS_KEY_ID: placeholder
diff --git a/scripts/ci/chatops/config.py b/scripts/ci/chatops/config.py
index 008bb7f6d..97b7a72ee 100755
--- a/scripts/ci/chatops/config.py
+++ b/scripts/ci/chatops/config.py
@@ -34,7 +34,7 @@ FEISHU_APP_SECRET = os.environ.get("FEISHU_APP_SECRET", "")
 NOTIFY_BRANCHES = [b.strip() for b in os.environ.get("CHATOPS_NOTIFY_BRANCHES", "main,develop").split(",") if b.strip()]
 
 # ── Webhook 服务配置 ──────────────────────────────────
-WEBHOOK_PORT = int(os.environ.get("CHATOPS_WEBHOOK_PORT", "8090"))
+CHATOPS_WEBHOOK_PORT = int(os.environ.get("CHATOPS_WEBHOOK_PORT", "8090"))
 WEBHOOK_SECRET = os.environ.get("CHATOPS_WEBHOOK_SECRET", "")
 
 # ── 常量 ──────────────────────────────────────────────
diff --git a/scripts/ci/chatops/webhook_server.py b/scripts/ci/chatops/webhook_server.py
index 0cbcc5d14..8efcc570c 100755
--- a/scripts/ci/chatops/webhook_server.py
+++ b/scripts/ci/chatops/webhook_server.py
@@ -417,7 +417,7 @@ def main():
     import argparse
 
     parser = argparse.ArgumentParser(description="CI ChatOps Webhook 服务")
-    parser.add_argument("--port", type=int, default=config.WEBHOOK_PORT, help="监听端口")
+    parser.add_argument("--port", type=int, default=config.CHATOPS_WEBHOOK_PORT, help="监听端口")
     parser.add_argument("--host", default="0.0.0.0", help="监听地址")
     args = parser.parse_args()