提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

modules/storage/obs.go

@@ -372,7 +372,7 @@ func GetAllObjectByBucketAndPrefix(bucket string, prefix string) ([]FileInfo, er
 	return fileInfos, nil
 }
 
-func GetObsListObject(jobName, parentDir string) ([]FileInfo, error) {
+func GetObsListObject(jobName, parentDir, versionName string) ([]FileInfo, error) {
 	input := &obs.ListObjectsInput{}
 	input.Bucket = setting.Bucket
 	input.Prefix = strings.TrimPrefix(path.Join(setting.TrainJobModelPath, jobName, setting.OutPutPath, versionName, parentDir), "/")
@@ -501,10 +501,7 @@ func GetObsCreateSignedUrlByBucketAndKey(bucket, key string) (string, error) {
 		return "", err
 	}
 
-	return output.SignedUrl, nil
-
-<<<<<<< HEAD
-}
+	return output.SignedUrl, nil}
 
 func GetObsCreateSignedUrl(jobName, parentDir, fileName string) (string, error) {
 	// input := &obs.CreateSignedUrlInput{}
@@ -526,8 +523,7 @@ func GetObsCreateSignedUrl(jobName, parentDir, fileName string) (string, error)
 	// }
 
 	// return output.SignedUrl, nil
-=======
->>>>>>> origin/V20211213
+
 }
 
 func ObsGetPreSignedUrl(uuid, fileName string) (string, error) {