feat: OAuth Token 自动刷新调度、OAuth 对话框优化及 OpenAI CLI normalizer 重构

- 系统设置新增 OAuth Token 自动刷新任务开关，支持动态调度 - OAuth 授权对话框简化步骤布局，移除编号圆圈样式 - 重构 OpenAI CLI normalizer：将 if-else 链替换为事件处理器映射表，将 stream_event_from_internal 拆分为独立方法 - 维护调度器在禁用刷新时移除已调度的 job - .gitignore 新增 CLIProxyAPI/ 和 sub2api/ 排除项 - 补充 noop/unknown 事件处理器的测试覆盖
2026-09-02 09:20:22 +08:00 · 2026-02-05 01:07:47 +08:00
parent ba4d88e8ce
commit 9a8f25d1a9
7 changed files with 609 additions and 513 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 # Created by https://www.toptal.com/developers/gitignore/api/python
 # Edit at https://www.toptal.com/developers/gitignore?templates=python

+CLIProxyAPI/
+sub2api/
+
 # AI Assistant Configuration
 .claude/
 .serena/
--- a/frontend/src/features/providers/components/OAuthAccountDialog.vue
+++ b/frontend/src/features/providers/components/OAuthAccountDialog.vue
@@ -6,7 +6,7 @@
    size="md"
    @update:model-value="handleDialogUpdate"
  >
-    <div class="space-y-6">
+    <div class="space-y-5">
      <!-- 加载中 -->
      <div
        v-if="oauth.starting && !oauth.authorization_url"
@@ -21,22 +21,14 @@
      <!-- 授权流程 -->
      <template v-else-if="oauth.authorization_url">
        <!-- 步骤 1: 打开授权链接 -->
-        <div class="space-y-3">
-          <div class="flex items-center gap-2">
-            <div class="w-5 h-5 rounded-full bg-primary text-primary-foreground flex items-center justify-center text-xs font-medium shrink-0">
-              1
-            </div>
-            <span class="text-sm font-medium">打开授权链接</span>
-          </div>
-          <p class="text-xs text-muted-foreground pl-7">
+        <div class="space-y-2">
+          <p class="text-xs font-medium text-muted-foreground uppercase tracking-wider">
+            第一步 · 前往授权
+          </p>
+          <p class="text-xs text-muted-foreground">
            点击下方按钮在浏览器中完成登录授权
          </p>
-          <div class="ml-7 p-2.5 rounded-md bg-muted/50 border border-border/50">
-            <p class="text-xs font-mono text-muted-foreground break-all line-clamp-3 leading-relaxed">
-              {{ oauth.authorization_url }}
-            </p>
-          </div>
-          <div class="flex gap-2 pl-7">
+          <div class="flex gap-2 pt-1">
            <Button
              size="sm"
              :disabled="oauthBusy"
@@ -57,28 +49,26 @@
          </div>
        </div>

+        <Separator />
+
        <!-- 步骤 2: 粘贴回调地址 -->
-        <div class="space-y-3">
-          <div class="flex items-center gap-2">
-            <div class="w-5 h-5 rounded-full bg-muted text-muted-foreground flex items-center justify-center text-xs font-medium shrink-0">
-              2
-            </div>
-            <span class="text-sm font-medium">粘贴回调地址</span>
-          </div>
-          <p class="text-xs text-muted-foreground pl-7">
+        <div class="space-y-2">
+          <p class="text-xs font-medium text-muted-foreground uppercase tracking-wider">
+            第二步 · 粘贴回调
+          </p>
+          <p class="text-xs text-muted-foreground">
            授权完成后，复制浏览器地址栏的完整 URL 并粘贴到下方
          </p>
-          <div class="pl-7">
+          <div class="pt-1">
            <Textarea
              v-model="oauth.callback_url"
              :disabled="oauthBusy"
              placeholder="http://localhost:xxx/callback?code=..."
-              class="min-h-[80px] text-xs font-mono resize-none"
+              class="min-h-[80px] text-xs font-mono break-all !rounded-xl"
              spellcheck="false"
            />
          </div>
        </div>
-
      </template>
    </div>

@@ -93,7 +83,7 @@
        :disabled="!canCompleteOAuth"
        @click="handleCompleteOAuth"
      >
-        {{ oauth.completing ? '验证中...' : '完成授权' }}
+        {{ oauth.completing ? '验证中...' : '验证' }}
      </Button>
    </template>
  </Dialog>
@@ -101,7 +91,7 @@

 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
-import { Dialog, Button, Textarea } from '@/components/ui'
+import { Dialog, Button, Textarea, Separator } from '@/components/ui'
 import { UserPlus, Copy, ExternalLink } from 'lucide-vue-next'
 import { useToast } from '@/composables/useToast'
 import { useClipboard } from '@/composables/useClipboard'
