From c4290e2f4d7417e034764cc634bfda9d24ef9f7e Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Thu, 25 Nov 2021 11:39:44 +0800
Subject: [PATCH] fix bug

---
 routers/repo/modelarts.go | 45 ++++++---------------------------------
 1 file changed, 7 insertions(+), 38 deletions(-)

diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go
index 3236afdcd..a820c56fa 100755
--- a/routers/repo/modelarts.go
+++ b/routers/repo/modelarts.go
@@ -1387,12 +1387,9 @@ func ModelDownload(ctx *context.Context) {
 
 	var jobID = ctx.Params(":jobid")
 	versionName := ctx.Query("version_name")
-	// versionName := "V0001"
 	parentDir := ctx.Query("parent_dir")
 	fileName := ctx.Query("file_name")
 	log.Info("DownloadSingleModelFile start.")
-	// id := ctx.Params(":ID")
-	// path := Model_prefix + models.AttachmentRelativePath(id) + "/" + parentDir + fileName
 	task, err := models.GetCloudbrainByJobIDAndVersionName(jobID, versionName)
 	if err != nil {
 		log.Error("GetCloudbrainByJobID(%s) failed:%v", task.JobName, err.Error())
@@ -1401,40 +1398,12 @@ func ModelDownload(ctx *context.Context) {
 
 	path := strings.TrimPrefix(path.Join(setting.TrainJobModelPath, task.JobName, setting.OutPutPath, versionName, parentDir, fileName), "/")
 	log.Info("Download path is:%s", path)
-	if setting.PROXYURL == "" {
-		body, err := storage.ObsDownloadAFile(setting.Bucket, path)
-		if err != nil {
-			log.Info("download error.")
-		} else {
-			//count++
-			// models.ModifyModelDownloadCount(id)
-			defer body.Close()
-			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+fileName)
-			ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
-			p := make([]byte, 1024)
-			var readErr error
-			var readCount int
-			// 读取对象内容
-			for {
-				readCount, readErr = body.Read(p)
-				if readCount > 0 {
-					ctx.Resp.Write(p[:readCount])
-					//fmt.Printf("%s", p[:readCount])
-				}
-				if readErr != nil {
-					break
-				}
-			}
-		}
-	} else {
-		url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)
-		if err != nil {
-			log.Error("GetObsCreateSignedUrl failed: %v", err.Error(), ctx.Data["msgID"])
-			ctx.ServerError("GetObsCreateSignedUrl", err)
-			return
-		}
-		//count++
-		// models.ModifyModelDownloadCount(id)
-		http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
+
+	url, err := storage.GetObsCreateSignedUrlByBucketAndKey(setting.Bucket, path)
+	if err != nil {
+		log.Error("GetObsCreateSignedUrl failed: %v", err.Error(), ctx.Data["msgID"])
+		ctx.ServerError("GetObsCreateSignedUrl", err)
+		return
 	}
+	http.Redirect(ctx.Resp, ctx.Req.Request, url, http.StatusMovedPermanently)
 }