From c44c76ea3e1f6b70bb84bdde85ffd1b389e5b8f4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 23 四月 2025 10:58:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/src/main/java/com/doumee/core/utils/FtpUtil.java |    2 ++
 1 files changed, 2 insertions(+), 0 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..8fbf0b0 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)){

--
Gitblit v1.9.3