From 85016ed2734e91e4c8ea03623cde11c29964ba5a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 25 四月 2026 14:00:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/project/common/CommonController.java | 59 ++++-------------------------------------------------------
1 files changed, 4 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/ruoyi/project/common/CommonController.java
index ca64819..bf7bda4 100644
--- a/src/main/java/com/ruoyi/project/common/CommonController.java
+++ b/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -3,10 +3,9 @@
import com.ruoyi.basic.service.StorageBlobService;
import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
-import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.framework.web.domain.R;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.slf4j.Logger;
@@ -29,16 +28,13 @@
*
* @author ruoyi
*/
-@Api(tags = "閫氱敤鎺ュ彛")
+@Tag(name = "閫氱敤鎺ュ彛")
@AllArgsConstructor
@RestController
@RequestMapping("/common")
public class CommonController {
private static final Logger log = LoggerFactory.getLogger(CommonController.class);
- private ServerConfig serverConfig;
-
- private static final String FILE_DELIMETER = ",";
private final StorageBlobService storageBlobService;
private final FileUtil fileUtil;
@@ -77,16 +73,6 @@
// }
//
// /**
-// * minio閫氱敤涓婁紶璇锋眰锛堝涓級
-// */
-// @PostMapping("/minioUploads")
-// @ApiOperation(value = "minio閫氱敤涓婁紶璇锋眰")
-// public AjaxResult minioUploadFiles(List<MultipartFile> files, String bucketName, Long type) throws Exception
-// {
-// return AjaxResult.success();
-// }
-//
-// /**
// * 閫氱敤涓婁紶璇锋眰锛堝崟涓級
// */
// @PostMapping("/upload")
@@ -104,43 +90,6 @@
// ajax.put("fileName", fileName);
// ajax.put("newFileName", FileUtils.getName(fileName));
// ajax.put("originalFilename", file.getOriginalFilename());
-// return ajax;
-// }
-// catch (Exception e)
-// {
-// return AjaxResult.error(e.getMessage());
-// }
-// }
-//
-// /**
-// * 閫氱敤涓婁紶璇锋眰锛堝涓級
-// */
-// @PostMapping("/uploads")
-// public AjaxResult uploadFiles(List<MultipartFile> files) throws Exception
-// {
-// try
-// {
-// // 涓婁紶鏂囦欢璺緞
-// String filePath = RuoYiConfig.getUploadPath();
-// List<String> urls = new ArrayList<String>();
-// List<String> fileNames = new ArrayList<String>();
-// List<String> newFileNames = new ArrayList<String>();
-// List<String> originalFilenames = new ArrayList<String>();
-// for (MultipartFile file : files)
-// {
-// // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
-// String fileName = FileUploadUtils.upload(filePath, file);
-// String url = serverConfig.getUrl() + fileName;
-// urls.add(url);
-// fileNames.add(fileName);
-// newFileNames.add(FileUtils.getName(fileName));
-// originalFilenames.add(file.getOriginalFilename());
-// }
-// AjaxResult ajax = AjaxResult.success();
-// ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
-// ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
-// ajax.put("newFileNames", StringUtils.join(newFileNames, FILE_DELIMETER));
-// ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
// return ajax;
// }
// catch (Exception e)
@@ -178,7 +127,7 @@
// }
// }
@PostMapping({"/upload"})
- @ApiOperation(value = "鏂囦欢涓婁紶")
+ @Operation(summary = "鏂囦欢涓婁紶")
public R upload(@RequestParam("files") List<MultipartFile> files) throws Exception {
return R.ok(storageBlobService.upload(files));
}
--
Gitblit v1.9.3