fix: 今日校园任务登录问题

internal/framework/redis/redis.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"likedream-goframe/internal/cst"
 	"likedream-goframe/internal/utils"
+	"time"
 
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/redis/go-redis/v9"
@@ -25,6 +26,9 @@ func Init(ctx context.Context) {
 	redisUrl := g.Cfg().MustGetWithEnv(ctx, cst.ConfigRedisUrl).String()
 
 	redisOpts, e := redis.ParseURL(redisUrl)
+	redisOpts.DialTimeout = 30 * time.Second
+	redisOpts.ReadTimeout = 30 * time.Second
+	redisOpts.WriteTimeout = 30 * time.Second
 	utils.OkOrPanic(e, oops.WithContext(ctx).
 		With("redisUrl", redisUrl).
 		Wrap)

internal/framework/schedule/cpdaily_handler.go

@@ -41,7 +41,7 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task)
 	// 查询指定的任务和关联今日校园用户
 	targetTask, e := db.Global.CpTask.Query().Where(cptask.ID(taskPayload.CpTaskID)).
 		WithCpUser(func(cuq *ent.CpUserQuery) {
-			cuq.Select(cpuser.FieldSchoolID, cpuser.FieldEmail).
+			cuq.
 				WithSysuser(func(suq *ent.SysUserQuery) {
 					suq.Select(sysuser.FieldID, sysuser.FieldEmail)
 				})
@@ -91,17 +91,11 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task)
 	schoolDetail := school.GetSchoolDetail(ctx, targetTask.Edges.CpUser.SchoolID)
 
 	// 执行登录
-	var loginClient login.CpdailyLogin
+	loginExecutor := login.GetCpdailyLoginBySchoolInfo(ctx, &schoolDetail)
 
-	if schoolDetail.IsIap() {
-		loginClient = login.NewIap(ctx)
-	} else {
-		loginClient = login.NewCas(ctx)
-	}
+	loginExecutor.Login(ctx, &schoolDetail, targetTask.Edges.CpUser.Username, targetTask.Edges.CpUser.Password)
 
-	loginClient.Login(ctx, &schoolDetail, targetTask.Edges.CpUser.Username, targetTask.Edges.CpUser.Username)
-
-	restyClient := loginClient.GetClient()
+	restyClient := loginExecutor.GetClient()
 
 	// 获取任务执行handler
 	var taskExecutor cpdailyTask.CpdailyTask

internal/framework/schedule/scanner.go

@@ -88,8 +88,8 @@ func (ts *TaskScanner) scanCpdailyTask() {
 	minExecuteTime := currentTime.Add(-30 * time.Minute).Unix()
 
 	allTasks := db.Global.CpTask.Query().
-		Where(cptask.NextExecuteTimeLTE(currentTime.Unix()), cptask.NextExecuteTimeNotNil(), cptask.NextExecuteTimeGT(0)).
-		Select(cptask.FieldID, cptask.FieldExecuteHour, cptask.FieldExecuteMinute).
+		Where(cptask.NextExecuteTimeLTE(currentTime.Unix()), cptask.NextExecuteTimeNotNil(), cptask.NextExecuteTimeGT(0), cptask.StepEQ(cptask.StepComplete), cptask.TaskStatusEQ(cptask.TaskStatusNotStart)).
+		Select(cptask.FieldID, cptask.FieldExecuteHour, cptask.FieldExecuteMinute, cptask.FieldNextExecuteTime).
 		AllX(ts.ctx)
 
 	var failedIDS []int64
@@ -151,7 +151,7 @@ func (ts *TaskScanner) scanCpdailyTask() {
 
 	// 重置30分钟之前的任务到下次执行时间
 	expiredTasks := db.Global.CpTask.Query().
-		Where(cptask.NextExecuteTimeLT(minExecuteTime), cptask.NextExecuteTimeNotNil()).
+		Where(cptask.NextExecuteTimeLT(minExecuteTime), cptask.NextExecuteTimeNotNil(), cptask.NextExecuteTimeGT(0)).
 		Select(cptask.FieldID, cptask.FieldExecuteHour, cptask.FieldExecuteMinute).
 		AllX(ts.ctx)
 

internal/service/balance/balance_service.go

@@ -6,21 +6,27 @@ import (
 	"likedream-goframe/internal/db"
 	"likedream-goframe/internal/ent/sysuser"
 	"likedream-goframe/internal/utils"
+	"sync"
 
 	"github.com/samber/oops"
 	"github.com/shopspring/decimal"
 )
 
-var BalanceService = &BalanceServiceV1{}
+var BalanceService = &BalanceServiceV1{
+	lock: sync.Mutex{},
+}
 
 type BalanceServiceV1 struct {
+	lock sync.Mutex
 }
 
 func (v *BalanceServiceV1) ChangeUserBalance(ctx context.Context, userId int64, balance decimal.Decimal) {
+	v.lock.Lock()
+	defer v.lock.Unlock()
 	tx, err := db.Global.Tx(ctx)
 	utils.OkOrPanic(err, oops.WithContext(ctx).Wrap)
 	defer tx.Rollback()
-	user := tx.SysUser.Query().Where(sysuser.ID(userId)).WithRoles().ForUpdate().OnlyX(ctx)
+	user := tx.SysUser.Query().Where(sysuser.ID(userId)).WithRoles().OnlyX(ctx)
 	newBalance := user.Balance.Add(balance)
 	if newBalance.LessThan(decimal.Zero) {
 		utils.OkOrPanic(errors.NewBusinessError(400, "余额不足"))