1

2026-04-28 06:58:37 +00:00 · 2026-02-09 18:13:45 +08:00
parent 61e772fd95
commit a119cb1744
86 changed files with 3803 additions and 2618 deletions
--- a/web/admin-spa/src/components/accounts/AccountForm.vue
+++ b/web/admin-spa/src/components/accounts/AccountForm.vue
@@ -1614,7 +1614,7 @@
              </div>

              <!-- 上游错误处理 -->
-              <div v-if="form.platform === 'claude-console'">
+              <div v-if="autoProtectionPlatforms.includes(form.platform)">
                <label class="mb-3 block text-sm font-semibold text-gray-700 dark:text-gray-300"
                  >上游错误处理</label
                >
@@ -1714,24 +1714,26 @@
                  {{ errors.baseUrl }}
                </p>
                <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">
-                  填写 API 基础地址，必须以
-                  <code class="rounded bg-gray-100 px-1 dark:bg-gray-600">/models</code>
-                  结尾。系统会自动拼接
+                  支持三种格式，系统自动识别：
+                </p>
+                <p class="mt-0.5 text-xs text-gray-400 dark:text-gray-500">
+                  以 /models 结尾:
                  <code class="rounded bg-gray-100 px-1 dark:bg-gray-600"
-                    >/{model}:generateContent</code
+                    >https://proxy.com/v1beta/models</code
                  >
                </p>
                <p class="mt-0.5 text-xs text-gray-400 dark:text-gray-500">
-                  官方:
+                  模板模式:
                  <code class="rounded bg-gray-100 px-1 dark:bg-gray-600"
-                    >https://generativelanguage.googleapis.com/v1beta/models</code
+                    >https://proxy.com/api/{model}:{action}</code
                  >
                </p>
                <p class="mt-0.5 text-xs text-gray-400 dark:text-gray-500">
-                  上游为 CRS:
+                  域名:
                  <code class="rounded bg-gray-100 px-1 dark:bg-gray-600"
-                    >https://your-crs.com/gemini/v1beta/models</code
+                    >https://generativelanguage.googleapis.com</code
                  >
+                  (自动拼接 /v1beta/models)
                </p>
              </div>

@@ -3371,26 +3373,24 @@
                <p class="mt-1 text-xs text-gray-500">账号被限流后暂停调度的时间（分钟）</p>
              </div>
            </div>
+          </div>

-            <!-- 上游错误处理（编辑模式）-->
-            <div v-if="form.platform === 'claude-console'">
-              <label class="mb-3 block text-sm font-semibold text-gray-700 dark:text-gray-300">
-                上游错误处理
-              </label>
-              <label class="inline-flex cursor-pointer items-center">
-                <input
-                  v-model="form.disableAutoProtection"
-                  class="mr-2 rounded border-gray-300 text-blue-600 focus:border-blue-500 focus:ring focus:ring-blue-200 dark:border-gray-600 dark:bg-gray-700"
-                  type="checkbox"
-                />
-                <span class="text-sm text-gray-700 dark:text-gray-300">
-                  上游错误不自动暂停调度
-                </span>
-              </label>
-              <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">
-                勾选后遇到 401/400/429/529 等上游错误仅记录日志并透传，不自动禁用或限流
-              </p>
-            </div>
+          <!-- 上游错误处理（编辑模式）-->
+          <div v-if="autoProtectionPlatforms.includes(form.platform)">
+            <label class="mb-3 block text-sm font-semibold text-gray-700 dark:text-gray-300">
+              上游错误处理
+            </label>
+            <label class="inline-flex cursor-pointer items-center">
+              <input
+                v-model="form.disableAutoProtection"
+                class="mr-2 rounded border-gray-300 text-blue-600 focus:border-blue-500 focus:ring focus:ring-blue-200 dark:border-gray-600 dark:bg-gray-700"
+                type="checkbox"
+              />
+              <span class="text-sm text-gray-700 dark:text-gray-300"> 上游错误不自动暂停调度 </span>
+            </label>
+            <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">
+              勾选后遇到 401/400/429/529 等上游错误仅记录日志并透传，不自动禁用或限流
+            </p>
          </div>

          <!-- OpenAI-Responses 特定字段（编辑模式）-->
@@ -3505,24 +3505,26 @@
                {{ errors.baseUrl }}
              </p>
              <p class="mt-1 text-xs text-gray-500 dark:text-gray-400">
-                填写 API 基础地址，必须以
-                <code class="rounded bg-gray-100 px-1 dark:bg-gray-600">/models</code>
-                结尾。系统会自动拼接
+                支持三种格式，系统自动识别：
+              </p>
+              <p class="mt-0.5 text-xs text-gray-400 dark:text-gray-500">
+                以 /models 结尾:
                <code class="rounded bg-gray-100 px-1 dark:bg-gray-600"
-                  >/{model}:generateContent</code
+                  >https://proxy.com/v1beta/models</code
                >
              </p>
              <p class="mt-0.5 text-xs text-gray-400 dark:text-gray-500">
-                官方:
+                模板模式:
                <code class="rounded bg-gray-100 px-1 dark:bg-gray-600"
-                  >https://generativelanguage.googleapis.com/v1beta/models</code
+                  >https://proxy.com/api/{model}:{action}</code
                >
              </p>
              <p class="mt-0.5 text-xs text-gray-400 dark:text-gray-500">
