From c81a5b4f6c18f01059a5012ce436f079a1ff840a Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 04 三月 2023 13:31:21 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/controller/FileController.java | 75 ++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 38 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..af875a7 100644
--- a/ycl-common/src/main/java/com/ycl/controller/FileController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/FileController.java
@@ -3,6 +3,7 @@
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;
@@ -18,23 +19,17 @@
@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 +43,36 @@
// }
// }
- @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("/upload")
+ public CommonResult<String> uploadImages(MultipartFile file) {
+ String url = ossService.uploadImages(file);
+ 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("/delete")
+ public CommonResult<Boolean> deleteImages(String fileUrl) {
+ boolean flag = ossService.deleteImages(fileUrl);
+ if (flag) {
+ return CommonResult.success(true, "鍒犻櫎鎴愬姛");
}
-
+ return CommonResult.failed("fail!");
}
+
}
--
Gitblit v1.8.0