win 2d2f677a64 chore: merge upstream Wei-Shaw/sub2api 至 v0.1.117 ...

主要合并内容：
- feat(channel-monitor): admin 渠道监控 MVP + 日聚合/模板/用户端卡片
- feat(available-channels): 新增"可用渠道"聚合视图与平台聚合
- feat(settings): 功能开关联动到配置页
- refactor(channel-monitor): 事件驱动调度器 / runner 生命周期 + 单测
- fix(openai/codex): 图像生成桥接修复、支付 webhook 未知单号处理
- misc: i18n/UI polish, typing tightening

冲突已手动解决，保留本地订制：
- handler.Handlers / AdminHandlers 联合 windsurf + channel_monitor/available_channel 字段
- wire/wire_gen 清理步骤同时注册 WindsurfRefreshService 与 ChannelMonitorRunner
- routes/admin 同时注册 windsurf 与 channel-monitor 路由
- service/wire 合并 Windsurf* 与 ChannelMonitor* 的 provider
- frontend admin API barrel 取两侧并集
- 采纳上游对 migrationChecksumCompatibilityRule 字段的重命名（非订制代码）

2026-04-24 11:52:21 +08:00

..

account_repo_integration_test.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

account_repo_sort_integration_test.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

account_repo.go

revert: remove fork-only changes from release sync

2026-04-23 21:40:58 +08:00

aes_encryptor.go

merge upstream main

2026-02-02 22:13:50 +08:00

allowed_groups_contract_integration_test.go

fix: correct migration 061 checksum and add missing BillingCache mock methods

2026-03-03 16:11:05 +08:00

announcement_read_repo.go

Fix user profile writes on postgres conflicts

2026-04-21 10:13:28 -07:00

announcement_repo_sort_test.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

announcement_repo.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

api_key_cache_integration_test.go

chore: 更新依赖、配置和代码生成

2026-01-03 06:37:08 -08:00

api_key_cache_test.go

chore: 更新依赖、配置和代码生成

2026-01-03 06:37:08 -08:00

api_key_cache.go

merge upstream main

2026-02-02 22:13:50 +08:00

api_key_repo_integration_test.go

fix: preserve messages dispatch config in repository hydration

2026-04-10 18:13:18 +08:00

api_key_repo_last_used_unit_test.go

feat(api-key): 增加 API Key 上次使用时间并补齐测试

2026-02-22 22:07:17 +08:00

api_key_repo_messages_dispatch_unit_test.go

fix: preserve messages dispatch config in repository hydration

2026-04-10 18:13:18 +08:00

api_key_repo_sort_integration_test.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

api_key_repo.go

feat(rpm): RPM 限流模块优化

2026-04-23 16:34:37 +08:00

auth_identity_compat_backfill_integration_test.go

fix(ci): run 108a migration before 109 in backfill integration test

2026-04-22 18:36:44 +08:00

auth_identity_legacy_migration_integration_test.go

fix(auth): harden oauth identity upgrade paths

2026-04-22 14:56:56 +08:00

backup_pg_dumper.go

fix: 按 review 意见重构数据库备份服务（安全性 + 架构 + 健壮性）

2026-03-14 17:48:21 +08:00

backup_s3_store.go

feat(backup): 备份/恢复异步化，解决 504 超时

2026-03-16 20:22:10 +08:00

billing_cache_integration_test.go

fix(audit): 第二批审计修复 — P0 生产 Bug、安全加固、性能优化、缓存一致性、代码质量

2026-02-07 19:46:42 +08:00

billing_cache_jitter_test.go

test: 完善自动化测试体系（7个模块，73个任务）

2026-02-08 12:05:39 +08:00

billing_cache_test.go

fix(audit): 第二批审计修复 — P0 生产 Bug、安全加固、性能优化、缓存一致性、代码质量

2026-02-07 19:46:42 +08:00

billing_cache.go

fix(billing): add window expiration check to Redis rate limit Lua script

