From 0c52809591bd9256e3d502fde9652dd258a5ff2b Mon Sep 17 00:00:00 2001 From: ianshaw Date: Sun, 11 Jan 2026 22:09:35 -0800 Subject: [PATCH] =?UTF-8?q?refactor(settings):=20=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E6=B5=81=E8=B6=85=E6=97=B6=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=86=97=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 TimeoutSeconds 字段，超时判定由网关配置控制 - 默认禁用流超时处理功能 --- backend/internal/handler/admin/setting_handler.go | 4 ---- backend/internal/handler/dto/settings.go | 1 - backend/internal/service/setting_service.go | 15 --------------- backend/internal/service/settings_view.go | 7 ++----- frontend/src/api/admin/settings.ts | 1 - 5 files changed, 2 insertions(+), 26 deletions(-) diff --git a/backend/internal/handler/admin/setting_handler.go b/backend/internal/handler/admin/setting_handler.go index 1071879b..6666ce4e 100644 --- a/backend/internal/handler/admin/setting_handler.go +++ b/backend/internal/handler/admin/setting_handler.go @@ -666,7 +666,6 @@ func (h *SettingHandler) GetStreamTimeoutSettings(c *gin.Context) { response.Success(c, dto.StreamTimeoutSettings{ Enabled: settings.Enabled, - TimeoutSeconds: settings.TimeoutSeconds, Action: settings.Action, TempUnschedMinutes: settings.TempUnschedMinutes, ThresholdCount: settings.ThresholdCount, @@ -677,7 +676,6 @@ func (h *SettingHandler) GetStreamTimeoutSettings(c *gin.Context) { // UpdateStreamTimeoutSettingsRequest 更新流超时配置请求 type UpdateStreamTimeoutSettingsRequest struct { Enabled bool `json:"enabled"` - TimeoutSeconds int `json:"timeout_seconds"` Action string `json:"action"` TempUnschedMinutes int `json:"temp_unsched_minutes"` ThresholdCount int `json:"threshold_count"` @@ -695,7 +693,6 @@ func (h *SettingHandler) UpdateStreamTimeoutSettings(c *gin.Context) { settings := &service.StreamTimeoutSettings{ Enabled: req.Enabled, - TimeoutSeconds: req.TimeoutSeconds, Action: req.Action, TempUnschedMinutes: req.TempUnschedMinutes, ThresholdCount: req.ThresholdCount, @@ -716,7 +713,6 @@ func (h *SettingHandler) UpdateStreamTimeoutSettings(c *gin.Context) { response.Success(c, dto.StreamTimeoutSettings{ Enabled: updatedSettings.Enabled, - TimeoutSeconds: updatedSettings.TimeoutSeconds, Action: updatedSettings.Action, TempUnschedMinutes: updatedSettings.TempUnschedMinutes, ThresholdCount: updatedSettings.ThresholdCount, diff --git a/backend/internal/handler/dto/settings.go b/backend/internal/handler/dto/settings.go index bb498914..81206def 100644 --- a/backend/internal/handler/dto/settings.go +++ b/backend/internal/handler/dto/settings.go @@ -70,7 +70,6 @@ type PublicSettings struct { // StreamTimeoutSettings 流超时处理配置 DTO type StreamTimeoutSettings struct { Enabled bool `json:"enabled"` - TimeoutSeconds int `json:"timeout_seconds"` Action string `json:"action"` TempUnschedMinutes int `json:"temp_unsched_minutes"` ThresholdCount int `json:"threshold_count"` diff --git a/backend/internal/service/setting_service.go b/backend/internal/service/setting_service.go index 4707a854..0a7426f8 100644 --- a/backend/internal/service/setting_service.go +++ b/backend/internal/service/setting_service.go @@ -696,15 +696,6 @@ func (s *SettingService) GetStreamTimeoutSettings(ctx context.Context) (*StreamT } // 验证并修正配置值 - if settings.TimeoutSeconds < 0 { - settings.TimeoutSeconds = 0 - } - if settings.TimeoutSeconds > 0 && settings.TimeoutSeconds < 30 { - settings.TimeoutSeconds = 30 - } - if settings.TimeoutSeconds > 300 { - settings.TimeoutSeconds = 300 - } if settings.TempUnschedMinutes < 1 { settings.TempUnschedMinutes = 1 } @@ -742,12 +733,6 @@ func (s *SettingService) SetStreamTimeoutSettings(ctx context.Context, settings } // 验证配置值 - if settings.TimeoutSeconds < 0 { - return fmt.Errorf("timeout_seconds must be non-negative") - } - if settings.TimeoutSeconds > 0 && (settings.TimeoutSeconds < 30 || settings.TimeoutSeconds > 300) { - return fmt.Errorf("timeout_seconds must be 0 or between 30-300") - } if settings.TempUnschedMinutes < 1 || settings.TempUnschedMinutes > 60 { return fmt.Errorf("temp_unsched_minutes must be between 1-60") } diff --git a/backend/internal/service/settings_view.go b/backend/internal/service/settings_view.go index ce5387d8..e4ee2826 100644 --- a/backend/internal/service/settings_view.go +++ b/backend/internal/service/settings_view.go @@ -70,12 +70,10 @@ type PublicSettings struct { Version string } -// StreamTimeoutSettings 流超时处理配置 +// StreamTimeoutSettings 流超时处理配置（仅控制超时后的处理方式，超时判定由网关配置控制） type StreamTimeoutSettings struct { // Enabled 是否启用流超时处理 Enabled bool `json:"enabled"` - // TimeoutSeconds 流数据间隔超时阈值（秒），0表示禁用 - TimeoutSeconds int `json:"timeout_seconds"` // Action 超时后的处理方式: "temp_unsched" | "error" | "none" Action string `json:"action"` // TempUnschedMinutes 临时不可调度持续时间（分钟） @@ -96,8 +94,7 @@ const ( // DefaultStreamTimeoutSettings 返回默认的流超时配置 func DefaultStreamTimeoutSettings() *StreamTimeoutSettings { return &StreamTimeoutSettings{ - Enabled: true, - TimeoutSeconds: 60, + Enabled: false, Action: StreamTimeoutActionTempUnsched, TempUnschedMinutes: 5, ThresholdCount: 3, diff --git a/frontend/src/api/admin/settings.ts b/frontend/src/api/admin/settings.ts index eb046741..fc72be8d 100644 --- a/frontend/src/api/admin/settings.ts +++ b/frontend/src/api/admin/settings.ts @@ -206,7 +206,6 @@ export async function deleteAdminApiKey(): Promise<{ message: string }> { */ export interface StreamTimeoutSettings { enabled: boolean - timeout_seconds: number action: 'temp_unsched' | 'error' | 'none' temp_unsched_minutes: number threshold_count: number