From adb5fe929dc24ff783932f53e950b612f5da729f Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 17 May 2022 11:55:10 +0800
Subject: [PATCH] FTP 修改

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

diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index f84ce13..f878947 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -34,6 +34,8 @@
 				return false;
 			}
 
+			System.out.println("ftp 连接成功!");
+
 			//被动模式,文件上传不成功会有提示
 			ftp.enterLocalActiveMode();
 
@@ -124,16 +126,16 @@
 							//删除 ftp 文件
 							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 						}
-						else if(substring1.equals("f")){
-							//把文件下载到本地(图片文件类),测试内外网使用同一台服务器
-							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
-						}
-//						else {
-//							//把文件下载到本地(图片文件类),ftp 内外网服务器分开时使用
+//						else if(substring1.equals("f")){
+//							//把文件下载到本地(图片文件类),测试内外网使用同一台服务器
 //							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
 //							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 //						}
+						else {
+							//把文件下载到本地(图片文件类),ftp 内外网服务器分开时使用
+							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
+							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+						}
 						//删除本地文件,ftp 文件没有对应读取的不删除
 						MysqlCenlint.deletess(fileName);
 						is.close();

--
Gitblit v1.9.3