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

.github/workflows/build.yml

@@ -29,7 +29,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
+          username: ${{ secrets.USERNAME }}
           password: ${{ secrets.PASSWORD }}
       - name: Extract metadata for Docker
         id: meta

internal/cst/base_point.go

@@ -0,0 +1,5 @@
+package cst
+
+const (
+	BasePointCpdaily = 1
+)

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/middleware/exception_handler.go

@@ -8,6 +8,7 @@ import (
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/ghttp"
+	"github.com/gogf/gf/v2/util/gvalid"
 )
 
 func ExceptionHandler(r *ghttp.Request) {
@@ -50,6 +51,15 @@ func ExceptionHandler(r *ghttp.Request) {
 		code = tmpErr.Code()
 	} else if code == gcode.CodeNil {
 		code = errors.CodeInternal.Code()
+	} else if code == gcode.CodeValidationFailed {
+		// 请求参数校验失败返回第一个错误信息
+		if validationErr, ok := err.(gvalid.Error); ok {
+			if firstErr := validationErr.FirstError(); firstErr != nil {
+				c := errors.CodeParam
+				c.SetMessage(firstErr.Error())
+				code = c.Code()
+			}
+		}
 	}
 	r.Response.ClearBuffer()
 	r.Response.WriteHeader(200)

internal/service/agent/agent_service.go

@@ -8,6 +8,7 @@ import (
 	"likedream-goframe/internal/ent"
 	"likedream-goframe/internal/ent/sysrole"
 	"likedream-goframe/internal/ent/sysuser"
+	"likedream-goframe/internal/service/balance"
 	"likedream-goframe/internal/utils"
 
 	"github.com/samber/oops"
@@ -128,44 +129,19 @@ func (s *AgentServiceV1) Ban(ctx context.Context, req *v1.AgentBanReq) *utils.Re
 func (s *AgentServiceV1) Recharge(ctx context.Context, req *v1.AgentRechargeReq) *utils.Response[any] {
 	// 参数校验
 	user := db.Global.SysUser.Query().Where(sysuser.IDEQ(req.ID)).WithAgent().OnlyX(ctx)
-	tx, err := db.Global.Tx(ctx)
-	defer tx.Rollback()
 	if !utils.IsAdminFromCtx(ctx) {
 		currentUser := db.Global.SysUser.Query().Where(sysuser.ID(utils.GetUserInfoFromCtx(ctx).ID)).WithAgent().WithRoles().OnlyX(ctx)
-
 		// 判断是否是自己的下级代理
 		parent := user.QueryParent().WithAgent().FirstX(ctx)
 		if parent == nil || parent.ID != currentUser.ID {
 			return utils.FailParam("非法的下级代理参数")
 		}
-		utils.OkOrPanic(err, func(err error) error {
-			return oops.
-				WithContext(ctx).
-				With("创建事务失败").
-				Wrap(err)
-		})
 		if !utils.HasRole(currentUser.Edges.Roles, cst.KeyRoleAdmin) {
-			parent.Balance = utils.CalculateBalance(parent.Balance, parent.Edges.Agent.Rate, req.Amount, user.Edges.Agent.Rate)
-			if parent.Balance.Compare(decimal.NewFromInt(0)) < 0 {
-				return utils.FailParam("余额不足")
-			}
+			needBalance := utils.CalculateBalance(parent.Balance, parent.Edges.Agent.Rate, req.Amount, user.Edges.Agent.Rate)
+			balance.BalanceService.ChangeUserBalance(ctx, parent.ID, needBalance.Neg())
 		}
-		tx.SysUser.UpdateOne(parent).SetBalance(parent.Balance).SaveX(ctx)
-		utils.OkOrPanic(err, func(err error) error {
-			return oops.
-				WithContext(ctx).
-				With("更新用户余额失败").
-				Wrap(err)
-		})
 	}
-	tx.SysUser.UpdateOne(user).SetBalance(user.Balance.Add(req.Amount)).SaveX(ctx)
-	utils.OkOrPanic(err, func(err error) error {
-		return oops.
-			WithContext(ctx).
-			With("更新用户余额失败").
-			Wrap(err)
-	})
-	err = tx.Commit()
+	balance.BalanceService.ChangeUserBalance(ctx, user.ID, req.Amount)
 	return utils.SuccessWithMsg("操作成功")
 }
 
@@ -212,7 +188,7 @@ func (s *AgentServiceV1) AgentPutInfoReq(ctx context.Context, req *v1.AgentPutIn
 	//按照新费率计算余额
 	newBalance := utils.TransformBalance(oldBalance, req.Rate)
 	// 6. 更新用户余额
-	tx.SysUser.UpdateOne(user).SetBalance(newBalance).SaveX(ctx)
+	balance.BalanceService.ChangeUserBalance(ctx, user.ID, newBalance.Sub(oldBalance))
 	err = tx.Commit()
 	utils.OkOrPanic(err, func(err error) error {
 		return oops.

internal/service/balance/balance_service.go

@@ -6,24 +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) {
-	if utils.IsAdminFromCtx(ctx) {
-		return
-	}
+	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, "余额不足"))

internal/service/cpdaily/cptask.go

@@ -21,6 +21,7 @@ import (
 	"likedream-goframe/internal/ent/sysuser"
 	"likedream-goframe/internal/framework/queue"
 	"likedream-goframe/internal/framework/schedule"
+	"likedream-goframe/internal/service/balance"
 	"likedream-goframe/internal/utils"
 	"time"
 
@@ -28,6 +29,7 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/hibiken/asynq"
 	"github.com/samber/oops"
+	"github.com/shopspring/decimal"
 )
 
 type CpTaskServiceV1 struct {
@@ -172,11 +174,18 @@ func (v CpTaskServiceV1) PostExecute(ctx context.Context, req *v1.PostCpTaskExec
 	if cpTask.Step == cptask.StepForm {
 		utils.OkOrPanic(errors2.NewBusinessError(400, "请先完成前置参数设置"))
 	}
-	pointConsume := req.Frequency - cpTask.Frequency
-	if req.Frequency < 1 || pointConsume < 0 {
+	consume := req.Frequency - cpTask.Frequency
+	if req.Frequency < 1 || consume < 0 {
 		utils.OkOrPanic(errors2.NewBusinessError(400, "执行次数应不低于原有次数"))
 	}
-	//todo 扣积分
+	//扣积分
+	basePoint := decimal.NewFromInt(cst.BasePointCpdaily)
+	if user.Edges.Agent != nil {
+		basePoint = basePoint.Mul(user.Edges.Agent.Rate)
+	}
+	needPoint := basePoint.Mul(decimal.NewFromInt(int64(consume)))
+	balance.BalanceService.ChangeUserBalance(ctx, user.ID, needPoint.Neg())
+	// 更新任务
 	e := db.WithTx(ctx, func(ctx context.Context, tx *ent.Tx) {
 		cpTask := db.Global.CpTask.UpdateOne(cpTask).
 			SetStep(cptask.StepComplete).