From b7feda7c2cc54e03966ecbd2ed2582097eb3ee73 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 23 May 2022 08:24:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 76 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index a5affee..564ca29 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.*;
@@ -26,13 +25,13 @@
public class Monitor {
-
/**
* 读取文件（用户对象）单用户新增
* @param uuid 随机数
* @return
*/
public static Result isFTPFileExist(String uuid) {
+// System.out.println("uuid = " + uuid);
//创建 ftp 对象
FTPClient ftp = new FTPClient();
boolean flag = false;
@@ -50,40 +49,43 @@
ftp.enterLocalActiveMode();
+
// 设置文件类型为二进制，与ASCII有区别
ftp.setFileType(FTP.BINARY_FILE_TYPE);
// 设置编码格式
ftp.setControlEncoding("GBK");
- System.out.println("ftpPathIn = " + ftpPathIn);
// 检验文件是否存在
- boolean ftpFile = ftp.changeWorkingDirectory(ftpPathIn);
- System.out.println("检验文件是否存在 = " + ftpFile);
+ 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("开始读取内网回传消息");
+// System.out.println("files = " + files);
+// System.out.println("开始读取内网回传消息");
if (files.length==0){
- System.out.println("未读取到文件");
+// System.out.println("未读取到文件");
return new Result(400,null,"未读取到文件",null);
} else {
- System.out.println("-----有读取到文件--------");
+// System.out.println("-----有读取到文件--------");
for (FTPFile file : files){
String fileName = file.getName();
- System.out.println("fileName = " + fileName);
+// 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);
+// System.out.println("substring1 = " + substring1);
if (substring1.equals("n")){
- System.out.println("-------接收到内网回传的文件： " + substring1);
+ System.out.println("-------接收到内网回传的文件： " + fileName);
//把文件下载到本地
- 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) {
@@ -101,6 +103,10 @@
if (result.getCode()==203) {
//返回
return new Result(203,null,result.getMsg(),null);
+ }
+ if (result.getCode()==205){
+ //返回
+ return new Result(202,null,"新增失败,找不到该用户",null);
}
}
}
@@ -151,7 +157,11 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPathIn);
+ ftp.changeWorkingDirectory(ftpPath);
+
+ // Use passive mode as default
+ ftp.enterLocalPassiveMode();
+
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
@@ -162,7 +172,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 +182,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 +236,11 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPathIn);
+ ftp.changeWorkingDirectory(ftpPath);
+
+ // Use passive mode as default
+ ftp.enterLocalPassiveMode();
+
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
@@ -237,7 +251,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 +261,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPathIn, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
@@ -280,6 +294,8 @@
public static boolean isFTPFileExist() {
FTPClient ftp = new FTPClient();
try {
+ //设置超时时间
+ ftp.setConnectTimeout(2000);
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
@@ -299,7 +315,11 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPathIn);
+ ftp.changeWorkingDirectory(ftpPath);
+
+ // Use passive mode as default
+ ftp.enterLocalPassiveMode();
+
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return false;
@@ -314,7 +334,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 +360,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 +413,11 @@
ftp.setControlEncoding("GBK");
// 检验文件是否存在
- ftp.changeWorkingDirectory(ftpPathIn);
+ ftp.changeWorkingDirectory(ftpPath);
+
+ // Use passive mode as default
+ ftp.enterLocalPassiveMode();
+
FTPFile[] files = ftp.listFiles();
if (files.length==0){
return new Result(400,null,"未读取到文件",null);
@@ -404,7 +428,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 +438,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