fix oss文件下载

This commit is contained in:
秋辞未寒
2026-03-26 00:19:44 +08:00
parent e00837a26f
commit f45f58c340
6 changed files with 103 additions and 33 deletions

View File

@@ -2,7 +2,6 @@ package org.dromara.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.PageResult;
@@ -16,6 +15,7 @@ import org.dromara.system.domain.bo.SysOssBo;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.service.ISysOssService;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -83,13 +83,12 @@ public class SysOssController extends BaseController {
* 下载OSS对象
*
* @param ossId OSS对象ID
* @param response HTTP 响应
* @throws IOException IO 异常
*/
@SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}")
public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
ossService.download(ossId, response);
public ResponseEntity<byte[]> download(@PathVariable Long ossId) throws IOException {
return ossService.download(ossId);
}
/**

View File

@@ -1,14 +1,13 @@
package org.dromara.system.service;
import jakarta.servlet.http.HttpServletResponse;
import org.dromara.common.core.domain.PageResult;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.system.domain.bo.SysOssBo;
import org.dromara.system.domain.vo.SysOssVo;
import org.springframework.http.ResponseEntity;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.List;
@@ -64,9 +63,8 @@ public interface ISysOssService {
* 文件下载方法,支持一次性下载完整文件
*
* @param ossId OSS对象ID
* @param response HttpServletResponse对象用于设置响应头和向客户端发送文件内容
*/
void download(Long ossId, HttpServletResponse response) throws IOException;
ResponseEntity<byte[]> download(Long ossId);
/**
* 删除OSS对象存储

View File

@@ -2,11 +2,11 @@ package org.dromara.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.domain.PageResult;
@@ -21,10 +21,9 @@ import org.dromara.common.core.utils.file.FileUtils;
import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.oss.client.OssClient;
import org.dromara.common.oss.factory.OssFactory;
import org.dromara.common.oss.model.GetObjectResult;
import org.dromara.common.oss.model.PutObjectResult;
import org.dromara.common.oss.enums.AccessPolicy;
import org.dromara.common.oss.factory.OssFactory;
import org.dromara.common.oss.model.PutObjectResult;
import org.dromara.common.oss.util.S3ObjectUtil;
import org.dromara.system.domain.SysOss;
import org.dromara.system.domain.SysOssExt;
@@ -35,6 +34,7 @@ import org.dromara.system.service.ISysOssService;
import org.jetbrains.annotations.NotNull;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -182,20 +182,28 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
/**
* 文件下载方法,支持一次性下载完整文件
*
* @param ossId OSS对象ID
* @param response HttpServletResponse对象用于设置响应头和向客户端发送文件内容
* @param ossId OSS对象ID
*/
@Override
public void download(Long ossId, HttpServletResponse response) throws IOException {
public ResponseEntity<byte[]> download(Long ossId) {
SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId);
if (ObjectUtil.isNull(sysOss)) {
throw new ServiceException("文件数据不存在!");
}
FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
OssClient instance = OssFactory.instance(sysOss.getService());
GetObjectResult result = instance.download(sysOss.getFileName(), response.getOutputStream());
response.setContentLengthLong(result.size());
String percentEncodedFileName = FileUtils.percentEncode(sysOss.getOriginalName());
String contentDispositionValue = "attachment; filename=%s;filename*=utf-8''%s".formatted(percentEncodedFileName, percentEncodedFileName);
return OssFactory.instance(sysOss.getService())
.download(sysOss.getFileName(), (result, inputStream) -> {
// 构建响应实体
return ResponseEntity.ok()
.header("Access-Control-Expose-Headers", "Content-Disposition,download-filename")
.header("Content-disposition", contentDispositionValue)
.header("download-filename", percentEncodedFileName)
.contentType(MediaType.APPLICATION_OCTET_STREAM)
.contentLength(result.size())
.body(IoUtil.readBytes(inputStream));
});
}
/**