--- a/frontend/src/views/admin/SystemSettings.vue
+++ b/frontend/src/views/admin/SystemSettings.vue
@@ -534,7 +534,7 @@

                <!-- 右侧：时间选择器 + 保存按钮 -->
                <div
-                  v-if="task.enabled"
+                  v-if="task.enabled && task.hasTimeConfig"
                  class="flex items-center gap-2 shrink-0"
                >
                  <Clock class="w-4 h-4 text-muted-foreground" />
@@ -995,7 +995,7 @@

 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
-import { Download, Upload, CalendarCheck, RotateCcw, Clock, Check, Loader2 } from 'lucide-vue-next'
+import { Download, Upload, CalendarCheck, RotateCcw, RefreshCw, Clock, Check, Loader2 } from 'lucide-vue-next'
 import Button from '@/components/ui/button.vue'
 import Input from '@/components/ui/input.vue'
 import Label from '@/components/ui/label.vue'
@@ -1044,6 +1044,7 @@ interface SystemConfig {
  enable_user_quota_reset: boolean
  user_quota_reset_time: string
  user_quota_reset_interval_days: number
+  enable_oauth_token_refresh: boolean
 }

 const basicConfigLoading = ref(false)
@@ -1104,6 +1105,7 @@ const systemConfig = ref<SystemConfig>({
  enable_user_quota_reset: false,
  user_quota_reset_time: '05:00',
  user_quota_reset_interval_days: 1,
+  enable_oauth_token_refresh: true,
 })

 // 原始配置值（用于检测变动）
@@ -1215,6 +1217,7 @@ async function loadSystemConfig() {
      'enable_user_quota_reset',
      'user_quota_reset_time',
      'user_quota_reset_interval_days',
+      'enable_oauth_token_refresh',
    ]

    for (const key of configs) {
@@ -1423,6 +1426,28 @@ async function handleUserQuotaResetToggle(enabled: boolean) {
  }
 }

+async function handleOAuthTokenRefreshToggle(enabled: boolean) {
+  const previousValue = systemConfig.value.enable_oauth_token_refresh
+  systemConfig.value.enable_oauth_token_refresh = enabled
+  try {
+    await adminApi.updateSystemConfig(
+      'enable_oauth_token_refresh',
+      enabled,
+      '是否启用 OAuth Token 自动刷新任务'
+    )
+    success(enabled ? '已启用 OAuth Token 自动刷新' : '已禁用 OAuth Token 自动刷新')
+  } catch (err) {
+    error('保存配置失败')
+    log.error('保存 OAuth Token 自动刷新配置失败:', err)
+    // 回滚状态
+    systemConfig.value.enable_oauth_token_refresh = previousValue
+  }
+}
+
+// OAuth Token 刷新（无时间配置，占位 ref）
+const oauthRefreshHourSelectOpen = ref(false)
+const oauthRefreshMinuteSelectOpen = ref(false)
+
 // 用户配额重置时间相关
 const previousUserQuotaResetTime = ref('')
 const userQuotaResetHourSelectOpen = ref(false)
