From 4566a255edffe93cca71eb74e28debd30c87917b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 08:23:47 +0800
Subject: [PATCH] 用户新增修改

---
 src/main/java/org/springblade/modules/FTP/Monitor.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 513e91f..7105194 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -31,7 +31,7 @@
 	 * @return
 	 */
 	public static Result isFTPFileExist(String uuid) {
-		System.out.println("uuid = " + uuid);
+//		System.out.println("uuid = " + uuid);
 		//创建 ftp 对象
 		FTPClient ftp = new FTPClient();
 		boolean flag = false;
@@ -57,26 +57,26 @@
 			ftp.setControlEncoding("GBK");
 			// 检验文件是否存在
 			boolean ftpFile = ftp.changeWorkingDirectory(ftpPath);
-			System.out.println("检验文件是否存在 = " + ftpFile);
+//			System.out.println("检验文件是否存在 = " + ftpFile);
 			// Use passive mode as default
 			ftp.enterLocalPassiveMode();
 
 			FTPFile[] files = ftp.listFiles();
-			System.out.println("files = " + files);
-			System.out.println("开始读取内网回传消息");
+//			System.out.println("files = " + files);
+//			System.out.println("开始读取内网回传消息");
 			if (files.length==0){
-				System.out.println("未读取到文件");
+//				System.out.println("未读取到文件");
 				return new Result(400,null,"未读取到文件",null);
 			} else {
-				System.out.println("-----有读取到文件--------");
+//				System.out.println("-----有读取到文件--------");
 				for (FTPFile file : files){
 					String fileName = file.getName();
-					System.out.println("fileName = " + fileName);
+//					System.out.println("fileName = " + fileName);
 					InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
 					String substring1 = fileName.substring(0, 1);
-					System.out.println("substring1 = " + substring1);
+//					System.out.println("substring1 = " + substring1);
 					if (substring1.equals("n")){
-						System.out.println("-------接收到内网回传的文件: " + substring1);
+						System.out.println("-------接收到内网回传的文件: " + fileName);
 					    //把文件下载到本地
 						FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
 						// 解析数据
@@ -290,6 +290,8 @@
 	public static boolean isFTPFileExist() {
 		FTPClient ftp = new FTPClient();
 		try {
+			//设置超时时间
+			ftp.setConnectTimeout(2000);
 			//连接
 			ftp.connect(ftpHost, ftpPort);
 			// 登陆

--
Gitblit v1.9.3