From 73205addaf58f5a7ccfdccf2a4d7554d722c732d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 06 Jun 2022 18:05:40 +0800
Subject: [PATCH] 修改ftp 文件删除,减少 ftp 连接

---
 src/main/java/org/springblade/modules/FTP/Monitor.java |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 96ce7bd..16fd859 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -85,7 +85,8 @@
 						Result result = DataHandler.handler(s,uuid);
 						//删除本地文件
 						MysqlCenlint.deletess(fileName);
-						FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+						ftp.dele(fileName);
+//						FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
 						is.close();
 						ftp.completePendingCommand();
 						if (result.getCode()==200) {
@@ -182,7 +183,8 @@
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
 							//删除 ftp 文件
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+//							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+							ftp.dele(fileName);
 							//返回
 							return result;
 						}
@@ -261,7 +263,8 @@
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
 							//删除 ftp 文件
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+							ftp.dele(fileName);
+//							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
 							//返回
 							return result;
 						}
@@ -360,7 +363,8 @@
 							//删除本地服务器文件
 							MysqlCenlint.deletess(fileName);
 							//删除 ftp 服务器文件
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+							ftp.dele(fileName);
+//							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
 						}
 						//关闭流
 						is.close();
@@ -442,7 +446,8 @@
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
 							//删除 ftp 文件
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+							ftp.dele(fileName);
+//							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
 							//返回
 							return result;
 						}

--
Gitblit v1.9.3