From ffa0bfc08acddebf438f6f27a4efd401a88d4097 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 15 七月 2025 14:32:00 +0800
Subject: [PATCH] bug修改
---
pt-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/pt-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/pt-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 2fc8b80..7539642 100644
--- a/pt-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/pt-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -5,6 +5,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.utils.OssService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
@@ -44,7 +45,7 @@
/**
* 通用上传请求（单个）
*/
- @ApiOperation(value = "文件上传", notes = "文件上传")
+ /* @ApiOperation(value = "文件上传", notes = "文件上传")
@PostMapping("/upload")
public AjaxResult uploadFile(MultipartFile file) throws Exception {
try {
@@ -62,12 +63,53 @@
} catch (Exception e) {
return AjaxResult.error(e.getMessage());
}
+ }*/
+ @Autowired
+ private OssService ossService;
+ @ApiOperation(value = "文件上传", notes = "文件上传")
+ @PostMapping("/upload")
+ public AjaxResult uploadFile(MultipartFile file) throws Exception {
+ // 指定存储目录，例如images
+ AjaxResult ajax = AjaxResult.success();
+ String directory = "images";
+ String url = ossService.uploadFile(file, directory);
+ ajax.put("url", url);
+// System.err.println(url);
+ return ajax;
+ }
+
+ @ApiOperation(value = "文件上传", notes = "多个文件上传")
+ @PostMapping("/uploadFiles")
+ // 新增：批量上传文件
+ public List<String> uploadFiles(List<MultipartFile> files) {
+ List<String> urlList = new ArrayList<>();
+ if (files == null || files.isEmpty()) {
+ return urlList; // 返回空列表
+ }
+
+ for (MultipartFile file : files) {
+ if (file.isEmpty()) {
+ continue; // 跳过空文件
+ }
+ // 调用单个上传方法，添加到URL列表
+ String url = null;
+ try {
+ AjaxResult ajax = uploadFile(file);
+ url = ajax.get("url").toString();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ if (url != null) {
+ urlList.add(url);
+ }
+ }
+ return urlList;
}
/**
* 通用上传请求（多个）
*/
- @ApiOperation(value = "文件上传（多个）", notes = "文件上传（多个）")
+ /*@ApiOperation(value = "文件上传（多个）", notes = "文件上传（多个）")
@PostMapping("/uploads")
public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception {
try {
@@ -95,7 +137,7 @@
} catch (Exception e) {
return AjaxResult.error(e.getMessage());
}
- }
+ }*/
// /**
// * 本地资源通用下载
--
Gitblit v1.7.1