Browse Source

Merge branch 'zouap' of https://git.openi.org.cn/OpenI/aiforge into zouap

pull/1036/head
zhoupzh 3 years ago
parent
commit
d1526ff606
2 changed files with 2 additions and 2 deletions
  1. +1
    -2
      modules/storage/obs.go
  2. +1
    -0
      routers/repo/ai_model_manage.go

+ 1
- 2
modules/storage/obs.go View File

@@ -287,6 +287,7 @@ func GetOneLevelAllObjectUnderDir(bucket string, prefixRootPath string, relative
prefixLen := len(input.Prefix)
if err == nil {
for _, val := range output.Contents {
log.Info("val key=" + val.Key)
var isDir bool
var fileName string
if val.Key == input.Prefix {
@@ -454,8 +455,6 @@ func ObsGenMultiPartSignedUrl(uuid string, uploadId string, partNumber int, file
return output.SignedUrl, nil
}



func GetObsCreateSignedUrlByBucketAndKey(bucket, key string) (string, error) {
input := &obs.CreateSignedUrlInput{}
input.Bucket = bucket


+ 1
- 0
routers/repo/ai_model_manage.go View File

@@ -125,6 +125,7 @@ func downloadModelFromCloudBrainTwo(modelUUID string, jobName string, parentDir

objectkey := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, parentDir), "/")
modelDbResult, err := storage.GetOneLevelAllObjectUnderDir(setting.Bucket, objectkey, "")
log.Info("bucket=" + setting.Bucket + " objectkey=" + objectkey)
if err != nil {
log.Info("get TrainJobListModel failed:", err)
return "", 0, err


Loading…
Cancel
Save