From 8d756d72c121f803b4793bfd73a7a00e4a94fe8b Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 14 Nov 2022 16:24:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=AE=A1=E7=90=86=E4=B8=AD?= =?UTF-8?q?=EF=BC=8CNPU=E7=9A=84=E8=A7=84=E6=A0=BC=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/repo/attachment.go | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/routers/repo/attachment.go b/routers/repo/attachment.go index 5d678cd23..da950eb31 100755 --- a/routers/repo/attachment.go +++ b/routers/repo/attachment.go @@ -669,29 +669,37 @@ func GetSuccessChunks(ctx *context.Context) { modelname := "" if dbmodeluuid != modeluuid { log.Info("The file has uploaded.fileChunk.ObjectName=" + fileChunk.ObjectName + " typeCloudBrain=" + fmt.Sprint(typeCloudBrain)) - model, err := models.QueryModelById(dbmodeluuid) - if err == nil { - modelname = model.Name + srcObjectName := fileChunk.ObjectName + var isExist bool + if dbmodeluuid != "" { + model, err := models.QueryModelById(dbmodeluuid) + if err == nil && model != nil { + modelname = model.Name + } } //copy - srcObjectName := fileChunk.ObjectName destObjectName := getObjectName(fileName, modeluuid) - var isExist bool - if typeCloudBrain == int(models.TypeCloudBrainOne) { - log.Info("minio copy..") + if typeCloudBrain == models.TypeCloudBrainOne { bucketName := setting.Attachment.Minio.Bucket + log.Info("minio copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName) if storage.MinioGetFilesSize(bucketName, []string{destObjectName}) > 0 { isExist = true } else { + if srcObjectName == "" { + srcObjectName = getMinioInitObjectName("", fileChunk.UUID, "", "") + } storage.MinioCopyAFile(bucketName, srcObjectName, bucketName, destObjectName) } } else { - log.Info("obs copy..") bucketName := setting.Bucket + log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName) if storage.ObsGetFilesSize(bucketName, []string{destObjectName}) > 0 { isExist = true } else { - log.Info("obs copy............") + if srcObjectName == "" { + srcObjectName = getOBSInitObjectName("", fileChunk.UUID, "", attach.Name) + } + log.Info("obs copy..srcObjectName=" + srcObjectName + " bucketName=" + bucketName) storage.ObsCopyFile(bucketName, srcObjectName, bucketName, destObjectName) } }