wishpal_ironfan
/
service
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'by Robin at 20240101' (#29) from fix-20231231-Robin-BUG0001 into test 

Reviewed-on: #29
This commit is contained in:
chenhao 2024-01-01 19:25:46 +08:00
parent 9a2e42200f a71728dc14
commit 08b04e17a9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/contentaudit/imageaudit/imageaudit.go
View File

@ -45,7 +45,7 @@ func executeImageAuditTasks(tasks []*ImageAuditTaskControlBlock, batchId string)
_result, err := defaultImageAuditClient.ScanImageAdvance(req, runtime) _result, err := defaultImageAuditClient.ScanImageAdvance(req, runtime)
//_result, err := defaultImageAuditClient.ScanImageWithOptions(req, runtime) //_result, err := defaultImageAuditClient.ScanImageWithOptions(req, runtime)
if err != nil { if err != nil {
logger.Error("ScanImageAdvance fail : %v", err) logger.Error("ScanImageAdvance fail, requestId : %v, err : %v", _result.Body.RequestId, err)
handleBatchError(tasks, batchId, err) handleBatchError(tasks, batchId, err)
return return
} }
@ -87,6 +87,7 @@ func createScanImageAdvanceRequest(tasks []*ImageAuditTaskControlBlock, batchId
// 2.打包图像url及图像审核id，转成ScanImageAdvanceRequest // 2.打包图像url及图像审核id，转成ScanImageAdvanceRequest
reqTasks := make([]*imageaudit.ScanImageAdvanceRequestTask, 0) reqTasks := make([]*imageaudit.ScanImageAdvanceRequestTask, 0)
reqs := make([]*imageaudit.ScanImageRequestTask, 0)
for _, task := range tasks { for _, task := range tasks {
if util.DerefInt64(task.ImageAuditTask.IsFragmented) == 1 { if util.DerefInt64(task.ImageAuditTask.IsFragmented) == 1 {
imageauditIds := util.DerefStringSlice(task.ImageAuditTask.ImageAuditFragmentIds) imageauditIds := util.DerefStringSlice(task.ImageAuditTask.ImageAuditFragmentIds)
@ -101,6 +102,10 @@ func createScanImageAdvanceRequest(tasks []*ImageAuditTaskControlBlock, batchId
DataId: goproto.String(imageauditIds[i]), DataId: goproto.String(imageauditIds[i]),
ImageURLObject: file.Body, ImageURLObject: file.Body,
}) })
reqs = append(reqs, &imageaudit.ScanImageRequestTask{
DataId: goproto.String(imageauditIds[i]),
ImageURL: goproto.String(task.Images[i].Images[0].Urls[0]),
})
} }
} else { } else {
var file *http.Response var file *http.Response
@ -113,6 +118,10 @@ func createScanImageAdvanceRequest(tasks []*ImageAuditTaskControlBlock, batchId
DataId: task.ImageAuditTask.ImageAuditId, DataId: task.ImageAuditTask.ImageAuditId,
ImageURLObject: file.Body, ImageURLObject: file.Body,
}) })
reqs = append(reqs, &imageaudit.ScanImageRequestTask{
DataId: task.ImageAuditTask.ImageAuditId,
ImageURL: goproto.String(task.Images[0].Images[0].Urls[0]),
})
} }
} }
@ -121,7 +130,7 @@ func createScanImageAdvanceRequest(tasks []*ImageAuditTaskControlBlock, batchId
Scene: scenes, Scene: scenes,
Task: reqTasks, Task: reqTasks,
} }
logger.Info("本次打包:%v", reqTasks) logger.Info("本次打包:%v", reqs)
return return
} }