Merge remote-tracking branch 'origin/main'

internal/application/httpclient/cpdaily.go

@@ -10,11 +10,12 @@ import (
 
 var Cpdaily = resty.New().
 	SetCookieJar(nil).
-	SetTimeout(30 * time.Second).
+	SetTimeout(30*time.Second).
 	SetDoNotParseResponse(true).
 	SetTLSClientConfig(&tls.Config{
 		InsecureSkipVerify: true,
-	})
+	}).
+	SetHeader("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36")
 
 func init() {
 	if !utils.IsDebug() {

internal/framework/schedule/scanner.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/gob"
 	"errors"
-	"fmt"
 	cst2 "likedream-goframe/internal/common/cst"
 	"likedream-goframe/internal/common/db"
 	"likedream-goframe/internal/ent"
@@ -124,10 +123,10 @@ func (ts *TaskScanner) scanCpdailyTask() {
 
 		e = utils.Catch(func() {
 			queue.AddTask(ts.ctx, asynq.NewTask(cst2.TaskCpdaily, payloadWriter.Bytes()),
-				asynq.TaskID(fmt.Sprintf(cst2.TaskCpdailyId, task.ID)),
+				asynq.Unique(20*time.Minute),
 				asynq.MaxRetry(4),
 				asynq.ProcessAt(execTime),
-				asynq.Deadline(execTime.Add(10*time.Minute)),
+				asynq.Timeout(10*time.Minute),
 				asynq.Queue(cst2.TaskQueueCpdaily),
 			)
 			// 更新未开始的任务状态为队列中

internal/service/cpdaily/cptask.go

@@ -260,10 +260,10 @@ func (v CpTaskServiceV1) ExecuteNow(ctx context.Context, req *v1.ExecuteNowReq)
 
 	// 使用时间戳生成唯一的 TaskID，避免与自动扫描的任务冲突，也避免 Unique 限制
 	// 由于已经检查了任务状态，不需要使用 Unique 来防重复
-	taskID := fmt.Sprintf("cpdaily:task:manual:%d:%d", req.Id, time.Now().UnixNano())
+	//taskID := fmt.Sprintf("cpdaily:task:manual:%d:%d", req.Id, time.Now().UnixNano())
 	e = utils.Catch(func() {
 		queue.AddTask(ctx, asynq.NewTask(cst2.TaskCpdaily, payloadWriter.Bytes()),
-			asynq.TaskID(taskID),
+			asynq.Unique(20*time.Minute),
 			asynq.Unique(5*time.Second),
 			asynq.MaxRetry(0),
 			asynq.Timeout(10*time.Minute),