From 9051d6194b11a2151bd62b9be731689524a32d5a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 12:58:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java | 51 +--------------------------------------------------
1 files changed, 1 insertions(+), 50 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java b/ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java
index d8fd6fe..c5d568c 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/common/CommonController.java
@@ -5,10 +5,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import com.ard.common.core.domain.entity.MinioUploadResult;
-import com.ard.work.domain.entity.MinioSysFile;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -23,14 +20,11 @@
import com.ard.common.utils.file.FileUtils;
import com.ard.framework.config.ServerConfig;
-import static com.ard.common.utils.file.MinioUtil.uploadFile;
-
/**
* 通用请求处理
*
- * @author ruoyi
+ * @author ard
*/
-@Api(tags = "通用请求处理")
@RestController
@RequestMapping("/common")
public class CommonController
@@ -166,48 +160,5 @@
}
}
-
- /**
- * minio上传文件
- */
- @ApiOperation("minio文件上传")
- @PostMapping("/uploadMinio")
- public AjaxResult uploadFileMinio(@RequestPart MultipartFile file) {
- try
- {
- // 上传并返回新文件名称
- String url = FileUploadUtils.uploadMinio(file);
- MinioUploadResult minioUploadResult = MinioUploadResult.builder()
- .url(url)
- .newFileName(FileUtils.getName(url))
- .originalFilename(file.getOriginalFilename())
- .build();
- return AjaxResult.success(minioUploadResult);
- }
- catch (Exception e)
- {
- return AjaxResult.error(e.getMessage());
- }
- }
- /**
- * minio文件上传-指定桶
- */
- @ApiOperation("minio文件上传-指定桶")
- @PostMapping("/uploadMinio/{bucketName}")
- public AjaxResult upload(@RequestPart("file")MultipartFile file,
- @PathVariable String bucketName) {
- try {
- // 上传并返回访问地址
- String url = FileUploadUtils.uploadMinio(file,bucketName);
- MinioUploadResult minioUploadResult = MinioUploadResult.builder()
- .url(url)
- .newFileName(FileUtils.getName(url))
- .originalFilename(file.getOriginalFilename())
- .build();
- return AjaxResult.success(minioUploadResult);
- } catch (Exception e) {
- return AjaxResult.error(e.getMessage());
- }
- }
}
--
Gitblit v1.9.3