From 9869430984ab7bf8920cdb33dc77adcf03748f06 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 May 2022 18:57:56 +0800
Subject: [PATCH] ftp path 路径修改
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index df16648..de4764e 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -12,7 +12,6 @@
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.SocketException;
-import java.net.URLEncoder;
import java.util.List;
import static org.springblade.common.config.FtpConfig.*;
@@ -24,8 +23,6 @@
*/
@Component
public class Monitor {
-
-
/**
* 读取文件（用户对象）单用户新增
@@ -55,10 +52,9 @@
// 设置编码格式
ftp.setControlEncoding("GBK");
- System.out.println("ftpPathIn = " + ftpPathIn);
- //转移到FTP服务器目录，检验文件是否存在
-// boolean ftpFile = ftp.changeWorkingDirectory(ftpPathIn);
-// System.out.println("检验文件是否存在 = " + ftpFile);
+ // 检验文件是否存在
+ boolean ftpFile = ftp.changeWorkingDirectory(ftpPath);
+ System.out.println("检验文件是否存在 = " + ftpFile);
FTPFile[] files = ftp.listFiles();
System.out.println("files = " + files);
System.out.println("开始读取内网回传消息");
@@ -76,14 +72,14 @@
if (substring1.equals("n")){
System.out.println("-------接收到内网回传的文件： " + substring1);
//把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
Result result = DataHandler.handler(s,uuid);
//删除本地文件
MysqlCenlint.deletess(fileName);
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
is.close();
ftp.completePendingCommand();
if (result.getCode()==200) {
@@ -151,7 +147,7 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPathIn);
+ ftp.changeWorkingDirectory(ftpPath);
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
@@ -162,7 +158,7 @@
String substring1 = fileName.substring(0, 2);
if (substring1.equals("nl")){
//把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
@@ -172,7 +168,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
@@ -226,7 +222,7 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPathIn);
+ ftp.changeWorkingDirectory(ftpPath);
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
@@ -237,7 +233,7 @@
String substring1 = fileName.substring(0, 2);
if (substring1.equals("nt")){
//把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
@@ -247,7 +243,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
@@ -299,7 +295,7 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPathIn);
+ ftp.changeWorkingDirectory(ftpPath);
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return false;
@@ -314,7 +310,7 @@
String substring1 = fileName.substring(0, 4);
if (substring1.equals("nsql")) {
//把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
//
String s = OutJson.TestJson(fileName);
//sql语句
@@ -340,7 +336,7 @@
//删除本地服务器文件
MysqlCenlint.deletess(fileName);
//删除 ftp 服务器文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
}
//关闭流
is.close();
@@ -393,7 +389,7 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPathIn);
+ ftp.changeWorkingDirectory(ftpPath);
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
@@ -404,7 +400,7 @@
String substring1 = fileName.substring(0, 2);
if (substring1.equals("ns")){
//把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
@@ -414,7 +410,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
--
Gitblit v1.9.3