🐛 修改定时任务信息

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

@@ -67,7 +67,23 @@ func (a *AllSavePersistCookieJar) SetCookies(u *url.URL, cookies []*http.Cookie)
 		if a.domainMap[mainDomain] == nil {
 			a.domainMap[mainDomain] = make(cookieMap)
 		}
-		a.domainMap[mainDomain][cookie.Name] = cookie
+
+		// 查找是否存在相同 name, path 和 domain 的 cookie
+		existingCookies := a.domainMap[mainDomain][cookie.Name]
+		found := false
+		for i, existing := range existingCookies {
+			if existing.Path == cookie.Path && existing.Domain == cookie.Domain {
+				// 找到完全匹配的 cookie，替换它
+				existingCookies[i] = cookie
+				found = true
+				break
+			}
+		}
+
+		if !found {
+			// 没有找到匹配的，添加新的 cookie
+			a.domainMap[mainDomain][cookie.Name] = append(a.domainMap[mainDomain][cookie.Name], cookie)
+		}
 	}
 }
 
@@ -78,10 +94,43 @@ func (a *AllSavePersistCookieJar) Cookies(u *url.URL) []*http.Cookie {
 	// 提取主域名
 	mainDomain := extractMainDomain(u.Host)
 
-	if cookies, exists := a.domainMap[mainDomain]; exists {
-		result := make([]*http.Cookie, 0, len(cookies))
-		for _, cookie := range cookies {
-			result = append(result, cookie)
+	if cookiesList, exists := a.domainMap[mainDomain]; exists {
+		result := make([]*http.Cookie, 0, len(cookiesList))
+		requestPath := u.Path
+		if requestPath == "" {
+			requestPath = "/"
+		}
+
+		for _, cookies := range cookiesList {
+			// 如果只有一个 cookie，直接返回
+			if len(cookies) == 1 {
+				result = append(result, cookies[0])
+				continue
+			}
+
+			// 有多个同名 cookie，选择最匹配的（path 最长且匹配请求路径的）
+			var bestMatch *http.Cookie
+			bestMatchLen := -1
+
+			for _, cookie := range cookies {
+				cookiePath := cookie.Path
+				if cookiePath == "" {
+					cookiePath = "/"
+				}
+
+				// 检查 path 是否匹配
+				if pathMatch(requestPath, cookiePath) {
+					if len(cookiePath) > bestMatchLen {
+						bestMatch = cookie
+						bestMatchLen = len(cookiePath)
+					}
+				}
+			}
+
+			// 如果找到匹配的，添加到结果中
+			if bestMatch != nil {
+				result = append(result, bestMatch)
+			}
 		}
 		return result
 	}

internal/application/cookiejar/jar.go

@@ -3,47 +3,19 @@ package cookiejar
 import (
 	"bytes"
 	"encoding/gob"
-	"fmt"
-	"github.com/bytedance/sonic"
 	"io"
 	"likedream-goframe/internal/utils"
 	"net/http"
 	"net/url"
 	"strings"
 	"sync"
+
+	"github.com/bytedance/sonic"
 )
 
 type hostMap map[string]cookieMap
 
-type cookieMap map[string]*http.Cookie
-
-// cookieKey 生成 cookie 的唯一标识 key，使用 name 和 path 的组合
-func cookieKey(name, path string) string {
-	return fmt.Sprintf("%s|%s", name, path)
-}
-
-// pathMatch 检查请求路径是否匹配 cookie 的 path
-// 根据 RFC 6265 Section 5.1.4
-func pathMatch(requestPath, cookiePath string) bool {
-	// 如果路径完全相同
-	if requestPath == cookiePath {
-		return true
-	}
-
-	// 如果 cookie path 是请求 path 的前缀
-	if strings.HasPrefix(requestPath, cookiePath) {
-		// cookie path 以 / 结尾，或者请求 path 在 cookie path 后紧跟 /
-		if strings.HasSuffix(cookiePath, "/") {
-			return true
-		}
-		if len(requestPath) > len(cookiePath) && requestPath[len(cookiePath)] == '/' {
-			return true
-		}
-	}
-
-	return false
-}
-
+type cookieMap map[string][]*http.Cookie
 type PersistCookieJar struct {
 	hostMap hostMap
 	*sync.RWMutex
@@ -63,7 +35,7 @@ func (p *PersistCookieJar) SetCookies(u *url.URL, cookies []*http.Cookie) {
 	host := u.Host
 
 	if _, exists := p.hostMap[host]; !exists {
-		p.hostMap = make(hostMap)
+		p.hostMap[host] = make(cookieMap)
 	}
 
 	for _, cookie := range cookies {
@@ -71,21 +43,21 @@ func (p *PersistCookieJar) SetCookies(u *url.URL, cookies []*http.Cookie) {
 			p.hostMap[host] = make(cookieMap)
 		}
 
-		// 如果 cookie 没有设置 Path，使用默认值 "/"
-		cookiePath := cookie.Path
-		if cookiePath == "" {
-			cookiePath = "/"
+		// 查找是否存在相同 name, path 和 domain 的 cookie
+		existingCookies := p.hostMap[host][cookie.Name]
+		found := false
+		for i, existing := range existingCookies {
+			if existing.Path == cookie.Path && existing.Domain == cookie.Domain {
+				// 找到完全匹配的 cookie，替换它
+				existingCookies[i] = cookie
+				found = true
+				break
+			}
 		}
 
-		// 使用 name 和 path 的组合作为 key
-		key := cookieKey(cookie.Name, cookiePath)
-
-		// 如果 MaxAge=0 或 MaxAge<0，表示删除 cookie
-		// 只删除完全匹配的 cookie（name 和 path 都相同）
-		if cookie.MaxAge < 0 || (cookie.MaxAge == 0 && cookie.Value == "") {
-			delete(p.hostMap[host], key)
-		} else {
-			p.hostMap[host][key] = cookie
+		if !found {
+			// 没有找到匹配的，添加新的 cookie
+			p.hostMap[host][cookie.Name] = append(p.hostMap[host][cookie.Name], cookie)
 		}
 	}
 
@@ -96,22 +68,42 @@ func (p *PersistCookieJar) Cookies(u *url.URL) []*http.Cookie {
 	defer p.RUnlock()
 
 	host := u.Host
-	requestPath := u.Path
-	if requestPath == "" {
-		requestPath = "/"
-	}
+	if cookiesList, exists := p.hostMap[host]; exists {
+		result := make([]*http.Cookie, 0, len(cookiesList))
+		requestPath := u.Path
+		if requestPath == "" {
+			requestPath = "/"
+		}
 
-	if cookies, exists := p.hostMap[host]; exists {
-		result := make([]*http.Cookie, 0, len(cookies))
-		for _, cookie := range cookies {
-			// 检查 cookie 的 path 是否匹配请求的 path
-			cookiePath := cookie.Path
-			if cookiePath == "" {
-				cookiePath = "/"
+		for _, cookies := range cookiesList {
+			// 如果只有一个 cookie，直接返回
+			if len(cookies) == 1 {
+				result = append(result, cookies[0])
+				continue
 			}
 
-			if pathMatch(requestPath, cookiePath) {
-				result = append(result, cookie)
+			// 有多个同名 cookie，选择最匹配的（path 最长且匹配请求路径的）
+			var bestMatch *http.Cookie
+			bestMatchLen := -1
+
+			for _, cookie := range cookies {
+				cookiePath := cookie.Path
+				if cookiePath == "" {
+					cookiePath = "/"
+				}
+
+				// 检查 path 是否匹配
+				if pathMatch(requestPath, cookiePath) {
+					if len(cookiePath) > bestMatchLen {
+						bestMatch = cookie
+						bestMatchLen = len(cookiePath)
+					}
+				}
+			}
+
+			// 如果找到匹配的，添加到结果中
+			if bestMatch != nil {
+				result = append(result, bestMatch)
 			}
 		}
 		return result
@@ -119,6 +111,26 @@ func (p *PersistCookieJar) Cookies(u *url.URL) []*http.Cookie {
 	return nil
 }
 
+// pathMatch 检查请求路径是否匹配 cookie 的 path
+// 根据 RFC 6265 的规则
+func pathMatch(requestPath, cookiePath string) bool {
+	if requestPath == cookiePath {
+		return true
+	}
+
+	if strings.HasPrefix(requestPath, cookiePath) {
+		// cookiePath 以 / 结尾，或者 requestPath 的下一个字符是 /
+		if strings.HasSuffix(cookiePath, "/") {
+			return true
+		}
+		if len(requestPath) > len(cookiePath) && requestPath[len(cookiePath)] == '/' {
+			return true
+		}
+	}
+
+	return false
+}
+
 func (p *PersistCookieJar) Serialize() string {
 	p.RLock()
 	defer p.RUnlock()

internal/application/cpdaily/login/cas.go

@@ -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)
 	}
 
 	// 修改部分参数
@@ -450,11 +450,11 @@ func submitCasKickOut(ctx context.Context, requestUrl string, doc *goquery.Docum
 }
 
 func getCasValidLoginUrl(info *school.SchoolDetailInfo) string {
-	if strings.Contains(info.AmpUrl, "campusphere") {
+	if strings.Contains(info.AmpUrl, "campusphere") || strings.Contains(info.AmpUrl, "wec-portal-mobile") {
 		return info.AmpUrl
-	} else if strings.Contains(info.AmpUrl2, "campusphere") {
+	} else if strings.Contains(info.AmpUrl2, "campusphere") || strings.Contains(info.AmpUrl2, "wec-portal-mobile") {
 		return info.AmpUrl2
-	} else if strings.Contains(info.AmpUrl3, "campusphere") {
+	} else if strings.Contains(info.AmpUrl3, "campusphere") || strings.Contains(info.AmpUrl3, "wec-portal-mobile") {
 		return info.AmpUrl3
 	}
 

internal/application/cpdaily/login/iap.go

@@ -172,12 +172,11 @@ func (c *CpdailyIapLogin) Login(ctx context.Context, schoolDetail *school.School
 					In("Cpdaily.Login").New("Iap登录失败, 用户名或密码错误")
 			})
 		default:
-			utils.OkOrPanic(errors.NewBusinessError(503, fmt.Sprintf("Iap登录失败, 状态识别码: %s", resultCode)), func(err error) error {
-				return oops.With("username", username).
+			utils.OkOrPanic(errors.NewBusinessError(503, fmt.Sprintf("Iap登录失败, 状态识别码: %s", resultCode)),
+				oops.With("username", username).
 					With("password", password).
 					With("userId", utils.GetUserIdNotPanic(ctx)).
-					In("Cpdaily.Login").New("Iap登录失败, 状态识别码: %s" + resultCode)
-			})
+					In("Cpdaily.Login").Wrap)
 		}
 	}
 }

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,