diff --git a/modules/storage/local.go b/modules/storage/local.go index df5807f87..4f431f11a 100755 --- a/modules/storage/local.go +++ b/modules/storage/local.go @@ -39,6 +39,14 @@ func (l *LocalStorage) Open(path string) (io.ReadCloser, error) { return f, nil } +func (l *LocalStorage) DownloadAFile(bucket string, objectName string) (io.ReadCloser, error) { + f, err := os.Open(filepath.Join(l.dir, objectName)) + if err != nil { + return nil, err + } + return f, nil +} + // Save save a file func (l *LocalStorage) Save(path string, r io.Reader) (int64, error) { p := filepath.Join(l.dir, path) diff --git a/modules/storage/minio.go b/modules/storage/minio.go index bc27c8753..47f70e12d 100755 --- a/modules/storage/minio.go +++ b/modules/storage/minio.go @@ -72,7 +72,6 @@ func (m *MinioStorage) DownloadAFile(bucket string, objectName string) (io.ReadC // Open open a file func (m *MinioStorage) Open(path string) (io.ReadCloser, error) { var opts = minio.GetObjectOptions{} - log.Info("minio objectName=" + m.buildMinioPath(path)) object, err := m.client.GetObject(m.bucket, m.buildMinioPath(path), opts) if err != nil { return nil, err diff --git a/modules/storage/storage.go b/modules/storage/storage.go index fc9d38020..bb9fff10a 100755 --- a/modules/storage/storage.go +++ b/modules/storage/storage.go @@ -22,6 +22,7 @@ const ( type ObjectStorage interface { Save(path string, r io.Reader) (int64, error) Open(path string) (io.ReadCloser, error) + DownloadAFile(bucket string, objectName string) (io.ReadCloser, error) Delete(path string) error DeleteDir(dir string) error PresignedGetURL(path string, fileName string) (string, error) diff --git a/routers/repo/ai_model_manage.go b/routers/repo/ai_model_manage.go index 8359c906d..67eee5f3b 100644 --- a/routers/repo/ai_model_manage.go +++ b/routers/repo/ai_model_manage.go @@ -327,7 +327,7 @@ func MinioDownloadManyFile(path string, ctx *context.Context, returnFileName str return } log.Info("minio file path=" + (path + oneFile.FileName)) - body, err := storage.Attachments.Open(path + oneFile.FileName) + body, err := storage.Attachments.DownloadAFile(setting.Attachment.Minio.Bucket, path+oneFile.FileName) if err != nil { log.Info("download file failed: %s\n", err.Error()) ctx.ServerError("download file failed:", err)