From 76bfdd03dd9cca1d6b9b7f9bfcf967d9a0ddd8e1 Mon Sep 17 00:00:00 2001 From: sugarBecomer Date: Mon, 10 Nov 2025 22:20:34 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20cookie=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/framework/schedule/cpdaily_handler.go | 7 ++++--- internal/service/cpdaily/cptask.go | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/internal/framework/schedule/cpdaily_handler.go b/internal/framework/schedule/cpdaily_handler.go index c885e35..46c4fa2 100644 --- a/internal/framework/schedule/cpdaily_handler.go +++ b/internal/framework/schedule/cpdaily_handler.go @@ -90,16 +90,17 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task) // 查询学校详情 schoolDetail := school.GetSchoolDetail(ctx, targetTask.Edges.CpUser.SchoolID) - restyClient := login.GetClient(ctx, targetTask.Edges.CpUser.Cookie) + cookie := targetTask.Edges.CpUser.Cookie + restyClient := login.GetClient(ctx, cookie) if !login.CookieEnabled(ctx, schoolDetail.WecloudUrl, restyClient) { loginExecutor := login.GetCpdailyLoginBySchoolInfo(ctx, &schoolDetail) loginExecutor.Login(ctx, &schoolDetail, targetTask.Edges.CpUser.Username, targetTask.Edges.CpUser.Password) - cookie := loginExecutor.GetCookieString() + cookie = loginExecutor.GetCookieString() db.Global.CpUser.UpdateOne(targetTask.Edges.CpUser).SetCookie(cookie).ExecX(ctx) restyClient = login.GetClient(ctx, cookie) } // 获取任务执行handler - taskExecutor := task2.GetCpdailyTaskService(ctx, targetTask.TaskType, targetTask.Edges.CpUser.Cookie, targetTask.Edges.CpUser.SchoolID) + taskExecutor := task2.GetCpdailyTaskService(ctx, targetTask.TaskType, cookie, targetTask.Edges.CpUser.SchoolID) cpdailyRealTask := taskExecutor.QueryFormByTitle(ctx, targetTask.Title) diff --git a/internal/service/cpdaily/cptask.go b/internal/service/cpdaily/cptask.go index b7ea3db..796c083 100644 --- a/internal/service/cpdaily/cptask.go +++ b/internal/service/cpdaily/cptask.go @@ -265,6 +265,7 @@ func (v CpTaskServiceV1) ExecuteNow(ctx context.Context, req *v1.ExecuteNowReq) asynq.Unique(5*time.Second), asynq.MaxRetry(0), asynq.Timeout(10*time.Minute), + asynq.Deadline(time.Now().Add(10*time.Minute)), asynq.Queue(cst2.TaskQueueCpdaily), ) // 更新未开始的任务状态为队列中