From 32afac47543b5572f82bae1396ec8b965d943f62 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Fri, 20 May 2022 08:26:38 +0800
Subject: [PATCH] 用户新增返回修改

---
 src/main/java/org/springblade/modules/FTP/Monitor.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 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 4378f85..e94bc71 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -24,12 +24,14 @@
 @Component
 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;
@@ -47,15 +49,20 @@
 
 			ftp.enterLocalActiveMode();
 
+
 			// 设置文件类型为二进制,与ASCII有区别
 			ftp.setFileType(FTP.BINARY_FILE_TYPE);
 
 			// 设置编码格式
 			ftp.setControlEncoding("GBK");
-
 			// 检验文件是否存在
-			ftp.changeWorkingDirectory(ftpPath);
+			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("开始读取内网回传消息");
 			if (files.length==0){
 				System.out.println("未读取到文件");
@@ -96,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);
 						}
 					}
 				}
@@ -147,6 +158,10 @@
 
 			// 检验文件是否存在
 			ftp.changeWorkingDirectory(ftpPath);
+
+			// Use passive mode as default
+			ftp.enterLocalPassiveMode();
+
 			FTPFile[] files = ftp.listFiles();
 			if (files.length==0){
 				return new Result(400,null,"未读取到文件",null);
@@ -222,6 +237,10 @@
 
 			// 检验文件是否存在
 			ftp.changeWorkingDirectory(ftpPath);
+
+			// Use passive mode as default
+			ftp.enterLocalPassiveMode();
+
 			FTPFile[] files = ftp.listFiles();
 			if (files.length==0){
 				return new Result(400,null,"未读取到文件",null);
@@ -295,6 +314,10 @@
 
 			// 检验文件是否存在
 			ftp.changeWorkingDirectory(ftpPath);
+
+			// Use passive mode as default
+			ftp.enterLocalPassiveMode();
+
 			FTPFile[] files = ftp.listFiles();
 			if (files.length==0){
 				return false;
@@ -389,6 +412,10 @@
 
 			// 检验文件是否存在
 			ftp.changeWorkingDirectory(ftpPath);
+
+			// Use passive mode as default
+			ftp.enterLocalPassiveMode();
+
 			FTPFile[] files = ftp.listFiles();
 			if (files.length==0){
 				return new Result(400,null,"未读取到文件",null);

--
Gitblit v1.9.3