xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions Packages Projects Releases 7 Wiki Activity

chore(ci): 端口变量命名统一 (#799) #845

Merged
xiaoxia merged 1 commits from chore/ci-port-variable-unification into develop 2026-07-24 21:29:35 +08:00
Conversation 2 Commits 1 Files Changed 3
+5 -5
xiaoxia commented 2026-07-24 20:26:31 +08:00
Owner
Copy Link
Copy Source

背景

#799 - 端口变量命名统一（P2）

问题

.gitea/workflows/ 和 scripts/ci/ 下的端口变量命名存在不一致：

  1. CI_PG_PORT（workflow）vs CI_LOCAL_PG_PORT（ci_env.sh）— 同一概念两套命名
  2. WEBHOOK_PORT（chatops内部）vs CHATOPS_WEBHOOK_PORT（外部env）— 内外命名不统一

变更

1. CI_PG_PORT → CI_LOCAL_PG_PORT

  • ci-pipeline.yml 顶层 env 及 2 处 DATABASE_URL 引用
  • 与 ci_env.sh 命名对齐，明确区分本地 PG vs 共享 PG

2. WEBHOOK_PORT → CHATOPS_WEBHOOK_PORT

  • scripts/ci/chatops/config.py 内部变量
  • scripts/ci/chatops/webhook_server.py 引用
  • 内外命名统一，全局搜索可定位所有引用

命名规范

{服务/场景}_{资源}_PORT 格式，如：

  • CI_LOCAL_PG_PORT / CI_SHARED_PG_PORT
  • CHATOPS_WEBHOOK_PORT
  • STAGING_SSH_PORT / PREVIEW_SSH_PORT / PRODUCTION_SSH_PORT

影响范围

  • ✅ 仅 CI 配置和脚本，不动业务代码
  • ✅ 变量值不变，仅重命名，功能无变化
  • ✅ 所有引用同步修改，无遗漏
## 背景 #799 - 端口变量命名统一（P2） ## 问题 `.gitea/workflows/` 和 `scripts/ci/` 下的端口变量命名存在不一致： 1. `CI_PG_PORT`（workflow）vs `CI_LOCAL_PG_PORT`（ci_env.sh）— 同一概念两套命名 2. `WEBHOOK_PORT`（chatops内部）vs `CHATOPS_WEBHOOK_PORT`（外部env）— 内外命名不统一 ## 变更 ### 1. CI_PG_PORT → CI_LOCAL_PG_PORT - `ci-pipeline.yml` 顶层 env 及 2 处 DATABASE_URL 引用 - 与 `ci_env.sh` 命名对齐，明确区分本地 PG vs 共享 PG ### 2. WEBHOOK_PORT → CHATOPS_WEBHOOK_PORT - `scripts/ci/chatops/config.py` 内部变量 - `scripts/ci/chatops/webhook_server.py` 引用 - 内外命名统一，全局搜索可定位所有引用 ### 命名规范 `{服务/场景}_{资源}_PORT` 格式，如： - `CI_LOCAL_PG_PORT` / `CI_SHARED_PG_PORT` - `CHATOPS_WEBHOOK_PORT` - `STAGING_SSH_PORT` / `PREVIEW_SSH_PORT` / `PRODUCTION_SSH_PORT` ## 影响范围 - ✅ 仅 CI 配置和脚本，不动业务代码 - ✅ 变量值不变，仅重命名，功能无变化 - ✅ 所有引用同步修改，无遗漏
xiaoxia self-assigned this 2026-07-24 20:26:31 +08:00
xiaoxia added 1 commit 2026-07-24 20:26:31 +08:00
chore(ci): 端口变量命名统一 (#799)
CI/CD Pipeline / Check if frontend-only change (pull_request) Successful in 15s
Details
CI/CD Pipeline / Validate - Type Check (mypy) (pull_request) Successful in 1m9s
Details
CI/CD Pipeline / Validate - Migration (alembic) (pull_request) Successful in 49s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 29s
Details
CI/CD Pipeline / PR Build Web Image (pull_request) Successful in 10s
Details
CI/CD Pipeline / PR Build Worker Image (pull_request) Successful in 16s
Details
CI/CD Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate - Code Quality (pull_request) Successful in 3m54s
Details
Preview Deploy / Deploy Preview Environment (pull_request) Failing after 25s
Details
CI/CD Pipeline / PR Build API Image (pull_request) Successful in 3m42s
Details
AI Code Review / AI Code Review (pull_request) Successful in 3m27s
Details
PR Automation / Auto Approve on CI Green (pull_request) Successful in 3m25s
Details
CI/CD Pipeline / Frontend Unit Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI/CD Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 3m27s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 7m12s
Details
CI/CD Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / ACR Image Cleanup (pull_request) Has been skipped
Details
CI/CD Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
Preview Cleanup / Cleanup Preview Environment (pull_request) Successful in 6s
Details
PR Automation / Auto Merge on CI Green + Approved (pull_request) Successful in 49m50s
Details
599dcd62d9 
统一 .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配置和脚本，不动业务代码。
auto-approve-bot commented 2026-07-24 20:52:27 +08:00
Collaborator
Copy Link
Copy Source

代码审查结果 - PR #845

⚠️ 问题（0个需要修改）

无

💡 建议（1个可选）

  1. 全局变量重命名完整性检查：本次修改将环境变量 CI_PG_PORT 重命名为 CI_LOCAL_PG_PORT，将配置常量 WEBHOOK_PORT 重命名为 CHATOPS_WEBHOOK_PORT。请务必全局检索确认 CI 流程的其他 Job 步骤以及其他可能引用 config.py 的 Python 脚本中不存在对旧变量名的引用，避免运行时出现 undefined 或 KeyError。

审查结论：代码变更为纯粹的变量重命名，逻辑一致，未发现安全隐患或性能问题。

✅ 格式检查通过 | ✅ 逻辑审查通过 | ✅ 性能良好

🤖 由 AI 代码审查机器人自动生成 | 2026-07-24 12:52:27 | 模型:

## 代码审查结果 - PR #845 ### ⚠️ 问题（0个需要修改） 无 ### 💡 建议（1个可选） 1. **全局变量重命名完整性检查**：本次修改将环境变量 `CI_PG_PORT` 重命名为 `CI_LOCAL_PG_PORT`，将配置常量 `WEBHOOK_PORT` 重命名为 `CHATOPS_WEBHOOK_PORT`。请务必全局检索确认 CI 流程的其他 Job 步骤以及其他可能引用 `config.py` 的 Python 脚本中不存在对旧变量名的引用，避免运行时出现 `undefined` 或 `KeyError`。 **审查结论**：代码变更为纯粹的变量重命名，逻辑一致，未发现安全隐患或性能问题。 --- ✅ 格式检查通过 | ✅ 逻辑审查通过 | ✅ 性能良好 --- <sub>🤖 由 AI 代码审查机器人自动生成 | 2026-07-24 12:52:27 | 模型: </sub> <!-- AI_CODE_REVIEW_AUTO_COMMENT -->
xiaoxia merged commit 6e70a7ad29 into develop 2026-07-24 21:29:35 +08:00
xiaoxia deleted branch chore/ci-port-variable-unification 2026-07-24 21:29:35 +08:00
gitea-actions bot commented 2026-07-24 21:31:55 +08:00
Copy Link
Copy Source

🗑️ 预览环境已清理

PR #845 已关闭或合并，对应的预览环境已被清理。

如有需要，可以重新打开 PR 来重新生成预览环境。

🗑️ **预览环境已清理** PR #845 已关闭或合并，对应的预览环境已被清理。 > 如有需要，可以重新打开 PR 来重新生成预览环境。
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot xiaoxia
No Assignees xiaoxia
3 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#845
Delete Branch "chore/ci-port-variable-unification"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?