🐛 每次直接创建全新client试试效果

config.toml

@@ -44,4 +44,8 @@ bucket = "likedream"
 [cpdaily]
 appVersion = "9.7.2"
 systemVersion = "iOS 17"
-calVersion = "firstv"
+calVersion = "firstv"
+
+
+[task]
+concurrency = 20

internal/application/cookiejar/all_save_jar.go

@@ -158,7 +158,30 @@ func (a *AllSavePersistCookieJar) Deserialize(content string) {
 
 	var domainMap domainMap
 	err := sonic.Unmarshal([]byte(content), &domainMap)
-	utils.OkOrPanic(err)
+
+	// 如果反序列化失败，尝试从旧格式转换
+	if err != nil {
+		// 旧格式: map[string]map[string]*http.Cookie
+		type oldCookieMap map[string]*http.Cookie
+		type oldDomainMap map[string]oldCookieMap
+
+		var oldMap oldDomainMap
+		oldErr := sonic.Unmarshal([]byte(content), &oldMap)
+		if oldErr != nil {
+			// 两种格式都失败，抛出原始错误
+			utils.OkOrPanic(err)
+			return
+		}
+
+		// 转换旧格式到新格式
+		domainMap = make(map[string]cookieMap)
+		for domain, cookies := range oldMap {
+			domainMap[domain] = make(map[string][]*http.Cookie)
+			for name, cookie := range cookies {
+				domainMap[domain][name] = []*http.Cookie{cookie}
+			}
+		}
+	}
 
 	a.domainMap = domainMap
 }
@@ -191,7 +214,31 @@ func (a *AllSavePersistCookieJar) DeserializeBytes(content []byte) {
 	var domainMap domainMap
 	err := gob.NewDecoder(retReader).
 		Decode(&domainMap)
-	utils.OkOrPanic(err)
+
+	// 如果反序列化失败，尝试从旧格式转换
+	if err != nil {
+		// 旧格式: map[string]map[string]*http.Cookie
+		type oldCookieMap map[string]*http.Cookie
+		type oldDomainMap map[string]oldCookieMap
+
+		retReader = bytes.NewBuffer(content)
+		var oldMap oldDomainMap
+		oldErr := gob.NewDecoder(retReader).Decode(&oldMap)
+		if oldErr != nil {
+			// 两种格式都失败，抛出原始错误
+			utils.OkOrPanic(err)
+			return
+		}
+
+		// 转换旧格式到新格式
+		domainMap = make(map[string]cookieMap)
+		for domain, cookies := range oldMap {
+			domainMap[domain] = make(map[string][]*http.Cookie)
+			for name, cookie := range cookies {
+				domainMap[domain][name] = []*http.Cookie{cookie}
+			}
+		}
+	}
 
 	a.domainMap = domainMap
 }
@@ -200,10 +247,36 @@ func (a *AllSavePersistCookieJar) DeserializeReader(reader io.Reader) {
 	a.Lock()
 	defer a.Unlock()
 
-	var domainMap domainMap
-	err := gob.NewDecoder(reader).
-		Decode(&domainMap)
+	// 先读取所有数据，以便在失败时可以重试
+	data, err := io.ReadAll(reader)
 	utils.OkOrPanic(err)
 
+	var domainMap domainMap
+	err = gob.NewDecoder(bytes.NewBuffer(data)).Decode(&domainMap)
+
+	// 如果反序列化失败，尝试从旧格式转换
+	if err != nil {
+		// 旧格式: map[string]map[string]*http.Cookie
+		type oldCookieMap map[string]*http.Cookie
+		type oldDomainMap map[string]oldCookieMap
+
+		var oldMap oldDomainMap
+		oldErr := gob.NewDecoder(bytes.NewBuffer(data)).Decode(&oldMap)
+		if oldErr != nil {
+			// 两种格式都失败，抛出原始错误
+			utils.OkOrPanic(err)
+			return
+		}
+
+		// 转换旧格式到新格式
+		domainMap = make(map[string]cookieMap)
+		for domain, cookies := range oldMap {
+			domainMap[domain] = make(map[string][]*http.Cookie)
+			for name, cookie := range cookies {
+				domainMap[domain][name] = []*http.Cookie{cookie}
+			}
+		}
+	}
+
 	a.domainMap = domainMap
 }

internal/application/cookiejar/jar.go

