From b7feda7c2cc54e03966ecbd2ed2582097eb3ee73 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 08:24:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w

---
 src/main/java/org/springblade/modules/quartz/task/Task.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/quartz/task/Task.java b/src/main/java/org/springblade/modules/quartz/task/Task.java
index b1e4028..4f11f69 100644
--- a/src/main/java/org/springblade/modules/quartz/task/Task.java
+++ b/src/main/java/org/springblade/modules/quartz/task/Task.java
@@ -62,9 +62,15 @@
 //	@Scheduled(cron = "*/30 * * * * ?")
 	public boolean readFile() {
 		FTPClient ftp = new FTPClient();
+		System.out.println("ftp 创建客户端");
 		try {
+			//设置传输超时时间为60秒
+			ftp.setDataTimeout(60000);
+			//连接超时为60秒
+			ftp.setConnectTimeout(60000);
 			//连接
 			ftp.connect(ftpHost, ftpPort);
+			System.out.println("ftp 连接成功!");
 			// 登陆
 			ftp.login(ftpUserNameIn, ftpPasswordIn);
 			// 检验登陆操作的返回码是否正确
@@ -140,7 +146,7 @@
 			System.out.println("ftp连接失败");
 			e.printStackTrace();
 		} finally {
-			if (ftp != null) {
+			if (ftp.isConnected()) {
 				try {
 					ftp.disconnect();
 				} catch (IOException e) {

--
Gitblit v1.9.3