Commit 2d1e5225 authored by duanjinfei's avatar duanjinfei

update task handler

parent 0a0dbbda
...@@ -282,12 +282,13 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -282,12 +282,13 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
{ {
res := data.([][]string) res := data.([][]string)
log.Info("data is [][]string type") log.Info("data is [][]string type")
apiRes := make([][]string, 1) apiRes := make([][]string, 0)
for i, innerSlice := range res { for _, innerSlice := range res {
for j, respStr := range innerSlice { apiResOneArr := make([]string, 0)
for _, respStr := range innerSlice {
ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd) ossUri, err := t.getFileCache(respStr, taskMsg, taskParam, taskCmd)
if err != nil || ossUri == "" { if err != nil || ossUri == "" {
apiRes[i][j] = respStr apiResOneArr = append(apiResOneArr, respStr)
continue continue
} }
if ossUri != "" && len(res) == 1 && len(innerSlice) == 1 && isUseFileCache { if ossUri != "" && len(res) == 1 && len(innerSlice) == 1 && isUseFileCache {
...@@ -295,9 +296,10 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -295,9 +296,10 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
post.Header.Set("Location", ossUri) post.Header.Set("Location", ossUri)
break break
} else { } else {
apiRes[i][j] = ossUri apiResOneArr = append(apiResOneArr, ossUri)
} }
} }
apiRes = append(apiRes, apiResOneArr)
} }
if len(apiRes) > 1 || len(apiRes[0]) > 1 { if len(apiRes) > 1 || len(apiRes[0]) > 1 {
apiResBody := utils.EncodeJsonEscapeHTML(apiRes) apiResBody := utils.EncodeJsonEscapeHTML(apiRes)
...@@ -498,7 +500,7 @@ func (t *TaskHandler) uploadOSS(taskId string, queries string, decodedImage []by ...@@ -498,7 +500,7 @@ func (t *TaskHandler) uploadOSS(taskId string, queries string, decodedImage []by
func (t *TaskHandler) getFileCache(respStr string, taskMsg *nodeManagerV1.PushTaskMessage, taskParam *models.TaskParam, taskCmd *models.TaskCmd) (string, error) { func (t *TaskHandler) getFileCache(respStr string, taskMsg *nodeManagerV1.PushTaskMessage, taskParam *models.TaskParam, taskCmd *models.TaskCmd) (string, error) {
isBase64, decodeByte, respFormat, suffix := utils.IsBase64ImageStr(respStr) isBase64, decodeByte, respFormat, suffix := utils.IsBase64ImageStr(respStr)
log.WithField("isBase64", isBase64).WithField("decodeByte", decodeByte).Info("resp str info") log.WithField("isBase64", isBase64).Info("resp str info")
if isBase64 { if isBase64 {
log.WithField("taskId", taskMsg.TaskId).WithField("format", respFormat).WithField("suffix", suffix).Info("Parse container resp") log.WithField("taskId", taskMsg.TaskId).WithField("format", respFormat).WithField("suffix", suffix).Info("Parse container resp")
queryString := utils.MatchFileCacheQueryString(taskParam.Headers, taskCmd.ImageName, t.DockerOp.ModelsInfo, respFormat) queryString := utils.MatchFileCacheQueryString(taskParam.Headers, taskCmd.ImageName, t.DockerOp.ModelsInfo, respFormat)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment