From 9bff652c667848c0112e5ffa59b67aa40a779421 Mon Sep 17 00:00:00 2001 From: yml2213 Date: Fri, 26 Jun 2026 13:46:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=AE=9A=E4=B9=89=E9=87=8D?= =?UTF-8?q?=E8=AF=95=E9=97=B4=E9=9A=94=E7=AD=96=E7=95=A5=20+=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=8C=89=E9=92=AEhover=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增重试间隔阶段配置，支持自定义时间分界点和频率 - 默认配置: 0-8秒=130ms, 8-25秒=260ms, 25-75秒=900ms - 设置面板添加可增删的阶段配置 UI - 修复按钮 hover 时文字变白的问题 --- app.go | 8 +- frontend/src/components/ck/CKManager.vue | 6 +- .../src/components/modal/SettingsModal.vue | 165 ++++++++++++++++-- frontend/src/composables/useSettings.ts | 20 ++- frontend/src/styles/common.css | 9 +- internal/config/config.go | 13 ++ internal/seckill/scheduler.go | 34 ++-- internal/types/types.go | 19 +- 8 files changed, 231 insertions(+), 43 deletions(-) diff --git a/app.go b/app.go index 8df3055..94068ee 100644 --- a/app.go +++ b/app.go @@ -70,7 +70,7 @@ func (a *App) startup(ctx context.Context) { a.client = client.New(a.cfg.TimeAPIURL, a.trace) a.font = imgpkg.LoadFont(a.paths.FontFiles) - a.scheduler = seckill.New(a.client, a.paths, a.font, a.cfg.Concurrency, a.cfg.Attempts) + a.scheduler = seckill.New(a.client, a.paths, a.font, a.cfg.Concurrency, a.cfg.Attempts, a.cfg.RetryStages) a.scheduler.LoadAccounts() if err := os.MkdirAll(a.paths.SuccessDir, 0755); err != nil { @@ -563,10 +563,10 @@ func (a *App) SaveSettings(cfg types.Config) map[string]any { // 运行时生效 a.cfg = cfg logger.SetMinLevel(cfg.LogLevel) - a.scheduler.UpdateSettings(cfg.Concurrency, cfg.Attempts) + a.scheduler.UpdateSettings(cfg.Concurrency, cfg.Attempts, cfg.RetryStages) - logger.LogEvent("配置", "success", "配置已保存并生效: 日志等级=%s 并发=%d 重试=%d trace=%v", - cfg.LogLevel, cfg.Concurrency, cfg.Attempts, cfg.TraceEnabled) + logger.LogEvent("配置", "success", "配置已保存并生效: 日志等级=%s 并发=%d 重试=%d 重试阶段=%d trace=%v", + cfg.LogLevel, cfg.Concurrency, cfg.Attempts, len(cfg.RetryStages), cfg.TraceEnabled) return map[string]any{"success": true} } diff --git a/frontend/src/components/ck/CKManager.vue b/frontend/src/components/ck/CKManager.vue index 3fc1a59..42d3860 100644 --- a/frontend/src/components/ck/CKManager.vue +++ b/frontend/src/components/ck/CKManager.vue @@ -352,7 +352,8 @@ const handleOrganize = async () => { } .btn-primary:hover { - filter: brightness(1.08); + background: #4d9aff; + border-color: #4d9aff; } .btn-success { @@ -362,7 +363,8 @@ const handleOrganize = async () => { } .btn-success:hover { - filter: brightness(1.08); + background: #4fc95f; + border-color: #4fc95f; } .btn-compact { diff --git a/frontend/src/components/modal/SettingsModal.vue b/frontend/src/components/modal/SettingsModal.vue index d167c90..f460c7a 100644 --- a/frontend/src/components/modal/SettingsModal.vue +++ b/frontend/src/components/modal/SettingsModal.vue @@ -1,6 +1,6 @@ @@ -133,25 +150,65 @@ defineExpose({ open, close }) + +
+ +
+
+ 阶段{{ index + 1 }}: +
+
+ + 秒内 +
+ → +
+ + ms +
+
+ +
+ +
+
按经过秒数从小到大排列，每个阶段设置不同的重试频率
+
+
💡 抢购策略说明
-
-
⚠️ 自动停止条件
- -
@@ -415,6 +472,86 @@ defineExpose({ open, close }) font-weight: 600; } +/* 重试阶段配置 */ +.retry-stages { + display: flex; + flex-direction: column; + gap: 10px; + margin-top: 8px; +} + +.retry-stage-row { + display: flex; + align-items: center; + gap: 10px; + padding: 10px 12px; + background: var(--field); + border: 1px solid var(--line); + border-radius: var(--radius-sm); +} + +.stage-label { + font-size: 12px; + color: var(--muted); + white-space: nowrap; + min-width: 42px; +} + +.stage-inputs { + display: flex; + align-items: center; + gap: 8px; + flex: 1; +} + +.stage-input-group { + display: flex; + align-items: center; + gap: 4px; +} + +.stage-input { + width: 70px !important; + text-align: center; +} + +.stage-separator { + color: var(--muted); + font-size: 14px; +} + +.btn-icon { + width: 28px; + height: 28px; + border: none; + border-radius: var(--radius-sm); + background: transparent; + color: var(--muted); + cursor: pointer; + display: flex; + align-items: center; + justify-content: center; + font-size: 18px; + transition: .15s; + flex-shrink: 0; +} + +.btn-remove:hover { + background: var(--danger-soft, #fef2f2); + color: var(--danger, #ef4444); +} + +.btn-add-stage { + align-self: flex-start; + margin-top: 4px; +} + +.btn-sm { + height: 32px; + padding: 0 12px; + font-size: 12px; +} + /* 动画 */ .modal-enter-active { transition: all .2s ease; diff --git a/frontend/src/composables/useSettings.ts b/frontend/src/composables/useSettings.ts index 5338c11..8118b05 100644 --- a/frontend/src/composables/useSettings.ts +++ b/frontend/src/composables/useSettings.ts @@ -1,6 +1,11 @@ import { ref } from 'vue' import { useToast } from './useToast' +export interface RetryStage { + maxElapsed: number + interval: number +} + export interface Settings { timeApiUrl: string traceEnabled: boolean @@ -8,17 +13,25 @@ export interface Settings { logLevel: string concurrency: number attempts: number + retryStages: RetryStage[] } const App = window.go.main.App +const defaultRetryStages: RetryStage[] = [ + { maxElapsed: 8, interval: 130 }, + { maxElapsed: 25, interval: 260 }, + { maxElapsed: 75, interval: 900 } +] + const settings = ref({ timeApiUrl: '', traceEnabled: false, traceMaxBody: 0, logLevel: 'info', concurrency: 80, - attempts: 1 + attempts: 1, + retryStages: [...defaultRetryStages] }) export function useSettings() { @@ -33,7 +46,10 @@ export function useSettings() { traceMaxBody: cfg.traceMaxBody || 0, logLevel: cfg.logLevel || 'info', concurrency: cfg.concurrency || 80, - attempts: cfg.attempts || 1 + attempts: cfg.attempts || 1, + retryStages: cfg.retryStages && cfg.retryStages.length > 0 + ? cfg.retryStages + : [...defaultRetryStages] } } catch (e: any) { showToast('读取设置失败', e.message, 'error') diff --git a/frontend/src/styles/common.css b/frontend/src/styles/common.css index faf03dc..aa2e397 100644 --- a/frontend/src/styles/common.css +++ b/frontend/src/styles/common.css @@ -39,7 +39,8 @@ } .btn-primary:hover { - filter: brightness(1.08); + background: #4d9aff; + border-color: #4d9aff; } .btn-danger { @@ -49,7 +50,8 @@ } .btn-danger:hover { - filter: brightness(1.08); + background: #ff6b63; + border-color: #ff6b63; } .btn-success { @@ -59,7 +61,8 @@ } .btn-success:hover { - filter: brightness(1.08); + background: #4fc95f; + border-color: #4fc95f; } .btn-cancel { diff --git a/internal/config/config.go b/internal/config/config.go index f1f9fdf..99456e7 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -81,6 +81,16 @@ func defaultConfig() types.Config { LogLevel: "info", Concurrency: constants.DefaultConcurrency, Attempts: constants.DefaultAttempts, + RetryStages: defaultRetryStages(), + } +} + +// defaultRetryStages 返回默认重试间隔阶段配置。 +func defaultRetryStages() []types.RetryStage { + return []types.RetryStage{ + {MaxElapsed: 8, Interval: 130}, + {MaxElapsed: 25, Interval: 260}, + {MaxElapsed: 75, Interval: 900}, } } @@ -118,6 +128,9 @@ func LoadConfig(path string) types.Config { if cfg.LogLevel == "" { cfg.LogLevel = "info" } + if len(cfg.RetryStages) == 0 { + cfg.RetryStages = defaultRetryStages() + } logger.LogEvent("配置", "success", "配置加载完成: %s", path) return cfg } diff --git a/internal/seckill/scheduler.go b/internal/seckill/scheduler.go index 9368c53..ef90ba2 100644 --- a/internal/seckill/scheduler.go +++ b/internal/seckill/scheduler.go @@ -46,6 +46,8 @@ type Scheduler struct { concurrency int // 抢购并发数 attempts int // 单号重试次数 + retryStages []types.RetryStage // 重试间隔阶段配置 + accountsMu sync.RWMutex accounts []types.Account @@ -65,7 +67,7 @@ type Scheduler struct { } // New 创建抢购调度器。 -func New(cli *client.DouyuClient, paths types.AppPaths, font *truetype.Font, concurrency, attempts int) *Scheduler { +func New(cli *client.DouyuClient, paths types.AppPaths, font *truetype.Font, concurrency, attempts int, retryStages []types.RetryStage) *Scheduler { if concurrency <= 0 { concurrency = constants.DefaultConcurrency } @@ -78,18 +80,22 @@ func New(cli *client.DouyuClient, paths types.AppPaths, font *truetype.Font, con font: font, concurrency: concurrency, attempts: attempts, + retryStages: retryStages, results: make(map[string]string), } } -// UpdateSettings 运行时更新并发数和重试次数。 -func (s *Scheduler) UpdateSettings(concurrency, attempts int) { +// UpdateSettings 运行时更新并发数、重试次数和重试间隔。 +func (s *Scheduler) UpdateSettings(concurrency, attempts int, retryStages []types.RetryStage) { if concurrency > 0 { s.concurrency = concurrency } if attempts > 0 { s.attempts = attempts } + if len(retryStages) > 0 { + s.retryStages = retryStages + } } // LoadAccounts 从账号文件加载账号。 @@ -300,7 +306,7 @@ func (s *Scheduler) RunNow(accountProducts map[string]string) { break } - retryInterval := seckillRetryInterval(time.Since(startTime)) + retryInterval := s.getRetryInterval(time.Since(startTime)) if retryInterval > 0 && time.Since(startTime)+retryInterval < seckillMaxDuration { time.Sleep(jitterDuration(retryInterval)) } @@ -421,15 +427,19 @@ func (s *Scheduler) executeRound(attempts []types.ExchangeAttempt) roundOutcome return outcome } -func seckillRetryInterval(elapsed time.Duration) time.Duration { - switch { - case elapsed < 8*time.Second: - return 180 * time.Millisecond - case elapsed < 25*time.Second: - return 350 * time.Millisecond - default: - return 900 * time.Millisecond +// getRetryInterval 根据配置的重试阶段计算当前应该使用的重试间隔。 +func (s *Scheduler) getRetryInterval(elapsed time.Duration) time.Duration { + elapsedSec := int(elapsed.Seconds()) + + // 使用配置的阶段 + for _, stage := range s.retryStages { + if stage.MaxElapsed > 0 && elapsedSec < stage.MaxElapsed && stage.Interval > 0 { + return time.Duration(stage.Interval) * time.Millisecond + } } + + // 默认值（如果没有配置或配置无效） + return 900 * time.Millisecond } func jitterDuration(base time.Duration) time.Duration { diff --git a/internal/types/types.go b/internal/types/types.go index 13c4a7f..dda4412 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -7,12 +7,19 @@ import ( // Config 应用配置。 type Config struct { - TimeAPIURL string `json:"timeApiUrl"` - TraceEnabled bool `json:"traceEnabled"` - TraceMaxBody int `json:"traceMaxBody"` - LogLevel string `json:"logLevel"` // debug / info / warn / error - Concurrency int `json:"concurrency"` // 抢购并发数 - Attempts int `json:"attempts"` // 单号重试次数 + TimeAPIURL string `json:"timeApiUrl"` + TraceEnabled bool `json:"traceEnabled"` + TraceMaxBody int `json:"traceMaxBody"` + LogLevel string `json:"logLevel"` // debug / info / warn / error + Concurrency int `json:"concurrency"` // 抢购并发数 + Attempts int `json:"attempts"` // 单号重试次数 + RetryStages []RetryStage `json:"retryStages"` // 重试间隔阶段配置 +} + +// RetryStage 重试间隔阶段配置。 +type RetryStage struct { + MaxElapsed int `json:"maxElapsed"` // 经过秒数上限 + Interval int `json:"interval"` // 重试间隔(ms) } // AppPaths 运行时路径。