2026-03-16 13:39:50 +08:00

channel_monitor_repo.go

feat(monitor): 30-day raw retention + timeline 4-tier style + CC template seed + JSON format button

2026-04-21 15:24:48 +08:00

channel_monitor_template_repo.go

feat(channel-monitor): apply template via subset picker; CC 2.1.114 baseline doc

2026-04-21 14:39:19 +08:00

channel_repo_account_stats_pricing.go

fix: audit round-3 — proxy safety, intervals persistence, SMTP timeout, sort fix

2026-04-14 09:35:20 +08:00

channel_repo_pricing.go

feat(channel): 渠道管理全链路集成 — 模型映射、定价、限制、用量统计

2026-04-04 11:13:58 +08:00

channel_repo_test.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

channel_repo.go

fix: merge 5 PR-related improvements

2026-04-14 18:34:57 +08:00

claude_oauth_service_test.go

feat(proxy): 集中代理 URL 验证并实现全局 fail-fast

2026-03-02 16:04:20 +08:00

claude_oauth_service.go

fix: SOCKS5 dialer 日志改 Info 级别，OAuth 超时延长至 60s

2026-04-01 16:54:33 +08:00

claude_usage_service_test.go

feat(proxy): 集中代理 URL 验证并实现全局 fail-fast

2026-03-02 16:04:20 +08:00

claude_usage_service.go

x

2026-04-16 19:11:47 +08:00

concurrency_cache_benchmark_test.go

feat(gateway): 实现负载感知的账号调度优化

2026-01-01 04:01:51 +08:00

concurrency_cache_integration_test.go

feat: cleanup stale concurrency slots on startup

2026-03-09 19:55:18 +08:00

concurrency_cache.go

feat: cleanup stale concurrency slots on startup

2026-03-09 19:55:18 +08:00

dashboard_aggregation_repo.go

feat(usage): add account cost display to admin dashboard and usage pages

2026-04-15 15:02:21 +08:00

dashboard_cache_test.go

fix(仪表盘): 修复缓存稳定性并补充测试

2026-01-11 15:00:16 +08:00

dashboard_cache.go

fix(仪表盘): 修复缓存稳定性并补充测试

2026-01-11 15:00:16 +08:00

db_pool_test.go

