Merge branch 'fawney19:master' into master

2026-09-01 17:00:21 +08:00 · 2026-01-16 16:24:41 +08:00
parent ed1d828f85 50343d5459
commit 9285dc896c
26 changed files with 146 additions and 146 deletions
--- a/frontend/src/api/admin.ts
+++ b/frontend/src/api/admin.ts
@@ -76,7 +76,6 @@ export interface ProviderExport {
  provider_priority?: number
  is_active: boolean
  concurrent_limit?: number | null
-  timeout?: number | null
  max_retries?: number | null
  proxy?: any
  config?: any
@@ -89,7 +88,6 @@ export interface EndpointExport {
  api_format: string
  base_url: string
  headers?: any
-  timeout?: number
  max_retries?: number
  is_active: boolean
  custom_path?: string | null
--- a/frontend/src/api/endpoints/endpoints.ts
+++ b/frontend/src/api/endpoints/endpoints.ts
@@ -28,7 +28,6 @@ export async function createEndpoint(
    base_url: string
    custom_path?: string
    header_rules?: HeaderRule[]
-    timeout?: number
    max_retries?: number
    is_active?: boolean
    config?: Record<string, any>
@@ -48,7 +47,6 @@ export async function updateEndpoint(
    base_url: string
    custom_path: string | null
    header_rules: HeaderRule[]
-    timeout: number
    max_retries: number
    is_active: boolean
    config: Record<string, any>
--- a/frontend/src/api/endpoints/providers.ts
+++ b/frontend/src/api/endpoints/providers.ts
@@ -34,7 +34,6 @@ export async function updateProvider(
    quota_expires_at: string
    rpm_limit: number | null
    // 请求配置（从 Endpoint 迁移）
-    timeout: number
    max_retries: number
    proxy: ProxyConfig | null
    cache_ttl_minutes: number  // 0表示不支持缓存，>0表示支持缓存并设置TTL(分钟)
--- a/frontend/src/api/endpoints/types.ts
+++ b/frontend/src/api/endpoints/types.ts
@@ -96,7 +96,6 @@ export interface ProviderEndpoint {
  custom_path?: string  // 自定义请求路径（可选，为空则使用 API 格式默认路径）
  // 请求头配置
  header_rules?: HeaderRule[]  // 请求头规则列表，支持 set/drop/rename 操作
-  timeout: number
  max_retries: number
  is_active: boolean
  config?: Record<string, any>
@@ -302,7 +301,6 @@ export interface ProviderWithEndpointsSummary {
  quota_last_reset_at?: string  // 当前周期开始时间
  quota_expires_at?: string
  // 请求配置（从 Endpoint 迁移）
-  timeout?: number  // 请求超时（秒）
  max_retries?: number  // 最大重试次数
  proxy?: ProxyConfig | null  // 代理配置
  is_active: boolean
--- a/frontend/src/features/providers/components/ProviderFormDialog.vue
+++ b/frontend/src/features/providers/components/ProviderFormDialog.vue
@@ -80,29 +80,16 @@
              </SelectContent>
            </Select>
          </div>
-          <div class="grid grid-cols-2 gap-4">
-            <div class="space-y-1.5">
-              <Label>超时时间 (秒)</Label>
-              <Input
-                :model-value="form.timeout ?? ''"
-                type="number"
-                min="1"
-                max="600"
-                placeholder="默认 300"
-                @update:model-value="(v) => form.timeout = parseNumberInput(v)"
-              />
-            </div>
-            <div class="space-y-1.5">
-              <Label>最大重试次数</Label>
-              <Input
-                :model-value="form.max_retries ?? ''"
-                type="number"
-                min="0"
-                max="10"
-                placeholder="默认 2"
-                @update:model-value="(v) => form.max_retries = parseNumberInput(v)"
-              />
-            </div>
+          <div class="space-y-1.5">
+            <Label>最大重试次数</Label>
+            <Input
+              :model-value="form.max_retries ?? ''"
+              type="number"
+              min="0"
+              max="10"
+              placeholder="默认 2"
+              @update:model-value="(v) => form.max_retries = parseNumberInput(v)"
+            />
          </div>
        </div>

@@ -279,7 +266,6 @@ const form = ref({
  rate_limit: undefined as number | undefined,
  concurrent_limit: undefined as number | undefined,
  // 请求配置
-  timeout: undefined as number | undefined,
  max_retries: undefined as number | undefined,
  // 代理配置（扁平化便于表单绑定）
  proxy_enabled: false,
@@ -304,7 +290,6 @@ function resetForm() {
    rate_limit: undefined,
    concurrent_limit: undefined,
    // 请求配置
-    timeout: undefined,
    max_retries: undefined,
    // 代理配置
    proxy_enabled: false,
@@ -335,7 +320,6 @@ function loadProviderData() {
    rate_limit: undefined,
    concurrent_limit: undefined,
    // 请求配置
-    timeout: props.provider.timeout ?? undefined,
    max_retries: props.provider.max_retries ?? undefined,
    // 代理配置
    proxy_enabled: proxy?.enabled ?? false,
@@ -391,7 +375,6 @@ const handleSubmit = async () => {
      provider_priority: form.value.provider_priority,
      is_active: form.value.is_active,
      // 请求配置
-      timeout: form.value.timeout ?? undefined,
      max_retries: form.value.max_retries ?? undefined,
      proxy,
    }
--- a/frontend/src/mocks/handler.ts
+++ b/frontend/src/mocks/handler.ts
@@ -425,9 +425,9 @@ const MOCK_ENDPOINT_KEYS = [

 // Mock Endpoints
 const MOCK_ENDPOINTS = [
-  { id: 'ep-001', provider_id: 'provider-001', provider_name: 'anthropic', api_format: 'CLAUDE', base_url: 'https://api.anthropic.com', timeout: 300, max_retries: 2, is_active: true, total_keys: 2, active_keys: 2, created_at: '2024-01-01T00:00:00Z', updated_at: new Date().toISOString() },
-  { id: 'ep-002', provider_id: 'provider-002', provider_name: 'openai', api_format: 'OPENAI', base_url: 'https://api.openai.com', timeout: 60, max_retries: 2, is_active: true, total_keys: 1, active_keys: 1, created_at: '2024-01-01T00:00:00Z', updated_at: new Date().toISOString() },
-  { id: 'ep-003', provider_id: 'provider-003', provider_name: 'google', api_format: 'GEMINI', base_url: 'https://generativelanguage.googleapis.com', timeout: 60, max_retries: 2, is_active: true, total_keys: 1, active_keys: 1, created_at: '2024-01-15T00:00:00Z', updated_at: new Date().toISOString() }
+  { id: 'ep-001', provider_id: 'provider-001', provider_name: 'anthropic', api_format: 'CLAUDE', base_url: 'https://api.anthropic.com', max_retries: 2, is_active: true, total_keys: 2, active_keys: 2, created_at: '2024-01-01T00:00:00Z', updated_at: new Date().toISOString() },
+  { id: 'ep-002', provider_id: 'provider-002', provider_name: 'openai', api_format: 'OPENAI', base_url: 'https://api.openai.com', max_retries: 2, is_active: true, total_keys: 1, active_keys: 1, created_at: '2024-01-01T00:00:00Z', updated_at: new Date().toISOString() },
+  { id: 'ep-003', provider_id: 'provider-003', provider_name: 'google', api_format: 'GEMINI', base_url: 'https://generativelanguage.googleapis.com', max_retries: 2, is_active: true, total_keys: 1, active_keys: 1, created_at: '2024-01-15T00:00:00Z', updated_at: new Date().toISOString() }
 ]

 // Mock 能力定义
@@ -1221,7 +1221,6 @@ function generateMockEndpointsForProvider(providerId: string) {
      base_url: format.includes('CLAUDE') ? 'https://api.anthropic.com' :
                format.includes('OPENAI') ? 'https://api.openai.com' :
                'https://generativelanguage.googleapis.com',
-      timeout: 300,
      max_retries: 2,
      is_active: healthDetail?.is_active ?? true,
      total_keys: Math.ceil(Math.random() * 3) + 1,