win
7347dfffc1
chore: merge upstream v0.1.124-125, keep Windsurf/Antigravity customizations
Upstream changes:
- feat: 邮箱 + GitHub + Google OAuth 快捷登录
- feat: Codex image bridge 开关
- feat: 内容审核 (content moderation) — 新增 contentModerationService/Handler
- feat: redeem code 返利、批量并发 API、markdown 页面渲染
- feat: 登录注册条款确认
- fix(security): pages API 加 JWT + 可见性校验
- fix: 修复 markdown 页面图片路径
- fix(gateway): 不再默认注入 redact thinking beta
- fix: 稳定 anthropic passthrough 超时错误
- chore: VERSION 升到 0.1.125 + golang:1.26.3-alpine
Conflict resolutions:
- Dockerfile/backend/Dockerfile: 取 upstream golang:1.26.3-alpine
- backend/go.mod: 取 upstream term v0.42.0,保留定制 protobuf v1.36.10
- frontend/src/api/admin/index.ts: 并集 (windsurf + riskControl)
- backend/cmd/server/wire_gen.go: 接 upstream contentModeration*,保留 windsurfHandler/windsurfGatewayService/billingCacheService/requestEventBus;并通过 wire 重生成
- frontend/src/views/admin/AccountsView.vue: 采用 upstream 双层布局 + OpenAI Meta,保留 is_enterprise prop 和 Windsurf tier badge
Note:
- WIP commit (de048fad) preserved Windsurf tier access service / NLU
extractor / ops log stream / Google OAuth login modal et al before merge.
- 3 pre-existing go vet issues in test files (NewOpsHandler, RegisterGatewayRoutes,
DefaultCLIProductVersion) are unrelated to this merge — leftover from local
customization refactors; production code (go build ./...) passes.
2026-05-09 01:42:39 +08:00
..
2026-05-09 00:41:19 +08:00
2026-05-05 19:36:33 +08:00
2026-05-09 01:42:39 +08:00
2026-04-16 19:11:47 +08:00
2026-03-01 15:45:44 +08:00
2026-02-28 15:01:20 +08:00
2026-04-01 02:19:10 +08:00
2026-04-01 01:35:49 +08:00
2026-02-05 20:17:53 +08:00
2026-03-19 23:48:37 +08:00
2026-04-29 22:11:45 +08:00
2026-02-28 15:01:20 +08:00
2026-04-14 17:35:27 +08:00
2026-03-28 00:55:55 +08:00
2026-04-24 09:08:31 +08:00
2026-04-30 19:25:45 +08:00
2026-04-09 18:14:28 +08:00
2026-04-01 01:35:49 +08:00
2026-03-02 16:04:20 +08:00
2026-03-16 20:22:10 +08:00
2026-01-04 19:28:20 +08:00
2026-04-16 19:11:47 +08:00
2026-01-05 20:43:03 -06:00
2026-04-10 21:10:45 +08:00
2026-04-15 15:40:40 +08:00
2026-04-14 12:19:44 +08:00
2026-05-09 00:41:19 +08:00