From 7f36a55767f870937a473f9c0eebf0240300a5ef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 08 Jun 2022 22:07:21 +0800
Subject: [PATCH] ftp 个人保安新增修改

---
 src/main/java/org/springblade/modules/FTP/Monitor.java                      |   21 +++++++++++----------
 src/main/java/org/springblade/modules/system/controller/UserController.java |    2 ++
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index 341d27a..624126b 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -88,16 +88,16 @@
 							//删除 ftp 文件
 							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
 //							ftp.dele(fileName);
-							ftp.completePendingCommand();
-							ftp.logout();
 							//返回
 							return result.getData().get(0);
 						}
+						ftp.completePendingCommand();
+						ftp.logout();
 					}
 				}
-				if (!flag){
-					ftp.logout();
-				}
+//				if (!flag){
+//					ftp.logout();
+//				}
 				return new Result(400,null,"未读取到对应的文件",null);
 			}
 		} catch (Exception e) {
@@ -174,16 +174,17 @@
 							//删除 ftp 文件
 							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserNameIn, ftpPasswordIn, ftpPath, fileName);
 //							ftp.dele(fileName);
-							ftp.completePendingCommand();
-							ftp.logout();
+
 							//返回
 							return result;
 						}
+						ftp.completePendingCommand();
+						ftp.logout();
 					}
 				}
-				if (!flag){
-					ftp.logout();
-				}
+//				if (!flag){
+//					ftp.logout();
+//				}
 				return new Result(400,null,"未读取到对应的文件",null);
 			}
 		} catch (Exception e) {
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 114c63e..ac732ac 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -1653,6 +1653,8 @@
 		if (null!=result){
 			//用户数处理
 			User users = handlerUserInfo(uuid);
+			System.out.println("用户数据处理---------------");
+			System.out.println("用户数据 = " + users);
 			//判断结果
 			if (result.getCode()==200){
 				//新增

--
Gitblit v1.9.3