From 9b9329e081eac70e035ff4c884eb4a9737a51d5a Mon Sep 17 00:00:00 2001 From: taojinlong Date: Sun, 9 Mar 2025 20:32:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=BF=9C=E7=A8=8BExcel=E6=96=87=E4=BB=B6=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/datasource/provider/ExcelUtils.java | 1 + .../src/main/java/io/dataease/utils/HttpClientUtil.java | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java index baf81e5d38..e2bda89030 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java @@ -767,6 +767,7 @@ public class ExcelUtils { fileNames.put("tranName", tranName); FTPClient ftpClient = new FTPClient(); try { + ftpClient.setConnectTimeout(5 * 1000); ftpClient.connect(serverAddress, port); ftpClient.login(username, password); ftpClient.enterLocalPassiveMode(); diff --git a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java b/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java index 1309bda9be..15be895534 100755 --- a/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java +++ b/sdk/common/src/main/java/io/dataease/utils/HttpClientUtil.java @@ -376,6 +376,13 @@ public class HttpClientUtil { // 设置请求头 config.getHeader().forEach(httpGet::addHeader); HttpResponse response = httpClient.execute(httpGet); + if (response.getStatusLine().getStatusCode() >= 400) { + String msg = EntityUtils.toString(response.getEntity(), config.getCharset()); + if (StringUtils.isEmpty(msg)) { + msg = "StatusCode: " + response.getStatusLine().getStatusCode(); + } + throw new Exception(msg); + } String fileName = extractFileName(response, url); String suffix = fileName.substring(fileName.lastIndexOf(".") + 1); String tranName = UUID.randomUUID().toString() + "." + suffix;