From c99438c64037b06c629e37f1f1acb5ce48a31036 Mon Sep 17 00:00:00 2001
From: 17808 <1780814303@qq.com>
Date: 星期三, 13 九月 2023 13:05:38 +0800
Subject: [PATCH] Merge branch 'lyl-dev'

---
 ycl-common/src/main/java/com/ycl/controller/FileController.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/controller/FileController.java b/ycl-common/src/main/java/com/ycl/controller/FileController.java
index 6f4c2f7..25c2a1e 100644
--- a/ycl-common/src/main/java/com/ycl/controller/FileController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/FileController.java
@@ -1,18 +1,14 @@
 package com.ycl.controller;
 
 import com.ycl.api.CommonResult;
-import com.ycl.dto.media.Media;
-import com.ycl.dto.media.PictureZoomParameter;
 import com.ycl.service.oss.OssService;
-import com.ycl.utils.AliyunUtils;
-import com.ycl.utils.MediaFileUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-
-import java.io.InputStream;
 
 @RestController
 @Api(tags = "鏂囦欢涓婁紶")
@@ -75,5 +71,12 @@
         return CommonResult.failed("fail!");
     }
 
+    @ApiOperation(value = "涓婁紶瑙嗛")
+    @PostMapping("/video")
+    public CommonResult<String> uploadVideo(MultipartFile file) {
+        String url = ossService.uploadVideo(file);
+        return CommonResult.success(url, "ok");
+    }
+
 
 }

--
Gitblit v1.8.0