oadmin/xinghuoapi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
839975b0cfdb7833d9a9215c7ed2cda961425153
xinghuoapi/backend/internal/service
History
ianshaw 839975b0cf feat(gemini): 支持 Gemini CLI 粘性会话与跨账号 thoughtSignature 清理 
## 问题背景

1. Gemini CLI 没有明确的会话标识（如 Claude Code 的 metadata.user_id）
2. thoughtSignature 与具体上游账号强绑定，跨账号使用会导致 400 错误
3. 粘性会话切换账号或 cache 丢失时，旧签名会导致请求失败

## 解决方案

### 1. Gemini CLI 会话标识提取

- 从 `x-gemini-api-privileged-user-id` header 和请求体中的 tmp 目录哈希生成会话标识
- 组合策略：SHA256(privileged-user-id + ":" + tmp_dir_hash)
- 正则提取：`/\.gemini/tmp/([A-Fa-f0-9]{64})`

### 2. 跨账号 thoughtSignature 清理

实现三种场景的智能清理：

1. **Cache 命中 + 账号切换**
   - 粘性会话绑定的账号与当前选择的账号不同时清理

2. **同一请求内 failover 切换**
   - 通过 sessionBoundAccountID 跟踪，检测重试时的账号切换

3. **Gemini CLI + Cache 未命中 + 含签名**
   - 预防性清理，避免 cache 丢失后首次转发就 400
   - 仅对 Gemini CLI 请求且请求体包含 thoughtSignature 时触发

## 修改内容

### backend/internal/handler/gemini_v1beta_handler.go
- 添加 `extractGeminiCLISessionHash` 函数提取 Gemini CLI 会话标识
- 添加 `isGeminiCLIRequest` 函数识别 Gemini CLI 请求
- 实现账号切换检测与 thoughtSignature 清理逻辑
- 添加 `geminiCLITmpDirRegex` 正则表达式

### backend/internal/service/gateway_service.go
- 添加 `GetCachedSessionAccountID` 方法查询粘性会话绑定的账号 ID

### backend/internal/service/gemini_native_signature_cleaner.go (新增)
- 实现 `CleanGeminiNativeThoughtSignatures` 函数
- 递归清理 JSON 中的所有 thoughtSignature 字段
- 支持任意 JSON 顶层类型（object/array）

### backend/internal/handler/gemini_cli_session_test.go (新增)
- 测试 Gemini CLI 会话哈希提取逻辑
- 测试 tmp 目录正则匹配
- 覆盖有/无 privileged-user-id 的场景

## 影响范围

- 修复 Gemini CLI 多轮对话时账号切换导致的 400 错误
- 提高粘性会话的稳定性和容错能力
- 不影响其他客户端（Claude Code 等）的会话标识生成

## 测试

