From f32b979981abe68f29c5c5655d42cfa48732920c Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Thu, 26 May 2022 09:00:14 +0800
Subject: [PATCH] ftp 文件读取规则修改
---
src/main/java/org/springblade/modules/quartz/task/Task.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/quartz/task/Task.java b/src/main/java/org/springblade/modules/quartz/task/Task.java
index fe09c1d..7cd8df3 100644
--- a/src/main/java/org/springblade/modules/quartz/task/Task.java
+++ b/src/main/java/org/springblade/modules/quartz/task/Task.java
@@ -8,9 +8,6 @@
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.MysqlCenlint;
import org.springblade.modules.FTP.OutJson;
-import org.springblade.modules.training.service.TrainingRegistrationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.io.IOException;
@@ -37,6 +34,10 @@
FTPClient ftp = new FTPClient();
String fileName = null;
try {
+ //设置超时时间
+ ftp.setDataTimeout(60000);
+ //连接超时为60秒
+ ftp.setConnectTimeout(60000);
ftp.connect(ftpHost, ftpPort);
@@ -111,7 +112,7 @@
//删除 ftp 文件
FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
}else if(substring1.equals("l")){
- //用户集合数据
+ //用户集合数据,批量导入用户
//获取对象字符串
String json = OutJson.TestJson(fileName);
//数据处理
@@ -141,16 +142,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