@@ -154,7 +154,29 @@ func (p *PersistCookieJar) Deserialize(content string) {
 	var hostMap hostMap
 	err := sonic.Unmarshal([]byte(content), &hostMap)
 
-	utils.OkOrPanic(err)
+	// 如果反序列化失败，尝试从旧格式转换
+	if err != nil {
+		// 旧格式: map[string]map[string]*http.Cookie
+		type oldCookieMap map[string]*http.Cookie
+		type oldHostMap map[string]oldCookieMap
+
+		var oldMap oldHostMap
+		oldErr := sonic.Unmarshal([]byte(content), &oldMap)
+		if oldErr != nil {
+			// 两种格式都失败，抛出原始错误
+			utils.OkOrPanic(err)
+			return
+		}
+
+		// 转换旧格式到新格式
+		hostMap = make(map[string]cookieMap)
+		for host, cookies := range oldMap {
+			hostMap[host] = make(map[string][]*http.Cookie)
+			for name, cookie := range cookies {
+				hostMap[host][name] = []*http.Cookie{cookie}
+			}
+		}
+	}
 
 	p.hostMap = hostMap
 }
@@ -187,7 +209,31 @@ func (p *PersistCookieJar) DeserializeBytes(content []byte) {
 	var hostMap hostMap
 	err := gob.NewDecoder(retReader).
 		Decode(&hostMap)
-	utils.OkOrPanic(err)
+
+	// 如果反序列化失败，尝试从旧格式转换
+	if err != nil {
+		// 旧格式: map[string]map[string]*http.Cookie
+		type oldCookieMap map[string]*http.Cookie
+		type oldHostMap map[string]oldCookieMap
+
+		retReader = bytes.NewBuffer(content)
+		var oldMap oldHostMap
+		oldErr := gob.NewDecoder(retReader).Decode(&oldMap)
+		if oldErr != nil {
+			// 两种格式都失败，抛出原始错误
+			utils.OkOrPanic(err)
+			return
+		}
+
+		// 转换旧格式到新格式
+		hostMap = make(map[string]cookieMap)
+		for host, cookies := range oldMap {
+			hostMap[host] = make(map[string][]*http.Cookie)
+			for name, cookie := range cookies {
+				hostMap[host][name] = []*http.Cookie{cookie}
+			}
+		}
+	}
 
 	p.hostMap = hostMap
 }
@@ -196,10 +242,36 @@ func (p *PersistCookieJar) DeserializeReader(reader io.Reader) {
 	p.Lock()
 	defer p.Unlock()
 
-	var hostMap hostMap
-	err := gob.NewDecoder(reader).
-		Decode(&hostMap)
+	// 先读取所有数据，以便在失败时可以重试
+	data, err := io.ReadAll(reader)
 	utils.OkOrPanic(err)
 
+	var hostMap hostMap
+	err = gob.NewDecoder(bytes.NewBuffer(data)).Decode(&hostMap)
+
+	// 如果反序列化失败，尝试从旧格式转换
+	if err != nil {
+		// 旧格式: map[string]map[string]*http.Cookie
+		type oldCookieMap map[string]*http.Cookie
+		type oldHostMap map[string]oldCookieMap
+
+		var oldMap oldHostMap
+		oldErr := gob.NewDecoder(bytes.NewBuffer(data)).Decode(&oldMap)
+		if oldErr != nil {
+			// 两种格式都失败，抛出原始错误
+			utils.OkOrPanic(err)
+			return
+		}
+
+		// 转换旧格式到新格式
+		hostMap = make(map[string]cookieMap)
+		for host, cookies := range oldMap {
+			hostMap[host] = make(map[string][]*http.Cookie)
+			for name, cookie := range cookies {
+				hostMap[host][name] = []*http.Cookie{cookie}
+			}
+		}
+	}
+
 	p.hostMap = hostMap
 }

internal/application/cookiejar/jar_test.go

@@ -114,3 +114,10 @@ func TestPersistCookieJar_DeserializeReader(t *testing.T) {
 		}
 	}
 }
