提交代码。

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

modules/storage/minio_ext.go

@@ -116,6 +116,107 @@ func GenMultiPartSignedUrl(uuid string, uploadId string, partNumber int, partSiz
 
 }
 
+func GetAllObjectByBucketAndPrefixMinio(bucket string, prefix string) ([]FileInfo, error) {
+	_, core, err := getClients()
+	if err != nil {
+		log.Error("getClients failed:", err.Error())
+		return nil, err
+	}
+	prefixLen := len(prefix)
+	delimiter := ""
+	marker := ""
+	index := 1
+	fileInfoList := FileInfoList{}
+	for {
+		output, err := core.ListObjects(bucket, prefix, marker, delimiter, 1000)
+		if err == nil {
+			log.Info("Page:%d\n", index)
+			index++
+			for _, val := range output.Contents {
+				var isDir bool
+				if prefixLen == len(val.Key) {
+					continue
+				}
+				if strings.HasSuffix(val.Key, "/") {
+					isDir = true
+				} else {
+					isDir = false
+				}
+				fileInfo := FileInfo{
+					ModTime:  val.LastModified.Format("2006-01-02 15:04:05"),
+					FileName: val.Key[prefixLen:],
+					Size:     val.Size,
+					IsDir:    isDir,
+					ParenDir: "",
+				}
+				fileInfoList = append(fileInfoList, fileInfo)
+			}
+			if output.IsTruncated {
+				marker = output.NextMarker
+			} else {
+				break
+			}
+		} else {
+			log.Info("list error." + err.Error())
+			return nil, err
+		}
+	}
+	sort.Sort(fileInfoList)
+	return fileInfoList, nil
+}
+
+func GetOneLevelAllObjectUnderDirMinio(bucket string, prefixRootPath string, relativePath string) ([]FileInfo, error) {
+	_, core, err := getClients()
+	if err != nil {
+		log.Error("getClients failed:", err.Error())
+		return nil, err
+	}
+
+	Prefix := prefixRootPath + relativePath
+	if !strings.HasSuffix(Prefix, "/") {
+		Prefix += "/"
+	}
+	output, err := core.ListObjects(bucket, Prefix, "", "", 1000)
+	fileInfos := make([]FileInfo, 0)
+	prefixLen := len(Prefix)
+	if err == nil {
+		for _, val := range output.Contents {
+			log.Info("val key=" + val.Key)
+			var isDir bool
+			var fileName string
+			if val.Key == Prefix {
+				continue
+			}
+			if strings.Contains(val.Key[prefixLen:len(val.Key)-1], "/") {
+				continue
+			}
+			if strings.HasSuffix(val.Key, "/") {
+				isDir = true
+				fileName = val.Key[prefixLen : len(val.Key)-1]
+				relativePath += val.Key[prefixLen:]
+			} else {
+				isDir = false
+				fileName = val.Key[prefixLen:]
+			}
+			fileInfo := FileInfo{
+				ModTime:  val.LastModified.Local().Format("2006-01-02 15:04:05"),
+				FileName: fileName,
+				Size:     val.Size,
+				IsDir:    isDir,
+				ParenDir: relativePath,
+			}
+			fileInfos = append(fileInfos, fileInfo)
+		}
+		return fileInfos, err
+	} else {
+
+		log.Error("Message:%s", err.Error())
+
+		return nil, err
+	}
+
+}
+
 func MinioPathCopy(bucketName string, srcPath string, destPath string) (int64, error) {
 	_, core, err := getClients()
 	var count int64

routers/repo/ai_model_manage.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"net/url"
 	"path"
 	"strings"
 
@@ -295,13 +296,64 @@ func DownloadMultiModelFile(ctx *context.Context) {
 
 	path := Model_prefix + models.AttachmentRelativePath(id) + "/"
 	if task.Type == models.TypeCloudBrainTwo {
-
+		downloadFromCloudBrainTwo(path, task, ctx, id)
 	} else if task.Type == models.TypeCloudBrainOne {
-
+		downloadFromCloudBrainOne(path, task, ctx, id)
 	}
 
 }
 
+func downloadFromCloudBrainOne(path string, task *models.AiModelManage, ctx *context.Context, id string) {
+	allFile, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, path)
+	if err == nil {
+		//count++
+		models.ModifyModelDownloadCount(id)
+
+		returnFileName := task.Name + "_" + task.Version + ".zip"
+		ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(returnFileName))
+		ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
+		w := zip.NewWriter(ctx.Resp)
+		defer w.Close()
+		for _, oneFile := range allFile {
+			if oneFile.IsDir {
+				log.Info("zip dir name:" + oneFile.FileName)
+			} else {
+				log.Info("zip file name:" + oneFile.FileName)
+				fDest, err := w.Create(oneFile.FileName)
+				if err != nil {
+					log.Info("create zip entry error, download file failed: %s\n", err.Error())
+					ctx.ServerError("download file failed:", err)
+					return
+				}
+				body, err := storage.ObsDownloadAFile(setting.Bucket, path+oneFile.FileName)
+				if err != nil {
+					log.Info("download file failed: %s\n", err.Error())
+					ctx.ServerError("download file failed:", err)
+					return
+				} else {
+					defer body.Close()
+					p := make([]byte, 1024)
+					var readErr error
+					var readCount int
+					// 读取对象内容
+					for {
+						readCount, readErr = body.Read(p)
+						if readCount > 0 {
+							fDest.Write(p[:readCount])
+						}
+						if readErr != nil {
+							break
+						}
+					}
+				}
+			}
+		}
+	} else {
+		log.Info("error,msg=" + err.Error())
+		ctx.ServerError("no file to download.", err)
+	}
+}
+
 func downloadFromCloudBrainTwo(path string, task *models.AiModelManage, ctx *context.Context, id string) {
 	allFile, err := storage.GetAllObjectByBucketAndPrefix(setting.Bucket, path)
 	if err == nil {
@@ -309,7 +361,7 @@ func downloadFromCloudBrainTwo(path string, task *models.AiModelManage, ctx *con
 		models.ModifyModelDownloadCount(id)
 
 		returnFileName := task.Name + "_" + task.Version + ".zip"
-		ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+returnFileName)
+		ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(returnFileName))
 		ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
 		w := zip.NewWriter(ctx.Resp)
 		defer w.Close()