From 16b823326f5ff0166be44efa34880d2e184659a9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 12 May 2022 17:35:18 +0800
Subject: [PATCH] ftp 连接修改,新增打印

---
 src/main/java/org/springblade/modules/FTP/FtpUtil.java     |    1 +
 src/main/java/org/springblade/modules/FTP/DataHanlder.java |    1 +
 src/main/java/org/springblade/modules/FTP/Monitor.java     |   14 +++++++-------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/DataHanlder.java b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
index 2de4aa2..656c423 100644
--- a/src/main/java/org/springblade/modules/FTP/DataHanlder.java
+++ b/src/main/java/org/springblade/modules/FTP/DataHanlder.java
@@ -279,6 +279,7 @@
 			}
 			Map<String, Object> map1 = new HashMap<>(1);
 			map1.put(uuid,result1);
+			System.out.println("用户新增:开始向外网推送数据............");
 			//向外网发送数据
 			FtpUtil.objectFileUpload(map1);
 		}
diff --git a/src/main/java/org/springblade/modules/FTP/FtpUtil.java b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
index 38c55b6..b539771 100644
--- a/src/main/java/org/springblade/modules/FTP/FtpUtil.java
+++ b/src/main/java/org/springblade/modules/FTP/FtpUtil.java
@@ -376,6 +376,7 @@
 			e.printStackTrace();
 		}
 		FtpUtil.uploadFile(ftpHost, ftpPort, ftpUserNameOut, ftpPasswordOut, ftpPath, "/",  "n"+response1+".json", in1);
+		System.out.println("用户新增,向外网推送数据结束.................");
 		MysqlCenlint.deletess("n"+response1+".json");
 	}
 
diff --git a/src/main/java/org/springblade/modules/FTP/Monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
index f84ce13..fec7cf7 100644
--- a/src/main/java/org/springblade/modules/FTP/Monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -124,16 +124,16 @@
 							//删除 ftp 文件
 							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 						}
-						else if(substring1.equals("f")){
-							//把文件下载到本地(图片文件类),测试内外网使用同一台服务器
-							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
-							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
-						}
-//						else {
-//							//把文件下载到本地(图片文件类),ftp 内外网服务器分开时使用
+//						else if(substring1.equals("f")){
+//							//把文件下载到本地(图片文件类),测试内外网使用同一台服务器
 //							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
 //							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 //						}
+						else {
+							//把文件下载到本地(图片文件类),ftp 内外网服务器分开时使用
+							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
+							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+						}
 						//删除本地文件,ftp 文件没有对应读取的不删除
 						MysqlCenlint.deletess(fileName);
 						is.close();

--
Gitblit v1.9.3