diff --git a/config.toml b/config.toml index dd8eea1..19bdebc 100644 --- a/config.toml +++ b/config.toml @@ -37,4 +37,9 @@ fromName = "今日校园系统" accessKey = "dzckoE1UlZe8XFItWQDI" secretKey = "f8UZdnDohtwZk5HInT1Cw1QCztSGnFuPPqfSSjzu" baseUrl = "http://s3.out" -bucket = "likedream" \ No newline at end of file +bucket = "likedream" + +[cpdaily] +appVersion = "5.7.0" +systemVersion = "iOS 17" +calVersion = "3.0.0" \ No newline at end of file diff --git a/internal/application/cpdaily/task/sleepcheck.go b/internal/application/cpdaily/task/sleepcheck.go index 1fe3ac6..4ac9f38 100644 --- a/internal/application/cpdaily/task/sleepcheck.go +++ b/internal/application/cpdaily/task/sleepcheck.go @@ -605,9 +605,9 @@ func (c *CpdailySleepCheckTask) FillCustomForm(ctx context.Context, form map[str } else { // 否则,填充查寝其他参数 if signInstanceWidVar := rows["signInstanceWid"]; signInstanceWidVar != nil { - resultForm["signInstanceWid"] = gvar.New(signInstanceWidVar.String()) + resultForm["SignInstanceWid"] = gvar.New(signInstanceWidVar.String()) } else { - resultForm["signInstanceWid"] = gvar.New("") + resultForm["SignInstanceWid"] = gvar.New("") } // 查找 isMalposition 参数 diff --git a/internal/common/errors/business_test.go b/internal/common/errors/business_test.go new file mode 100644 index 0000000..bd8fef3 --- /dev/null +++ b/internal/common/errors/business_test.go @@ -0,0 +1,27 @@ +package errors + +import ( + "errors" + + "testing" +) + +func TestBusinessError(t *testing.T) { + defer func() { + if err := recover(); err != nil { + of, b := Of[*BusinessError](err.(error)) + t.Log(of, b) + t.Log("ok") + } + }() + err := NewBusinessError(503, "调试错误") + panic(err) +} +func Of[T error](input error) (T, bool) { + var ret T + if errors.As(input, &ret) { + return ret, true + } + + return ret, false +} diff --git a/internal/framework/schedule/cpdaily_handler.go b/internal/framework/schedule/cpdaily_handler.go index 3da544e..b07918a 100644 --- a/internal/framework/schedule/cpdaily_handler.go +++ b/internal/framework/schedule/cpdaily_handler.go @@ -8,6 +8,7 @@ import ( "likedream-goframe/internal/application/cpdaily/school" task2 "likedream-goframe/internal/application/cpdaily/task" "likedream-goframe/internal/application/cpdaily/task/formtype" + errors2 "likedream-goframe/internal/common/errors" "likedream-goframe/internal/db" "likedream-goframe/internal/ent" "likedream-goframe/internal/ent/cptask" @@ -57,6 +58,8 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task) if e1, ok := utils.Of[*errors.BusinessError](err); ok { errorMessage = e1.Message() + } else if e1, ok := utils.Of[*errors2.BusinessError](err); ok { + errorMessage = e1.Message } else { errorMessage = "未知的错误导致任务执行失败" } @@ -68,7 +71,7 @@ func (c *CpdailyTaskHandler) ProcessTask(ctx context.Context, task *asynq.Task) SetIsSuccess(false). SetRealName(""). SetErrorMessage(errorMessage). - Exec(ctx) + Exec(context.Background()) utils.LogError(ctx, "创建任务日志失败", oops.With("task_id", taskPayload.CpTaskID).Wrap(e))