From fd859409107bd2c8fecf435b461347aa865b6531 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 12 May 2022 16:09:40 +0800
Subject: [PATCH] 新增读取内网 ftp 配置
---
src/main/resources/application-dev.yml | 6 ++++--
src/main/java/org/springblade/modules/FTP/Monitor.java | 30 +++++++++++++++---------------
src/main/java/org/springblade/common/config/FtpConfig.java | 19 +++++++++++++++++++
3 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/common/config/FtpConfig.java b/src/main/java/org/springblade/common/config/FtpConfig.java
index 4365141..e385225 100644
--- a/src/main/java/org/springblade/common/config/FtpConfig.java
+++ b/src/main/java/org/springblade/common/config/FtpConfig.java
@@ -41,6 +41,17 @@
*/
public static String ftpPassword;
+ /**
+ * ftp服务器用户名 (进)
+ */
+ public static String ftpUserNameIn;
+
+ /**
+ * ftp服务器密码 (进)
+ */
+ public static String ftpPasswordIn;
+
+
/**
* ftp服务器路径
@@ -100,6 +111,14 @@
FtpConfig.ftpPassword = ftpPassword;
}
+ public void setFtpUserNameIn(String ftpUserNameIn) {
+ FtpConfig.ftpUserNameIn = ftpUserNameIn;
+ }
+
+ public void setFtpPasswordIn(String ftpPasswordIn) {
+ FtpConfig.ftpPasswordIn = ftpPasswordIn;
+ }
+
public void setFtpPath(String ftpPath) {
FtpConfig.ftpPath = ftpPath;
}
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index d14509b..d62b6d2 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -37,7 +37,7 @@
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
- ftp.login(ftpUserName, ftpPassword);
+ ftp.login(ftpUserNameIn, ftpPasswordIn);
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
@@ -64,14 +64,14 @@
String substring1 = fileName.substring(0, 1);
if (substring1.equals("n")){
//把文件下载到本地
- FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, 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, ftpUserName, ftpPassword, ftpPath, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
is.close();
ftp.completePendingCommand();
if (result.getCode()==200) {
@@ -122,7 +122,7 @@
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
- ftp.login(ftpUserName, ftpPassword);
+ ftp.login(ftpUserNameIn, ftpPasswordIn);
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
@@ -149,7 +149,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, ftpPath, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
@@ -159,7 +159,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
@@ -197,7 +197,7 @@
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
- ftp.login(ftpUserName, ftpPassword);
+ ftp.login(ftpUserNameIn, ftpPasswordIn);
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
@@ -224,7 +224,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, ftpPath, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
@@ -234,7 +234,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
@@ -270,7 +270,7 @@
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
- ftp.login(ftpUserName, ftpPassword);
+ ftp.login(ftpUserNameIn, ftpPasswordIn);
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
@@ -301,7 +301,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, ftpPath, localPath, fileName);
//
String s = OutJson.TestJson(fileName);
//sql语句
@@ -327,7 +327,7 @@
//删除本地服务器文件
MysqlCenlint.deletess(fileName);
//删除 ftp 服务器文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
}
//关闭流
is.close();
@@ -364,7 +364,7 @@
//连接
ftp.connect(ftpHost, ftpPort);
// 登陆
- ftp.login(ftpUserName, ftpPassword);
+ ftp.login(ftpUserNameIn, ftpPasswordIn);
// 检验登陆操作的返回码是否正确
if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
ftp.disconnect();
@@ -391,7 +391,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, ftpPath, localPath, fileName);
// 解析数据
String s = OutJson.TestJson(fileName);
//数据处理
@@ -401,7 +401,7 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
//返回
return result;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index cf7c774..ad4a20a 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -53,8 +53,10 @@
sqlConnect: jdbc:mysql://localhost:2083/zhbaw?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
ftpHost: 117.40.91.118
ftpPort: 21
- ftpUserName: baftpout
- ftpPassword: baftpout
+ ftpUserName: zhbain
+ ftpPassword: zhbain@123
+ ftpUserNameIn: baftpout
+ ftpPasswordIn: baftpout
ftpPath: yly/anbao/
localPath: /home/zhongsong/anbao/
ip: http://47.49.36.190:9000
--
Gitblit v1.9.3