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

liyong

2 天以前 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

 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()