From 46251c20b66bb1ca05058ae63a92a195e5543b90 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 02 十一月 2023 21:27:37 +0800
Subject: [PATCH] 优化
---
ycl-common/src/main/java/com/ycl/controller/FileController.java | 93 ++++++++++++++++++++++++----------------------
1 files changed, 48 insertions(+), 45 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 73eeb9e..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,40 +1,31 @@
package com.ycl.controller;
import com.ycl.api.CommonResult;
-import com.ycl.dto.media.Media;
-import com.ycl.dto.media.PictureZoomParameter;
-import com.ycl.utils.AliyunUtils;
-import com.ycl.utils.MediaFileUtil;
+import com.ycl.service.oss.OssService;
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 = "鏂囦欢涓婁紶")
@RequestMapping("/file")
public class FileController {
- private MediaFileUtil mediaFileUtil;
+// private MediaFileUtil mediaFileUtil;
+// @Autowired
+// public void setMediaFileUtil(MediaFileUtil mediaFileUtil) {
+// this.mediaFileUtil = mediaFileUtil;
+// }
- @Autowired
- private AliyunUtils aliyunUtils;
-
- @Autowired
- public void setMediaFileUtil(MediaFileUtil mediaFileUtil) {
- this.mediaFileUtil = mediaFileUtil;
- }
-
- /**
- * 涓婁紶鍥剧墖
- *
- * @param file
- * @return
- */
-
+// /**
+// * 涓婁紶鍥剧墖
+// * @param file
+// * @return
+// */
// @ApiOperation("涓婁紶鍥剧墖")
// @RequestMapping(value = "/medias", method = RequestMethod.POST)
// public CommonResult<Media> mediaUpload(@RequestParam("file") MultipartFile file) {
@@ -48,32 +39,44 @@
// }
// }
- @ApiOperation("涓婁紶鍥剧墖")
- @RequestMapping(value = "/medias", method = RequestMethod.POST)
- public CommonResult<String> mediaUpload(@RequestParam("file") MultipartFile file) {
- try {
- InputStream inputStream = file.getInputStream();
- String orginalFileName = file.getOriginalFilename();
- String res = aliyunUtils.upload(inputStream, orginalFileName);
- return CommonResult.success(res, "ok");
- } catch (Exception e) {
+// @ApiOperation("鍒犻櫎鍥剧墖")
+// @RequestMapping(value = "media/delete", method = RequestMethod.DELETE)
+// public CommonResult<Boolean> delete(@RequestBody Media media) {
+// try {
+// mediaFileUtil.removeMedia(media);
+// return CommonResult.success(true, "ok");
+// } catch (Exception e) {
+// return CommonResult.failed("fail!");
+// }
+// }
- e.printStackTrace();
- }
- return CommonResult.failed("鍥剧墖鏍煎紡鍙兘涓簀pg銆乯peg銆乸ng,鍙慨鏀规枃浠剁殑鍚庣紑鏃犳晥!");
+ @Autowired
+ private OssService ossService;
+
+ @ApiOperation(value = "涓婁紶鍥剧墖")
+ @PostMapping("/medias")
+ public CommonResult<String> uploadImages(MultipartFile file) {
+ String url = ossService.uploadImages(file);
+ // String url = "https://xshcs.com/img/ercode.7a421889.png?v=1";
+ return CommonResult.success(url, "ok");
}
- @ApiOperation("鍒犻櫎鍥剧墖")
- @RequestMapping(value = "media/delete", method = RequestMethod.DELETE)
- public CommonResult<Boolean> delete(@RequestBody Media media) {
- try {
- mediaFileUtil.removeMedia(media);
-
- return CommonResult.success(true, "ok");
- } catch (Exception e) {
- return CommonResult.failed("fail!");
+ @ApiOperation(value = "鍒犻櫎鍥剧墖")
+ @PostMapping("media/delete")
+ public CommonResult<Boolean> deleteImages(String fileUrl) {
+ boolean flag = ossService.deleteImages(fileUrl);
+ if (flag) {
+ return CommonResult.success(true, "鍒犻櫎鎴愬姛");
}
-
+ 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