From 2b287056e2f59518888d05a1bbc7e5a55fbd84d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:35:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
index 2183c7f..831575c 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -164,11 +164,9 @@
if(StringUtils.isBlank(param.getUrl())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- InputStream inputStream = HttpsUtil.connectionInputsteam(param.getUrl(),"GET","",null);
+ InputStream inputStream = HttpsUtil.connectionInputsteam(param.getUrl(),"GET",null,null);
if(inputStream == null){
- if(StringUtils.isBlank(param.getUrl())){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏂囦欢涓嬭浇澶辫触锛岃妫�鏌ユ枃浠惰矾寰勬槸鍚﹀悎娉曪紒");
- }
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏂囦欢涓嬭浇澶辫触锛岃妫�鏌ユ枃浠惰矾寰勬槸鍚﹀悎娉曪紒");
}
if(StringUtils.isBlank(param.getFileName())){
param.setFileName(System.currentTimeMillis()+"");
@@ -177,12 +175,14 @@
param.setFileName(System.currentTimeMillis()+"."+nfix);
}
}
+
String encodeFileName = URLEncoder.encode(param.getFileName(), Charset.forName("UTF-8").toString());
response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
response.setContentType("application/octet-stream");
response.setHeader("eva-opera-type", "download");
response.setHeader("eva-download-filename", encodeFileName);
- ServletOutputStream os = response.getOutputStream();
+
+ OutputStream os = new BufferedOutputStream(response.getOutputStream());
byte[] buffer = new byte[4096];
int bytesRead;
while ((bytesRead = inputStream.read(buffer)) != -1) {
--
Gitblit v1.9.3