refactor: 移除 infrastructure 目录 (#108)

2025-12-31 23:42:01 +08:00

db_pool.go

refactor: 移除 infrastructure 目录 (#108)

2025-12-31 23:42:01 +08:00

email_cache_integration_test.go

refactor: 删除 ports 目录

2025-12-25 17:15:01 +08:00

email_cache_test.go

refactor: 封装 Redis key 生成函数

2025-12-26 16:47:44 +08:00

email_cache.go

fix: audit round-3 — proxy safety, intervals persistence, SMTP timeout, sort fix

2026-04-14 09:35:20 +08:00

ent.go

fix: 简易模式仅提升管理员默认并发到30

2026-03-07 18:19:04 +08:00

error_passthrough_cache.go

feat: 新增全局错误透传规则功能

2026-02-05 21:52:54 +08:00

error_passthrough_repo.go

feat: 错误透传规则支持 skip_monitoring 跳过运维监控记录

2026-02-10 11:42:39 +08:00

error_translate.go

refactor: 移除 infrastructure 目录 (#108)

2025-12-31 23:42:01 +08:00

fixtures_integration_test.go

fix: stabilize repository integration paths

2026-03-12 17:42:41 +08:00

gateway_cache_integration_test.go

feat(sync): full code sync from release

2026-02-28 15:01:20 +08:00

gateway_cache.go

revert: remove fork-only changes from release sync

2026-04-23 21:40:58 +08:00

gateway_routing_integration_test.go

merge upstream main

2026-02-02 22:13:50 +08:00

gemini_drive_client.go

fix: 将 DriveClient 注入 GeminiOAuthService，消除单元测试中的真实 HTTP 调用

2026-02-26 10:53:04 +08:00

gemini_oauth_client.go

feat(proxy): 集中代理 URL 验证并实现全局 fail-fast

2026-03-02 16:04:20 +08:00

gemini_token_cache_integration_test.go

fix(认证): 修复 OAuth token 缓存失效与 401 处理

2026-01-14 15:55:44 +08:00

gemini_token_cache_test.go

fix(认证): 修复 OAuth token 缓存失效与 401 处理

2026-01-14 15:55:44 +08:00

gemini_token_cache.go

feat(网关): 引入 OpenAI/Claude OAuth token 缓存

2026-01-15 18:27:06 +08:00

geminicli_codeassist_client.go

feat(proxy): 集中代理 URL 验证并实现全局 fail-fast

2026-03-02 16:04:20 +08:00

github_release_service_test.go

feat(update): 添加在线更新和定价数据获取的代理支持

2026-01-07 23:15:20 +08:00

github_release_service.go

feat(proxy): 集中代理 URL 验证并实现全局 fail-fast

2026-03-02 16:04:20 +08:00

group_repo_integration_test.go

fix: preserve messages dispatch config in repository hydration

2026-04-10 18:13:18 +08:00

group_repo_sort_integration_test.go

fix(lint): 修复 CI 中的 ineffassign 和 unused 代码告警，修正 group 排序集成测试兼容性

2026-04-09 19:25:08 +08:00

group_repo.go

feat(rpm): RPM 限流模块优化

2026-04-23 16:34:37 +08:00

http_upstream_antigravity.go

feat(windsurf): 补全ops日志记录与endpoint派生，对齐其他平台

2026-04-23 20:46:27 +08:00

http_upstream_benchmark_test.go

feat(proxy): 集中代理 URL 验证并实现全局 fail-fast

2026-03-02 16:04:20 +08:00

http_upstream_test.go

feat(proxy): 集中代理 URL 验证并实现全局 fail-fast

2026-03-02 16:04:20 +08:00

http_upstream.go

x

2026-04-16 19:11:47 +08:00

idempotency_repo_integration_test.go

feat(sync): full code sync from release

2026-02-28 15:01:20 +08:00

idempotency_repo.go

feat(idempotency): 为关键写接口接入幂等并完善并发容错

2026-02-23 12:45:37 +08:00

identity_cache_integration_test.go

refactor: 删除 ports 目录

2025-12-25 17:15:01 +08:00

identity_cache_test.go

refactor: 封装 Redis key 生成函数

2025-12-26 16:47:44 +08:00

identity_cache.go

feat(identity): 指纹缓存 TTL 懒续期机制

2026-03-02 01:12:41 +08:00

inprocess_transport_test.go

fix(test): 修复测试和添加数据库迁移

2026-01-03 06:36:35 -08:00

integration_harness_test.go

fix: 优化调度快照缓存以避免 Redis 大 MGET

2026-04-08 10:39:15 -07:00

internal500_counter_cache.go

refactor: extract internal500 penalty logic to dedicated file

2026-03-27 20:11:24 +08:00

migrations_runner_checksum_test.go

fix(upgrade): close payment and oidc compatibility gaps

2026-04-22 18:01:51 +08:00

migrations_runner_extra_test.go

Merge remote-tracking branch 'origin/main'

2026-04-22 21:27:18 +08:00

migrations_runner_notx_test.go

fix(auth): harden oauth identity upgrade paths

2026-04-22 14:56:56 +08:00

migrations_runner.go

fix(upgrade): close payment and oidc compatibility gaps

2026-04-22 18:01:51 +08:00

migrations_schema_integration_test.go

fix(auth): harden oauth identity upgrade paths

2026-04-22 14:56:56 +08:00

openai_403_counter_cache.go

修改403逻辑: 先临时冷却，再根据连续次数决定是否判坏号

2026-04-23 12:58:13 +08:00

openai_oauth_service_test.go

fix: clarify OpenAI OAuth proxy errors

2026-04-23 12:23:04 +08:00

openai_oauth_service.go

fix: clarify OpenAI OAuth proxy errors

2026-04-23 12:23:04 +08:00

ops_repo_alerts.go

feat: merge dev

2026-01-15 15:14:44 +08:00

ops_repo_dashboard_timeout_test.go

feat(sync): full code sync from release

2026-02-28 15:01:20 +08:00

ops_repo_dashboard.go

feat(sync): full code sync from release

2026-02-28 15:01:20 +08:00

ops_repo_error_where_test.go

fix(ops): 修复错误日志查询 q 过滤列名二义性

2026-02-14 11:21:30 +08:00

ops_repo_histograms.go

fix(ci): 修复所有CI失败问题

2026-01-11 23:49:03 +08:00

ops_repo_latency_histogram_buckets_test.go

feat(repository): 实现运维监控数据访问层

2026-01-09 20:52:57 +08:00

ops_repo_latency_histogram_buckets.go

feat(gateway): 双模式用户消息队列 — 串行队列 + 软性限速

2026-03-03 01:05:11 +08:00

ops_repo_metrics.go

feat(ops): add account switch metrics and trend

2026-01-23 19:39:48 +08:00

ops_repo_openai_token_stats_test.go

feat(ops): 运维监控新增 OpenAI Token 请求统计表

2026-02-12 14:20:14 +08:00

ops_repo_openai_token_stats.go

feat(ops): 运维监控新增 OpenAI Token 请求统计表

2026-02-12 14:20:14 +08:00

ops_repo_preagg.go

fix(网关): 修复账号选择中的调度器快照延迟问题

2026-01-13 22:49:26 -08:00

ops_repo_realtime_traffic.go

feat(ops): 新增实时流量数据层

2026-01-12 14:17:42 +08:00

ops_repo_request_details.go

fix(ci): 修复剩余的CI错误

2026-01-11 23:57:20 +08:00

ops_repo_system_logs_test.go

feat(log): 落地统一日志底座与系统日志运维能力

2026-02-12 16:27:29 +08:00

ops_repo_trends.go

fix(ops): count failover kinds with suffix

2026-01-24 01:14:44 +08:00

ops_repo_window_stats.go

feat(repository): 实现运维监控数据访问层

2026-01-09 20:52:57 +08:00

ops_repo.go

feat(ops): adapt repository INSERT/SELECT + add setOpsEndpointContext in error logger middleware

2026-03-21 23:38:00 +08:00

ops_write_pressure_integration_test.go

Fix ops write pressure integration fixture

2026-03-11 17:40:28 +08:00

pagination.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

pricing_service_test.go

feat(proxy): 集中代理 URL 验证并实现全局 fail-fast

2026-03-02 16:04:20 +08:00

pricing_service.go

feat(proxy): 集中代理 URL 验证并实现全局 fail-fast

2026-03-02 16:04:20 +08:00

promo_code_repo.go

fix(lint): 修复 CI 中的 ineffassign 和 unused 代码告警，修正 group 排序集成测试兼容性

2026-04-09 19:25:08 +08:00

proxy_latency_cache.go

feat: merge dev

2026-01-15 15:14:44 +08:00

proxy_probe_service_test.go

fix(proxy): 增加代理探测的多 URL 回退机制

2026-02-03 17:12:27 +08:00

proxy_probe_service.go

fix(antigravity): fast-fail on proxy unavailable, temp-unschedule account

2026-03-19 23:48:37 +08:00

proxy_repo_integration_test.go

fix(仓储): 修复软删除过滤与事务测试

2025-12-29 19:23:49 +08:00

proxy_repo_sort_integration_test.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

proxy_repo.go

fix(lint): restore repository sort helpers

2026-04-09 21:49:10 +08:00

redeem_cache_integration_test.go

refactor: 封装 Redis key 生成函数

2025-12-26 16:47:44 +08:00

redeem_cache_test.go

refactor: 封装 Redis key 生成函数

2025-12-26 16:47:44 +08:00

redeem_cache.go

refactor: 封装 Redis key 生成函数

2025-12-26 16:47:44 +08:00

redeem_code_repo_integration_test.go

fix(仓储): 修复软删除过滤与事务测试

2025-12-29 19:23:49 +08:00

redeem_code_repo_sort_integration_test.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

redeem_code_repo.go

fix(lint): restore repository sort helpers

2026-04-09 21:49:10 +08:00

redis_test.go

merge upstream main

2026-02-02 22:13:50 +08:00

redis.go

merge upstream main

2026-02-02 22:13:50 +08:00

refresh_token_cache.go

feat(auth): 实现 Refresh Token 机制

2026-02-05 12:42:54 +08:00

req_client_pool_test.go

feat(proxy): 集中代理 URL 验证并实现全局 fail-fast

2026-03-02 16:04:20 +08:00

req_client_pool.go

feat: GPT 隐私模式 + no-train 前端展示优化

2026-03-12 21:24:01 +08:00

rpm_cache.go

fix: 修复 gofmt 格式问题

2026-02-28 20:38:35 +08:00

scheduled_test_repo.go

feat(admin): 支持定时测试自动恢复并统一账号恢复入口

2026-03-08 06:59:53 +08:00

scheduler_cache_integration_test.go

fix: 优化调度快照缓存以避免 Redis 大 MGET

2026-04-08 10:39:15 -07:00

scheduler_cache_unit_test.go

chore(wip): 保存订制改动以便合并上游

2026-04-24 11:14:36 +08:00

scheduler_cache.go

chore(wip): 保存订制改动以便合并上游

2026-04-24 11:14:36 +08:00

scheduler_outbox_repo.go

Reduce ops and scheduler write amplification

2026-03-11 17:32:00 +08:00

scheduler_snapshot_outbox_integration_test.go

merge upstream main

2026-02-02 22:13:50 +08:00

security_secret_bootstrap_test.go

test(repository): 补充 JWT 密钥引导并发与兼容性单测

2026-02-12 12:07:20 +08:00

security_secret_bootstrap.go

fix(repository): 修复 JWT 密钥引导冲突一致性与并发读取竞态

2026-02-12 12:04:13 +08:00

session_limit_cache.go

fix: 修复管理页面活跃会话数始终显示为0的问题

2026-02-05 22:36:17 +08:00

setting_repo_integration_test.go

chore: 清理一些无用的文件

2026-03-04 10:15:42 +08:00

setting_repo.go

refactor(数据库): 迁移持久层到 Ent 并清理 GORM

2025-12-29 10:03:27 +08:00

simple_mode_admin_concurrency.go

fix: 简易模式仅提升管理员默认并发到30

2026-03-07 18:19:04 +08:00

simple_mode_default_groups_integration_test.go

merge upstream main

2026-02-02 22:13:50 +08:00

simple_mode_default_groups.go

feat(windsurf): 补全ops日志记录与endpoint派生，对齐其他平台

2026-04-23 20:46:27 +08:00

soft_delete_ent_integration_test.go

fix: correct migration 061 checksum and add missing BillingCache mock methods

2026-03-03 16:11:05 +08:00

sql_scan.go

fix(仓储): 规范 rows.Close 错误回传

2025-12-30 17:13:32 +08:00

temp_unsched_cache.go

feat(admin): 添加临时不可调度功能

2026-01-03 06:34:00 -08:00

timeout_counter_cache.go

feat(gateway): 添加流超时处理机制

2026-01-11 21:54:52 -08:00

tls_fingerprint_profile_cache.go

feat(tls-fingerprint): 新增 TLS 指纹 Profile 数据库管理及代码质量优化

2026-03-27 14:33:05 +08:00

tls_fingerprint_profile_repo.go

feat(tls-fingerprint): 新增 TLS 指纹 Profile 数据库管理及代码质量优化

2026-03-27 14:33:05 +08:00

totp_cache.go

merge upstream main

2026-02-02 22:13:50 +08:00

transport_audit_test.go

x

2026-04-16 19:11:47 +08:00

transport_audit.go

x

2026-04-16 19:11:47 +08:00

turnstile_service_test.go

fix(test): 修复测试和添加数据库迁移

2026-01-03 06:36:35 -08:00

turnstile_service.go

fix(安全): 修复上游校验与 URL 清理问题

2026-01-03 10:52:24 +08:00

update_cache_integration_test.go

test: 增加 repository 测试

2025-12-25 16:01:17 +08:00

update_cache.go

refactor: 删除 ports 目录

2025-12-25 17:15:01 +08:00

usage_billing_repo_integration_test.go

fix: 修复账户配额跨越时调度快照入队逻辑

2026-04-23 14:53:57 +08:00

usage_billing_repo.go

fix: 修复账户配额跨越时调度快照入队逻辑

2026-04-23 14:53:57 +08:00

usage_cleanup_repo_ent_test.go

merge upstream main

2026-02-02 22:13:50 +08:00

usage_cleanup_repo_test.go

feat(sync): full code sync from release

2026-02-28 15:01:20 +08:00

usage_cleanup_repo.go

feat(sync): full code sync from release

2026-02-28 15:01:20 +08:00

usage_log_repo_breakdown_test.go

test(repo): cover requested model repository semantics

2026-03-21 01:23:20 +08:00

usage_log_repo_integration_test.go

test(usage): add unit tests for account_cost and fix gofmt

2026-04-15 15:02:21 +08:00

usage_log_repo_request_type_test.go

test(usage): add unit tests for account_cost and fix gofmt

2026-04-15 15:02:21 +08:00

usage_log_repo_sort_integration_test.go

feat(table): 表格排序与搜索改为后端处理

2026-04-09 18:14:28 +08:00

usage_log_repo_unit_test.go

fix: harden usage billing idempotency and backpressure

2026-03-12 18:38:09 +08:00

usage_log_repo.go

revert: remove fork-only changes from release sync

2026-04-23 21:40:58 +08:00

user_attribute_repo.go

fix: resolve CI failures

2026-01-01 19:09:06 +08:00

user_group_rate_repo.go

feat(rpm): RPM 限流模块优化

2026-04-23 16:34:37 +08:00

user_msg_queue_cache.go

feat(gateway): 双模式用户消息队列 — 串行队列 + 软性限速

2026-03-03 01:05:11 +08:00

user_profile_identity_repo_contract_test.go

fix(test): restore identity repo integration imports

2026-04-22 13:22:33 +08:00

user_profile_identity_repo_unit_test.go

fix(auth): harden oauth identity upgrade paths

2026-04-22 14:56:56 +08:00

user_profile_identity_repo.go

fix(auth): harden oauth identity upgrade paths

2026-04-22 14:56:56 +08:00

user_repo_email_identity_integration_test.go

Add auth identity legacy backfill and email sync

2026-04-21 00:13:40 +08:00

user_repo_email_lookup_unit_test.go

fix(ci): clean up lint and dead code

2026-04-22 16:38:36 +08:00

user_repo_integration_test.go

Fix user profile writes on postgres conflicts

2026-04-21 10:13:28 -07:00

user_repo_sort_integration_test.go

fix(ci): repair integration repository tests

2026-04-22 02:42:43 +08:00

user_repo.go

feat(rpm): RPM 限流模块优化

2026-04-23 16:34:37 +08:00

user_rpm_cache.go

feat(rpm): RPM 限流模块优化

2026-04-23 16:34:37 +08:00

user_subscription_repo_integration_test.go

fix: add missing platform parameter to List calls in integration tests

2026-03-18 10:35:03 +08:00

user_subscription_repo.go

feat: add platform type filter to subscription management page

2026-03-18 09:23:19 +08:00

wire.go

Merge remote-tracking branch 'upstream/main' into feat/channel-insights

2026-04-23 22:30:45 +08:00