From 95985b5a5bb7c5656098cc8923ed3d1d8aaa3d2b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期五, 24 一月 2025 10:44:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/COSController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/COSController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/COSController.java
index eeba769..5fe8e8d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/COSController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/COSController.java
@@ -13,6 +13,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.io.OutputStream;
/**
* @author HJL
@@ -33,8 +34,15 @@
@ApiImplicitParam(value = "文件", name = "file", dataType = "MultipartFile", required = true)
})
public R<String> upload(@RequestParam("file") MultipartFile file) {
- String s = tencentCosUtil.upLoadFile(file);
- return R.ok(s, s);
+ String url = tencentCosUtil.upLoadFile(file);
+ return R.ok(url, url);
}
-
+ @PostMapping("/download")
+ @ApiOperation(value = "文件下载", tags = "公共-文件下载")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "文件url", name = "url", dataType = "String", required = true)
+ })
+ public void upload(@RequestParam("url") String url) {
+ tencentCosUtil.downLoadFile(url);
+ }
}
--
Gitblit v1.7.1