Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

yuan

2026-04-24 b4a9e12e00b78e1aef8acda070434de9ffd0d66a

 src/main/java/com/ruoyi/project/common/CommonController.java

@@ -1,18 +1,22 @@
package com.ruoyi.project.common;



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;

import org.slf4j.LoggerFactory;

import org.springframework.core.io.FileSystemResource;

import org.springframework.http.ContentDisposition;

import org.springframework.http.MediaType;

import org.springframework.http.ResponseEntity;

import org.springframework.web.bind.annotation.*;

import org.springframework.web.multipart.MultipartFile;



import jakarta.servlet.http.HttpServletResponse;

import java.io.File;

import java.net.URLEncoder;

import java.nio.charset.StandardCharsets;

@@ -24,18 +28,16 @@
 *

 * @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;





//    /**

@@ -71,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")

@@ -98,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)

@@ -171,9 +126,8 @@
//            log.error("下载文件失败", e);

//        }

//    }



    @PostMapping({"/upload"})

    @ApiOperation(value = "文件上传")

    @Operation(summary = "文件上传")

    public R upload(@RequestParam("files") List<MultipartFile> files) throws Exception {

        return R.ok(storageBlobService.upload(files));

    }

@@ -186,17 +140,25 @@
        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);

        response.setContentLengthLong(file.length());

        Files.copy(file.toPath(), response.getOutputStream());

    }



    @GetMapping("/preview/{fileName}")

    @Anonymous

    public void preview(@PathVariable String fileName, @RequestParam("token") String token, HttpServletResponse response) throws Exception {

        File file = storageBlobService.getFileByToken(fileName, token);

    public ResponseEntity<FileSystemResource> preview(@PathVariable String fileName,

                                                      @RequestParam("token") String token) throws Exception {

        File file = fileUtil.compressFile(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());



        ContentDisposition contentDisposition = ContentDisposition.inline()

                .filename(fileName, StandardCharsets.UTF_8)

                .build();



        return ResponseEntity.ok()

                .contentType(MediaType.parseMediaType(contentType != null ? contentType : "application/octet-stream"))

                .contentLength(file.length())

                .header("Content-Disposition", contentDisposition.toString())

                .body(new FileSystemResource(file));

    }

}