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

Merge develop to main - Release PR #37

Merged
xiaoxia merged 5 commits from develop into main 2026-06-27 00:24:48 +08:00
Conversation 0 Commits 5 Files Changed 10
+1278 -129
xiaoxia commented 2026-06-27 00:24:15 +08:00
Owner
Copy Link
Copy Source

合并 develop 分支到 main，包含以下 PR:

  • PR #35: fix: 创建 API 和 Worker Dockerfiles
  • PR #36: feat: 标准化部署流程和文档化
  • PR #1: ci: add CI/CD pipeline configuration (内容已在 develop 中)
合并 develop 分支到 main，包含以下 PR: - PR #35: fix: 创建 API 和 Worker Dockerfiles - PR #36: feat: 标准化部署流程和文档化 - PR #1: ci: add CI/CD pipeline configuration (内容已在 develop 中)
xiaoxia added 5 commits 2026-06-27 00:24:15 +08:00
fix: 修复 DATABASE_POOL_RECYLE 拼写错误 -> DATABASE_POOL_RECYCLE
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been cancelled
Details
116ef1d7ce 
- 将配置变量名从 DATABASE_POOL_RECYLE 更改为 DATABASE_POOL_RECYCLE
- 修正了拼写错误，使配置与标准 SQLAlchemy 命名一致
fix: Web Dockerfile API URL 改为通用默认值
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been cancelled
Details
f626dff4e7 
- 将硬编码的 VITE_API_URL=http://47.98.113.167:8000 改为 https://saas-api.xiaoxiajianji.com
- 支持通过 --build-arg VITE_API_URL=xxx 在构建时覆盖默认值
fix: 创建 API 和 Worker Dockerfiles
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been cancelled
Details
a22fad9dd6 
- 创建 infra/docker/api.Dockerfile 用于 FastAPI 应用
- 创建 infra/docker/worker.Dockerfile 用于 Celery Worker
- 使用 python:3.12-slim-bookworm 作为基础镜像
- Worker 包含 ffmpeg 和 opencv 依赖（用于视频处理）
- API 包含 PostgreSQL 开发库（用于 psycopg2 编译）
- 分离镜像减少不必要的依赖
feat: 标准化部署流程和文档化
CI/CD Pipeline / Validate Code Quality And Tests (push) Has been cancelled
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been cancelled
Details
d6f28e8f37 
- 添加 docs/deployment.md 完整部署文档，包含：
  - 环境要求
  - 首次部署流程
  - 版本更新流程
  - 回滚流程
  - 常见问题排查
  - 环境变量说明

- 添加标准化部署脚本：
  - scripts/deploy_production.sh: 生产环境部署脚本
  - scripts/deploy_staging.sh: 预发布环境部署脚本
  - scripts/rollback.sh: 回滚脚本（支持交互式和命令行模式）

- 完善 infra/docker/compose.yml：
  - 添加详细注释说明
  - 添加资源限制建议（注释）
  - 记录 web volume 挂载的注意事项（避免 403 问题）

- 添加 .github/workflows/release.yml：
  - 完整的发布流程
  - 构建所有三个镜像（api、worker、web）
  - 自动部署到生产环境
  - E2E 测试和 GitHub Release 创建
Merge branch 'pr-35' into develop
Deploy / Deploy Staging (push) Failing after 1m47s
Details
Deploy / Build Production Runtime Images (push) Has been skipped
Details
Deploy / Deploy Production (push) Has been skipped
Details
Deploy / Production Browser E2E (push) Has been skipped
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Has been cancelled
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Has been cancelled
Details
e2e0194eda
xiaoxia merged commit c72675a594 into main 2026-06-27 00:24:48 +08:00
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
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#37
Delete Branch "develop"

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?