From 59860e55d62097a26b21f73964b4f036bc84fcae Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 May 2022 10:10:10 +0800
Subject: [PATCH] ftp 配置修改

---
 src/main/java/org/springblade/modules/FTP/FtpMain.java |   36 ++++++++++++++++++------------------
 src/main/java/org/springblade/modules/FTP/Monitor.java |   19 +++++++++++++++----
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/FtpMain.java b/src/main/java/org/springblade/modules/FTP/FtpMain.java
index 6397f59..66d925a 100644
--- a/src/main/java/org/springblade/modules/FTP/FtpMain.java
+++ b/src/main/java/org/springblade/modules/FTP/FtpMain.java
@@ -5,24 +5,24 @@
 public class FtpMain {
 	public static void main(String[] args) throws FileNotFoundException {
 		//ftp服务器IP地址
-		String ftpHost = "192.168.0.105";
-		//ftp服务器端口
-		int ftpPort = 21;
-		//ftp服务器用户名
-		String ftpUserName = "yly";
-		//ftp服务器密码
-		String ftpPassword = "Yly@123";
-		//ftp服务器路径
-		String ftpPath = "";
-		//本地路径
-		String localPath = "D:\\anbao";
-		//文件名
-		String fileName = "sql.json";
-
-
-		//下载
-		//将ftp根目录下的文件下载至E盘
-		FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+//		String ftpHost = "192.168.0.105";
+//		//ftp服务器端口
+//		int ftpPort = 21;
+//		//ftp服务器用户名
+//		String ftpUserName = "yly";
+//		//ftp服务器密码
+//		String ftpPassword = "Yly@123";
+//		//ftp服务器路径
+//		String ftpPath = "";
+//		//本地路径
+//		String localPath = "D:\\anbao";
+//		//文件名
+//		String fileName = "sql.json";
+//
+//
+//		//下载
+//		//将ftp根目录下的文件下载至E盘
+//		FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
 
 		//上传
 		//将E盘的文件上传至ftp根目录
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index f878947..34ad406 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -9,6 +9,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 import static org.springblade.common.config.FtpConfig.*;
 
@@ -16,7 +18,7 @@
 @Component
 public class Monitor {
 
-	@Scheduled(cron = "*/1 * * * * ?")
+	@Scheduled(cron = "*/10 * * * * ?")
 	public static boolean isFTPFileExist() {
 
 		FTPClient ftp = new FTPClient();
@@ -34,7 +36,7 @@
 				return false;
 			}
 
-			System.out.println("ftp 连接成功!");
+			System.out.println("ftp 连接成功!时间: "+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
 
 			//被动模式,文件上传不成功会有提示
 			ftp.enterLocalActiveMode();
@@ -49,12 +51,14 @@
 			ftp.changeWorkingDirectory(ftpPath);
 			FTPFile[] files = ftp.listFiles();
 			if (files.length == 0) {
+				ftp.disconnect();
 				return false;
 			} else {
 				for (FTPFile file : files) {
-					 fileName = file.getName();
+					fileName = file.getName();
 					InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
 					if (null == is) {
+						ftp.disconnect();
 						return false;
 					} else {
 						String substring1 = fileName.substring(0, 1);
@@ -142,9 +146,9 @@
 						ftp.completePendingCommand();
 					}
 				}
+				ftp.disconnect();
 				return true;
 			}
-
 		} catch (Exception e) {
 			MysqlCenlint.deletess(fileName);
 			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
@@ -157,6 +161,13 @@
 					e.printStackTrace();
 				}
 			}
+			if (ftp.isConnected()) {
+				try {
+					ftp.disconnect();
+				} catch (IOException io) {
+					io.printStackTrace();
+				}
+			}
 		}
 		return false;
 	}

--
Gitblit v1.9.3