@@ -1009,11 +967,6 @@ const allOpenAIOAuth = computed(() => {
)
})
-// 是否全部为 Antigravity 平台（allow_overages 仅在此条件下显示）
-const allAntigravity = computed(() =>
- props.selectedPlatforms.length === 1 && props.selectedPlatforms[0] === 'antigravity'
-)
-
// 是否全部为 Anthropic OAuth/SetupToken（RPM 配置仅在此条件下显示）
const allAnthropicOAuthOrSetupToken = computed(() => {
return (
@@ -1060,7 +1013,6 @@ const enableGroups = ref(false)
const enableOpenAIPassthrough = ref(false)
const enableOpenAIWSMode = ref(false)
const enableRpmLimit = ref(false)
-const enableAllowOverages = ref(false)
// State - field values
const submitting = ref(false)
@@ -1088,7 +1040,6 @@ const bulkBaseRpm = ref
(null)
const bulkRpmStrategy = ref<'tiered' | 'sticky_exempt'>('tiered')
const bulkRpmStickyBuffer = ref(null)
const userMsgQueueMode = ref(null)
-const allowOverages = ref(false)
const umqModeOptions = computed(() => [
{ value: '', label: t('admin.accounts.quotaControl.rpmLimit.umqModeOff') },
{ value: 'throttle', label: t('admin.accounts.quotaControl.rpmLimit.umqModeThrottle') },
@@ -1330,13 +1281,6 @@ const buildUpdatePayload = (): Record | null => {
umqExtra.user_msg_queue_enabled = false // 清理旧字段（JSONB merge）
}
- // Allow overages (Antigravity only)
- if (enableAllowOverages.value) {
- if (!updates.extra) updates.extra = {}
- const overagesExtra = updates.extra as Record
- overagesExtra.allow_overages = allowOverages.value
- }
-
return Object.keys(updates).length > 0 ? updates : null
}
@@ -1401,7 +1345,6 @@ const handleSubmit = async () => {
enableGroups.value ||
enableOpenAIWSMode.value ||
enableRpmLimit.value ||
- enableAllowOverages.value ||
userMsgQueueMode.value !== null
if (!hasAnyFieldEnabled) {
@@ -1495,7 +1438,6 @@ watch(
enableOpenAIPassthrough.value = false
enableOpenAIWSMode.value = false
enableRpmLimit.value = false
- enableAllowOverages.value = false
// Reset all values
baseUrl.value = ''
@@ -1519,7 +1461,6 @@ watch(
bulkRpmStrategy.value = 'tiered'
bulkRpmStickyBuffer.value = null
userMsgQueueMode.value = null
- allowOverages.value = false
// Reset mixed channel warning state
showMixedChannelWarning.value = false
diff --git a/frontend/src/components/account/CreateAccountModal.vue b/frontend/src/components/account/CreateAccountModal.vue
index f910ad07..2130c9ab 100644
--- a/frontend/src/components/account/CreateAccountModal.vue
+++ b/frontend/src/components/account/CreateAccountModal.vue
@@ -3322,12 +3322,7 @@ watch(
if (newVal) {
// Load TLS fingerprint profiles
adminAPI.tlsFingerprintProfiles.list()
- .then(profiles => {
- tlsFingerprintProfiles.value = profiles.map(p => ({
- id: p.id,
- name: p.name,
- }))
- })
+ .then(profiles => { tlsFingerprintProfiles.value = profiles.map(p => ({ id: p.id, name: p.name })) })
.catch(() => { tlsFingerprintProfiles.value = [] })
// Modal opened - fill related models
allowedModels.value = [...getModelsByPlatform(form.platform)]
diff --git a/frontend/src/components/account/EditAccountModal.vue b/frontend/src/components/account/EditAccountModal.vue
index 17df51bb..59ca0b9c 100644
--- a/frontend/src/components/account/EditAccountModal.vue
+++ b/frontend/src/components/account/EditAccountModal.vue
@@ -2440,10 +2440,7 @@ watch(
const loadTLSProfiles = async () => {
try {
const profiles = await adminAPI.tlsFingerprintProfiles.list()
- tlsFingerprintProfiles.value = profiles.map(p => ({
- id: p.id,
- name: p.name,
- }))
+ tlsFingerprintProfiles.value = profiles.map(p => ({ id: p.id, name: p.name }))
} catch {
tlsFingerprintProfiles.value = []
}
@@ -3312,5 +3309,4 @@ const handleMixedChannelConfirm = async () => {
const handleMixedChannelCancel = () => {
clearMixedChannelDialog()
}
-
diff --git a/frontend/src/components/account/__tests__/AccountStatusIndicator.spec.ts b/frontend/src/components/account/__tests__/AccountStatusIndicator.spec.ts
index f758e6b0..7cdf7999 100644
--- a/frontend/src/components/account/__tests__/AccountStatusIndicator.spec.ts
+++ b/frontend/src/components/account/__tests__/AccountStatusIndicator.spec.ts
@@ -122,7 +122,7 @@ describe('AccountStatusIndicator', () => {
}
})
- expect(wrapper.text()).toContain('admin.accounts.status.creditsExhausted')
+ expect(wrapper.text()).toContain('account.creditsExhausted')
})
it('模型限流 + overages 启用 + AICredits key 生效 → 普通限流样式（积分耗尽，无 ⚡）', () => {
@@ -157,6 +157,6 @@ describe('AccountStatusIndicator', () => {
expect(wrapper.text()).toContain('CSon45')
expect(wrapper.text()).not.toContain('⚡')
// AICredits 积分耗尽状态应显示
- expect(wrapper.text()).toContain('admin.accounts.status.creditsExhausted')
+ expect(wrapper.text()).toContain('account.creditsExhausted')
})
})
diff --git a/frontend/src/components/account/__tests__/AccountUsageCell.spec.ts b/frontend/src/components/account/__tests__/AccountUsageCell.spec.ts
index 7a739d44..9158da64 100644
--- a/frontend/src/components/account/__tests__/AccountUsageCell.spec.ts
+++ b/frontend/src/components/account/__tests__/AccountUsageCell.spec.ts
@@ -15,10 +15,6 @@ vi.mock('@/api/admin', () => ({
}
}))
-vi.mock('@/utils/usageLoadQueue', () => ({
- enqueueUsageRequest: (_account: unknown, fn: () => Promise) => fn()
-}))
-
vi.mock('vue-i18n', async () => {
const actual = await vi.importActual('vue-i18n')
return {
@@ -389,117 +385,6 @@ describe('AccountUsageCell', () => {
expect(wrapper.text()).toContain('7d|0|27700')
})
- it('OpenAI OAuth 在 usage 请求失败时仍回退显示本地 codex 快照', async () => {
- getUsage.mockRejectedValue(new Error('network error'))
- const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-
- const wrapper = mount(AccountUsageCell, {
- props: {
- account: makeAccount({
- id: 2004,
- platform: 'openai',
- type: 'oauth',
- extra: {
- codex_usage_updated_at: '2099-03-07T10:00:00Z',
- codex_5h_used_percent: 12,
- codex_5h_reset_at: '2099-03-07T12:00:00Z',
- codex_7d_used_percent: 34,
- codex_7d_reset_at: '2099-03-13T12:00:00Z'
- }
- })
- },
- global: {
- stubs: {
- UsageProgressBar: {
- props: ['label', 'utilization', 'resetsAt', 'windowStats', 'color'],
- template: '{{ label }}|{{ utilization }}|{{ resetsAt }}
'
- },
- AccountQuotaInfo: true
- }
- }
- })
-
- await flushPromises()
-
- expect(getUsage).toHaveBeenCalledWith(2004)
- expect(wrapper.text()).toContain('5h|12|2099-03-07T12:00:00.000Z')
- expect(wrapper.text()).toContain('7d|34|2099-03-13T12:00:00.000Z')
- errorSpy.mockRestore()
- })
-
- it('OpenAI OAuth 已限额时首屏优先等待重新查询的 usage，而不是先显示旧 codex 快照', async () => {
- let resolveUsage: ((value: any) => void) | null = null
- getUsage.mockReturnValue(
- new Promise((resolve) => {
- resolveUsage = resolve
- })
- )
-
- const wrapper = mount(AccountUsageCell, {
- props: {
- account: makeAccount({
- id: 2005,
- platform: 'openai',
- type: 'oauth',
- rate_limit_reset_at: '2099-03-07T12:00:00Z',
- extra: {
- codex_5h_used_percent: 0,
- codex_5h_reset_at: '2099-03-07T12:00:00Z',
- codex_7d_used_percent: 0,
- codex_7d_reset_at: '2099-03-13T12:00:00Z'
- }
- })
- },
- global: {
- stubs: {
- UsageProgressBar: {
- props: ['label', 'utilization', 'resetsAt', 'windowStats', 'color'],
- template: '{{ label }}|{{ utilization }}|{{ windowStats?.tokens }}
'
- },
- AccountQuotaInfo: true
- }
- }
- })
-
- await Promise.resolve()
-
- expect(getUsage).toHaveBeenCalledWith(2005)
- expect(wrapper.text()).not.toContain('5h|0|')
- expect(wrapper.text()).not.toContain('7d|0|')
-
- resolveUsage?.({
- five_hour: {
- utilization: 100,
- resets_at: '2026-03-07T12:00:00Z',
- remaining_seconds: 3600,
- window_stats: {
- requests: 211,
- tokens: 106540000,
- cost: 38.13,
- standard_cost: 38.13,
- user_cost: 38.13
- }
- },
- seven_day: {
- utilization: 100,
- resets_at: '2026-03-13T12:00:00Z',
- remaining_seconds: 3600,
- window_stats: {
- requests: 211,
- tokens: 106540000,
- cost: 38.13,
- standard_cost: 38.13,
- user_cost: 38.13
- }
- }
- })
-
- await flushPromises()
-
- expect(wrapper.text()).toContain('5h|100|106540000')
- expect(wrapper.text()).toContain('7d|100|106540000')
- })
-
it('OpenAI OAuth 在行数据刷新但仍无 codex 快照时会重新拉取 usage', async () => {
getUsage
.mockResolvedValueOnce({
diff --git a/frontend/src/components/common/HelpTooltip.vue b/frontend/src/components/common/HelpTooltip.vue
index e95052da..d2a2e48f 100644
--- a/frontend/src/components/common/HelpTooltip.vue
+++ b/frontend/src/components/common/HelpTooltip.vue
@@ -1,23 +1,69 @@
@@ -35,6 +95,7 @@ function updatePosition() {
class="group relative ml-1 inline-flex items-center align-middle"
@mouseenter="onEnter"
@mouseleave="onLeave"
+ @click="onClick"
>
@@ -56,10 +117,26 @@ function updatePosition() {
diff --git a/frontend/src/components/common/WechatServiceButton.vue b/frontend/src/components/common/WechatServiceButton.vue
deleted file mode 100644
index 9ee8d3d5..00000000
--- a/frontend/src/components/common/WechatServiceButton.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 微信扫码添加客服
-
-
-
- 工作时间：周一至周五 9:00-18:00
-
-
-
-
diff --git a/frontend/src/components/payment/PaymentProviderDialog.vue b/frontend/src/components/payment/PaymentProviderDialog.vue
index 624ddcdd..0e03ec60 100644
--- a/frontend/src/components/payment/PaymentProviderDialog.vue
+++ b/frontend/src/components/payment/PaymentProviderDialog.vue
@@ -73,9 +73,42 @@
-
- {{ t('admin.settings.payment.providerConfig') }}
-
+
+
+ {{ t('admin.settings.payment.providerConfig') }}
+
+
+
+
+
+
+
{{ paymentGuide.summary }}
+
+
{{ item.title }}
+
{{ t('admin.settings.payment.guideOpenLabel') }}{{ item.open }}
+
{{ t('admin.settings.payment.guideCallLabel') }}{{ item.call }}
+
{{ t('admin.settings.payment.guideFallbackLabel') }}{{ item.fallback }}
+
+
+ {{ paymentGuide.note }}
+
+
+
+
+ {{ paymentGuide.summary }}
+
{{ scanHint }}
+
diff --git a/frontend/src/components/payment/__tests__/PaymentProviderDialog.spec.ts b/frontend/src/components/payment/__tests__/PaymentProviderDialog.spec.ts
new file mode 100644
index 00000000..637d805f
--- /dev/null
+++ b/frontend/src/components/payment/__tests__/PaymentProviderDialog.spec.ts
@@ -0,0 +1,78 @@
+import { describe, expect, it, vi } from 'vitest'
+import { mount } from '@vue/test-utils'
+import { nextTick } from 'vue'
+import PaymentProviderDialog from '@/components/payment/PaymentProviderDialog.vue'
+
+const messages: Record
= {
+ 'admin.settings.payment.providerConfig': 'Credentials',
+ 'admin.settings.payment.paymentGuideTrigger': 'View payment guide',
+ 'admin.settings.payment.alipayGuideSummary': 'Desktop prefers QR precreate and falls back to cashier; mobile prefers WAP checkout.',
+ 'admin.settings.payment.wxpayGuideSummary': 'Desktop prefers Native QR; mobile routes to JSAPI or H5 based on browser context.',
+}
+
+vi.mock('vue-i18n', () => ({
+ useI18n: () => ({
+ t: (key: string) => messages[key] ?? key,
+ }),
+}))
+
+function mountDialog() {
+ return mount(PaymentProviderDialog, {
+ props: {
+ show: true,
+ saving: false,
+ editing: null,
+ allKeyOptions: [
+ { value: 'alipay', label: 'Alipay' },
+ { value: 'wxpay', label: 'WeChat Pay' },
+ { value: 'stripe', label: 'Stripe' },
+ ],
+ enabledKeyOptions: [
+ { value: 'alipay', label: 'Alipay' },
+ { value: 'wxpay', label: 'WeChat Pay' },
+ ],
+ allPaymentTypes: [
+ { value: 'alipay', label: 'Alipay' },
+ { value: 'wxpay', label: 'WeChat Pay' },
+ ],
+ redirectLabel: 'Redirect',
+ },
+ global: {
+ stubs: {
+ BaseDialog: {
+ template: '
',
+ },
+ Select: {
+ props: ['modelValue', 'options', 'disabled'],
+ template: '',
+ },
+ ToggleSwitch: {
+ template: '',
+ },
+ },
+ },
+ })
+}
+
+describe('PaymentProviderDialog payment guide', () => {
+ it('shows no payment guide for providers without a flow guide', () => {
+ const wrapper = mountDialog()
+
+ expect(wrapper.text()).not.toContain(messages['admin.settings.payment.alipayGuideSummary'])
+ expect(wrapper.text()).not.toContain(messages['admin.settings.payment.wxpayGuideSummary'])
+ expect(wrapper.find('button[title="View payment guide"]').exists()).toBe(false)
+ })
+
+ it.each([
+ ['alipay', 'admin.settings.payment.alipayGuideSummary'],
+ ['wxpay', 'admin.settings.payment.wxpayGuideSummary'],
+ ])('shows the payment guide summary for %s', async (providerKey, summaryKey) => {
+ const wrapper = mountDialog()
+
+ ;(wrapper.vm as unknown as { reset: (key: string) => void }).reset(providerKey)
+ await nextTick()
+
+ expect(wrapper.text()).toContain(messages[summaryKey])
+ expect(wrapper.find('button[title="View payment guide"]').exists()).toBe(true)
+ })
+})
diff --git a/frontend/src/components/payment/__tests__/PaymentStatusPanel.spec.ts b/frontend/src/components/payment/__tests__/PaymentStatusPanel.spec.ts
index d7017e1f..ea2b6377 100644
--- a/frontend/src/components/payment/__tests__/PaymentStatusPanel.spec.ts
+++ b/frontend/src/components/payment/__tests__/PaymentStatusPanel.spec.ts
@@ -96,4 +96,36 @@ describe('PaymentStatusPanel', () => {
expect(wrapper.text()).toContain('payment.result.success')
expect(wrapper.emitted('success')).toHaveLength(1)
})
+
+ it('shows reopen button in QR mode when payUrl is also available', async () => {
+ const openSpy = vi.spyOn(window, 'open').mockReturnValue({ closed: false } as Window)
+
+ const wrapper = mount(PaymentStatusPanel, {
+ props: {
+ orderId: 42,
+ qrCode: 'https://pay.example.com/qr/42',
+ payUrl: 'https://pay.example.com/session/42',
+ expiresAt: '2099-01-01T12:30:00Z',
+ paymentType: 'alipay',
+ orderType: 'balance',
+ },
+ global: {
+ stubs: {
+ Icon: true,
+ },
+ },
+ })
+
+ await flushPromises()
+ expect(wrapper.text()).toContain('payment.qr.openPayWindow')
+
+ await wrapper.get('button.btn.btn-secondary.text-sm').trigger('click')
+ expect(openSpy).toHaveBeenCalledWith(
+ 'https://pay.example.com/session/42',
+ 'paymentPopup',
+ expect.any(String),
+ )
+
+ openSpy.mockRestore()
+ })
})
diff --git a/frontend/src/components/payment/__tests__/paymentFlow.spec.ts b/frontend/src/components/payment/__tests__/paymentFlow.spec.ts
index 48c77dfb..72dc61f1 100644
--- a/frontend/src/components/payment/__tests__/paymentFlow.spec.ts
+++ b/frontend/src/components/payment/__tests__/paymentFlow.spec.ts
@@ -190,12 +190,14 @@ describe('buildCreateOrderPayload', () => {
paymentType: 'alipay_direct',
orderType: 'balance',
origin: 'https://app.example.com/',
+ isMobile: true,
isWechatBrowser: false,
})).toEqual({
amount: 88,
payment_type: 'alipay',
order_type: 'balance',
return_url: 'https://app.example.com/payment/result',
+ is_mobile: true,
payment_source: 'hosted_redirect',
})
})
@@ -207,6 +209,7 @@ describe('buildCreateOrderPayload', () => {
orderType: 'subscription',
planId: 7,
origin: 'https://app.example.com',
+ isMobile: false,
isWechatBrowser: true,
})).toEqual({
amount: 128,
@@ -214,6 +217,7 @@ describe('buildCreateOrderPayload', () => {
order_type: 'subscription',
plan_id: 7,
return_url: 'https://app.example.com/payment/result',
+ is_mobile: false,
payment_source: 'wechat_in_app_resume',
})
})
diff --git a/frontend/src/components/payment/__tests__/providerConfig.spec.ts b/frontend/src/components/payment/__tests__/providerConfig.spec.ts
index 6a4c9c26..ec63726f 100644
--- a/frontend/src/components/payment/__tests__/providerConfig.spec.ts
+++ b/frontend/src/components/payment/__tests__/providerConfig.spec.ts
@@ -12,9 +12,9 @@ describe('PROVIDER_CONFIG_FIELDS.wxpay', () => {
expect(findField('certSerial')?.optional).toBeFalsy()
})
- it('exposes optional mp and H5 metadata fields for WeChat-specific flows', () => {
- expect(findField('mpAppId')?.optional).toBe(true)
- expect(findField('h5AppName')?.optional).toBe(true)
- expect(findField('h5AppUrl')?.optional).toBe(true)
+ it('only keeps the simplified visible credential set in the admin form', () => {
+ expect(findField('mpAppId')).toBeUndefined()
+ expect(findField('h5AppName')).toBeUndefined()
+ expect(findField('h5AppUrl')).toBeUndefined()
})
})
diff --git a/frontend/src/components/payment/paymentFlow.ts b/frontend/src/components/payment/paymentFlow.ts
index 05f36ed0..2a5f93dc 100644
--- a/frontend/src/components/payment/paymentFlow.ts
+++ b/frontend/src/components/payment/paymentFlow.ts
@@ -68,6 +68,7 @@ export interface BuildCreateOrderPayloadInput {
orderType: OrderType
planId?: number
origin?: string
+ isMobile: boolean
isWechatBrowser: boolean
}
@@ -106,6 +107,7 @@ export function buildCreateOrderPayload(input: BuildCreateOrderPayloadInput): Cr
amount: input.amount,
payment_type: visibleMethod,
order_type: input.orderType,
+ is_mobile: input.isMobile,
payment_source: visibleMethod === 'wxpay' && input.isWechatBrowser
? 'wechat_in_app_resume'
: 'hosted_redirect',
diff --git a/frontend/src/components/payment/providerConfig.ts b/frontend/src/components/payment/providerConfig.ts
index 67ffdec1..f4f5acdc 100644
--- a/frontend/src/components/payment/providerConfig.ts
+++ b/frontend/src/components/payment/providerConfig.ts
@@ -96,15 +96,12 @@ export const PROVIDER_CONFIG_FIELDS: Record = {
],
wxpay: [
{ key: 'appId', label: 'App ID', sensitive: false },
- { key: 'mpAppId', label: '', sensitive: false, optional: true },
{ key: 'mchId', label: '', sensitive: false },
{ key: 'privateKey', label: '', sensitive: true },
{ key: 'apiV3Key', label: '', sensitive: true },
{ key: 'certSerial', label: '', sensitive: false },
{ key: 'publicKey', label: '', sensitive: true },
{ key: 'publicKeyId', label: '', sensitive: false },
- { key: 'h5AppName', label: '', sensitive: false, optional: true },
- { key: 'h5AppUrl', label: '', sensitive: false, optional: true },
],
stripe: [
{ key: 'secretKey', label: '', sensitive: true },
diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts
index 195dea22..1b81b1de 100644
--- a/frontend/src/i18n/locales/en.ts
+++ b/frontend/src/i18n/locales/en.ts
@@ -1665,6 +1665,8 @@ export default {
failedToLoadApiKeys: 'Failed to load user API keys',
emailRequired: 'Please enter email',
concurrencyMin: 'Concurrency must be at least 1',
+ soraStorageQuota: 'Sora Storage Quota',
+ soraStorageQuotaHint: 'In GB, 0 means use group or system default quota',
amountRequired: 'Please enter a valid amount',
insufficientBalance: 'Insufficient balance',
deleteConfirm: "Are you sure you want to delete '{email}'? This action cannot be undone.",
@@ -1997,6 +1999,14 @@ export default {
enabled: 'Enabled',
disabled: 'Disabled'
},
+ claudeMaxSimulation: {
+ title: 'Claude Max Usage Simulation',
+ tooltip:
+ 'When enabled, for Claude models without upstream cache-write usage, the system deterministically maps tokens to a small input plus 1h cache creation while keeping total tokens unchanged.',
+ enabled: 'Enabled (simulate 1h cache)',
+ disabled: 'Disabled',
+ hint: 'Only token categories in usage billing logs are adjusted. No per-request mapping state is persisted.'
+ },
supportedScopes: {
title: 'Supported Model Families',
tooltip: 'Select the model families this group supports. Unchecked families will not be routed to this group.',
@@ -2630,7 +2640,7 @@ export default {
resetQuota: 'Reset Quota',
quotaLimit: 'Quota Limit',
quotaLimitPlaceholder: '0 means unlimited',
- quotaLimitHint: 'Set daily/weekly/total spending limits (USD). Changing limits won\'t reset usage.',
+ quotaLimitHint: 'Set daily/weekly/total spending limits (USD). Anthropic API key accounts can also configure client affinity. Changing limits won\'t reset usage.',
quotaLimitToggle: 'Enable Quota Limit',
quotaLimitToggleHint: 'When enabled, account will be paused when usage reaches the set limit',
quotaDailyLimit: 'Daily Limit',
@@ -2834,7 +2844,7 @@ export default {
// Quota control (Anthropic OAuth/SetupToken only)
quotaControl: {
title: 'Quota Control',
- hint: 'Configure cost windows, session limits and other scheduling controls.',
+ hint: 'Configure cost window, session limits, client affinity and other scheduling controls.',
windowCost: {
label: '5h Window Cost Limit',
hint: 'Limit account cost usage within the 5-hour window',
@@ -2880,7 +2890,7 @@ export default {
label: 'TLS Fingerprint Simulation',
hint: 'Simulate Node.js/Claude Code client TLS fingerprint',
defaultProfile: 'Built-in Default',
- randomProfile: 'Random',
+ randomProfile: 'Random'
},
sessionIdMasking: {
label: 'Session ID Masking',
@@ -2897,7 +2907,25 @@ export default {
hint: 'Forward requests to a custom relay service. Proxy URL will be passed as a query parameter.',
urlHint: 'Relay service URL (e.g., https://relay.example.com)',
},
+ clientAffinity: {
+ label: 'Client Affinity Scheduling',
+ hint: 'When enabled, new sessions prefer accounts previously used by this client to reduce account switching'
+ }
},
+ affinityNoClients: 'No affinity clients',
+ affinityClients: '{count} affinity clients:',
+ affinitySection: 'Client Affinity',
+ affinitySectionHint: 'Control how clients are distributed across accounts. Configure zone thresholds to balance load.',
+ affinityToggle: 'Enable Client Affinity',
+ affinityToggleHint: 'New sessions prefer accounts previously used by this client',
+ affinityBase: 'Base Limit (Green Zone)',
+ affinityBasePlaceholder: 'Empty = no limit',
+ affinityBaseHint: 'Max clients in green zone (full priority scheduling)',
+ affinityBaseOffHint: 'No green zone limit. All clients receive full priority scheduling.',
+ affinityBuffer: 'Buffer (Yellow Zone)',
+ affinityBufferPlaceholder: 'e.g. 3',
+ affinityBufferHint: 'Additional clients allowed in the yellow zone (degraded priority)',
+ affinityBufferInfinite: 'Unlimited',
expired: 'Expired',
proxy: 'Proxy',
noProxy: 'No Proxy',
@@ -4919,6 +4947,12 @@ export default {
integrationDoc: 'Payment Integration Docs',
integrationDocHint: 'Covers endpoint specs, idempotency semantics, and code samples'
},
+ soraClient: {
+ title: 'Sora Client',
+ description: 'Control whether to show the Sora client entry in the sidebar',
+ enabled: 'Enable Sora Client',
+ enabledHint: 'When enabled, the Sora entry will be shown in the sidebar for users to access Sora features'
+ },
customMenu: {
title: 'Custom Menu Pages',
description: 'Add custom iframe pages to the sidebar navigation. Each page can be visible to regular users or administrators.',
@@ -5010,6 +5044,8 @@ export default {
field_certSerial: 'Certificate Serial',
field_h5AppName: 'H5 App Name',
field_h5AppUrl: 'H5 App URL',
+ wxpayConfigHint: 'WeChat Pay usually only needs App ID. Fill MP App ID, H5 App Name, and H5 App URL only when your Official Account or H5 flow specifically requires them.',
+ wxpayAdvancedOptions: 'WeChat Pay Advanced Options',
field_secretKey: 'Secret Key',
field_publishableKey: 'Publishable Key',
field_webhookSecret: 'Webhook Secret',
@@ -5040,6 +5076,37 @@ export default {
providerKey: 'Provider Type',
selectProviderKey: 'Select Provider Type',
providerConfig: 'Credentials',
+ paymentGuideTrigger: 'View payment guide',
+ guideOpenLabel: 'Enable: ',
+ guideCallLabel: 'Call: ',
+ guideFallbackLabel: 'Fallback: ',
+ alipayGuideSummary: 'Desktop prefers QR precreate and falls back to cashier; mobile prefers WAP checkout.',
+ alipayGuideFaceToFaceTitle: 'Face-to-face / QR Payment',
+ alipayGuideFaceToFaceOpen: 'Enable face-to-face or QR payment capability.',
+ alipayGuideFaceToFaceCall: 'Desktop orders call alipay.trade.precreate first and render the QR code directly.',
+ alipayGuideFaceToFaceFallback: 'If unavailable or failed, the flow falls back to website checkout automatically.',
+ alipayGuidePagePayTitle: 'Website Payment',
+ alipayGuidePagePayOpen: 'Enable website payment.',
+ alipayGuidePagePayCall: 'When face-to-face is unavailable on desktop, the flow calls alipay.trade.page.pay and still renders the returned link as a QR code.',
+ alipayGuidePagePayFallback: 'The cashier link stays available so users can reopen the checkout page manually.',
+ alipayGuideWapTitle: 'WAP Payment',
+ alipayGuideWapOpen: 'Enable mobile website payment.',
+ alipayGuideWapCall: 'Mobile orders call alipay.trade.wap.pay first and jump to Alipay checkout.',
+ alipayGuideWapFallback: 'If mobile payment is unavailable or fails, the frontend switches to QR payment and shows a notice.',
+ wxpayGuideSummary: 'Desktop prefers Native QR; mobile routes to JSAPI or H5 based on browser context.',
+ wxpayGuideNote: 'The current form defaults to one shared App ID, which fits the common single-subject web, mobile, and Official Account setup.',
+ wxpayGuideNativeTitle: 'Native / QR Payment',
+ wxpayGuideNativeOpen: 'Enable Native or QR payment capability.',
+ wxpayGuideNativeCall: 'Desktop orders use Native by default and the frontend renders the QR payload.',
+ wxpayGuideNativeFallback: 'Mobile flows also fall back here when JSAPI or H5 cannot be used.',
+ wxpayGuideJsapiTitle: 'JSAPI / Official Account',
+ wxpayGuideJsapiOpen: 'Enable Official Account payment and ensure the browser is inside WeChat with an available OpenID.',
+ wxpayGuideJsapiCall: 'Inside WeChat, the app calls JSAPI after authorization and launches WeChat Pay directly.',
+ wxpayGuideJsapiFallback: 'If configuration is missing, the bridge is unavailable, or launch fails, the flow falls back to QR payment.',
+ wxpayGuideH5Title: 'H5 Payment',
+ wxpayGuideH5Open: 'Enable H5 payment.',
+ wxpayGuideH5Call: 'On mobile browsers outside WeChat, the app calls H5 payment when a client IP is available.',
+ wxpayGuideH5Fallback: 'If H5 is unavailable or order creation fails, the flow falls back to QR payment.',
noProviders: 'No provider instances configured',
supportedTypes: 'Supported Payment Types',
supportedTypesHint: 'Comma-separated, e.g. alipay,wxpay',
@@ -5138,6 +5205,98 @@ export default {
securityWarning: 'Warning: This key provides full admin access. Keep it secure.',
usage: 'Usage: Add to request header - x-api-key: '
},
+ soraS3: {
+ title: 'Sora Storage',
+ description: 'Manage Sora media storage profiles with S3 and Google Drive support',
+ newProfile: 'New Profile',
+ reloadProfiles: 'Reload Profiles',
+ empty: 'No storage profiles yet, create one first',
+ createTitle: 'Create Storage Profile',
+ editTitle: 'Edit Storage Profile',
+ selectProvider: 'Select Storage Type',
+ providerS3Desc: 'S3-compatible object storage',
+ providerGDriveDesc: 'Google Drive cloud storage',
+ profileID: 'Profile ID',
+ profileName: 'Profile Name',
+ setActive: 'Set as active after creation',
+ saveProfile: 'Save Profile',
+ activateProfile: 'Activate',
+ profileCreated: 'Storage profile created',
+ profileSaved: 'Storage profile saved',
+ profileDeleted: 'Storage profile deleted',
+ profileActivated: 'Active storage profile switched',
+ profileIDRequired: 'Profile ID is required',
+ profileNameRequired: 'Profile name is required',
+ profileSelectRequired: 'Please select a profile first',
+ endpointRequired: 'S3 endpoint is required when enabled',
+ bucketRequired: 'Bucket is required when enabled',
+ accessKeyRequired: 'Access Key ID is required when enabled',
+ deleteConfirm: 'Delete storage profile {profileID}?',
+ columns: {
+ profile: 'Profile',
+ profileId: 'Profile ID',
+ name: 'Name',
+ provider: 'Type',
+ active: 'Active',
+ endpoint: 'Endpoint',
+ bucket: 'Bucket',
+ storagePath: 'Storage Path',
+ capacityUsage: 'Capacity / Used',
+ capacityUnlimited: 'Unlimited',
+ videoCount: 'Videos',
+ videoCompleted: 'completed',
+ videoInProgress: 'in progress',
+ quota: 'Default Quota',
+ updatedAt: 'Updated At',
+ actions: 'Actions',
+ rootFolder: 'Root folder',
+ testInTable: 'Test',
+ testingInTable: 'Testing...',
+ testTimeout: 'Test timed out (15s)'
+ },
+ enabled: 'Enable Storage',
+ enabledHint: 'When enabled, Sora generated media files will be automatically uploaded',
+ endpoint: 'S3 Endpoint',
+ region: 'Region',
+ bucket: 'Bucket',
+ prefix: 'Object Prefix',
+ accessKeyId: 'Access Key ID',
+ secretAccessKey: 'Secret Access Key',
+ secretConfigured: '(Configured, leave blank to keep)',
+ cdnUrl: 'CDN URL',
+ cdnUrlHint: 'Optional. When configured, files are accessed via CDN URL',
+ forcePathStyle: 'Force Path Style',
+ defaultQuota: 'Default Storage Quota',
+ defaultQuotaHint: 'Default quota when not specified at user or group level. 0 means unlimited',
+ testConnection: 'Test Connection',
+ testing: 'Testing...',
+ testSuccess: 'Connection test successful',
+ testFailed: 'Connection test failed',
+ saved: 'Storage settings saved successfully',
+ saveFailed: 'Failed to save storage settings',
+ gdrive: {
+ authType: 'Authentication Method',
+ serviceAccount: 'Service Account',
+ clientId: 'Client ID',
+ clientSecret: 'Client Secret',
+ clientSecretConfigured: '(Configured, leave blank to keep)',
+ refreshToken: 'Refresh Token',
+ refreshTokenConfigured: '(Configured, leave blank to keep)',
+ serviceAccountJson: 'Service Account JSON',
+ serviceAccountConfigured: '(Configured, leave blank to keep)',
+ folderId: 'Folder ID (optional)',
+ authorize: 'Authorize Google Drive',
+ authorizeHint: 'Get Refresh Token via OAuth2',
+ oauthFieldsRequired: 'Please fill in Client ID and Client Secret first',
+ oauthSuccess: 'Google Drive authorization successful',
+ oauthFailed: 'Google Drive authorization failed',
+ closeWindow: 'This window will close automatically',
+ processing: 'Processing authorization...',
+ testStorage: 'Test Storage',
+ testSuccess: 'Google Drive storage test passed (upload, access, delete all OK)',
+ testFailed: 'Google Drive storage test failed'
+ }
+ },
overloadCooldown: {
title: '529 Overload Cooldown',
description: 'Configure account scheduling pause strategy when upstream returns 529 (overloaded)',
@@ -5804,6 +5963,7 @@ export default {
wechatOpenInWeChatHint: 'Open the current page inside WeChat, or switch to desktop WeChat QR payment.',
wechatScanOnDesktopHint: 'On desktop, use WeChat Scan to pay; on mobile, reopen the current page inside WeChat.',
wechatSwitchBrowserHint: 'Switch to desktop WeChat QR payment, or reopen this page in an external browser and retry.',
+ mobilePaymentFallbackToQr: 'This merchant has not enabled mobile payment. The flow has been switched to QR payment automatically.',
alipayDesktopUnavailable: 'The desktop Alipay flow could not generate a QR code.',
alipayDesktopQrHint: 'Desktop Alipay should render a QR code. Refresh and retry, or make sure the payment page was not blocked.',
alipayMobileUnavailable: 'This page could not hand off to Alipay.',
diff --git a/frontend/src/i18n/locales/zh.ts b/frontend/src/i18n/locales/zh.ts
index 50967f2b..c2bccc1f 100644
--- a/frontend/src/i18n/locales/zh.ts
+++ b/frontend/src/i18n/locales/zh.ts
@@ -1729,6 +1729,8 @@ export default {
failedToAdjust: '调整失败',
emailRequired: '请输入邮箱',
concurrencyMin: '并发数不能小于1',
+ soraStorageQuota: 'Sora 存储配额',
+ soraStorageQuotaHint: '单位 GB，0 表示使用分组或系统默认配额',
amountRequired: '请输入有效金额',
insufficientBalance: '余额不足',
setAllowedGroups: '设置允许分组',
@@ -2985,7 +2987,7 @@ export default {
// Quota control (Anthropic OAuth/SetupToken only)
quotaControl: {
title: '配额控制',
- hint: '配置费用窗口、会话限制等调度控制。',
+ hint: '配置费用窗口、会话限制、客户端亲和等调度控制。',
windowCost: {
label: '5h窗口费用控制',
hint: '限制账号在5小时窗口内的费用使用',
@@ -3031,7 +3033,7 @@ export default {
label: 'TLS 指纹模拟',
hint: '模拟 Node.js/Claude Code 客户端的 TLS 指纹',
defaultProfile: '内置默认',
- randomProfile: '随机',
+ randomProfile: '随机'
},
sessionIdMasking: {
label: '会话 ID 伪装',
@@ -3048,7 +3050,25 @@ export default {
hint: '启用后将请求转发到自定义中继服务，代理地址将作为 URL 参数传递给中继服务',
urlHint: '中继服务地址（如 https://relay.example.com）',
},
+ clientAffinity: {
+ label: '客户端亲和调度',
+ hint: '启用后，新会话会优先调度到该客户端之前使用过的账号，避免频繁切换账号'
+ }
},
+ affinityNoClients: '无亲和客户端',
+ affinityClients: '{count} 个亲和客户端：',
+ affinitySection: '客户端亲和',
+ affinitySectionHint: '控制客户端在账号间的分布。通过配置区域阈值来平衡负载。',
+ affinityToggle: '启用客户端亲和',
+ affinityToggleHint: '新会话优先调度到该客户端之前使用过的账号',
+ affinityBase: '基础限额（绿区）',
+ affinityBasePlaceholder: '留空表示不限制',
+ affinityBaseHint: '绿区最大客户端数量（完整优先级调度）',
+ affinityBaseOffHint: '未开启绿区限制，所有客户端均享受完整优先级调度',
+ affinityBuffer: '缓冲区（黄区）',
+ affinityBufferPlaceholder: '例如 3',
+ affinityBufferHint: '黄区允许的额外客户端数量（降级优先级调度）',
+ affinityBufferInfinite: '不限制',
expired: '已过期',
proxy: '代理',
noProxy: '无代理',
@@ -5091,6 +5111,12 @@ export default {
integrationDoc: '支付集成文档',
integrationDocHint: '包含接口说明、幂等语义及示例代码'
},
+ soraClient: {
+ title: 'Sora 客户端',
+ description: '控制是否在侧边栏展示 Sora 客户端入口',
+ enabled: '启用 Sora 客户端',
+ enabledHint: '开启后，侧边栏将显示 Sora 入口，用户可访问 Sora 功能'
+ },
customMenu: {
title: '自定义菜单页面',
description: '添加自定义 iframe 页面到侧边栏导航。每个页面可以设置为普通用户或管理员可见。',
@@ -5182,6 +5208,8 @@ export default {
field_certSerial: '证书序列号',
field_h5AppName: 'H5 应用名称',
field_h5AppUrl: 'H5 应用地址',
+ wxpayConfigHint: '微信支付通常只需要填写 App ID。公众号 App ID、H5 应用名称、H5 应用地址仅在公众号支付或 H5 场景有特殊要求时再填写。',
+ wxpayAdvancedOptions: '微信支付高级可选项',
field_secretKey: '密钥',
field_publishableKey: '公开密钥',
field_webhookSecret: 'Webhook 密钥',
@@ -5212,6 +5240,37 @@ export default {
providerKey: '服务商类型',
selectProviderKey: '选择服务商类型',
providerConfig: '凭证配置',
+ paymentGuideTrigger: '查看支付方式说明',
+ guideOpenLabel: '开通：',
+ guideCallLabel: '调用：',
+ guideFallbackLabel: '降级：',
+ alipayGuideSummary: '桌面优先扫码单，失败再走收银台；移动优先手机网站支付。',
+ alipayGuideFaceToFaceTitle: '当面付 / 扫码支付',
+ alipayGuideFaceToFaceOpen: '需开通当面付或扫码支付能力。',
+ alipayGuideFaceToFaceCall: '桌面端下单时优先调用 alipay.trade.precreate，前台直接渲染二维码。',
+ alipayGuideFaceToFaceFallback: '接口不可用或返回失败时，自动降级到电脑网站支付。',
+ alipayGuidePagePayTitle: '电脑网站支付',
+ alipayGuidePagePayOpen: '需开通电脑网站支付。',
+ alipayGuidePagePayCall: '桌面端当面付不可用时调用 alipay.trade.page.pay，并继续把返回链接渲染成二维码。',
+ alipayGuidePagePayFallback: '同时保留打开收银台入口，用户可手动重新拉起支付页。',
+ alipayGuideWapTitle: '手机网站支付',
+ alipayGuideWapOpen: '需开通手机网站支付。',
+ alipayGuideWapCall: '移动端优先调用 alipay.trade.wap.pay，跳转支付宝收银台。',
+ alipayGuideWapFallback: '未开通或返回异常时，前端自动改走扫码支付并提示未开通移动支付。',
+ wxpayGuideSummary: '桌面优先 Native 扫码，移动端按浏览器环境走 JSAPI 或 H5。',
+ wxpayGuideNote: '当前表单默认共用一个 App ID，适合同主体下统一配置网页、移动和公众号场景。',
+ wxpayGuideNativeTitle: 'Native / 扫码支付',
+ wxpayGuideNativeOpen: '需开通 Native 或扫码支付能力。',
+ wxpayGuideNativeCall: '桌面端默认调用 Native，下发二维码内容给前台渲染。',
+ wxpayGuideNativeFallback: '移动端无法走 JSAPI 或 H5 时，也会自动回退到这里。',
+ wxpayGuideJsapiTitle: 'JSAPI / 公众号支付',
+ wxpayGuideJsapiOpen: '需开通公众号支付，并保证当前浏览器在微信内且能拿到 OpenID。',
+ wxpayGuideJsapiCall: '微信内浏览器完成授权后调用 JSAPI，直接拉起微信支付。',
+ wxpayGuideJsapiFallback: '未配置、Bridge 不可用或拉起失败时，自动改走扫码支付。',
+ wxpayGuideH5Title: 'H5 支付',
+ wxpayGuideH5Open: '需开通 H5 支付。',
+ wxpayGuideH5Call: '移动端非微信浏览器且有客户端 IP 时调用 H5 支付，跳转微信收银台。',
+ wxpayGuideH5Fallback: '未开通 H5 或下单失败时，自动改走扫码支付。',
noProviders: '暂无服务商实例',
supportedTypes: '支持的支付方式',
supportedTypesHint: '逗号分隔，如 alipay,wxpay',
@@ -5309,6 +5368,98 @@ export default {
securityWarning: '警告：此密钥拥有完整的管理员权限，请妥善保管。',
usage: '使用方法：在请求头中添加 x-api-key: '
},
+ soraS3: {
+ title: 'Sora 存储配置',
+ description: '以多配置列表管理 Sora 媒体存储，支持 S3 和 Google Drive',
+ newProfile: '新建配置',
+ reloadProfiles: '刷新列表',
+ empty: '暂无存储配置，请先创建',
+ createTitle: '新建存储配置',
+ editTitle: '编辑存储配置',
+ selectProvider: '选择存储类型',
+ providerS3Desc: 'S3 兼容对象存储',
+ providerGDriveDesc: 'Google Drive 云盘',
+ profileID: '配置 ID',
+ profileName: '配置名称',
+ setActive: '创建后设为生效',
+ saveProfile: '保存配置',
+ activateProfile: '设为生效',
+ profileCreated: '存储配置创建成功',
+ profileSaved: '存储配置保存成功',
+ profileDeleted: '存储配置删除成功',
+ profileActivated: '生效配置已切换',
+ profileIDRequired: '请填写配置 ID',
+ profileNameRequired: '请填写配置名称',
+ profileSelectRequired: '请先选择配置',
+ endpointRequired: '启用时必须填写 S3 端点',
+ bucketRequired: '启用时必须填写存储桶',
+ accessKeyRequired: '启用时必须填写 Access Key ID',
+ deleteConfirm: '确定删除存储配置 {profileID} 吗？',
+ columns: {
+ profile: '配置',
+ profileId: 'Profile ID',
+ name: '名称',
+ provider: '存储类型',
+ active: '生效状态',
+ endpoint: '端点',
+ bucket: '存储桶',
+ storagePath: '存储路径',
+ capacityUsage: '容量 / 已用',
+ capacityUnlimited: '无限制',
+ videoCount: '视频数',
+ videoCompleted: '完成',
+ videoInProgress: '进行中',
+ quota: '默认配额',
+ updatedAt: '更新时间',
+ actions: '操作',
+ rootFolder: '根目录',
+ testInTable: '测试',
+ testingInTable: '测试中...',
+ testTimeout: '测试超时（15秒）'
+ },
+ enabled: '启用存储',
+ enabledHint: '启用后，Sora 生成的媒体文件将自动上传到存储',
+ endpoint: 'S3 端点',
+ region: '区域',
+ bucket: '存储桶',
+ prefix: '对象前缀',
+ accessKeyId: 'Access Key ID',
+ secretAccessKey: 'Secret Access Key',
+ secretConfigured: '(已配置，留空保持不变)',
+ cdnUrl: 'CDN URL',
+ cdnUrlHint: '可选，配置后使用 CDN URL 访问文件',
+ forcePathStyle: '强制路径风格（Path Style）',
+ defaultQuota: '默认存储配额',
+ defaultQuotaHint: '未在用户或分组级别指定配额时的默认值，0 表示无限制',
+ testConnection: '测试连接',
+ testing: '测试中...',
+ testSuccess: '连接测试成功',
+ testFailed: '连接测试失败',
+ saved: '存储设置保存成功',
+ saveFailed: '保存存储设置失败',
+ gdrive: {
+ authType: '认证方式',
+ serviceAccount: '服务账号',
+ clientId: 'Client ID',
+ clientSecret: 'Client Secret',
+ clientSecretConfigured: '(已配置，留空保持不变)',
+ refreshToken: 'Refresh Token',
+ refreshTokenConfigured: '(已配置，留空保持不变)',
+ serviceAccountJson: '服务账号 JSON',
+ serviceAccountConfigured: '(已配置，留空保持不变)',
+ folderId: 'Folder ID（可选）',
+ authorize: '授权 Google Drive',
+ authorizeHint: '通过 OAuth2 获取 Refresh Token',
+ oauthFieldsRequired: '请先填写 Client ID 和 Client Secret',
+ oauthSuccess: 'Google Drive 授权成功',
+ oauthFailed: 'Google Drive 授权失败',
+ closeWindow: '此窗口将自动关闭',
+ processing: '正在处理授权...',
+ testStorage: '测试存储',
+ testSuccess: 'Google Drive 存储测试成功（上传、访问、删除均正常）',
+ testFailed: 'Google Drive 存储测试失败'
+ }
+ },
overloadCooldown: {
title: '529 过载冷却',
description: '配置上游返回 529（过载）时的账号调度暂停策略',
@@ -6000,6 +6151,7 @@ export default {
wechatOpenInWeChatHint: '请复制当前页面链接到微信内打开，或直接改用电脑端微信扫码支付。',
wechatScanOnDesktopHint: '电脑端请直接使用微信扫一扫完成支付；移动端请在微信内打开当前页面。',
wechatSwitchBrowserHint: '请改用电脑端微信扫码，或在外部浏览器重新打开本页后再试。',
+ mobilePaymentFallbackToQr: '当前商户未开通移动支付，已自动切换为扫码支付。',
alipayDesktopUnavailable: '当前支付宝桌面支付未成功生成二维码。',
alipayDesktopQrHint: '电脑端支付宝应展示扫码单，请刷新后重试，或确认浏览器未拦截当前支付页。',
alipayMobileUnavailable: '当前页面未成功跳转到支付宝。',
diff --git a/frontend/src/utils/__tests__/codexUsage.spec.ts b/frontend/src/utils/__tests__/codexUsage.spec.ts
deleted file mode 100644
index b7453544..00000000
--- a/frontend/src/utils/__tests__/codexUsage.spec.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { resolveCodexUsageWindow } from '@/utils/codexUsage'
-
-describe('resolveCodexUsageWindow', () => {
- it('快照为空时返回空窗口', () => {
- const result = resolveCodexUsageWindow(null, '5h', new Date('2026-02-20T08:00:00Z'))
- expect(result).toEqual({ usedPercent: null, resetAt: null })
- })
-
- it('优先使用后端提供的绝对重置时间', () => {
- const result = resolveCodexUsageWindow(
- {
- codex_5h_used_percent: 55,
- codex_5h_reset_at: '2026-02-20T10:00:00Z',
- codex_5h_reset_after_seconds: 1
- },
- '5h',
- new Date('2026-02-20T08:00:00Z')
- )
-
- expect(result.usedPercent).toBe(55)
- expect(result.resetAt).toBe('2026-02-20T10:00:00.000Z')
- })
-
- it('窗口已过期时自动归零', () => {
- const result = resolveCodexUsageWindow(
- {
- codex_7d_used_percent: 100,
- codex_7d_reset_at: '2026-02-20T07:00:00Z'
- },
- '7d',
- new Date('2026-02-20T08:00:00Z')
- )
-
- expect(result.usedPercent).toBe(0)
- expect(result.resetAt).toBe('2026-02-20T07:00:00.000Z')
- })
-
- it('无绝对时间时使用 updated_at + seconds 回退计算', () => {
- const result = resolveCodexUsageWindow(
- {
- codex_5h_used_percent: 20,
- codex_5h_reset_after_seconds: 3600,
- codex_usage_updated_at: '2026-02-20T06:30:00Z'
- },
- '5h',
- new Date('2026-02-20T07:00:00Z')
- )
-
- expect(result.usedPercent).toBe(20)
- expect(result.resetAt).toBe('2026-02-20T07:30:00.000Z')
- })
-
- it('支持 legacy primary/secondary 字段映射', () => {
- const snapshot = {
- codex_primary_window_minutes: 10080,
- codex_primary_used_percent: 70,
- codex_primary_reset_after_seconds: 86400,
- codex_secondary_window_minutes: 300,
- codex_secondary_used_percent: 15,
- codex_secondary_reset_after_seconds: 1200,
- codex_usage_updated_at: '2026-02-20T07:00:00Z'
- }
-
- const result5h = resolveCodexUsageWindow(snapshot, '5h', new Date('2026-02-20T07:05:00Z'))
- const result7d = resolveCodexUsageWindow(snapshot, '7d', new Date('2026-02-20T07:05:00Z'))
-
- expect(result5h.usedPercent).toBe(15)
- expect(result5h.resetAt).toBe('2026-02-20T07:20:00.000Z')
- expect(result7d.usedPercent).toBe(70)
- expect(result7d.resetAt).toBe('2026-02-21T07:00:00.000Z')
- })
-
- it('legacy 5h 在 primary<=360 时优先 primary 并支持字符串数字', () => {
- const result = resolveCodexUsageWindow(
- {
- codex_primary_window_minutes: '300',
- codex_primary_used_percent: '21',
- codex_primary_reset_after_seconds: '1800',
- codex_secondary_window_minutes: '10080',
- codex_secondary_used_percent: '99',
- codex_secondary_reset_after_seconds: '99999',
- codex_usage_updated_at: '2026-02-20T08:00:00Z'
- },
- '5h',
- new Date('2026-02-20T08:10:00Z')
- )
-
- expect(result.usedPercent).toBe(21)
- expect(result.resetAt).toBe('2026-02-20T08:30:00.000Z')
- })
-
- it('legacy 5h 在无窗口信息时回退 secondary', () => {
- const result = resolveCodexUsageWindow(
- {
- codex_secondary_used_percent: 19,
- codex_secondary_reset_after_seconds: 120,
- codex_usage_updated_at: '2026-02-20T08:00:00Z'
- },
- '5h',
- new Date('2026-02-20T08:00:01Z')
- )
-
- expect(result.usedPercent).toBe(19)
- expect(result.resetAt).toBe('2026-02-20T08:02:00.000Z')
- })
-
- it('legacy 场景下 secondary 为 7d 时能正确识别', () => {
- const result = resolveCodexUsageWindow(
- {
- codex_primary_window_minutes: 300,
- codex_primary_used_percent: 5,
- codex_primary_reset_after_seconds: 600,
- codex_secondary_window_minutes: 10080,
- codex_secondary_used_percent: 66,
- codex_secondary_reset_after_seconds: 7200,
- codex_usage_updated_at: '2026-02-20T07:00:00Z'
- },
- '7d',
- new Date('2026-02-20T07:30:00Z')
- )
-
- expect(result.usedPercent).toBe(66)
- expect(result.resetAt).toBe('2026-02-20T09:00:00.000Z')
- })
-
- it('绝对时间非法时回退到 updated_at + seconds', () => {
- const result = resolveCodexUsageWindow(
- {
- codex_5h_used_percent: 33,
- codex_5h_reset_at: 'not-a-date',
- codex_5h_reset_after_seconds: 900,
- codex_usage_updated_at: '2026-02-20T07:30:00Z'
- },
- '5h',
- new Date('2026-02-20T07:40:00Z')
- )
-
- expect(result.usedPercent).toBe(33)
- expect(result.resetAt).toBe('2026-02-20T07:45:00.000Z')
- })
-
- it('updated_at 非法且无绝对时间时 resetAt 返回 null', () => {
- const result = resolveCodexUsageWindow(
- {
- codex_5h_used_percent: 10,
- codex_5h_reset_after_seconds: 123,
- codex_usage_updated_at: 'invalid-time'
- },
- '5h',
- new Date('2026-02-20T08:00:00Z')
- )
-
- expect(result.usedPercent).toBe(10)
- expect(result.resetAt).toBeNull()
- })
-
- it('reset_after_seconds 为负数时按 0 秒处理', () => {
- const result = resolveCodexUsageWindow(
- {
- codex_5h_used_percent: 80,
- codex_5h_reset_after_seconds: -30,
- codex_usage_updated_at: '2026-02-20T08:00:00Z'
- },
- '5h',
- new Date('2026-02-20T07:59:00Z')
- )
-
- expect(result.usedPercent).toBe(80)
- expect(result.resetAt).toBe('2026-02-20T08:00:00.000Z')
- })
-
- it('百分比缺失时仍可计算 resetAt 供倒计时展示', () => {
- const result = resolveCodexUsageWindow(
- {
- codex_7d_reset_after_seconds: 60,
- codex_usage_updated_at: '2026-02-20T08:00:00Z'
- },
- '7d',
- new Date('2026-02-20T08:00:01Z')
- )
-
- expect(result.usedPercent).toBeNull()
- expect(result.resetAt).toBe('2026-02-20T08:01:00.000Z')
- })
-})
diff --git a/frontend/src/utils/__tests__/usageLoadQueue.spec.ts b/frontend/src/utils/__tests__/usageLoadQueue.spec.ts
deleted file mode 100644
index 4700c9e9..00000000
--- a/frontend/src/utils/__tests__/usageLoadQueue.spec.ts
+++ /dev/null
@@ -1,224 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { enqueueUsageRequest } from '../usageLoadQueue'
-import type { Account } from '@/types'
-
-/** Helper to create a minimal Account with proxy info */
-function makeAccount(
- platform: string,
- type: string = 'oauth',
- proxy?: { host: string; port: number; username?: string | null } | null
-): Account {
- return {
- id: Math.floor(Math.random() * 10000),
- platform,
- type,
- name: 'test',
- status: 'active',
- proxy_id: proxy ? 1 : null,
- proxy: proxy
- ? { id: 1, name: 'p', protocol: 'http', host: proxy.host, port: proxy.port, username: proxy.username ?? null, status: 'active', created_at: '', updated_at: '' }
- : undefined,
- credentials: {},
- created_at: '',
- updated_at: ''
- } as unknown as Account
-}
-
-describe('usageLoadQueue', () => {
- // ─── Anthropic 账号：按代理出口排队 ───
-
- it('Anthropic 同代理出口串行执行，间隔 >= 1s', async () => {
- const timestamps: number[] = []
- const makeFn = () => async () => {
- timestamps.push(Date.now())
- return 'ok'
- }
-
- const acc = makeAccount('anthropic', 'oauth', { host: '1.2.3.4', port: 8080, username: 'u1' })
-
- const p1 = enqueueUsageRequest(acc, makeFn())
- const p2 = enqueueUsageRequest(acc, makeFn())
- const p3 = enqueueUsageRequest(acc, makeFn())
-
- await Promise.all([p1, p2, p3])
-
- expect(timestamps).toHaveLength(3)
- expect(timestamps[1] - timestamps[0]).toBeGreaterThanOrEqual(950)
- expect(timestamps[1] - timestamps[0]).toBeLessThan(2100)
- expect(timestamps[2] - timestamps[1]).toBeGreaterThanOrEqual(950)
- expect(timestamps[2] - timestamps[1]).toBeLessThan(2100)
- })
-
- it('Anthropic 不同代理出口并行执行', async () => {
- const timestamps: Record = {}
- const makeTracked = (key: string) => async () => {
- timestamps[key] = Date.now()
- return key
- }
-
- const acc1 = makeAccount('anthropic', 'oauth', { host: '1.2.3.4', port: 8080, username: 'u1' })
- const acc2 = makeAccount('anthropic', 'oauth', { host: '5.6.7.8', port: 3128, username: 'u2' })
-
- const p1 = enqueueUsageRequest(acc1, makeTracked('proxy1'))
- const p2 = enqueueUsageRequest(acc2, makeTracked('proxy2'))
-
- await Promise.all([p1, p2])
-
- const spread = Math.abs(timestamps['proxy1'] - timestamps['proxy2'])
- expect(spread).toBeLessThan(50)
- })
-
- it('Anthropic 相同代理连接信息的不同账号归为同一队列', async () => {
- const timestamps: number[] = []
- const makeFn = () => async () => {
- timestamps.push(Date.now())
- return 'ok'
- }
-
- const acc1 = makeAccount('anthropic', 'oauth', { host: '10.0.0.1', port: 3128, username: 'admin' })
- const acc2 = makeAccount('anthropic', 'setup-token', { host: '10.0.0.1', port: 3128, username: 'admin' })
-
- const p1 = enqueueUsageRequest(acc1, makeFn())
- const p2 = enqueueUsageRequest(acc2, makeFn())
-
- await Promise.all([p1, p2])
-
- expect(timestamps).toHaveLength(2)
- expect(timestamps[1] - timestamps[0]).toBeGreaterThanOrEqual(950)
- })
-
- it('Anthropic 直连（无代理）的账号归为同一队列', async () => {
- const order: number[] = []
- const makeFn = (n: number) => async () => {
- order.push(n)
- return n
- }
-
- const acc1 = makeAccount('anthropic', 'oauth')
- const acc2 = makeAccount('anthropic', 'setup-token')
-
- const p1 = enqueueUsageRequest(acc1, makeFn(1))
- const p2 = enqueueUsageRequest(acc2, makeFn(2))
-
- await Promise.all([p1, p2])
-
- expect(order).toEqual([1, 2])
- })
-
- it('Anthropic 请求失败时 reject，后续任务继续执行', async () => {
- const results: string[] = []
- const acc = makeAccount('anthropic', 'oauth', { host: '99.99.99.99', port: 1234 })
-
- const p1 = enqueueUsageRequest(acc, async () => {
- throw new Error('fail')
- })
- const p2 = enqueueUsageRequest(acc, async () => {
- results.push('second')
- return 'ok'
- })
-
- await expect(p1).rejects.toThrow('fail')
- await p2
- expect(results).toEqual(['second'])
- })
-
- // ─── 非 Anthropic 平台：直接执行，不排队 ───
-
- it('非 Anthropic 平台直接执行，不排队', async () => {
- const timestamps: number[] = []
- const makeFn = () => async () => {
- timestamps.push(Date.now())
- return 'ok'
- }
-
- // 同一代理的 Gemini 账号 — 应当并行，不排队
- const acc1 = makeAccount('gemini', 'oauth', { host: '1.2.3.4', port: 8080 })
- const acc2 = makeAccount('gemini', 'oauth', { host: '1.2.3.4', port: 8080 })
-
- const p1 = enqueueUsageRequest(acc1, makeFn())
- const p2 = enqueueUsageRequest(acc2, makeFn())
-
- await Promise.all([p1, p2])
-
- expect(timestamps).toHaveLength(2)
- // 并行执行，几乎同时完成
- expect(Math.abs(timestamps[1] - timestamps[0])).toBeLessThan(50)
- })
-
- it('Antigravity 平台直接执行，不排队', async () => {
- const timestamps: number[] = []
- const makeFn = () => async () => {
- timestamps.push(Date.now())
- return 'ok'
- }
-
- const acc1 = makeAccount('antigravity', 'oauth', { host: '1.2.3.4', port: 8080 })
- const acc2 = makeAccount('antigravity', 'oauth', { host: '1.2.3.4', port: 8080 })
-
- const p1 = enqueueUsageRequest(acc1, makeFn())
- const p2 = enqueueUsageRequest(acc2, makeFn())
-
- await Promise.all([p1, p2])
-
- expect(timestamps).toHaveLength(2)
- expect(Math.abs(timestamps[1] - timestamps[0])).toBeLessThan(50)
- })
-
- it('OpenAI 平台直接执行，不排队', async () => {
- const timestamps: number[] = []
- const makeFn = () => async () => {
- timestamps.push(Date.now())
- return 'ok'
- }
-
- const acc1 = makeAccount('openai', 'oauth', { host: '1.2.3.4', port: 8080 })
- const acc2 = makeAccount('openai', 'oauth', { host: '1.2.3.4', port: 8080 })
-
- const p1 = enqueueUsageRequest(acc1, makeFn())
- const p2 = enqueueUsageRequest(acc2, makeFn())
-
- await Promise.all([p1, p2])
-
- expect(timestamps).toHaveLength(2)
- expect(Math.abs(timestamps[1] - timestamps[0])).toBeLessThan(50)
- })
-
- // ─── Anthropic apikey 类型不排队 ───
-
- it('Anthropic apikey 类型直接执行，不排队', async () => {
- const timestamps: number[] = []
- const makeFn = () => async () => {
- timestamps.push(Date.now())
- return 'ok'
- }
-
- const acc1 = makeAccount('anthropic', 'apikey', { host: '1.2.3.4', port: 8080 })
- const acc2 = makeAccount('anthropic', 'apikey', { host: '1.2.3.4', port: 8080 })
-
- const p1 = enqueueUsageRequest(acc1, makeFn())
- const p2 = enqueueUsageRequest(acc2, makeFn())
-
- await Promise.all([p1, p2])
-
- expect(timestamps).toHaveLength(2)
- expect(Math.abs(timestamps[1] - timestamps[0])).toBeLessThan(50)
- })
-
- // ─── 返回值透传 ───
-
- it('返回值正确透传', async () => {
- const acc = makeAccount('anthropic', 'oauth')
- const result = await enqueueUsageRequest(acc, async () => {
- return { usage: 42 }
- })
- expect(result).toEqual({ usage: 42 })
- })
-
- it('非 Anthropic 返回值正确透传', async () => {
- const acc = makeAccount('gemini', 'oauth')
- const result = await enqueueUsageRequest(acc, async () => {
- return { quota: 100 }
- })
- expect(result).toEqual({ quota: 100 })
- })
-})
diff --git a/frontend/src/utils/codexUsage.ts b/frontend/src/utils/codexUsage.ts
deleted file mode 100644
index 57d8287b..00000000
--- a/frontend/src/utils/codexUsage.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-import type { CodexUsageSnapshot } from '@/types'
-
-export interface ResolvedCodexUsageWindow {
- usedPercent: number | null
- resetAt: string | null
-}
-
-type WindowKind = '5h' | '7d'
-
-function asNumber(value: unknown): number | null {
- if (typeof value === 'number' && Number.isFinite(value)) return value
- if (typeof value === 'string' && value.trim() !== '') {
- const n = Number(value)
- if (Number.isFinite(n)) return n
- }
- return null
-}
-
-function asString(value: unknown): string | null {
- if (typeof value !== 'string') return null
- const trimmed = value.trim()
- return trimmed === '' ? null : trimmed
-}
-
-function asISOTime(value: unknown): string | null {
- const raw = asString(value)
- if (!raw) return null
- const date = new Date(raw)
- if (Number.isNaN(date.getTime())) return null
- return date.toISOString()
-}
-
-function resolveLegacy5h(snapshot: Record): {
- used: number | null
- resetAfterSeconds: number | null
-} {
- const primaryWindow = asNumber(snapshot.codex_primary_window_minutes)
- const secondaryWindow = asNumber(snapshot.codex_secondary_window_minutes)
- const primaryUsed = asNumber(snapshot.codex_primary_used_percent)
- const secondaryUsed = asNumber(snapshot.codex_secondary_used_percent)
- const primaryReset = asNumber(snapshot.codex_primary_reset_after_seconds)
- const secondaryReset = asNumber(snapshot.codex_secondary_reset_after_seconds)
-
- if (primaryWindow != null && primaryWindow <= 360) {
- return { used: primaryUsed, resetAfterSeconds: primaryReset }
- }
- if (secondaryWindow != null && secondaryWindow <= 360) {
- return { used: secondaryUsed, resetAfterSeconds: secondaryReset }
- }
- return { used: secondaryUsed, resetAfterSeconds: secondaryReset }
-}
-
-function resolveLegacy7d(snapshot: Record): {
- used: number | null
- resetAfterSeconds: number | null
-} {
- const primaryWindow = asNumber(snapshot.codex_primary_window_minutes)
- const secondaryWindow = asNumber(snapshot.codex_secondary_window_minutes)
- const primaryUsed = asNumber(snapshot.codex_primary_used_percent)
- const secondaryUsed = asNumber(snapshot.codex_secondary_used_percent)
- const primaryReset = asNumber(snapshot.codex_primary_reset_after_seconds)
- const secondaryReset = asNumber(snapshot.codex_secondary_reset_after_seconds)
-
- if (primaryWindow != null && primaryWindow >= 10000) {
- return { used: primaryUsed, resetAfterSeconds: primaryReset }
- }
- if (secondaryWindow != null && secondaryWindow >= 10000) {
- return { used: secondaryUsed, resetAfterSeconds: secondaryReset }
- }
- return { used: primaryUsed, resetAfterSeconds: primaryReset }
-}
-
-function resolveFromSeconds(
- snapshot: Record,
- resetAfterSeconds: number | null
-): string | null {
- if (resetAfterSeconds == null) return null
-
- const baseRaw = asString(snapshot.codex_usage_updated_at)
- const base = baseRaw ? new Date(baseRaw) : new Date()
- if (Number.isNaN(base.getTime())) return null
-
- const sec = Math.max(0, resetAfterSeconds)
- const resetAt = new Date(base.getTime() + sec * 1000)
- return resetAt.toISOString()
-}
-
-function applyExpiredRule(
- window: ResolvedCodexUsageWindow,
- now: Date
-): ResolvedCodexUsageWindow {
- if (window.usedPercent == null || !window.resetAt) return window
- const resetDate = new Date(window.resetAt)
- if (Number.isNaN(resetDate.getTime())) return window
- if (resetDate.getTime() <= now.getTime()) {
- return { usedPercent: 0, resetAt: resetDate.toISOString() }
- }
- return window
-}
-
-export function resolveCodexUsageWindow(
- snapshot: (CodexUsageSnapshot & Record) | null | undefined,
- window: WindowKind,
- now: Date = new Date()
-): ResolvedCodexUsageWindow {
- if (!snapshot) {
- return { usedPercent: null, resetAt: null }
- }
-
- const typedSnapshot = snapshot as Record
- let usedPercent: number | null
- let resetAfterSeconds: number | null
- let resetAt: string | null
-
- if (window === '5h') {
- usedPercent = asNumber(typedSnapshot.codex_5h_used_percent)
- resetAfterSeconds = asNumber(typedSnapshot.codex_5h_reset_after_seconds)
- resetAt = asISOTime(typedSnapshot.codex_5h_reset_at)
- if (usedPercent == null || (resetAfterSeconds == null && !resetAt)) {
- const legacy = resolveLegacy5h(typedSnapshot)
- if (usedPercent == null) usedPercent = legacy.used
- if (resetAfterSeconds == null) resetAfterSeconds = legacy.resetAfterSeconds
- }
- } else {
- usedPercent = asNumber(typedSnapshot.codex_7d_used_percent)
- resetAfterSeconds = asNumber(typedSnapshot.codex_7d_reset_after_seconds)
- resetAt = asISOTime(typedSnapshot.codex_7d_reset_at)
- if (usedPercent == null || (resetAfterSeconds == null && !resetAt)) {
- const legacy = resolveLegacy7d(typedSnapshot)
- if (usedPercent == null) usedPercent = legacy.used
- if (resetAfterSeconds == null) resetAfterSeconds = legacy.resetAfterSeconds
- }
- }
-
- if (!resetAt) {
- resetAt = resolveFromSeconds(typedSnapshot, resetAfterSeconds)
- }
-
- return applyExpiredRule({ usedPercent, resetAt }, now)
-}
diff --git a/frontend/src/utils/embedded-url.ts b/frontend/src/utils/embedded-url.ts
index 1c792301..e70d30b4 100644
--- a/frontend/src/utils/embedded-url.ts
+++ b/frontend/src/utils/embedded-url.ts
@@ -1,6 +1,6 @@
/**
* Shared URL builder for iframe-embedded pages.
- * Used by CustomPageView to build consistent URLs
+ * Used by PurchaseSubscriptionView and CustomPageView to build consistent URLs
* with user_id, token, theme, lang, ui_mode, src_host, and src parameters.
*/
diff --git a/frontend/src/views/HomeView.vue b/frontend/src/views/HomeView.vue
index babcf046..6a3753f1 100644
--- a/frontend/src/views/HomeView.vue
+++ b/frontend/src/views/HomeView.vue
@@ -122,11 +122,8 @@
>
{{ siteName }}
-
- {{ t('home.heroSubtitle') }}
-
-
- {{ t('home.heroDescription') }}
+
+ {{ siteSubtitle }}
@@ -180,7 +177,7 @@
-
- {{ t('home.cta.title') }}
-
-
- {{ t('home.cta.description') }}
-
-
- {{ t('home.cta.button') }}
-
-
-
- {{ t('home.goToDashboard') }}
-
-
-
© {{ currentYear }} {{ siteName }}. {{ t('home.footer.allRightsReserved') }}
-