From eae0adbe7fa08c8550fba54ba884e04d8bfcf51f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 May 2022 16:12:24 +0800
Subject: [PATCH] 去除固定的 containername

---
 src/main/java/org/springblade/modules/FTP/Monitor.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index d62b6d2..a614d0e 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -36,6 +36,7 @@
 		try {
 			//连接
 			ftp.connect(ftpHost, ftpPort);
+
 			// 登陆
 			ftp.login(ftpUserNameIn, ftpPasswordIn);
 			// 检验登陆操作的返回码是否正确
@@ -43,7 +44,7 @@
 				ftp.disconnect();
 				return new Result(400,null,"ftp 连接失败",null);
 			}
-
+			System.out.println("开始读取内网回传消息");
 			ftp.enterLocalActiveMode();
 
 			// 设置文件类型为二进制,与ASCII有区别
@@ -56,6 +57,7 @@
 			ftp.changeWorkingDirectory(ftpPath);
 			FTPFile[] files = ftp.listFiles();
 			if (files.length==0){
+				System.out.println("未读取到文件");
 				return new Result(400,null,"未读取到文件",null);
 			} else {
 				for (FTPFile file : files){
@@ -63,7 +65,8 @@
 					InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
 					String substring1 = fileName.substring(0, 1);
 					if (substring1.equals("n")){
-						//把文件下载到本地
+						System.out.println("-------接收到内网回传的文件: " + substring1);
+					    //把文件下载到本地
 						FtpUtil.downloadFtpFile(ftpHost, ftpUserNameIn, ftpPasswordIn, ftpPort, ftpPath, localPath, fileName);
 						// 解析数据
 						String s = OutJson.TestJson(fileName);
@@ -92,6 +95,7 @@
 						}
 					}
 				}
+				System.out.println("未读取到对应的文件");
 				return new Result(400,null,"未读取到对应的文件",null);
 			}
 		} catch (Exception e) {

--
Gitblit v1.9.3