xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 20 Pull Requests 1 Actions Packages Projects Releases 7 Wiki Activity
1,628 Commits 836 Branches 127 Tags
5823917841eb761d5185ee467da1d1a8c62ef6d9
Commit Graph

1628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CI Bot 596ea163d7 fix: remove WorkspaceMember entity import from stub 2026-06-27 09:48:56 +08:00
CI Bot 034b147f92 fix: replace workspace_member_repository with stub (no model dependency) 2026-06-27 09:46:42 +08:00
CI Bot 4a8cbd5021 fix: correct dataclass field ordering and create() param order in generated_video and generation_task 
- Move workspace_id after required fields in both dataclass and create()
- Fix indentation in create() method body
- Add missing timezone import in generation_task.py
 2026-06-27 09:44:24 +08:00
CI Bot 11494918eb fix: resolve all workspace removal breakage - stub permissions, quota, ports, adapters 
- Remove Workspace from domain/__init__.py exports
- Stub domain/permissions.py (all checks pass)
- Stub domain/quota.py (all checks pass)
- Create missing port stubs: workspace_member_repository, workspace_repository, workspace_invitation_repository
- Create missing adapter stubs: workspace_repository, workspace_invitation_repository
- Create routes/permissions.py stub (require_workspace_member no-op)
- Fix .env Redis URL encoding on production server
 2026-06-27 09:16:53 +08:00
