From fe9c6432b0b6eea428bbb856fabe4f7d1e84f0cb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 27 Oct 2021 17:16:01 +0800
Subject: [PATCH] 保安员资格审查查询修改

---
 src/main/java/org/springblade/modules/FTP/monitor.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/monitor.java b/src/main/java/org/springblade/modules/FTP/monitor.java
index b11bcb7..43c1997 100644
--- a/src/main/java/org/springblade/modules/FTP/monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/monitor.java
@@ -10,7 +10,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import static org.springblade.common.constant.FtpConstant.*;
+import static org.springblade.common.config.FtpConfig.*;
+
 
 @Component
 public class monitor {
@@ -26,16 +27,18 @@
 
 		try {
 
+//			System.out.println("ftpHost = " + ftpHost);
 			// 连接ftp服务器
 
-			ftp.connect(ftpHost_dev, ftpPort);
+			ftp.connect(ftpHost, ftpPort);
 
 			// 登陆
 
 			ftp.login(ftpUserName, ftpPassword);
 
-			// 检验登陆操作的返回码是否正确
+			System.out.println("ftp.getReplyCode() = " + ftp.getReplyCode());
 
+			// 检验登陆操作的返回码是否正确
 			if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
 
 				ftp.disconnect();
@@ -44,6 +47,7 @@
 
 			}
 
+			//被动模式,文件上传不成功会有提示
 			ftp.enterLocalActiveMode();
 
 			// 设置文件类型为二进制,与ASCII有区别
@@ -80,7 +84,7 @@
 						String substring1 = fileName.substring(0, 1);
 						if (substring1.equals("w")) {
 							//把文件下载到本地
-							FtpUtil.downloadFtpFile(ftpHost_dev, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
 							//
 							String s = OutJson.TestJson(fileName);
 							//sql语句
@@ -106,15 +110,15 @@
 							//删除本地文件
 //						MysqlCenlint.deletes(fileName);
 							MysqlCenlint.deletess(fileName);
-							FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 							is.close();
 							ftp.completePendingCommand();
 						}
 						else {
 							//把文件下载到本地
-							FtpUtil.downloadFtpFile(ftpHost_dev, ftpUserName, ftpPassword, ftpPort, ftpPath, MinioPath, fileName);
+							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
 							//MysqlCenlint.deletess(fileName);
-							FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 							is.close();
 							ftp.completePendingCommand();
 						}

--
Gitblit v1.9.3