From 926b7f8d3be96716f46d1d84f5b436c43051df62 Mon Sep 17 00:00:00 2001 From: yanghao05 Date: Thu, 24 Apr 2025 10:31:55 +0800 Subject: [PATCH] feat: modify oss --- backend/app/jobs/download_from_alioss.go | 2 +- backend/app/jobs/provider.gen.go | 2 -- backend/app/jobs/video_cut.go | 2 -- backend/app/jobs/video_extract_head_image.go | 2 +- backend/app/jobs/video_store_short.go | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/backend/app/jobs/download_from_alioss.go b/backend/app/jobs/download_from_alioss.go index 464e6c1..d6d33b6 100644 --- a/backend/app/jobs/download_from_alioss.go +++ b/backend/app/jobs/download_from_alioss.go @@ -84,7 +84,7 @@ func (w *DownloadFromAliOSSWorker) Work(ctx context.Context, job *Job[DownloadFr } log.Infof("Starting download for file: %s", media.Path) - if err := w.oss.Download(ctx, media.Path, dst); err != nil { + if err := w.oss.Download(ctx, media.Path, dst, ali.WithInternal(true)); err != nil { log.Errorf("Error downloading file: %v", err) return err } diff --git a/backend/app/jobs/provider.gen.go b/backend/app/jobs/provider.gen.go index 3a017a6..0703620 100755 --- a/backend/app/jobs/provider.gen.go +++ b/backend/app/jobs/provider.gen.go @@ -93,12 +93,10 @@ func Provide(opts ...opt.Option) error { __job *job.Job, app *app.Config, job *job.Job, - oss *ali.OSSClient, ) (contracts.Initial, error) { obj := &VideoCutWorker{ app: app, job: job, - oss: oss, } if err := river.AddWorkerSafely(__job.Workers, obj); err != nil { return nil, err diff --git a/backend/app/jobs/video_cut.go b/backend/app/jobs/video_cut.go index 2886a45..bca980b 100644 --- a/backend/app/jobs/video_cut.go +++ b/backend/app/jobs/video_cut.go @@ -8,7 +8,6 @@ import ( "quyun/app/models" "quyun/database/fields" "quyun/pkg/utils" - "quyun/providers/ali" "quyun/providers/app" "quyun/providers/job" @@ -40,7 +39,6 @@ var _ Worker[VideoCut] = (*VideoCutWorker)(nil) type VideoCutWorker struct { WorkerDefaults[VideoCut] - oss *ali.OSSClient job *job.Job app *app.Config } diff --git a/backend/app/jobs/video_extract_head_image.go b/backend/app/jobs/video_extract_head_image.go index 54d5a20..10785d7 100644 --- a/backend/app/jobs/video_extract_head_image.go +++ b/backend/app/jobs/video_extract_head_image.go @@ -101,7 +101,7 @@ func (w *VideoExtractHeadImageWorker) Work(ctx context.Context, job *Job[VideoEx } // upload to oss - if err := w.oss.Upload(ctx, output, imageMedia.Path); err != nil { + if err := w.oss.Upload(ctx, output, imageMedia.Path, ali.WithInternal(true)); err != nil { log.Errorf("Error uploading image to OSS: %v", err) return JobCancel(err) } diff --git a/backend/app/jobs/video_store_short.go b/backend/app/jobs/video_store_short.go index a5a0585..0e64f21 100644 --- a/backend/app/jobs/video_store_short.go +++ b/backend/app/jobs/video_store_short.go @@ -101,7 +101,7 @@ func (w *VideoStoreShortWorker) Work(ctx context.Context, job *Job[VideoStoreSho } // upload to oss - if err := w.oss.Upload(ctx, job.Args.FilePath, filePath); err != nil { + if err := w.oss.Upload(ctx, job.Args.FilePath, filePath, ali.WithInternal(true)); err != nil { log.Errorf("Error uploading file to OSS: %v", err) return JobCancel(err) }