- 单元测试：go test -tags=unit ./internal/handler -run TestExtractGeminiCLISessionHash
- 单元测试：go test -tags=unit ./internal/handler -run TestGeminiCLITmpDirRegex
- 编译验证：go build ./cmd/server
2026-01-26 04:40:38 +08:00
..
prompts
fix(codex): 添加codex CLI instructions fallback机制
2026-01-13 11:14:32 +08:00
account_billing_rate_multiplier_test.go
feat: merge dev
2026-01-15 15:14:44 +08:00
account_expiry_service.go
feat: auto-pause expired accounts
2026-01-07 16:59:35 +08:00
account_group.go
refactor: 调整项目结构为单向依赖
2025-12-26 16:45:40 +08:00
account_service_delete_test.go
Merge upstream/main
2026-01-17 18:00:07 +08:00
account_service.go
Merge upstream/main
2026-01-17 18:00:07 +08:00
account_test_service.go
feat(tls): 新增 TLS 指纹模拟功能
2026-01-18 20:08:40 +08:00
account_usage_service.go
feat: usage接口支持TLS指纹和缓存User-Agent
2026-01-19 17:06:16 +08:00
account.go
fix(token-cache): 修复异步刷新与请求线程的缓存竞态条件
2026-01-22 21:09:28 +08:00
admin_service_bulk_update_test.go
feat: merge dev
2026-01-15 15:14:44 +08:00
admin_service_create_user_test.go
refactor: migrate wechat to user attributes and enhance users list
2026-01-01 18:59:38 +08:00
admin_service_delete_test.go
feat: merge dev
2026-01-15 15:14:44 +08:00
admin_service_group_test.go
chore(合并): 修复合并冲突并保留分组上下文优化
2026-01-10 10:00:49 +08:00
admin_service_search_test.go
fix(admin): 代码审查修复 - 输入验证和测试完善
2026-01-09 19:43:19 +08:00
admin_service_update_balance_test.go
perf(认证): 引入 API Key 认证缓存与轻量删除查询
2026-01-11 10:55:25 +08:00
admin_service.go
Merge upstream/main
2026-01-17 18:00:07 +08:00
antigravity_gateway_service_test.go
fix(backend): 修复 CI 失败问题
2026-01-05 00:56:48 +08:00
antigravity_gateway_service.go
style: gofmt antigravity_gateway_service.go
2026-01-22 14:38:55 +08:00
antigravity_image_test.go
fix: 图片计费代码审查问题修复
2026-01-05 17:14:06 +08:00
antigravity_model_mapping_test.go
fix(gemini): 更新 Gemini 模型列表配置
2026-01-16 23:47:42 +08:00
antigravity_oauth_service.go
fix(oauth): 修复 OAuth 令牌刷新时 missing_project_id 误报问题
2026-01-24 17:44:56 +08:00
antigravity_quota_fetcher.go
fix: Antigravity project_id 获取优化
2026-01-16 11:57:14 +08:00
antigravity_quota_scope.go
feat: Claude Sonnet 429 仅限模型限流
2026-01-16 13:03:04 +08:00
antigravity_rate_limit_test.go
fix(token-cache): 修复异步刷新与请求线程的缓存竞态条件
2026-01-22 21:09:28 +08:00
antigravity_token_provider.go
fix(token-cache): 版本过时时使用最新token而非旧token
2026-01-23 10:29:52 +08:00
antigravity_token_refresher.go
fix(oauth): 修复 OAuth 令牌刷新时 missing_project_id 误报问题
2026-01-24 17:44:56 +08:00
api_key_auth_cache_impl.go
fix: 修复多个管理后台问题
2026-01-18 22:13:47 +08:00
api_key_auth_cache_invalidate.go
perf(认证): 引入 API Key 认证缓存与轻量删除查询
2026-01-11 10:55:25 +08:00
api_key_auth_cache.go
feat(group): 添加分组级别模型路由配置功能
2026-01-16 17:26:05 +08:00
api_key_service_cache_test.go
fix: 补充测试桩缺失的接口方法
2026-01-18 22:23:03 +08:00
api_key_service_delete_test.go
fix: 补充测试桩缺失的接口方法
2026-01-18 22:23:03 +08:00
api_key_service.go
fix: 修复多个管理后台问题
2026-01-18 22:13:47 +08:00
api_key.go
feat(api-key): 添加 IP 白名单/黑名单限制功能 (#221)
2026-01-09 21:59:32 +08:00
auth_cache_invalidation_test.go
fix(认证): 订阅兑换失效认证缓存
2026-01-11 10:55:26 +08:00
auth_service_register_test.go
feat(auth): 密码重置邮件队列化与限流优化
2026-01-24 22:55:28 +08:00
auth_service.go
feat(auth): 密码重置邮件队列化与限流优化
2026-01-24 22:55:28 +08:00
billing_cache_port.go
refactor: 删除 ports 目录
2025-12-25 17:15:01 +08:00
billing_cache_service_test.go
perf(后端): 完成性能优化与连接池配置
2025-12-31 08:50:12 +08:00
billing_cache_service.go
fix(后端): 修复 lint 失败并清理无用代码
2026-01-04 22:10:32 +08:00
billing_service_image_test.go
feat: 图片生成计费功能
2026-01-05 17:07:29 +08:00
billing_service.go
feat: 图片生成计费功能
2026-01-05 17:07:29 +08:00
claude_code_validator.go
feat(groups): add Claude Code client restriction and session isolation
2026-01-08 23:07:00 +08:00
claude_token_provider_test.go
修复格式问题。
2026-01-16 17:35:17 +08:00
claude_token_provider.go
fix(token-cache): 版本过时时使用最新token而非旧token
2026-01-23 10:29:52 +08:00
concurrency_service.go
perf(gateway): 优化负载感知调度
2026-01-03 06:32:51 -08:00
crs_sync_service.go
fix(安全): 关闭白名单时保留最小校验与默认白名单
2026-01-05 14:41:08 +08:00
dashboard_aggregation_service_test.go
feat(usage): 添加清理任务与统计过滤
2026-01-18 10:52:18 +08:00
dashboard_aggregation_service.go
feat(认证): 启用 OpenAI OAuth HTTP/2 并修复清理任务 lint
2026-01-19 19:50:57 +08:00
dashboard_service_test.go
feat(usage): 添加清理任务与统计过滤
2026-01-18 10:52:18 +08:00
dashboard_service.go
feat(usage): 添加清理任务与统计过滤
2026-01-18 10:52:18 +08:00
deferred_service.go
feat: Schedule batch update for account last_used_at
2025-12-28 09:49:54 +08:00
domain_constants.go
feat(auth): 密码重置邮件队列化与限流优化
2026-01-24 22:55:28 +08:00
email_queue_service.go
feat(auth): 密码重置邮件队列化与限流优化
2026-01-24 22:55:28 +08:00
email_service.go
feat(auth): 密码重置邮件队列化与限流优化
2026-01-24 22:55:28 +08:00
gateway_multiplatform_test.go
fix(测试): 修复 SelectAccountWithLoadAwareness 调用缺少参数
2026-01-20 14:16:46 +08:00
gateway_prompt_test.go
fix: 修复创建账号schedulable值默认为false的bug
2026-01-04 10:45:18 +08:00
gateway_request_test.go
fix(backend): 修复 CI 失败问题
2026-01-05 00:56:48 +08:00
gateway_request.go
fix: 修复空content处理及更新Gemini使用指南链接
2026-01-04 18:26:39 -08:00
gateway_service_benchmark_test.go
perf(后端): 完成性能优化与连接池配置
2025-12-31 08:50:12 +08:00
gateway_service.go
feat(gemini): 支持 Gemini CLI 粘性会话与跨账号 thoughtSignature 清理
2026-01-26 04:40:38 +08:00
gemini_messages_compat_service_test.go
fix: 修复 /v1/messages 间歇性 400 错误 (#18)
2026-01-01 04:21:18 +08:00
gemini_messages_compat_service.go
fix(gateway): aggregate all text chunks in non-streaming Gemini responses
2026-01-23 13:54:09 +00:00
gemini_multiplatform_test.go
Merge branch 'main' of https://github.com/mt21625457/aicodex2api
2026-01-20 14:02:08 +08:00
gemini_native_signature_cleaner.go
feat(gemini): 支持 Gemini CLI 粘性会话与跨账号 thoughtSignature 清理
2026-01-26 04:40:38 +08:00
gemini_oauth_service_test.go
fix(gemini): Google One 强制使用内置 OAuth client + 自动获取 project_id + UI 优化 (#212)
2026-01-08 23:47:29 +08:00
gemini_oauth_service.go
fix(gemini): Google One 强制使用内置 OAuth client + 自动获取 project_id + UI 优化 (#212)
2026-01-08 23:47:29 +08:00
gemini_oauth.go
feat(service): 改进 Gemini OAuth 服务层，区分 Code Assist 和 AI Studio 客户端
2025-12-26 00:11:03 -08:00
gemini_quota.go
feat(gemini): 完善 Gemini OAuth 配额系统和用量显示
2026-01-04 15:36:00 +08:00
gemini_token_cache.go
fix(认证): 修复 OAuth token 缓存失效与 401 处理
2026-01-14 15:55:44 +08:00
gemini_token_provider.go
fix(token-cache): 版本过时时使用最新token而非旧token
2026-01-23 10:29:52 +08:00
gemini_token_refresher.go
refactor(service): 统一时间戳解析，支持多种格式
2025-12-31 16:25:45 +08:00
geminicli_codeassist.go
fix(backend): 移除对已删除 ports 包的依赖
2025-12-26 00:11:03 -08:00
group_service.go
fix(认证): 补齐余额与删除场景缓存失效
2026-01-11 10:55:25 +08:00
group_test.go
feat: 图片生成计费功能
2026-01-05 17:07:29 +08:00
group.go
feat(group): 添加分组级别模型路由配置功能
2026-01-16 17:26:05 +08:00
http_upstream_port.go
feat(tls): 新增 TLS 指纹模拟功能
2026-01-18 20:08:40 +08:00
identity_service.go
feat: 新增会话ID伪装功能，优化日志系统
2026-01-19 10:22:13 +08:00
model_rate_limit.go
feat: Claude Sonnet 429 仅限模型限流
2026-01-16 13:03:04 +08:00
oauth_service.go
feat: 保存并显示OAuth账号邮箱地址
2026-01-23 15:17:47 +08:00
openai_codex_transform_test.go
fix(openai): 增强 Codex 工具过滤和参数标准化
2026-01-17 11:00:07 +08:00
openai_codex_transform.go
fix(openai): 增强 Codex 工具过滤和参数标准化
2026-01-17 11:00:07 +08:00
openai_gateway_service_test.go
Merge branch 'test' into dev
2026-01-20 11:59:13 +08:00
openai_gateway_service_tool_correction_test.go
feat(openai): 添加Codex工具调用自动修正功能
2026-01-15 23:52:50 +08:00
openai_gateway_service.go
Merge branch 'test' into dev
2026-01-20 11:59:13 +08:00
openai_oauth_service.go
refactor: 调整项目结构为单向依赖
2025-12-26 16:45:40 +08:00
openai_token_provider_test.go
修复格式问题。
2026-01-16 17:35:17 +08:00
openai_token_provider.go
fix(token-cache): 版本过时时使用最新token而非旧token
2026-01-23 10:29:52 +08:00
openai_tool_continuation_test.go
fix(网关): 修复工具续链校验与存储策略
2026-01-13 16:47:35 +08:00
openai_tool_continuation.go
fix(网关): 修复工具续链校验与存储策略
2026-01-13 16:47:35 +08:00
openai_tool_corrector_test.go
fix(openai): 增强 Codex 工具过滤和参数标准化
2026-01-17 11:00:07 +08:00
openai_tool_corrector.go
fix(openai): 增强 Codex 工具过滤和参数标准化
2026-01-17 11:00:07 +08:00
ops_account_availability.go
feat(ops): 添加分组和账号级别监控指标
2026-01-11 20:33:52 +08:00
ops_advisory_lock.go
feat(运维监控): 增强监控功能和健康评分系统
2026-01-10 01:38:47 +08:00
ops_aggregation_service.go
refactor(ops): 优化任务心跳和组件刷新机制
2026-01-15 21:31:55 +08:00
ops_alert_evaluator_service_test.go
test(ops): 添加告警评估服务单元测试
2026-01-11 20:55:44 +08:00
ops_alert_evaluator_service.go
refactor(ops): 优化任务心跳和组件刷新机制
2026-01-15 21:31:55 +08:00
ops_alert_models.go
feat: merge dev
2026-01-15 15:14:44 +08:00
ops_alerts.go
feat: merge dev
2026-01-15 15:14:44 +08:00
ops_cleanup_service.go
refactor(ops): 优化任务心跳和组件刷新机制
2026-01-15 21:31:55 +08:00
ops_concurrency.go
feat(service): 实现运维监控业务逻辑层
2026-01-09 20:53:44 +08:00
ops_dashboard_models.go
feat(运维监控): 增强监控功能和健康评分系统
2026-01-10 01:38:47 +08:00
ops_dashboard.go
feat(运维监控): 增强监控功能和健康评分系统
2026-01-10 01:38:47 +08:00
ops_errors.go
feat(service): 实现运维监控业务逻辑层
2026-01-09 20:53:44 +08:00
ops_health_score_test.go
feat: merge dev
2026-01-15 15:14:44 +08:00
ops_health_score.go
fix(ops): 调整健康分数权重以修复CI测试
2026-01-15 23:02:15 +08:00
ops_histograms.go
feat(service): 实现运维监控业务逻辑层
2026-01-09 20:53:44 +08:00
ops_metrics_collector.go
feat(ops): 增强上游错误追踪和新增定时报告服务
2026-01-11 23:00:31 +08:00
ops_models.go
feat: merge dev
2026-01-15 15:14:44 +08:00
ops_port.go
refactor(ops): 优化任务心跳和组件刷新机制
2026-01-15 21:31:55 +08:00
ops_query_mode.go
feat(service): 实现运维监控业务逻辑层
2026-01-09 20:53:44 +08:00
ops_realtime_models.go
feat(数据库): 添加运维监控数据模型和数据库迁移脚本
2026-01-09 20:52:17 +08:00
ops_realtime_traffic_models.go
feat(ops): 新增实时流量数据层
2026-01-12 14:17:42 +08:00
ops_realtime_traffic.go
feat(ops): 新增实时流量数据层
2026-01-12 14:17:42 +08:00
ops_realtime.go
feat(service): 实现运维监控业务逻辑层
2026-01-09 20:53:44 +08:00
ops_request_details.go
fix(ci): 修复剩余的CI错误
2026-01-11 23:57:20 +08:00
ops_retry.go
feat: 添加5h窗口费用控制和会话数量限制
2026-01-16 23:36:52 +08:00
ops_scheduled_report_service.go
refactor(ops): 优化任务心跳和组件刷新机制
2026-01-15 21:31:55 +08:00
ops_service.go
feat: merge dev
2026-01-15 15:14:44 +08:00
ops_settings_models.go
feat: merge dev
2026-01-15 15:14:44 +08:00
ops_settings.go
feat: merge dev
2026-01-15 15:14:44 +08:00
ops_trend_models.go
feat(数据库): 添加运维监控数据模型和数据库迁移脚本
2026-01-09 20:52:17 +08:00
ops_trends.go
fix(ci): 修复最后一批CI错误
2026-01-12 00:02:19 +08:00
ops_upstream_context.go
feat: merge dev
2026-01-15 15:14:44 +08:00
ops_window_stats.go
feat(service): 实现运维监控业务逻辑层
2026-01-09 20:53:44 +08:00
pricing_service.go
fix(gemini): 更新 Gemini 模型列表配置
2026-01-16 23:47:42 +08:00
promo_code_repository.go
feat: 实现注册优惠码功能
2026-01-10 13:14:35 +08:00
promo_code.go
feat: 实现注册优惠码功能
2026-01-10 13:14:35 +08:00
promo_service.go
fix(认证): 补齐余额与删除场景缓存失效
2026-01-11 10:55:25 +08:00
proxy_latency_cache.go
feat: add proxy geo location
2026-01-15 15:15:20 +08:00
proxy_service.go
feat: merge dev
2026-01-15 15:14:44 +08:00
proxy.go
feat: add proxy geo location
2026-01-15 15:15:20 +08:00
quota_fetcher.go
feat(antigravity): 增强网关功能和 thinking 块处理
2026-01-03 06:29:02 -08:00
ratelimit_service_401_test.go
fix(认证): OAuth 401 直接标记错误状态
2026-01-15 15:06:34 +08:00
ratelimit_service.go
fix: handle 400 error for disabled organization
2026-01-19 10:54:40 +08:00
redeem_code.go
refactor: 调整项目结构为单向依赖
2025-12-26 16:45:40 +08:00
redeem_service.go
fix(认证): 订阅兑换失效认证缓存
2026-01-11 10:55:26 +08:00
scheduler_cache.go
feat(scheduler): 引入调度快照缓存与 outbox 回放
2026-01-12 14:19:06 +08:00
scheduler_events.go
feat(scheduler): 引入调度快照缓存与 outbox 回放
2026-01-12 14:19:06 +08:00
scheduler_outbox.go
feat(scheduler): 引入调度快照缓存与 outbox 回放
2026-01-12 14:19:06 +08:00
scheduler_snapshot_service.go
feat(scheduler): 引入调度快照缓存与 outbox 回放
2026-01-12 14:19:06 +08:00
session_limit_cache.go
fix: 修复会话数量查询使用错误的超时配置
2026-01-19 11:45:04 +08:00
setting_service.go
feat(auth): 密码重置邮件队列化与限流优化
2026-01-24 22:55:28 +08:00
setting.go
refactor: 调整项目结构为单向依赖
2025-12-26 16:45:40 +08:00
settings_view.go
feat(auth): 密码重置邮件队列化与限流优化
2026-01-24 22:55:28 +08:00
sticky_session_test.go
fix(调度): 完善粘性会话清理与账号调度刷新
2026-01-20 11:40:55 +08:00
subscription_expiry_service.go
feat(subscription): 订阅过期状态自动更新与服务端排序
2026-01-24 20:26:01 +08:00
subscription_service.go
feat(subscription): 订阅过期状态自动更新与服务端排序
2026-01-24 20:26:01 +08:00
temp_unsched.go
feat(gateway): 添加流超时处理机制
2026-01-11 21:54:52 -08:00
timing_wheel_service_test.go
fix(定时轮): 初始化失败返回错误并补充单测
2026-01-16 15:25:33 +08:00
timing_wheel_service.go
fix(定时轮): 初始化失败返回错误并补充单测
2026-01-16 15:25:33 +08:00
token_cache_invalidator_test.go
fix(test): 修复测试中引用不存在的函数名
2026-01-23 10:58:30 +08:00
token_cache_invalidator.go
fix(token-cache): 版本过时时使用最新token而非旧token
2026-01-23 10:29:52 +08:00
token_cache_key_test.go
fix(OAuth缓存): 修复缓存键冲突、401强制刷新及Redis降级处理
2026-01-15 19:08:07 +08:00
token_cache_key.go
feat(网关): 引入 OpenAI/Claude OAuth token 缓存
2026-01-15 18:27:06 +08:00
token_refresh_service_test.go
修复格式问题。
2026-01-16 17:35:17 +08:00
token_refresh_service.go
fix(oauth): 修复 OAuth 令牌刷新时 missing_project_id 误报问题
2026-01-24 17:44:56 +08:00
token_refresher_test.go
fix(lint): 修复所有 Go 命名规范问题
2026-01-04 19:28:20 +08:00
token_refresher.go
refactor(service): 统一时间戳解析，支持多种格式
2025-12-31 16:25:45 +08:00
turnstile_service.go
refactor: 移除 infrastructure 目录 (#108)
2025-12-31 23:42:01 +08:00
update_service.go
fix(lint): 修复所有 Go 命名规范问题
2026-01-04 19:28:20 +08:00
usage_cleanup_service_test.go
Merge branch 'test' into dev
2026-01-20 11:59:13 +08:00
usage_cleanup_service.go
feat(认证): 启用 OpenAI OAuth HTTP/2 并修复清理任务 lint
2026-01-19 19:50:57 +08:00
usage_cleanup.go
feat(usage): 添加清理任务与统计过滤
2026-01-18 10:52:18 +08:00
usage_log.go
feat: merge dev
2026-01-15 15:14:44 +08:00
usage_service.go
fix(认证): 补齐余额与删除场景缓存失效
2026-01-11 10:55:25 +08:00
user_attribute_service.go
chore: 更新依赖、配置和代码生成
2026-01-03 06:37:08 -08:00
user_attribute.go
feat(backend): add user custom attributes system
2026-01-01 18:58:34 +08:00
user_service.go
fix(认证): 补齐余额与删除场景缓存失效
2026-01-11 10:55:25 +08:00
user_subscription_port.go
feat(subscription): 订阅过期状态自动更新与服务端排序
2026-01-24 20:26:01 +08:00
user_subscription.go
refactor: 调整项目结构为单向依赖
2025-12-26 16:45:40 +08:00
user.go
fix(lint): 修复所有 Go 命名规范问题
2026-01-04 19:28:20 +08:00
wire_test.go
fix(定时轮): 初始化失败返回错误并补充单测
2026-01-16 15:25:33 +08:00
wire.go
feat(subscription): 订阅过期状态自动更新与服务端排序
2026-01-24 20:26:01 +08:00