Commit ecccfb12 authored by duanjinfei's avatar duanjinfei

update commit file cache

parent 37137882
...@@ -2,6 +2,7 @@ package nm ...@@ -2,6 +2,7 @@ package nm
import ( import (
"bytes" "bytes"
"encoding/base64"
"encoding/json" "encoding/json"
"example.com/m/conf" "example.com/m/conf"
"example.com/m/log" "example.com/m/log"
...@@ -239,10 +240,10 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -239,10 +240,10 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
} }
if len(containerResp.Output) == 1 { if len(containerResp.Output) == 1 {
if utils.IsBase64ImageStr(containerResp.Output[0]) { if utils.IsBase64ImageStr(containerResp.Output[0]) {
//imageStr := strings.SplitN(containerResp.Output[0], ",", 2)[1] imageStr := strings.SplitN(containerResp.Output[0], ",", 2)[1]
queryString := utils.MatchFileCacheQueryString(taskParam.Headers, taskCmd.ImageName, t.DockerOp.ModelsInfo) queryString := utils.MatchFileCacheQueryString(taskParam.Headers, taskCmd.ImageName, t.DockerOp.ModelsInfo)
ossUri, err := t.uploadOSS(taskMsg.TaskId, queryString, containerResp.Output[0]) //ossUri, err := t.uploadOSS(taskMsg.TaskId, queryString, containerResp.Output[0])
//ossUri, err := t.uploadOSS(taskMsg.TaskId, queryString, imageStr) ossUri, err := t.uploadOSS(taskMsg.TaskId, queryString, imageStr)
if err != nil { if err != nil {
log.WithError(err).Error("upload image into file cache failed") log.WithError(err).Error("upload image into file cache failed")
return return
...@@ -342,13 +343,13 @@ func (t *TaskHandler) uploadOSS(taskId string, queries string, base64Image strin ...@@ -342,13 +343,13 @@ func (t *TaskHandler) uploadOSS(taskId string, queries string, base64Image strin
return "", err return "", err
} }
// 将 base64 解码后的内容复制到表单字段 // 将 base64 解码后的内容复制到表单字段
//decodedImage, err := base64.StdEncoding.DecodeString(base64Image) decodedImage, err := base64.StdEncoding.DecodeString(base64Image)
//if err != nil { if err != nil {
// log.WithError(err).Error("Error decoding base64 image") log.WithError(err).Error("Error decoding base64 image")
// return "", err return "", err
//} }
//_, err = io.Copy(fileField, bytes.NewReader(decodedImage)) _, err = io.Copy(fileField, bytes.NewReader(decodedImage))
_, err = io.Copy(fileField, strings.NewReader(base64Image)) //_, err = io.Copy(fileField, strings.NewReader(base64Image))
if err != nil { if err != nil {
log.WithError(err).Error("Error copying file contents") log.WithError(err).Error("Error copying file contents")
return "", err return "", err
......
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