From d01c9ba8ff64c090db3ccd314b37c982fe70c9d9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 May 2022 10:17:28 +0800
Subject: [PATCH] ftp path 路径修改,中文字符处理
---
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 d14509b..2271876 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -12,6 +12,7 @@
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.*;
@@ -23,6 +24,8 @@
*/
@Component
public class Monitor {
+
+
/**
* 读取文件（用户对象）单用户新增
@@ -36,8 +39,9 @@
try {
//连接
ftp.connect(ftpHost, ftpPort);
+
// 登陆
- ftp.login(ftpUserName, ftpPassword);
+ ftp.login(ftpUserNameIn, ftpPasswordIn);
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
@@ -51,27 +55,36 @@
// 设置编码格式
ftp.setControlEncoding("GBK");
-
+ System.out.println("ftpPathIn = " + ftpPathIn);
+ System.out.println("ftpPathInURLEncoder = " + ftpPathIn);
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPath);
+ boolean ftpFile = ftp.changeWorkingDirectory(ftpPathIn);
+ System.out.println("检验文件是否存在 = " + ftpFile);
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")){
- //把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+ System.out.println("-------接收到内网回传的文件： " + substring1);
+ //把文件下载到本地
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
Result result = DataHandler.handler(s,uuid);
//删除本地文件
MysqlCenlint.deletess(fileName);
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
is.close();
ftp.completePendingCommand();
if (result.getCode()==200) {
@@ -92,6 +105,7 @@
}
}
}
+ System.out.println("未读取到对应的文件");
return new Result(400,null,"未读取到对应的文件",null);
}
} catch (Exception e) {
@@ -122,7 +136,7 @@
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
- ftp.login(ftpUserName, ftpPassword);
+ ftp.login(ftpUserNameIn, ftpPasswordIn);
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
@@ -138,7 +152,7 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPath);
+ ftp.changeWorkingDirectory(ftpPathIn);
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
@@ -149,7 +163,7 @@
String substring1 = fileName.substring(0, 2);
if (substring1.equals("nl")){
//把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
@@ -159,7 +173,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
//返回
return result;
}
@@ -197,7 +211,7 @@
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
- ftp.login(ftpUserName, ftpPassword);
+ ftp.login(ftpUserNameIn, ftpPasswordIn);
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
@@ -213,7 +227,7 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPath);
+ ftp.changeWorkingDirectory(ftpPathIn);
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
@@ -224,7 +238,7 @@
String substring1 = fileName.substring(0, 2);
if (substring1.equals("nt")){
//把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
@@ -234,7 +248,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
//返回
return result;
}
@@ -270,7 +284,7 @@
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
- ftp.login(ftpUserName, ftpPassword);
+ ftp.login(ftpUserNameIn, ftpPasswordIn);
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
@@ -286,7 +300,7 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPath);
+ ftp.changeWorkingDirectory(ftpPathIn);
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return false;
@@ -301,7 +315,7 @@
String substring1 = fileName.substring(0, 4);
if (substring1.equals("nsql")) {
//把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
//
String s = OutJson.TestJson(fileName);
//sql语句
@@ -327,7 +341,7 @@
//删除本地服务器文件
MysqlCenlint.deletess(fileName);
//删除 ftp 服务器文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
}
//关闭流
is.close();
@@ -364,7 +378,7 @@
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
- ftp.login(ftpUserName, ftpPassword);
+ ftp.login(ftpUserNameIn, ftpPasswordIn);
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
@@ -380,7 +394,7 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPath);
+ ftp.changeWorkingDirectory(ftpPathIn);
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
@@ -391,7 +405,7 @@
String substring1 = fileName.substring(0, 2);
if (substring1.equals("ns")){
//把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPathIn, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
@@ -401,7 +415,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
//返回
return result;
}
--
Gitblit v1.9.3