diff --git a/app/mix/service/xxljob_tasks.go b/app/mix/service/xxljob_tasks.go index 09b00274..9f61a6b7 100644 --- a/app/mix/service/xxljob_tasks.go +++ b/app/mix/service/xxljob_tasks.go @@ -94,6 +94,13 @@ func (s *CronService) CreateDailyStatement(ctx context.Context, param *xxl.RunRe return fmt.Sprintf("query h5 call count fail : %v", err) } + //获取站外user_id访问zone访问量 + zoneListFromOusideCount, err := DefaultScriptsService.QueryCallCount(consts.ZoneListFromOutsideCountCallUrl, logpath) + if err != nil { + logger.Error("query list_by_user_id_from_outside call count fail : %v", err) + return fmt.Sprintf("query list_by_user_id_from_outside call count fail : %v", err) + } + //获取用户总量 accountCount, err := _DefaultAccount.OpCount(&gin.Context{}, &accountproto.OpCountReq{ CtLowerBound: goproto.Int64(int64(consts.AppEnterProductionTime)), @@ -140,6 +147,7 @@ func (s *CronService) CreateDailyStatement(ctx context.Context, param *xxl.RunRe LastHourNewUserCountFromAndroid: goproto.Int64(androidCount), LastHourNewUserCountFromIos: goproto.Int64(iosCount), LastHourNewUserCountFromH5: goproto.Int64(h5Count), + ZoneListFromOutsideCount: goproto.Int64(int64(zoneListFromOusideCount)), StartTime: goproto.Int64(startTimeStamp), EndTime: goproto.Int64(endTimeStamp), } diff --git a/dbstruct/daily_statement.go b/dbstruct/daily_statement.go index bcba203e..a8a16a49 100644 --- a/dbstruct/daily_statement.go +++ b/dbstruct/daily_statement.go @@ -9,6 +9,7 @@ type DailyStatement struct { LastHourNewUserCountFromAndroid *int64 `json:"last_hour_new_user_count_from_android" bson:"last_hour_new_user_count_from_android"` // 安卓注册总量 LastHourNewUserCountFromIos *int64 `json:"last_hour_new_user_count_from_ios" bson:"last_hour_new_user_count_from_ios"` // ios注册总量 LastHourNewUserCountFromH5 *int64 `json:"last_hour_new_user_count_from_h5" bson:"last_hour_new_user_count_from_h5"` // h5注册总量 + ZoneListFromOutsideCount *int64 `json:"zone_list_from_outside_count" bson:"zone_list_from_outside_count"` // 站外user_id查询空间总量 StartTime *int64 `json:"start_time" bson:"start_time"` // 起始时间 EndTime *int64 `json:"end_time" bson:"end_time"` // 结束时间 Ct *int64 `json:"ct" bson:"ct"` // 创建时间 diff --git a/library/contentaudit/imageaudit/imageaudit.go b/library/contentaudit/imageaudit/imageaudit.go index 5ea73d74..20a08668 100644 --- a/library/contentaudit/imageaudit/imageaudit.go +++ b/library/contentaudit/imageaudit/imageaudit.go @@ -48,7 +48,7 @@ func Run(batchId string) (successNum int, failNum int, err error) { // 2.创建请求 // oss不在上海的服务器,需要调用Advance接口 - req, err := createScanImageAdvanceRequest(ctrlBlock) + reqs, err := createScanImageAdvanceRequest(ctrlBlock) if err != nil { logger.Info("Create Scan ImageRequest fail: %v", err) handleBatchError(ctrlBlock, err) @@ -60,25 +60,29 @@ func Run(batchId string) (successNum int, failNum int, err error) { runtime := &teautils.RuntimeOptions{ ConnectTimeout: tea.Int(30000), } - _result, err := defaultImageAuditClient.ScanImageAdvance(req, runtime) - if err != nil { - if _t, ok := err.(*tea.SDKError); ok { - logger.Error("ScanImageAdvance fail, errinfo : %v", util.DerefString(_t.Data)) - } - handleBatchError(ctrlBlock, err) - failNum = len(imageaudittasks) - return - } - logger.Info("Receive the response from ScanImageAdvance: %v", _result.String()) - // 4.处理应答 - err = handleScanImageResponse(ctrlBlock, _result) + for _, req := range reqs { + var _result *imageaudit.ScanImageResponse + _result, err = defaultImageAuditClient.ScanImageAdvance(req, runtime) + if err != nil { + if _t, ok := err.(*tea.SDKError); ok { + logger.Error("ScanImageAdvance fail, errinfo : %v", util.DerefString(_t.Data)) + } + handleBatchError(ctrlBlock, err) + failNum = len(imageaudittasks) + return + } + logger.Info("Receive the response from ScanImageAdvance: %v", _result.String()) + + // 4.处理应答 + err = handleScanImageResponse(ctrlBlock, _result) + } successNum = len(imageaudittasks) return } -func createScanImageAdvanceRequest(ctrlBlock *ImageAuditTaskBatchControlBlock) (request *imageaudit.ScanImageAdvanceRequest, err error) { +func createScanImageAdvanceRequest(ctrlBlock *ImageAuditTaskBatchControlBlock) (requests []*imageaudit.ScanImageAdvanceRequest, err error) { httpClient := http.Client{} imageauditIds := ctrlBlock.ImageAuditIds reqTasks := make([]*imageaudit.ScanImageAdvanceRequestTask, 0) @@ -90,7 +94,6 @@ func createScanImageAdvanceRequest(ctrlBlock *ImageAuditTaskBatchControlBlock) ( logger.Error("httpClient Get fail : %v", err) return } - reqTasks = append(reqTasks, &imageaudit.ScanImageAdvanceRequestTask{ DataId: goproto.String(imageauditIds[i]), ImageURLObject: file.Body, @@ -101,10 +104,24 @@ func createScanImageAdvanceRequest(ctrlBlock *ImageAuditTaskBatchControlBlock) ( }) } - request = &imageaudit.ScanImageAdvanceRequest{ - Scene: scenes, - Task: reqTasks, + // 阿里云一次最多审10条,将待审图片按10条拆分 + requests = make([]*imageaudit.ScanImageAdvanceRequest, 0) + i := 0 + for ; i < len(reqTasks)/10; i++ { + request := &imageaudit.ScanImageAdvanceRequest{ + Scene: scenes, + Task: reqTasks[i*10 : (i+1)*10], + } + requests = append(requests, request) } + if i*10 < len(reqTasks) { + request := &imageaudit.ScanImageAdvanceRequest{ + Scene: scenes, + Task: reqTasks[i*10:], + } + requests = append(requests, request) + } + logger.Info("本次打包:%v", reqs) return }