From cf99945deda3cba4b0e634abb100847f5cc2529b Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 11:36:46 +0800
Subject: [PATCH] 优化共享客户以及列表查询
---
src/main/java/com/ruoyi/project/common/CommonController.java | 125 +++++++++--------------------------------
1 files changed, 29 insertions(+), 96 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/ruoyi/project/common/CommonController.java
index bf7bda4..093e132 100644
--- a/src/main/java/com/ruoyi/project/common/CommonController.java
+++ b/src/main/java/com/ruoyi/project/common/CommonController.java
@@ -8,8 +8,6 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.core.io.FileSystemResource;
import org.springframework.http.ContentDisposition;
import org.springframework.http.MediaType;
@@ -33,110 +31,39 @@
@RestController
@RequestMapping("/common")
public class CommonController {
- private static final Logger log = LoggerFactory.getLogger(CommonController.class);
private final StorageBlobService storageBlobService;
private final FileUtil fileUtil;
-
-// /**
-// * 閫氱敤涓嬭浇璇锋眰
-// *
-// * @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);
-//
-// 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);
-// }
-// }
-//
-// /**
-// * 閫氱敤涓婁紶璇锋眰锛堝崟涓級
-// */
-// @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/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"})
@Operation(summary = "鏂囦欢涓婁紶")
- public R upload(@RequestParam("files") List<MultipartFile> files) throws Exception {
- return R.ok(storageBlobService.upload(files));
+ public R upload(@RequestParam("files") List<MultipartFile> files) {
+ return R.ok(storageBlobService.upload(files, false));
}
+ /**
+ * 鍏叡鏂囦欢涓婁紶
+ * 姝ゆ帴鍙ｄ笂浼犵殑鏂囦欢姘镐箙鏈夋晥锛屾厧鐢�
+ */
+ @PostMapping({"/public/upload"})
+ @Operation(summary = "鏂囦欢涓婁紶")
+ public R publicUpload(@RequestParam("files") List<MultipartFile> files) {
+ return R.ok(storageBlobService.upload(files, true));
+ }
@GetMapping("/download/{fileName}")
@Anonymous
- public void download(@PathVariable String fileName, @RequestParam("token") String token, HttpServletResponse response) throws Exception {
- File file = storageBlobService.getFileByToken(fileName, token);
+ public void download(@PathVariable String fileName,
+ @RequestParam(value = "token", required = false) String token,
+ @RequestParam(value = "publicKey", required = false) String publicKey,
+ HttpServletResponse response) throws Exception {
+ File file;
+ if (publicKey != null) {
+ file = fileUtil.compressFile(storageBlobService.getPublicFile(fileName, publicKey));
+ } else {
+ file = fileUtil.compressFile(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);
@@ -147,8 +74,14 @@
@GetMapping("/preview/{fileName}")
@Anonymous
public ResponseEntity<FileSystemResource> preview(@PathVariable String fileName,
- @RequestParam("token") String token) throws Exception {
- File file = fileUtil.compressFile(storageBlobService.getFileByToken(fileName, token));
+ @RequestParam(value = "token", required = false) String token,
+ @RequestParam(value = "publicKey", required = false) String publicKey) throws Exception {
+ File file;
+ if (publicKey != null) {
+ file = fileUtil.compressFile(storageBlobService.getPublicFile(fileName, publicKey));
+ } else {
+ file = fileUtil.compressFile(storageBlobService.getFileByToken(fileName, token));
+ }
String contentType = Files.probeContentType(file.toPath());
ContentDisposition contentDisposition = ContentDisposition.inline()
--
Gitblit v1.9.3