diff --git a/internal/biz/timeslicequery/execute.go b/internal/biz/timeslicequery/execute.go index 3133b69..0037332 100644 --- a/internal/biz/timeslicequery/execute.go +++ b/internal/biz/timeslicequery/execute.go @@ -17,11 +17,11 @@ func (v *Query) execute(ctx context.Context, req *timeslice.Manager) error { taskCount, err := timeslice.NewManager(v.callbackFunc).Run(ctx, req) if err != nil { - log.Errorf("%s到%s,微信券查询处理失败:%v", managerStartStr, managerEndStr, err) + log.Errorf("微信券查询处理,%s到%s,失败:%v", managerStartStr, managerEndStr, err) } fmt.Printf("%s到%s,微信券查询处理,总任务数:%d\n", managerStartStr, managerEndStr, taskCount) - log.Warnf("%s到%s,微信券查询处理,总任务数:%d", managerStartStr, managerEndStr, taskCount) + log.Warnf("微信券查询处理,%s到%s,总任务数:%d", managerStartStr, managerEndStr, taskCount) return nil } @@ -61,10 +61,10 @@ func (v *Query) callbackFunc(ctx context.Context, req *timeslice.Task) error { "open_id": order.Account, "err": err.Error(), } - log.Errorf("%s到%s,taskId:%d,微信券查询处理发生错误:%+v", startTimeStr, endTimeStr, req.TaskID, logFields) + log.Errorf("微信券查询处理,%s到%s,taskId:%d,错误:%+v", startTimeStr, endTimeStr, req.TaskID, logFields) if errNum > 20 { - return fmt.Errorf("%s到%s,第%d个任务,微信券查询处理,已经连续发生20次错误%+v", startTimeStr, endTimeStr, req.TaskID, logFields) + return fmt.Errorf("微信券查询处理,%s到%s,第%d个任务,已经连续发生20次错误%+v", startTimeStr, endTimeStr, req.TaskID, logFields) } } @@ -81,7 +81,7 @@ func (v *Query) callbackFunc(ctx context.Context, req *timeslice.Task) error { "notifyNum": notifyNum, "duration": end.Sub(start).String(), } - log.Warnf("%s到%s,taskId:%d,微信券查询处理,处理完毕:%+v", startTimeStr, endTimeStr, req.TaskID, logFields) + log.Warnf("微信券查询处理,%s到%s,taskId:%d,处理完毕:%+v", startTimeStr, endTimeStr, req.TaskID, logFields) return err } diff --git a/internal/pkg/script/script.go b/internal/pkg/script/script.go index ca79b75..9774a02 100644 --- a/internal/pkg/script/script.go +++ b/internal/pkg/script/script.go @@ -76,7 +76,7 @@ func pushWechatQuery(startTime, endTime time.Time, duration time.Duration, reque return err } - fmt.Printf("body:%s\n", string(bodyBytes)) + fmt.Printf("requestBody:%s\n", string(bodyBytes)) // 发送请求 if err2 := sendRequest(bodyBytes, requestURL); err2 != nil { @@ -104,7 +104,7 @@ func sendRequest(body []byte, requestURL string) error { } if resp.StatusCode == http.StatusOK { - fmt.Printf("Request sent successfully,body:%s", string(bodyBytes)) + fmt.Printf("responsBody:%s", string(bodyBytes)) } return fmt.Errorf("failed with status code: %d", resp.StatusCode) diff --git a/internal/pkg/script/script_test.go b/internal/pkg/script/script_test.go index 55b86d2..c5f7bee 100644 --- a/internal/pkg/script/script_test.go +++ b/internal/pkg/script/script_test.go @@ -43,7 +43,7 @@ func Test_script2(t *testing.T) { return } - duration := 50 * time.Hour + duration := 1 * time.Hour requestUrl := SINGLE_URL diff --git a/internal/service/script.go b/internal/service/script.go index 5f05ccc..c1cb2f0 100644 --- a/internal/service/script.go +++ b/internal/service/script.go @@ -90,12 +90,12 @@ func (this *CmbService) TimeSliceQueryPush(ctx http.Context) error { return fmt.Errorf("start_time or end_time is empty") } - reps, err := this.timeSliceQuery.Push(ctx, req) + _, err = this.timeSliceQuery.Push(ctx, req) if err != nil { return err } - return ctx.JSON(http2.StatusOK, reps) + return ctx.JSON(http2.StatusOK, req) } func (this *CmbService) PushWechatRetry(ctx http.Context) error {