CI Bot 38c66a9c68 fix: add workspace_id compatibility for removed workspace concept 2026-06-27 08:43:02 +08:00
xiaoxia 2d6682a3de Merge pull request 'refactor(web): remove workspace-related frontend code' (#41) from refactor/remove-workspace-code into develop 
Merge PR #41: remove workspace frontend code into develop
 2026-06-27 07:35:56 +08:00
CI Bot c70add5d8d refactor(web): remove workspace-related frontend code after backend removal 2026-06-27 07:34:29 +08:00
xiaoxia 6279012158 Merge pull request 'refactor: sync workspace removal to main' (#40) from develop into main
Auto Merge PRs / auto-merge (push) Failing after 0s
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Has been cancelled
Details
CI/CD Pipeline / Frontend Lint (push) Has been cancelled
Details
2026-06-27 00:51:51 +08:00
xiaoxia 0518c1ca2a Merge pull request 'docs: add release process and update git workflow' (#39) from chore/unify-ci-runners into develop 2026-06-27 00:51:02 +08:00
CI Bot 9f6ed89c09 fix: update default APP_VERSION to 0.1.61 2026-06-27 00:42:24 +08:00
CI Bot 89bada5608 feat: add auto-merge scripts and CI failure notification 
- Auto merge script for PRs targeting develop/main
- CI failure check script
- Gitea Actions workflow for scheduled auto-merge
- Cron jobs for periodic execution
 2026-06-27 00:42:05 +08:00
CI Bot 2a6b5045aa chore: unify CI/CD runner labels to runtime-builder:host 2026-06-27 00:41:39 +08:00
CI Bot 60adbf95ce chore: remove redundant .github/workflows (using Gitea Actions) 2026-06-27 00:41:09 +08:00
xiaoxia f729544e7c Merge pull request 'Merge develop to main - Release PR' (#37) from develop into main 2026-06-27 00:24:48 +08:00
CI Bot 0c97f40825 Merge branch 'pr-35' into develop 2026-06-27 00:23:55 +08:00
Deploy Agent 78e1af1054 feat: 标准化部署流程和文档化 
- 添加 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 创建
 2026-06-27 00:09:46 +08:00
xiaoxia e915c0d6df fix: 创建 API 和 Worker Dockerfiles 
- 创建 infra/docker/api.Dockerfile 用于 FastAPI 应用
- 创建 infra/docker/worker.Dockerfile 用于 Celery Worker
- 使用 python:3.12-slim-bookworm 作为基础镜像
- Worker 包含 ffmpeg 和 opencv 依赖（用于视频处理）
- API 包含 PostgreSQL 开发库（用于 psycopg2 编译）
- 分离镜像减少不必要的依赖
 2026-06-27 00:04:15 +08:00
xiaoxia 0fb4d95bd0 fix: Web Dockerfile API URL 改为通用默认值 
- 将硬编码的 VITE_API_URL=http://47.98.113.167:8000 改为 https://saas-api.xiaoxiajianji.com
- 支持通过 --build-arg VITE_API_URL=xxx 在构建时覆盖默认值
 2026-06-27 00:02:34 +08:00
xiaoxia 0e1f411356 fix: 修复 DATABASE_POOL_RECYLE 拼写错误 -> DATABASE_POOL_RECYCLE 
- 将配置变量名从 DATABASE_POOL_RECYLE 更改为 DATABASE_POOL_RECYCLE
- 修正了拼写错误，使配置与标准 SQLAlchemy 命名一致
 2026-06-27 00:01:44 +08:00
xiaoxia e6b0a2d6d4 Merge pull request 'fix: 统一编辑模式枚举名并删除重复workflow' (#32) from develop into main 2026-06-26 23:12:45 +08:00
CI Bot db8c6d55ce fix: 统一编辑模式枚举名并删除重复workflow 
1. 修复 edit_plan_generator.py 中的枚举名与 editing_modes.py 保持一致:
   - ONE_TAKE: one-take -> one_take
   - VOICEOVER -> VOICE_OVER: voiceover -> voice_over

2. 更新相关文档字符串和注释

3. 删除重复的 .gitea/workflows/tests.yml (ci-cd.yml 已包含完整测试)
 2026-06-26 23:12:06 +08:00
xiaoxia f140a5c87d Merge pull request 'fix(web): disable noUnusedLocals/noUnusedParameters' (#7) from develop into main 2026-06-26 23:04:31 +08:00
CI Bot e795426302 add-opencv-dep 2026-06-26 23:00:29 +08:00
CI Bot 7c44da9379 chore: update requirements.txt 2026-06-26 22:46:59 +08:00
CI Bot a97e3e72e9 fix: 修复 dedup.py 语法错误和 pHash DCT 实现，修复 chunked_upload.py 缩进错误 2026-06-26 22:46:21 +08:00
CI Bot 597ddd4318 fix: escape quotes in JSX description prop 2026-06-26 22:19:43 +08:00
CI Bot 8c88fed8db feat: V21 Admin 页面样式对齐 (#31) 2026-06-26 22:15:42 +08:00
CI Bot d8afc46d29 feat: V21 Workspace+组件样式对齐 (#30) 
Resolved merge conflict in business.css by keeping both sides
 2026-06-26 22:15:36 +08:00
CI Bot c6d53060fa feat: V21 Auth 页面样式对齐 (#29) 2026-06-26 22:14:39 +08:00
xiaoxia 416d7646f4 feat: V21 订阅+设置页面样式对齐 (#28) 
对齐 Subscription、UpgradeSubscription、Profile、Settings 页面到 V21 设计系统
 2026-06-26 22:13:56 +08:00
CI Bot a980691a10 fix: 修复剩余两个 TS 编译错误 
1. ProjectAssets.tsx: 处理 file_size 可能为 undefined 的情况
2. ProjectGeneration.tsx: 替换不存在的 AutoGenerateOutlined 为 ThunderboltOutlined
 2026-06-26 22:09:02 +08:00
CI Bot 5e50e9ae07 fix: 修复两个 TypeScript 编译错误 
1. ProjectAssets.tsx: 将 asset.size 改为 asset.file_size（与 AssetItem 接口一致）
2. ProjectGeneration.tsx: 将 ant-design/icons 改为 @ant-design/icons（正确的包名）

Fixes CI build errors
 2026-06-26 22:06:34 +08:00
CI Bot 60c00c668c ci: trigger rebuild after fixing runner label matching 2026-06-26 22:02:04 +08:00
CI Bot 1d139ba03f fix(ci): remove :host modifier from runs-on to fix runner matching 2026-06-26 22:01:25 +08:00
CI Bot 85fdd7731d chore: trigger CI rebuild 2026-06-26 21:53:28 +08:00
CI Test 294dea39f3 feat: V21 design system alignment for admin pages 
- Create unified Admin.css with V21 design tokens
- Update Dashboard with stat cards and V21 color scheme
- Update Analytics with V21 chart colors and metrics
- Update UserManagement with V21 table and search styles
- Update LogViewer with V21 filter bar and log level tags
- Update SystemMonitor with V21 progress and resource cards
- Update AdminComingSoon with V21 result styling
- Replace all inline styles with V21 CSS classes
- Apply Indigo/Green/Amber/Purple V21 color palette
 2026-06-26 21:40:50 +08:00
CI Test 206957eb10 feat: V21 design system alignment for workspace pages and business components 
- Add V21 styles to WorkspaceDetail page (page-head, cards, buttons)
- Create ProjectTasks.css and update ProjectTasks.tsx with V21 UI
- Create business.css with shared V21 styles (buttons, cards, tables, tags)
- Update InviteMemberModal with V21 modal styles
- Update MemberList with V21 table and tag styles
- Update PermissionMatrix with V21 card and table styles
- Update QuotaDisplay with V21 card and progress styles
- Update App.tsx and App.css with V21 design system
 2026-06-26 21:37:28 +08:00
CI Test 0d232b1588 feat(auth): 将 Register/ForgotPassword/ResetPassword 页面样式对齐 V21 设计系统 
- 使用统一的 xx-auth-page/xx-auth-card 布局结构
- 统一的渐变背景: rgba(79, 70, 229, 0.08) -> rgba(16, 185, 129, 0.06)
- 白色卡片 28px 圆角 + 大阴影效果
- Input 12px 圆角，focus 时 Indigo 边框
- 使用 btn primary class 样式按钮
- 添加 xx-auth-header/footer 统一头部和底部样式
- Result 页面使用 xx-result-page/xx-result-card 布局
 2026-06-26 21:34:15 +08:00
Coze Agent e740ac6429 feat: V21 UI full alignment (#27) 2026-06-26 21:27:19 +08:00
Coze Agent 06557f1709 feat: merge frontend generation UI (#26) 2026-06-26 21:27:02 +08:00
CI Test bd9e9fba45 chore: squash merge feature/voice-dedup into develop (resolve conflicts) 
- Add voice extraction and deduplication functionality
- Add dedup.py for video deduplication
- Add voice_extraction.py task for worker
- Resolve CI/CD and deploy workflow conflicts with develop version
- Keep new voice dedup features from feature branch
 2026-06-26 21:23:39 +08:00
CI Test cd887909c7 chore: squash merge feature/smart-edit-plan into develop (resolve conflicts) 
- Resolve CI/CD and deploy workflow conflicts with develop version
- Resolve database and dependencies conflicts with develop version
- Keep new edit plan generator and API functionality from feature branch
 2026-06-26 21:21:39 +08:00
CI Test ac5324d860 feat: 全面对齐 V21 设计系统 - Indigo主色/大圆角/毛玻璃/渐变背景 2026-06-26 21:16:21 +08:00
xiaoxia f687b4207f feat: add download_url field to generated video APIs (#20) 2026-06-26 21:13:18 +08:00
xiaoxia bfbc5855e8 feat: 实现真实素材AI分类和视频质量评估 (#19) 2026-06-26 21:11:06 +08:00
Coze Agent a37100af95 feat: 生成页面剪辑模式选择 + 智能编排时间轴 
- 新增剪辑模式选择器（one-take/pip/voiceover/voice_pip）
- 新增智能编排 API（auto-generate, getEditPlans, deleteEditPlan 等）
- 新增时间轴组件展示编排预览
- 新增 AutoArrangePanel 智能编排面板
- GenerationTaskItem 和 GeneratedVideoItem 新增 editing_mode 字段
- 生成弹窗新增剪辑模式选择 UI
 2026-06-26 21:10:04 +08:00
xiaoxia 299f42a6aa feat: 实现四种视频剪辑模式 (#23) 2026-06-26 20:58:26 +08:00
xiaoxia 84f3465778 feat: add chunked upload API for large file uploads (#21) 
feat: add chunked upload API for large file uploads (#21)
 2026-06-26 20:57:56 +08:00
CI Test 99dfdba7be fix: 修复PIP overlay顺序、音频索引、帧率统一等关键bug 2026-06-26 20:56:11 +08:00
AI Agent abce6c2a92 feat: 实现四种视频剪辑模式 
- 添加一镜到底(one_take)、画中画(pip)、口播(voice_over)、口播+画中画(voice_pip)四种剪辑模式
- 在GenerationTaskModel中添加editing_mode字段
- 在generation.py中实现从素材库下载视频的逻辑
- 使用FFmpeg进行视频处理，支持720p输出

支持的剪辑模式:
- one_take: 顺序拼接视频，可选淡入淡出转场
- pip: 主视频全屏+画中画叠加其他视频
- voice_over: 背景模糊画面+配音
- voice_pip: 口播视频画中画+背景画面
 2026-06-26 20:16:22 +08:00