-                上游为 CRS:
+                域名:
                <code class="rounded bg-gray-100 px-1 dark:bg-gray-600"
-                  >https://your-crs.com/gemini/v1beta/models</code
+                  >https://generativelanguage.googleapis.com</code
                >
+                (自动拼接 /v1beta/models)
              </p>
            </div>

@@ -4039,6 +4041,20 @@ const handleCancel = () => {
 const isEdit = computed(() => !!props.account)
 const show = ref(true)

+// 支持 disableAutoProtection 的平台白名单
+const autoProtectionPlatforms = [
+  'claude-console',
+  'ccr',
+  'droid',
+  'bedrock',
+  'azure-openai',
+  'azure_openai',
+  'gemini',
+  'gemini-api',
+  'openai',
+  'openai-responses'
+]
+
 // OAuthFlow 组件引用
 const oauthFlowRef = ref(null)

@@ -4274,7 +4290,9 @@ const form = ref({
  })(),
  userAgent: props.account?.userAgent || '',
  enableRateLimit: props.account ? props.account.rateLimitDuration > 0 : true,
-  disableAutoProtection: props.account?.disableAutoProtection === true,
+  disableAutoProtection:
+    props.account?.disableAutoProtection === true ||
+    props.account?.disableAutoProtection === 'true',
  // 额度管理字段
  dailyQuota: props.account?.dailyQuota || 0,
  dailyUsage: props.account?.dailyUsage || 0,
@@ -5242,13 +5260,9 @@ const createAccount = async () => {
        errors.value.apiKey = '请填写 API Key'
        hasError = true
      }
-      // 验证 baseUrl 必须以 /models 结尾
      if (!form.value.baseUrl || form.value.baseUrl.trim() === '') {
        errors.value.baseUrl = '请填写 API 基础地址'
        hasError = true
-      } else if (!form.value.baseUrl.trim().endsWith('/models')) {
-        errors.value.baseUrl = 'API 基础地址必须以 /models 结尾'
-        hasError = true
      }
    } else {
      // 其他平台（如 Droid）使用多 API Key 输入
@@ -5407,9 +5421,7 @@ const createAccount = async () => {
      data.userAgent = form.value.userAgent || null
      // 如果不启用限流，传递 0 表示不限流
      data.rateLimitDuration = form.value.enableRateLimit ? form.value.rateLimitDuration || 60 : 0
-      // 上游错误处理（仅 Claude Console）
      if (form.value.platform === 'claude-console') {
-        data.disableAutoProtection = !!form.value.disableAutoProtection
        data.interceptWarmup = !!form.value.interceptWarmup
      }
      // 额度管理字段
@@ -5474,6 +5486,11 @@ const createAccount = async () => {
      data.schedulable = form.value.schedulable !== false
    }

+    // 支持 disableAutoProtection 的平台才写入
+    if (autoProtectionPlatforms.includes(form.value.platform)) {
+      data.disableAutoProtection = !!form.value.disableAutoProtection
+    }
+
    let result
    if (form.value.platform === 'claude') {
      result = await accountsStore.createClaudeAccount(data)
@@ -5540,17 +5557,13 @@ const updateAccount = async () => {
    return
  }

-  // Gemini API 的 baseUrl 验证（必须以 /models 结尾）
+  // Gemini API 的 baseUrl 验证
  if (form.value.platform === 'gemini-api') {
    const baseUrl = form.value.baseUrl?.trim() || ''
    if (!baseUrl) {
      errors.value.baseUrl = '请填写 API 基础地址'
      return
    }
-    if (!baseUrl.endsWith('/models')) {
-      errors.value.baseUrl = 'API 基础地址必须以 /models 结尾'
-      return
-    }
  }

  // 分组类型验证 - 更新账户流程修复
@@ -5755,8 +5768,6 @@ const updateAccount = async () => {
      data.userAgent = form.value.userAgent || null
      // 如果不启用限流，传递 0 表示不限流
      data.rateLimitDuration = form.value.enableRateLimit ? form.value.rateLimitDuration || 60 : 0
-      // 上游错误处理
-      data.disableAutoProtection = !!form.value.disableAutoProtection
      // 拦截预热请求
      data.interceptWarmup = !!form.value.interceptWarmup
      // 额度管理字段
@@ -5847,6 +5858,11 @@ const updateAccount = async () => {
        : []
    }

+    // 支持 disableAutoProtection 的平台才写入
+    if (autoProtectionPlatforms.includes(props.account.platform)) {
+      data.disableAutoProtection = !!form.value.disableAutoProtection
+    }
+
    if (props.account.platform === 'claude') {
      await accountsStore.updateClaudeAccount(props.account.id, data)
    } else if (props.account.platform === 'claude-console') {
@@ -6399,7 +6415,8 @@ watch(
        // 并发控制字段
        maxConcurrentTasks: newAccount.maxConcurrentTasks || 0,
        // 上游错误处理
-        disableAutoProtection: newAccount.disableAutoProtection === true
+        disableAutoProtection:
+          newAccount.disableAutoProtection === true || newAccount.disableAutoProtection === 'true'
      }

      // 如果是Claude Console账户，加载实时使用情况