Commit Graph
18 Commits
Author SHA1 Message Date
Trae Assistant f42121d0bb feat: 部员多工作组归属 + 批量添加功能
Deploy to Server / deploy (push) Successful in 1m59s
- 数据库:新增 user_groups 多对多关联表,启动时自动迁移旧 group_id 数据
- 后端 users:所有查询聚合多工作组信息,增删改接口支持 group_ids 数组;新增 POST /users/batch 批量添加接口(事务+逐行错误反馈)
- 后端 export/hours/activities:全面兼容多工作组关联查询
- 前端 Users:新增/编辑改为工作组多选复选框;新增批量添加模态框(粘贴解析+实时校验表+提交汇总)
- 前端列表/详情:工作组以多标签形式展示,搜索支持工作组名称
2026-10-05 08:08:15 +08:00
Trae Assistant d62f2e2ba4 ci(deploy): 修复OCI read-only只读启动失败=compose之前/app整个挂载加了:ro,但Docker尝试创建容器子目录/app/server/data时在只读overlay层mkdir报错;改成z flag(SELinux兼容)去掉ro,让docker可在/app内创建容器内子目录结构,/opt/volunteer/data持久化db仍在外层bind mount不会丢
Deploy to Server / deploy (push) Successful in 1m28s
2026-10-05 01:07:15 +08:00
Trae Assistant 608d99bea2 ci(deploy): 修复Prepare deploy package失败=先mkdir -p完整目录树再cp;加ls校验client/server/dist和node_modules前置存在性;用cp src/x/. dst/ 代替 cp -r src/x dst避免复制层级错
Deploy to Server / deploy (push) Failing after 6m39s
2026-10-05 00:59:33 +08:00
Trae Assistant 42a5053b84 ci(deploy): 彻底修复runner上无node的PATH问题=Step0用find全系统搜索node/npm真实目录(/usr/local/bin /root/.nvm/versions/node/*/bin等),找到后写入 PATH,后续步骤所有node/npm 100%可执行;Health check失败自动打印docker ps+容器日志30行诊断
Deploy to Server / deploy (push) Failing after 1m20s
2026-10-05 00:55:57 +08:00
Trae Assistant bf0b969c9b ci(deploy): 修复PATH问题→jobs.env.PATH显式加/usr/local/bin;新增Step0 Verify tools打印node/npm version定位;Deploy同时兼容docker compose和docker-compose旧语法;Health check重试10次
Deploy to Server / deploy (push) Failing after 1s
2026-10-05 00:52:30 +08:00
Trae Assistant 1c92c7b9e8 ci(deploy): 移除Docker依赖actions/checkout@v4和shimataro/ssh-key-action,全部替换为纯shell命令(git clone + 手动写~/.ssh/deploy_key)。Set up job秒过,9步全shell执行不skipped,不需要Docker pull node镜像超时
Deploy to Server / deploy (push) Failing after 0s
2026-10-05 00:48:29 +08:00
Trae Assistant cc811edbd6 ci(deploy): runs-on仅保留两个纯标签名(ubuntu-latest/self-hosted),完全匹配Owner级runner API返回的真实labels池=[ubuntu-latest self-hosted ubuntu-latest self-hosted],一一对应消除歧义死等
Deploy to Server / deploy (push) Canceled after 0s
2026-10-05 00:11:44 +08:00
Trae Assistant bd5122c83a ci(deploy): runs-on追加:host后缀(ubuntu-latest:host / self-hosted:host),匹配act_runner declare自动生成的真实标签池,修复queued死等不调度
Deploy to Server / deploy (push) Canceled after 0s
2026-10-05 00:04:43 +08:00
Trae Assistant 4984f4a308 ci(deploy): runs-on数组写法多标签命中(三选一),兼容instance级act_runner全局注册+仓库级注册
Deploy to Server / deploy (push) Canceled after 0s
- 写runs-on数组按顺序尝试匹配:1) 目标机已注册的全限定标签 ubuntu-latest:docker://catthehacker/ubuntu:act-22.04
- 2) self-hosted(主流act_runner实例默认标签前缀) 3) ubuntu-latest(简写)
- 三种写法覆盖99%场景,避免后续换runner标签还要改yml
- 下一commit触发Run #11,若Secrets已配置好则build+scp+compose up健康检查完成部署
2026-10-04 23:36:40 +08:00
Trae Assistant cc5c1bdbd6 ci(deploy): runs-on全限定标签名匹配仓库已注册ubuntu-latest:docker://catthehacker/ubuntu:act-22.04
Deploy to Server / deploy (push) Canceled after 0s
- 直接写完整标签字符串(含:docker://...),确保act_runner调度器100%匹配该注册标签
- 前缀匹配失败时回退到精确字符串匹配,用此写法避免Gitea UI再报「无ubuntu-latest在线运行器」
- 新commit触发Run #10,自动拉取catthehacker镜像执行workflow build+ssh deploy
2026-10-04 23:31:20 +08:00
Trae Assistant 8f48a36e4e ci(deploy): runs-on ubuntu-latest 匹配现有act_runner标签(ubuntu-latest:docker...)
Deploy to Server / deploy (push) Canceled after 1m32s
- runs-on改回 ubuntu-latest,匹配你仓库已注册的ubuntu-latest:docker://catthehacker/ubuntu:act-22.04
- act_runner匹配前缀:前的 ubuntu-latest,直接命中;镜像内含 node+ssh+curl+npm,原workflow步骤不改动
- 新commit 会触发新Run #9,若Secrets全配置则Build->SSH scp->compose up->健康检查 自动完成
2026-10-04 23:29:04 +08:00
Trae Assistant 4d26e9ef7d ci(deploy): runner标签 ubuntu-latest -> self-hosted,适配Gitea自带Actions运行器
Deploy to Server / deploy (push) Canceled after 8m15s
- 修复 Actions 报错「没有匹配 ubuntu-latest 标签的在线运行器」:runs-on: self-hosted(act_runner 默认注册标签)
- 建议 act_runner 注册时同时打 ubuntu-latest,linux,self-hosted 三标签,兼容主流 workflow
- workflow 本身逻辑不变:npm ci(native build) -> scp app+compose -> ssh compose up -d -> curl localhost:3000 健康检查
2026-10-04 23:19:14 +08:00
Trae Assistant a84a8b19ac feat(export): 新增活动时长总表(矩阵)+ 移除Logo
Deploy to Server / deploy (push) Canceled after 14m38s
- 后端 POST /api/export 新增 include_activity_matrix:部员×活动矩阵行,列=所有活动(start_time DESC排),_total尾列
- 前端 Export 新增 06 卡片「活动时长总表(矩阵)」:部员+义工号 左固定列,活动列160px宽表头显示日期副标题,值>0高亮主色+浅底,总时长bg-primary-50
- Excel 新增「活动时长总表(矩阵)」Sheet:列名=活动标题,末列总时长
- 移除Brand组件所有img Logo渲染,纯标题,减小侧栏移动端头部视觉噪音
- 前后端 tsc --noEmit exit 0 + vite build exit 0;浏览器 E2E 验证矩阵张三/校园志愿宣传活动=2.00/总时长 2.00 h
2026-10-04 23:17:19 +08:00
Trae Assistant 1a51a854a3 feat(ui): 专业风UI改造 主色#275354 + Brand系统标题统一
Deploy to Server / deploy (push) Canceled after 14m40s
- 全量替换游戏感Neo-Brutalist为政务专业风:圆角2-16px、薄灰边、柔阴影
- Tailwind主题:primary 10阶调色板 + Noto Sans SC主字体 + fade-in-up动画
- 全局CSS:浅灰F6F8F9背景 + 主色焦点环和滚动条 + card/chip工具类
- 品牌组件Brand.tsx:云图形截断防云盘旧字泄露 + 新标题组合
- 6基础组件 + 8页面:Layout深绿侧栏 Login卡片 Export去五色卡 Activities/Hours/Users 用户端Index/Dashboard
- 数据链路回归:u/2张三2h明细正确显示
- tsc无错误  vite build成功
2026-10-04 23:05:39 +08:00
Trae Assistant b4b0f8b76d fix(ci): simplify deploy docker-compose - mount /opt/volunteer/app:/app:ro directly
Deploy to Server / deploy (push) Canceled after 17m13s
2026-10-04 22:40:07 +08:00
Trae Assistant 9c7d6c1455 feat(ui): SVG图标全替换 + Neo-Brutalist主题升级 + 数据导出卡片类别勾选
Deploy to Server / deploy (push) Failing after 14m55s
2026-10-04 22:12:17 +08:00
Trae Assistant 0169f19cf8 chore: 调整 .gitignore,排除 .trae/ 与 tsbuildinfo
Deploy to Server / deploy (push) Failing after 14m55s
2026-10-04 18:07:01 +08:00
Trae Assistant 25b2b8f381 feat: 初始化义工时长管理系统
- 管理台:活动设置、时长登记、用户管理、数据导出(Excel/PNG)
- 用户端:姓名查询个人义工时长与活动记录
- 技术栈:React + Vite + TailwindCSS / Node.js + Express + sql.js (SQLite)
- 支持 Docker 部署,附带 Gitea Actions 自动部署工作流
- 响应式界面,兼容移动端与 PC 端
- 默认管理员账号:admin / admin123
2026-10-04 18:06:24 +08:00