+
+func TestDeseralizeCookie(t *testing.T) {
+	var str = `{"cdpc.campusphere.net":{"MOD_AUTH_CAS":{"Name":"MOD_AUTH_CAS","Value":"ST-iap:1021988086918169:ST:8d7fe60b-dc7d-4fcd-b26b-5517e3ca1926:20251113162807","Quoted":false,"Path":"/","Domain":"","Expires":"0001-01-01T00:00:00Z","RawExpires":"","MaxAge":0,"Secure":false,"HttpOnly":true,"SameSite":0,"Partitioned":false,"Raw":"MOD_AUTH_CAS=ST-iap:1021988086918169:ST:8d7fe60b-dc7d-4fcd-b26b-5517e3ca1926:20251113162807; path=/; Httponly","Unparsed":null},"HWWAFSESID":{"Name":"HWWAFSESID","Value":"88d84731cf506df0bf","Quoted":false,"Path":"/","Domain":"","Expires":"0001-01-01T00:00:00Z","RawExpires":"","MaxAge":0,"Secure":false,"HttpOnly":false,"SameSite":0,"Partitioned":false,"Raw":"HWWAFSESID=88d84731cf506df0bf; path=/","Unparsed":null},"HWWAFSESTIME":{"Name":"HWWAFSESTIME","Value":"1763022486728","Quoted":false,"Path":"/","Domain":"","Expires":"0001-01-01T00:00:00Z","RawExpires":"","MaxAge":0,"Secure":false,"HttpOnly":false,"SameSite":0,"Partitioned":false,"Raw":"HWWAFSESTIME=1763022486728; path=/","Unparsed":null},"CONVERSATION":{"Name":"CONVERSATION","Value":"iap-1021988086918169-CONV-83bee566-7010-4ef6-ad17-4b9eebcccdf8","Quoted":false,"Path":"/iap","Domain":"","Expires":"0001-01-01T00:00:00Z","RawExpires":"","MaxAge":0,"Secure":false,"HttpOnly":true,"SameSite":0,"Partitioned":false,"Raw":"CONVERSATION=iap-1021988086918169-CONV-83bee566-7010-4ef6-ad17-4b9eebcccdf8; Path=/iap; HttpOnly","Unparsed":null},"CASTGC":{"Name":"CASTGC","Value":"iap-1021988086918169-TGT-717aa5db-92cb-46ac-a178-64b630946f43","Quoted":false,"Path":"/iap","Domain":"","Expires":"0001-01-01T00:00:00Z","RawExpires":"","MaxAge":0,"Secure":true,"HttpOnly":true,"SameSite":4,"Partitioned":false,"Raw":"CASTGC=iap-1021988086918169-TGT-717aa5db-92cb-46ac-a178-64b630946f43; Path=/iap; HttpOnly; Secure; SameSite=None","Unparsed":null}}}`
+	jar := NewPersistCookieJar()
+	jar.Deserialize(str)
+	t.Log(jar)
+}

internal/application/cpdaily/login/ahjzu.go

