abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !638 from 疯狂的牛子Li/ContentLength

Browse Source
This commit is contained in:
疯狂的牛子Li 2025-01-17 08:20:40 +00:00 committed by Gitee
commit 094edcce0d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
View File

@ -2,6 +2,7 @@ package org.dromara.common.oss.core;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import jakarta.servlet.http.HttpServletResponse;
import org.dromara.common.core.constant.Constants; import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.utils.DateUtils; import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;
@ -238,11 +239,11 @@ public class OssClient {
* 下载文件从 Amazon S3 到 输出流 * 下载文件从 Amazon S3 到 输出流
* *
* @param key 文件在 Amazon S3 中的对象键 * @param key 文件在 Amazon S3 中的对象键
* @param out 输出流 * @param response 响应头
* @return 输出流中写入的字节数（长度） * @return 输出流中写入的字节数（长度）
* @throws OssException 如果下载失败，抛出自定义异常 * @throws OssException 如果下载失败，抛出自定义异常
*/ */
public long download(String key, OutputStream out) { public long download(String key, HttpServletResponse response) {
try { try {
// 构建下载请求 // 构建下载请求
DownloadRequest<ResponseInputStream<GetObjectResponse>> downloadRequest = DownloadRequest.builder() DownloadRequest<ResponseInputStream<GetObjectResponse>> downloadRequest = DownloadRequest.builder()
@ -258,7 +259,10 @@ public class OssClient {
Download<ResponseInputStream<GetObjectResponse>> responseFuture = transferManager.download(downloadRequest); Download<ResponseInputStream<GetObjectResponse>> responseFuture = transferManager.download(downloadRequest);
// 输出到流中 // 输出到流中
try (ResponseInputStream<GetObjectResponse> responseStream = responseFuture.completionFuture().join().result()) { // auto-closeable stream try (ResponseInputStream<GetObjectResponse> responseStream = responseFuture.completionFuture().join().result()) { // auto-closeable stream
return responseStream.transferTo(out); // 阻塞调用线程 blocks the calling thread GetObjectResponse objectResponse = responseStream.response();
// 设置文件大小到响应头（确保在传输文件之前设置 Content-Length）
response.setContentLengthLong(objectResponse.contentLength());
return responseStream.transferTo(response.getOutputStream()); // 阻塞调用线程 blocks the calling thread
} }
} catch (Exception e) { } catch (Exception e) {
throw new OssException("文件下载失败，错误信息:[" + e.getMessage() + "]"); throw new OssException("文件下载失败，错误信息:[" + e.getMessage() + "]");

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
View File

@ -169,7 +169,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
* @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容
*/ */
@Override @Override
public void download(Long ossId, HttpServletResponse response) throws IOException { public void download(Long ossId, HttpServletResponse response) {
SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId);
if (ObjectUtil.isNull(sysOss)) { if (ObjectUtil.isNull(sysOss)) {
throw new ServiceException("文件数据不存在!"); throw new ServiceException("文件数据不存在!");
@ -177,8 +177,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
OssClient storage = OssFactory.instance(sysOss.getService()); OssClient storage = OssFactory.instance(sysOss.getService());
long contentLength = storage.download(sysOss.getFileName(), response.getOutputStream()); storage.download(sysOss.getFileName(), response);
response.setContentLengthLong(contentLength);
} }
/** /**