fix: iap login failed message

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/application/cpdaily/task/sleepcheck.go

@@ -640,11 +640,11 @@ func (c *CpdailySleepCheckTask) Submit(ctx context.Context, form map[string]*gva
 
 	// 构造提交数据
 	submitData := map[string]*gvar.Var{
-		"lon":           form["longitude"],
-		"version":       gvar.New(cryptoutil.EncryptVersion),
-		"calVersion":    gvar.New(cpdailyInfo.CalVersion),
-		"deviceId":      extensionForm["deviceId"],
-		"userId":        gvar.New(username),
+		"lon":        form["longitude"],
+		"version":    gvar.New(cryptoutil.EncryptVersion),
+		"calVersion": gvar.New(cpdailyInfo.CalVersion),
+		"deviceId":   extensionForm["deviceId"],
+		//"userId":        gvar.New(username),
 		"systemName":    gvar.New("android"),
 		"bodyString":    gvar.New(bodyString),
 		"lat":           form["latitude"],

internal/framework/schedule/cpdaily_handler.go

@@ -96,13 +96,14 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task)
 	schoolDetail := school.GetSchoolDetail(ctx, targetTask.Edges.CpUser.SchoolID)
 	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()
-		db.Global.CpUser.UpdateOneID(targetTask.Edges.CpUser.ID).SetCookie(cookie).ExecX(ctx)
-		restyClient = login.GetClient(ctx, cookie)
-	}
+	//if !login.CookieEnabled(ctx, schoolDetail.WecloudUrl, restyClient) {
+	// 定时任务强制登录并更新cookie
+	loginExecutor := login.GetCpdailyLoginBySchoolInfo(ctx, &schoolDetail)
+	loginExecutor.Login(ctx, &schoolDetail, targetTask.Edges.CpUser.Username, targetTask.Edges.CpUser.Password)
+	cookie = loginExecutor.GetCookieString()
+	db.Global.CpUser.UpdateOneID(targetTask.Edges.CpUser.ID).SetCookie(cookie).ExecX(ctx)
+	restyClient = login.GetClient(ctx, cookie)
+	//}
 	// 获取任务执行handler
 	taskExecutor := task2.GetCpdailyTaskService(ctx, targetTask.TaskType, restyClient, schoolDetail)
 

internal/service/cpdaily/cptask.go

@@ -264,7 +264,6 @@ func (v CpTaskServiceV1) ExecuteNow(ctx context.Context, req *v1.ExecuteNowReq)
 	e = utils.Catch(func() {
 		queue.AddTask(ctx, asynq.NewTask(cst2.TaskCpdaily, payloadWriter.Bytes()),
 			asynq.Unique(20*time.Minute),
-			asynq.Unique(5*time.Second),
 			asynq.MaxRetry(0),
 			asynq.Timeout(10*time.Minute),
 			asynq.Deadline(time.Now().Add(10*time.Minute)),