From 41d9c70dfc6dbe060eaaf5bfc153885be8140c76 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期日, 27 四月 2025 09:13:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/src/main/java/com/doumee/core/utils/FtpUtil.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/server/src/main/java/com/doumee/core/utils/FtpUtil.java b/server/src/main/java/com/doumee/core/utils/FtpUtil.java index b58fd38..72d0cc8 100644 --- a/server/src/main/java/com/doumee/core/utils/FtpUtil.java +++ b/server/src/main/java/com/doumee/core/utils/FtpUtil.java @@ -67,6 +67,8 @@ // LOCAL_CHARSET = "UTF-8"; // } ftpClient.setControlEncoding("GBK"); + ftpClient.setConnectTimeout(10*60*1000); + ftpClient.setDataTimeout(10*60*1000); ftpClient.enterLocalPassiveMode(); int replyCode = ftpClient.getReplyCode(); //鏄惁鎴愬姛鐧诲綍鏈嶅姟鍣� if(!FTPReply.isPositiveCompletion(replyCode)){ @@ -467,7 +469,7 @@ if (ftpClient.makeDirectory(subDirectory)) { ftpClient.changeWorkingDirectory(subDirectory); } else { - System.out.println("鍒涘缓鐩綍澶辫触"); + log.error("鍒涘缓鐩綍澶辫触subDirectory=锛�"+subDirectory); return "2"; // return UploadStatus.Create_Directory_Fail; } -- Gitblit v1.9.3