@@ -204,6 +204,6 @@ func (c CpdailyAhjzuLogin) GetClient() *resty.Client {
 
 func NewAhjzu(ctx context.Context) *CpdailyAhjzuLogin {
 	return &CpdailyAhjzuLogin{
-		client: httpclient.Cpdaily.Clone(ctx),
+		client: httpclient.NewCpdailyClient(),
 	}
 }

internal/application/cpdaily/login/cas.go

@@ -39,7 +39,7 @@ type CpdailyCasLogin struct {
 
 func NewCas(ctx context.Context) CpdailyLogin {
 	return &CpdailyCasLogin{
-		client: httpclient.Cpdaily.Clone(ctx),
+		client: httpclient.NewCpdailyClient(),
 	}
 }
 
@@ -157,11 +157,11 @@ func (c *CpdailyCasLogin) Login(ctx context.Context, schoolDetail *school.School
 			allInputs[name] = value
 		}
 	} else {
-		utils.OkOrPanic(oops.With("schoolDetail", schoolDetail).
+		utils.OkOrPanic(errors.NewBusinessError(503, "页面中未找到登录表单"), oops.With("schoolDetail", schoolDetail).
 			With("username", username).
 			With("password", password).
 			WithContext(ctx).
-			Wrap(errors.NewBusinessError(503, "页面中未找到登录表单")))
+			Wrap)
 	}
 
 	// 修改部分参数
@@ -289,7 +289,7 @@ func (c *CpdailyCasLogin) ConfirmAdd(ctx context.Context, sc *school.SchoolDetai
 	utils.OkOrPanic(err)
 
 	// 提交确认添加
-	client := httpclient.Cpdaily.Clone(ctx)
+	client := httpclient.NewCpdailyClient()
 	client.SetCookieJar(cookieJar)
 	post, err := client.R().SetFormData(map[string]string{
 		"service":       service,

internal/application/cpdaily/login/common.go

@@ -105,7 +105,8 @@ func CookieEnabled(ctx context.Context, host string, client *resty.Client) bool
 func GetClient(ctx context.Context, cookie string) *resty.Client {
 	cookieJar := cookiejar.NewPersistCookieJar()
 	cookieJar.Deserialize(cookie)
-	client := httpclient.Cpdaily.Clone(ctx)
+	// 不使用 Clone，创建全新的独立 client 实例避免状态共享
+	client := httpclient.NewCpdailyClient()
 	client.SetCookieJar(cookieJar)
 	return client
 }

internal/application/cpdaily/login/iap.go

@@ -27,7 +27,7 @@ type CpdailyIapLogin struct {
 
 func NewIap(ctx context.Context) *CpdailyIapLogin {
 	return &CpdailyIapLogin{
-		client: httpclient.Cpdaily.Clone(ctx),
+		client: httpclient.NewCpdailyClient(),
 	}
 }
 

internal/application/cpdaily/login/nut.go

@@ -201,7 +201,7 @@ func (c CpdailyNutLogin) GetClient() *resty.Client {
 
 func NewNut(ctx context.Context) *CpdailyNutLogin {
 	return &CpdailyNutLogin{
-		client: httpclient.Cpdaily.Clone(ctx),
+		client: httpclient.NewCpdailyClient(),
 	}
 }
 func reverseStringASCII(s string) string {

internal/application/cpdaily/school/school_fetcher.go

@@ -16,7 +16,7 @@ import (
 )
 
 func GetSchoolList(ctx context.Context) []CpdailySchoolBriefInfo {
-	response, err := httpclient.Cpdaily.R().
+	response, err := httpclient.Cpdaily.Clone(ctx).R().
 		WithContext(ctx).
 		Get("https://static.campushoy.com/apicache/tenantListSort")
 
@@ -52,7 +52,7 @@ func GetSchoolList(ctx context.Context) []CpdailySchoolBriefInfo {
 }
 
 func GetSchoolDetail(ctx context.Context, tenantId string) SchoolDetailInfo {
-	response, err := httpclient.Cpdaily.R().Clone(ctx).
+	response, err := httpclient.Cpdaily.Clone(ctx).R().
 		SetHeaders(map[string]string{
 			"deviceType":        "2",
 			"CpdailyClientType": "CPDAILY",

internal/application/httpclient/cpdaily.go

@@ -24,3 +24,25 @@ func init() {
 		Cpdaily.SetProxy("http://127.0.0.1:9000")
 	}
 }
+
+// NewCpdailyClient 创建一个全新的独立 client 实例，避免 Clone 可能的浅拷贝问题
+// 每个实例都是完全独立的，适用于并发场景，不会共享状态
+func NewCpdailyClient() *resty.Client {
+	client := resty.New().
+		SetCookieJar(nil).
+		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")
+
+	// 根据调试模式设置代理和调试选项
+	if !utils.IsDebug() {
+		client.SetDebug(false)
+	} else {
+		client.SetProxy("http://127.0.0.1:9000")
+	}
+
+	return client
+}

internal/framework/schedule/cpdaily_handler.go

@@ -67,7 +67,7 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task)
 		} else if e1, ok := utils.Of[*errors2.BusinessError](err); ok {
 			errorMessage = e1.Message
 		} else {
-			errorMessage = "未知的错误导致任务执行失败"
+			errorMessage = "未知的错误导致任务执行失败" + err.Error()
 		}
 
 		e = db.Global.CpTaskLog.Create().

internal/framework/schedule/scanner.go

@@ -123,7 +123,7 @@ func (ts *TaskScanner) scanCpdailyTask() {
 
 		e = utils.Catch(func() {
 			queue.AddTask(ts.ctx, asynq.NewTask(cst2.TaskCpdaily, payloadWriter.Bytes()),
-				asynq.Unique(20*time.Minute),
+				asynq.Unique(5*time.Minute),
 				asynq.MaxRetry(4),
 				asynq.ProcessAt(execTime),
 				asynq.Timeout(10*time.Minute),

internal/framework/schedule/server.go

@@ -26,7 +26,7 @@ func initServer(ctx context.Context) {
 		RetryDelayFunc: func(n int, _ error, _ *asynq.Task) time.Duration {
 			return time.Duration(n) * 2 * time.Second
 		},
-		DelayedTaskCheckInterval: 10 * time.Second,
+		DelayedTaskCheckInterval: 2 * time.Second,
 		ErrorHandler:             taskErrorHandler{},
 		Queues: map[string]int{
 			cst2.TaskQueueEmail:   2,

internal/service/cpdaily/cptask.go

@@ -263,7 +263,7 @@ func (v CpTaskServiceV1) ExecuteNow(ctx context.Context, req *v1.ExecuteNowReq)
 	//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.Unique(20*time.Minute),
+			asynq.Unique(2*time.Minute),
 			asynq.MaxRetry(0),
 			asynq.Timeout(10*time.Minute),
 			asynq.Deadline(time.Now().Add(10*time.Minute)),