From e331a882d4c872357995d65aff1c1094b975b367 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Jun 2022 18:26:57 +0800
Subject: [PATCH] ftp 文件无法删除问题
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 564ca29..22d2301 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -34,8 +34,11 @@
// System.out.println("uuid = " + uuid);
//创建 ftp 对象
FTPClient ftp = new FTPClient();
- boolean flag = false;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
@@ -57,25 +60,19 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
boolean ftpFile = ftp.changeWorkingDirectory(ftpPath);
-// System.out.println("检验文件是否存在 = " + ftpFile);
+
// Use passive mode as default
ftp.enterLocalPassiveMode();
FTPFile[] files = ftp.listFiles();
-// System.out.println("files = " + files);
-// System.out.println("开始读取内网回传消息");
if (files.length==0){
-// System.out.println("未读取到文件");
return new Result(400,null,"未读取到文件",null);
} else {
-// System.out.println("-----有读取到文件--------");
for (FTPFile file : files){
String fileName = file.getName();
-// 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);
- if (substring1.equals("n")){
+ String substring1 = fileName.substring(0, 2);
+ if (substring1.equals("ni")){
System.out.println("-------接收到内网回传的文件： " + fileName);
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -85,7 +82,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) {
@@ -136,8 +134,11 @@
public static Result getFtpDataByUuidList(String uuid) {
//创建 ftp 对象
FTPClient ftp = new FTPClient();
- boolean flag = false;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -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;
}
@@ -215,8 +217,11 @@
public static Result getFtpDataByUuidListTrain(String uuid) {
//创建 ftp 对象
FTPClient ftp = new FTPClient();
- boolean flag = false;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -261,7 +266,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;
}
@@ -290,12 +296,14 @@
* 读取内外推送的文件,每30秒读取一次
* @return
*/
- @Scheduled(cron = "*/30 * * * * ?")
+// @Scheduled(cron = "*/30 * * * * ?")
public static boolean isFTPFileExist() {
FTPClient ftp = new FTPClient();
try {
//设置超时时间
- ftp.setConnectTimeout(2000);
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -331,8 +339,8 @@
if (null == is) {
return false;
} else {
- String substring1 = fileName.substring(0, 4);
- if (substring1.equals("nsql")) {
+ String substring1 = fileName.substring(0, 2);
+ if (substring1.equals("nq")) {
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
//
@@ -360,7 +368,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();
@@ -394,6 +403,10 @@
FTPClient ftp = new FTPClient();
boolean flag = false;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -438,7 +451,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;
}
@@ -452,7 +466,7 @@
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
--
Gitblit v1.9.3