From f5fec3e27510969ee9f2fc89d2e1e2868d25f1f1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/project/common/CommonController.java | 311 +++++++++++++++++++++++++++++----------------------
1 files changed, 175 insertions(+), 136 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/ruoyi/project/common/CommonController.java
index c575425..f4ca6ca 100644
--- a/src/main/java/com/ruoyi/project/common/CommonController.java
+++ b/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -1,163 +1,202 @@
package com.ruoyi.project.common;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.basic.service.StorageBlobService;
+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 lombok.AllArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.framework.config.ServerConfig;
-import com.ruoyi.framework.web.domain.AjaxResult;
+
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.List;
/**
* 閫氱敤璇锋眰澶勭悊
- *
+ *
* @author ruoyi
*/
+@Api(tags = "閫氱敤鎺ュ彛")
+@AllArgsConstructor
@RestController
@RequestMapping("/common")
-public class CommonController
-{
+public class CommonController {
private static final Logger log = LoggerFactory.getLogger(CommonController.class);
- @Autowired
private ServerConfig serverConfig;
private static final String FILE_DELIMETER = ",";
- /**
- * 閫氱敤涓嬭浇璇锋眰
- *
- * @param fileName 鏂囦欢鍚嶇О
- * @param delete 鏄惁鍒犻櫎
- */
- @GetMapping("/download")
- public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
- {
- try
- {
- if (!FileUtils.checkAllowDownload(fileName))
- {
- throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", fileName));
- }
- String realFileName = fileName.substring(fileName.indexOf("_") + 1);
+ private final StorageBlobService storageBlobService;
- response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
- FileUtils.setAttachmentResponseHeader(response, realFileName);
- FileUtils.writeBytes(fileName, response.getOutputStream());
-// if (delete)
+
+// /**
+// * 閫氱敤涓嬭浇璇锋眰
+// *
+// * @param fileName 鏂囦欢鍚嶇О
+// * @param delete 鏄惁鍒犻櫎
+// */
+// @GetMapping("/download")
+// public void fileDownload(String fileName, Boolean delete, HttpServletResponse response, HttpServletRequest request)
+// {
+// try
+// {
+// if (!FileUtils.checkAllowDownload(fileName))
// {
-// FileUtils.deleteFile(fileName);
+// throw new Exception(StringUtils.format("鏂囦欢鍚嶇О({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", fileName));
// }
- }
- catch (Exception e)
- {
- log.error("涓嬭浇鏂囦欢澶辫触", e);
- }
+// String realFileName = fileName.substring(fileName.indexOf("_") + 1);
+//
+// response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+// FileUtils.setAttachmentResponseHeader(response, realFileName);
+// FileUtils.writeBytes(fileName, response.getOutputStream());
+
+ /// / if (delete)
+ /// / {
+ /// / FileUtils.deleteFile(fileName);
+ /// / }
+// }
+// catch (Exception e)
+// {
+// log.error("涓嬭浇鏂囦欢澶辫触", e);
+// }
+// }
+//
+// /**
+// * minio閫氱敤涓婁紶璇锋眰锛堝涓級
+// */
+// @PostMapping("/minioUploads")
+// @ApiOperation(value = "minio閫氱敤涓婁紶璇锋眰")
+// public AjaxResult minioUploadFiles(List<MultipartFile> files, String bucketName, Long type) throws Exception
+// {
+// return AjaxResult.success();
+// }
+//
+// /**
+// * 閫氱敤涓婁紶璇锋眰锛堝崟涓級
+// */
+// @PostMapping("/upload")
+// public AjaxResult uploadFile(MultipartFile file) throws Exception
+// {
+// try
+// {
+// // 涓婁紶鏂囦欢璺緞
+// String filePath = RuoYiConfig.getUploadPath();
+// // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
+// String fileName = FileUploadUtils.upload(filePath, file);
+// String url = serverConfig.getUrl() + fileName;
+// AjaxResult ajax = AjaxResult.success();
+// ajax.put("url", url);
+// 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)
+// {
+// return AjaxResult.error(e.getMessage());
+// }
+// }
+//
+// /**
+// * 鏈湴璧勬簮閫氱敤涓嬭浇
+// */
+// @GetMapping("/download/resource")
+// public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
+// throws Exception
+// {
+// try
+// {
+// if (!FileUtils.checkAllowDownload(resource))
+// {
+// throw new Exception(StringUtils.format("璧勬簮鏂囦欢({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", resource));
+// }
+// // 鏈湴璧勬簮璺緞
+// String localPath = RuoYiConfig.getProfile();
+// // 鏁版嵁搴撹祫婧愬湴鍧�
+// String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
+// // 涓嬭浇鍚嶇О
+// String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
+// response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+// FileUtils.setAttachmentResponseHeader(response, downloadName);
+// FileUtils.writeBytes(downloadPath, response.getOutputStream());
+// }
+// catch (Exception e)
+// {
+// log.error("涓嬭浇鏂囦欢澶辫触", e);
+// }
+// }
+
+ @PostMapping({"/upload"})
+ @ApiOperation(value = "鏂囦欢涓婁紶")
+ public R upload(@RequestParam("files") List<MultipartFile> files) throws Exception {
+ return R.ok(storageBlobService.upload(files));
}
- /**
- * 閫氱敤涓婁紶璇锋眰锛堝崟涓級
- */
- @PostMapping("/upload")
- public AjaxResult uploadFile(MultipartFile file) throws Exception
- {
- try
- {
- // 涓婁紶鏂囦欢璺緞
- String filePath = RuoYiConfig.getUploadPath();
- // 涓婁紶骞惰繑鍥炴柊鏂囦欢鍚嶇О
- String fileName = FileUploadUtils.upload(filePath, file);
- String url = serverConfig.getUrl() + fileName;
- AjaxResult ajax = AjaxResult.success();
- ajax.put("url", url);
- 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());
- }
+
+ @GetMapping("/download/{fileName}")
+ @Anonymous
+ public void download(@PathVariable String fileName, @RequestParam("token") String token, HttpServletResponse response) throws Exception {
+ File file = storageBlobService.getFileByToken(fileName, token);
+ String originalFileName = storageBlobService.getDownloadFileName(fileName);
+ String encodedFileName = URLEncoder.encode(originalFileName, StandardCharsets.UTF_8.name()).replace("+", "%20");
+ response.setHeader("Content-Disposition", "attachment;filename*=UTF-8''" + encodedFileName);
+ Files.copy(file.toPath(), response.getOutputStream());
}
- /**
- * 閫氱敤涓婁紶璇锋眰锛堝涓級
- */
- @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)
- {
- return AjaxResult.error(e.getMessage());
- }
- }
-
- /**
- * 鏈湴璧勬簮閫氱敤涓嬭浇
- */
- @GetMapping("/download/resource")
- public void resourceDownload(String resource, HttpServletRequest request, HttpServletResponse response)
- throws Exception
- {
- try
- {
- if (!FileUtils.checkAllowDownload(resource))
- {
- throw new Exception(StringUtils.format("璧勬簮鏂囦欢({})闈炴硶锛屼笉鍏佽涓嬭浇銆� ", resource));
- }
- // 鏈湴璧勬簮璺緞
- String localPath = RuoYiConfig.getProfile();
- // 鏁版嵁搴撹祫婧愬湴鍧�
- String downloadPath = localPath + StringUtils.substringAfter(resource, Constants.RESOURCE_PREFIX);
- // 涓嬭浇鍚嶇О
- String downloadName = StringUtils.substringAfterLast(downloadPath, "/");
- response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
- FileUtils.setAttachmentResponseHeader(response, downloadName);
- FileUtils.writeBytes(downloadPath, response.getOutputStream());
- }
- catch (Exception e)
- {
- log.error("涓嬭浇鏂囦欢澶辫触", e);
- }
+ @GetMapping("/preview/{fileName}")
+ @Anonymous
+ public void preview(@PathVariable String fileName, @RequestParam("token") String token, HttpServletResponse response) throws Exception {
+ File file = storageBlobService.getFileByToken(fileName, token);
+ String contentType = Files.probeContentType(file.toPath());
+ response.setContentType(contentType == null ? "application/octet-stream" : contentType);
+ String encodedFileName = URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()).replace("+", "%20");
+ response.setHeader("Content-Disposition", "inline;filename*=UTF-8''" + encodedFileName);
+ Files.copy(file.toPath(), response.getOutputStream());
}
}
--
Gitblit v1.9.3