diff --git a/server/internal/controller/admin/common/upload.go b/server/internal/controller/admin/common/upload.go index f8c8022..d4713f8 100644 --- a/server/internal/controller/admin/common/upload.go +++ b/server/internal/controller/admin/common/upload.go @@ -56,20 +56,21 @@ func (c *cUpload) UploadVideo(ctx context.Context, _ *common.UploadVideoReq) (re return } + m3u8UUID := uuid.New().String() + // 1. 保存上传视频到本地临时目录 tmpDir := "./tmp/video" - _, _ = file.Save(tmpDir) - tmpFile := tmpDir + "/" + file.Filename + _, _ = file.Save(tmpDir + "/" + m3u8UUID) + tmpFile := tmpDir + "/" + m3u8UUID + "/" + file.Filename // 2. 用ffmpeg切片为m3u8和ts文件 - m3u8UUID := uuid.New().String() - hlsDir := "./tmp/hls/" + m3u8UUID _ = os.MkdirAll(hlsDir, 0755) defer func() { os.RemoveAll(hlsDir) + os.RemoveAll(tmpDir + "/" + m3u8UUID) }() m3u8File := m3u8UUID + ".m3u8" @@ -99,6 +100,8 @@ func (c *cUpload) UploadVideo(ctx context.Context, _ *common.UploadVideoReq) (re } } + m3u8MinioPath = storager.LastUrl(ctx, m3u8MinioPath, "minio") + // 4. 返回m3u8文件的minio路径 return common.UploadVideoRes{ Path: m3u8MinioPath, diff --git a/web/src/views/lessonSection/edit.vue b/web/src/views/lessonSection/edit.vue index 5849d8c..54c6409 100644 --- a/web/src/views/lessonSection/edit.vue +++ b/web/src/views/lessonSection/edit.vue @@ -1,25 +1,13 @@ \ No newline at end of file