@@ -1465,6 +1490,7 @@ const scheduledTasks = computed(() => [
    title: 'Provider 自动签到',
    description: '自动执行已配置 Provider 的签到任务',
    enabled: systemConfig.value.enable_provider_checkin,
+    hasTimeConfig: true,
    hour: checkinHour.value,
    minute: checkinMinute.value,
    hourSelectOpen: checkinHourSelectOpen,
@@ -1481,6 +1507,7 @@ const scheduledTasks = computed(() => [
    title: '用户配额自动重置',
    description: '定时将用户已使用配额重置为零',
    enabled: systemConfig.value.enable_user_quota_reset,
+    hasTimeConfig: true,
    hour: userQuotaResetHour.value,
    minute: userQuotaResetMinute.value,
    hourSelectOpen: userQuotaResetHourSelectOpen,
@@ -1491,6 +1518,23 @@ const scheduledTasks = computed(() => [
    onToggle: handleUserQuotaResetToggle,
    onSave: handleQuotaResetConfigSave,
  },
+  {
+    id: 'oauth-token-refresh',
+    icon: RefreshCw,
+    title: 'OAuth Token 自动刷新',
+    description: '主动刷新即将过期的 OAuth Token（动态调度）',
+    enabled: systemConfig.value.enable_oauth_token_refresh,
+    hasTimeConfig: false,
+    hour: '',
+    minute: '',
+    hourSelectOpen: oauthRefreshHourSelectOpen,
+    minuteSelectOpen: oauthRefreshMinuteSelectOpen,
+    updateTime: () => {},
+    hasChanges: false,
+    loading: false,
+    onToggle: handleOAuthTokenRefreshToggle,
+    onSave: () => {},
+  },
 ])

 // Provider 签到时间保存
--- a/src/api/admin/system.py
+++ b/src/api/admin/system.py
@@ -634,6 +634,15 @@ class AdminSetSystemConfigAdapter(AdminApiAdapter):
            except Exception as e:
                logger.warning(f"更新用户配额重置任务时间失败: {e}")

+        # 如果更新的是 OAuth Token 自动刷新开关，触发调度器重新计算
+        if self.key == "enable_oauth_token_refresh":
+            try:
+                from src.services.system.maintenance_scheduler import get_maintenance_scheduler
+
+                get_maintenance_scheduler().trigger_oauth_refresh_check()
+            except Exception as e:
+                logger.warning("触发 OAuth Token 刷新调度失败: {}", e)
+
        # 返回时不暴露加密后的值
        display_value = "********" if self.key in self.ENCRYPTED_KEYS else config.value

--- a/src/core/api_format/conversion/normalizers/openai_cli.py
+++ b/src/core/api_format/conversion/normalizers/openai_cli.py
--- a/src/services/system/maintenance_scheduler.py
+++ b/src/services/system/maintenance_scheduler.py
@@ -396,6 +396,11 @@ class MaintenanceScheduler:
                # 检查配置开关
                if not SystemConfigService.get_config(db, "enable_oauth_token_refresh", True):
                    logger.info("OAuth Token 自动刷新已禁用，不调度任务")
+                    # 移除已调度的 job（如果存在）
+                    try:
+                        scheduler.remove_job(job_id)
+                    except Exception:
+                        pass
                    return
                # 查找所有活跃的 OAuth 类型 Key
                oauth_keys = (
@@ -966,9 +971,7 @@ class MaintenanceScheduler:
                    days_since_reset = (now_local.date() - last_local_date).days

                    if days_since_reset < 0:
-                        logger.warning(
-                            "user_quota_last_reset_at 在未来，跳过本次用户配额自动重置"
-                        )
+                        logger.warning("user_quota_last_reset_at 在未来，跳过本次用户配额自动重置")
                        should_run = False
                    elif days_since_reset < interval_days:
                        logger.info(
@@ -1006,7 +1009,9 @@ class MaintenanceScheduler:
                "用户配额自动重置的上次执行时间（UTC，内部使用）",
            )

-            logger.info(f"用户配额自动重置完成: interval_days={interval_days}, 重置用户数={reset_count}")
+            logger.info(
+                f"用户配额自动重置完成: interval_days={interval_days}, 重置用户数={reset_count}"
+            )

        except Exception as e:
            logger.exception(f"用户配额自动重置任务执行失败: {e}")
--- a/tests/core/api_format/conversion/test_cli_conversion.py
+++ b/tests/core/api_format/conversion/test_cli_conversion.py
@@ -17,6 +17,7 @@ from src.core.api_format.conversion.normalizers.gemini_cli import GeminiCliNorma
 from src.core.api_format.conversion.normalizers.openai import OpenAINormalizer
 from src.core.api_format.conversion.normalizers.openai_cli import OpenAICliNormalizer
 from src.core.api_format.conversion.registry import FormatConversionRegistry
+from src.core.api_format.conversion.stream_events import UnknownStreamEvent
 from src.core.api_format.conversion.stream_state import StreamState


@@ -309,6 +310,36 @@ def test_stream_openai_cli_in_progress_event() -> None:
    assert events2 == []


+def test_stream_openai_cli_noop_and_unknown_events() -> None:
+    """覆盖 OpenAI CLI noop/unknown 事件处理器"""
+    normalizer = OpenAICliNormalizer()
+    state = StreamState()
+
+    # 先触发 message_start 初始化
+    normalizer.stream_chunk_to_internal(
+        {"type": "response.created", "response": {"id": "resp_789", "model": "gpt-5"}}, state
+    )
+
+    # noop 事件不应产生内部事件
+    assert (
+        normalizer.stream_chunk_to_internal({"type": "response.function_call_arguments.done"}, state)
+        == []
+    )
+    assert (
+        normalizer.stream_chunk_to_internal({"type": "response.content_part.added"}, state) == []
+    )
+    assert (
+        normalizer.stream_chunk_to_internal({"type": "response.content_part.done"}, state) == []
+    )
+
+    # unknown 事件应返回 UnknownStreamEvent
+    events = normalizer.stream_chunk_to_internal(
+        {"type": "response.reasoning_summary_text.delta"}, state
+    )
+    assert len(events) == 1
+    assert isinstance(events[0], UnknownStreamEvent)
+
+
 def test_stream_openai_cli_function_call_events() -> None:
    """测试 OpenAI CLI 流式 function_call 相关事件"""
    reg = _make_registry_with_cli()