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;