From 26aa5b18f9525f10edcd1566fdcd9c3a566a0857 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Jun 2022 16:22:31 +0800
Subject: [PATCH] ftp 文件读取修改
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 68 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 22d2301..53d9c4e 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -70,9 +70,9 @@
} else {
for (FTPFile file : files){
String fileName = file.getName();
- InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
- String substring1 = fileName.substring(0, 2);
- if (substring1.equals("ni")){
+// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+// String substring1 = fileName.substring(0, 2);
+ if (fileName.contains("ni")){
System.out.println("-------接收到内网回传的文件： " + fileName);
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -82,9 +82,9 @@
Result result = DataHandler.handler(s,uuid);
//删除本地文件
MysqlCenlint.deletess(fileName);
- ftp.dele(fileName);
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
- is.close();
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+// is.close();
ftp.completePendingCommand();
if (result.getCode()==200) {
//返回
@@ -169,9 +169,9 @@
} else {
for (FTPFile file : files){
String fileName = file.getName();
- InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
- String substring1 = fileName.substring(0, 2);
- if (substring1.equals("nl")){
+ if (fileName.contains("nl")){
+ //转流
+// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
@@ -183,12 +183,12 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
- ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+// ftp.dele(fileName);
//返回
return result;
}
- is.close();
+// is.close();
ftp.completePendingCommand();
}
}
@@ -252,9 +252,9 @@
} else {
for (FTPFile file : files){
String fileName = file.getName();
- InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
- String substring1 = fileName.substring(0, 2);
- if (substring1.equals("nt")){
+// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+// String substring1 = fileName.substring(0, 2);
+ if (fileName.contains("nt")){
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
@@ -266,12 +266,12 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- ftp.dele(fileName);
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
- is.close();
+// is.close();
ftp.completePendingCommand();
}
}
@@ -335,12 +335,12 @@
else {
for (FTPFile file : files) {
String fileName = file.getName();
- InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
- if (null == is) {
- return false;
- } else {
- String substring1 = fileName.substring(0, 2);
- if (substring1.equals("nq")) {
+// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+// if (null == is) {
+// return false;
+// } else {
+// String substring1 = fileName.substring(0, 2);
+ if (fileName.contains("nq")) {
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
//
@@ -368,14 +368,12 @@
//删除本地服务器文件
MysqlCenlint.deletess(fileName);
//删除 ftp 服务器文件
- ftp.dele(fileName);
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
}
//关闭流
- is.close();
+// is.close();
ftp.completePendingCommand();
- }
- return true;
}
}
} catch (Exception e) {
@@ -437,9 +435,9 @@
} else {
for (FTPFile file : files){
String fileName = file.getName();
- InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
- String substring1 = fileName.substring(0, 2);
- if (substring1.equals("ns")){
+// InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+// String substring1 = fileName.substring(0, 2);
+ if (fileName.contains("ns")){
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
@@ -451,12 +449,12 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- ftp.dele(fileName);
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
- is.close();
+// is.close();
ftp.completePendingCommand();
}
}
--
Gitblit v1.9.3