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 01:42:39 +08:00
2026-05-09 01:42:39 +08:00
2026-02-02 22:13:50 +08:00
2026-04-27 19:01:41 +08:00
2026-04-09 18:14:28 +08:00
2026-04-24 11:52:53 +08:00
2026-05-06 20:52:10 +08:00
2026-05-06 20:52:10 +08:00
2026-04-24 22:22:26 +08:00
2026-04-22 14:56:56 +08:00
2026-04-26 12:42:35 +08:00
2026-04-22 12:30:00 +08:00
2026-05-07 10:07:28 +08:00
2026-04-26 12:42:35 +08:00
2026-04-22 13:19:20 +08:00
2026-04-22 14:56:56 +08:00
2026-04-26 12:42:35 +08:00
2026-04-25 08:44:18 +08:00
2026-04-25 08:44:18 +08:00
2026-04-26 12:42:35 +08:00
2026-04-21 21:44:34 +08:00
2026-04-21 21:44:34 +08:00
2026-04-21 00:21:29 +08:00
2026-05-07 09:14:47 +08:00
2026-04-22 12:30:08 +08:00
2026-04-23 20:46:27 +08:00
2026-04-29 10:32:36 +08:00
2026-04-29 10:32:36 +08:00
2026-04-23 16:34:37 +08:00
2026-05-07 09:14:47 +08:00
2026-02-14 11:23:10 +08:00
2026-02-07 19:04:08 +08:00
2026-05-07 09:14:47 +08:00
2026-03-15 16:21:49 +08:00
2026-04-29 22:48:39 +08:00
2026-05-09 01:42:39 +08:00
2026-02-07 22:14:07 +08:00
2026-03-09 19:55:18 +08:00
2026-03-18 11:31:32 +08:00
2026-01-06 20:31:40 +08:00
2026-03-01 15:45:44 +08:00
2026-02-07 17:12:15 +08:00
2026-04-01 02:20:13 +08:00
2026-05-07 09:14:47 +08:00
2026-05-09 01:42:39 +08:00
2026-02-23 12:45:37 +08:00
2026-02-23 12:45:37 +08:00
2026-05-05 03:26:54 +08:00
2026-05-05 03:26:54 +08:00
2026-02-12 19:01:09 +08:00
2026-05-07 09:14:47 +08:00
2026-04-25 05:26:33 +00:00
2026-03-15 22:13:42 +08:00
2026-05-07 09:14:47 +08:00
2026-05-07 09:14:47 +08:00
2026-05-05 03:26:54 +08:00
2026-05-07 09:14:47 +08:00
2026-03-24 09:52:56 +08:00
2026-04-23 20:46:27 +08:00
2026-05-09 00:41:19 +08:00
2026-05-07 10:05:49 +08:00
2026-05-07 10:05:49 +08:00
2026-04-25 08:44:18 +08:00
2026-04-22 11:17:23 +08:00
2026-04-24 11:52:53 +08:00
2026-04-23 18:33:28 +08:00
2025-12-26 16:45:40 +08:00
2025-12-31 08:50:12 +08:00
2025-12-31 08:50:12 +08:00
2026-04-21 20:36:10 +08:00
2026-05-07 17:35:05 +08:00
2025-12-26 16:45:40 +08:00
2026-02-02 22:13:50 +08:00
2026-04-09 18:14:28 +08:00
2026-04-09 18:14:28 +08:00
2026-04-09 18:14:28 +08:00
2026-05-05 03:26:54 +08:00
2026-05-09 01:42:39 +08:00
2026-04-25 08:44:18 +08:00
2026-03-03 01:05:11 +08:00
2026-05-09 01:42:39 +08:00