From abe28eee6f474983ec6779ebd8c24030c4c0236c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Jun 2022 17:27:09 +0800
Subject: [PATCH] ftp 连接配置修改优化
---
src/main/java/org/springblade/modules/FTP/Monitor.java | 95 ++++++++++++++++++++---------------------------
1 files changed, 41 insertions(+), 54 deletions(-)
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 53d9c4e..2bb37f2 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -70,8 +70,6 @@
} 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 (fileName.contains("ni")){
System.out.println("-------接收到内网回传的文件： " + fileName);
//把文件下载到本地
@@ -82,10 +80,10 @@
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);
ftp.completePendingCommand();
+ ftp.logout();
if (result.getCode()==200) {
//返回
return new Result(200,null,"新增成功",null);
@@ -115,7 +113,7 @@
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
@@ -170,8 +168,6 @@
for (FTPFile file : files){
String fileName = file.getName();
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);
// 解析数据
@@ -190,6 +186,7 @@
}
// is.close();
ftp.completePendingCommand();
+ ftp.logout();
}
}
return new Result(400,null,"未读取到对应的文件",null);
@@ -198,7 +195,7 @@
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
@@ -252,8 +249,6 @@
} 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 (fileName.contains("nt")){
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -273,6 +268,7 @@
}
// is.close();
ftp.completePendingCommand();
+ ftp.logout();
}
}
return new Result(400,null,"未读取到对应的文件",null);
@@ -281,7 +277,7 @@
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
@@ -335,52 +331,46 @@
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 (fileName.contains("nq")) {
- //把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
- //
- String s = OutJson.TestJson(fileName);
- //sql语句
- String sql = OutJson.stringReplace(s);
- String[] split = sql.split(";");//以逗号分割
- for (String sqls : split) {
- //判断是否是新增，删除，修改
- String substring = sqls.substring(0, 2);
- //新增
- if (substring.equals("in")) {
- //运行sql语句
- MysqlCenlint.inster(sqls);
- }
- //修改
- else if (substring.equals("up")) {
- MysqlCenlint.update(sqls);
- }
- //删除
- else {
- MysqlCenlint.delete(sqls);
- }
+ if (fileName.contains("nq")) {
+ //把文件下载到本地
+ FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
+ //
+ String s = OutJson.TestJson(fileName);
+ //sql语句
+ String sql = OutJson.stringReplace(s);
+ String[] split = sql.split(";");//以逗号分割
+ for (String sqls : split) {
+ //判断是否是新增，删除，修改
+ String substring = sqls.substring(0, 2);
+ //新增
+ if (substring.equals("in")) {
+ //运行sql语句
+ MysqlCenlint.inster(sqls);
}
- //删除本地服务器文件
- MysqlCenlint.deletess(fileName);
- //删除 ftp 服务器文件
-// ftp.dele(fileName);
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ //修改
+ else if (substring.equals("up")) {
+ MysqlCenlint.update(sqls);
+ }
+ //删除
+ else {
+ MysqlCenlint.delete(sqls);
+ }
}
- //关闭流
-// is.close();
- ftp.completePendingCommand();
+ //删除本地服务器文件
+ MysqlCenlint.deletess(fileName);
+ //删除 ftp 服务器文件
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
+ }
+ ftp.completePendingCommand();
+ ftp.logout();
}
}
} catch (Exception e) {
System.out.println("ftp连接失败");
e.printStackTrace();
} finally {
- if (ftp != null) {
+ if (ftp.isConnected()) {
try {
ftp.disconnect();
} catch (IOException e) {
@@ -399,7 +389,6 @@
public static Result getSecurityNumberBit(String uuid) {
//创建 ftp 对象
FTPClient ftp = new FTPClient();
- boolean flag = false;
try {
//设置超时时间
ftp.setDataTimeout(60000);
@@ -435,8 +424,6 @@
} 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 (fileName.contains("ns")){
//把文件下载到本地
FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
@@ -454,8 +441,8 @@
//返回
return result;
}
-// is.close();
ftp.completePendingCommand();
+ ftp.logout();
}
}
return new Result(400,null,"未读取到对应的文件",null);
--
Gitblit v1.9.3