From 9b3477676293514e8cb4092046954ec1fb9a53b5 Mon Sep 17 00:00:00 2001 From: yanglin Date: Wed, 26 Feb 2025 18:28:59 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3581:=20=E8=AF=A5=E7=AD=BE=E7=BD=B2?= =?UTF-8?q?=E4=BD=8D=E5=B7=B2=E7=AD=BE=E7=BD=B2,=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=86=8D=E6=AC=A1=E7=AD=BE=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ess/server/ess/support/OssService.java | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/OssService.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/OssService.java index 74001eea..7451abd8 100644 --- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/OssService.java +++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/support/OssService.java @@ -1,16 +1,7 @@ package cn.axzo.nanopart.ess.server.ess.support; -import cn.axzo.nanopart.ess.server.utils.BizAssertions; -import cn.axzo.oss.http.api.ServerFileServiceApi; -import cn.axzo.oss.http.model.ApiSignUrlDownloadRequest; -import cn.axzo.oss.http.model.ApiSignUrlDownloadResponse; -import cn.axzo.oss.http.model.ApiSignUrlUploadRequest; -import cn.axzo.oss.http.model.ApiSignUrlUploadResponse; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Component; +import static cn.axzo.nanopart.ess.server.utils.BizAssertions.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -23,7 +14,17 @@ import java.net.URLEncoder; import java.util.Collections; import java.util.List; -import static cn.axzo.nanopart.ess.server.utils.BizAssertions.fail; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Component; + +import cn.axzo.nanopart.ess.server.utils.BizAssertions; +import cn.axzo.oss.http.api.ServerFileServiceApi; +import cn.axzo.oss.http.model.ApiSignUrlDownloadRequest; +import cn.axzo.oss.http.model.ApiSignUrlDownloadResponse; +import cn.axzo.oss.http.model.ApiSignUrlUploadRequest; +import cn.axzo.oss.http.model.ApiSignUrlUploadResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; /** * @author yanglin @@ -91,21 +92,16 @@ public class OssService { connection.setRequestProperty("Content-Type", ossResponse.getContentType()); connection.setRequestProperty("Content-Disposition", String.format("attachment;filename=\"%s\"", URLEncoder.encode(fileName, "utf-8"))); - try { - try (OutputStream os = connection.getOutputStream()) { - ByteArrayInputStream is = new ByteArrayInputStream(content); - byte[] buffer = new byte[4096]; - int bytesRead; - while ((bytesRead = is.read(buffer)) != -1) - os.write(buffer, 0, bytesRead); - os.flush(); - } + try (OutputStream os = connection.getOutputStream()) { + ByteArrayInputStream is = new ByteArrayInputStream(content); + byte[] buffer = new byte[4096]; + int bytesRead; + while ((bytesRead = is.read(buffer)) != -1) + os.write(buffer, 0, bytesRead); + os.flush(); int responseCode = connection.getResponseCode(); log.info("上传到OSS返回码: {}", responseCode); } - finally { - connection.disconnect(); - } } }