mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-11-20 15:06:36 +00:00
merge: upstream v0.1.106 into release/custom-0.1.106
Resolved conflicts: - VERSION: set to 0.1.106.1 - wire_gen.go: keep our version with accountUsageService - antigravity_gateway_service.go: keep accountUsageService field/param - openai_gateway_service.go: keep billing model override logic - account.go: keep both affinity methods and new custom base URL methods - dto/types.go: keep both affinity fields and new custom base URL fields - CreateAccountModal.vue: keep both affinity and custom base URL logic - EditAccountModal.vue: keep both affinity and custom base URL state
This commit is contained in:
commit
fc5e96aa9f
30 files changed
+816
-112
No files matched your search
@@ -269,6 +269,14 @@ func AccountFromServiceShallow(a *service.Account) *Account {
|
||||
target := a.GetCacheTTLOverrideTarget()
|
||||
out.CacheTTLOverrideTarget = &target
|
||||
}
|
||||
// 自定义 Base URL 中继转发
|
||||
if a.IsCustomBaseURLEnabled() {
|
||||
enabled := true
|
||||
out.CustomBaseURLEnabled = &enabled
|
||||
if customURL := a.GetCustomBaseURL(); customURL != "" {
|
||||
out.CustomBaseURL = &customURL
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 客户端亲和调度(Anthropic 和 Antigravity 账号)
|
||||
|
||||
@@ -217,6 +217,10 @@ type Account struct {
|
||||
AffinityClientCount *int64 `json:"affinity_client_count,omitempty"`
|
||||
AffinityClients []string `json:"affinity_clients,omitempty"`
|
||||
|
||||
// 自定义 Base URL 中继转发(仅 Anthropic OAuth/SetupToken 账号有效)
|
||||
CustomBaseURLEnabled *bool `json:"custom_base_url_enabled,omitempty"`
|
||||
CustomBaseURL *string `json:"custom_base_url,omitempty"`
|
||||
|
||||
// API Key 账号配额限制
|
||||
QuotaLimit *float64 `json:"quota_limit,omitempty"`
|
||||
QuotaUsed *float64 `json:"quota_used,omitempty"`
|
||||
|
||||
Reference in new issue
Block a user