From ac120f258131bbc3a91f784345b19fb88dbca33e Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Wed, 27 Apr 2022 17:19:19 +0800
Subject: [PATCH] 从业记录新增修改,ftp 配置修改

---
 src/main/java/org/springblade/modules/FTP/Monitor.java |   32 +++++---------------------------
 1 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/monitor.java b/src/main/java/org/springblade/modules/FTP/Monitor.java
similarity index 85%
rename from src/main/java/org/springblade/modules/FTP/monitor.java
rename to src/main/java/org/springblade/modules/FTP/Monitor.java
index 71383f0..1ce263e 100644
--- a/src/main/java/org/springblade/modules/FTP/monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/Monitor.java
@@ -14,11 +14,7 @@
 
 
 @Component
-public class monitor {
-
-	//文件名
-	//private static String fileName = "nsql.json";
-
+public class Monitor {
 
 	@Scheduled(cron = "*/1 * * * * ?")
 	public static boolean isFTPFileExist() {
@@ -46,17 +42,6 @@
 
 			// 设置编码格式
 			ftp.setControlEncoding("GBK");
-			// 提取绝对地址的目录以及文件名
-
-			//ftpPath = ftpPath.replace("ftp://" + ftpHost + ":" + ftpPort + "/", "");
-
-			//String dir = ftpPath.substring(0, ftpPath.lastIndexOf("/"));
-
-			// file = ftpPath.substring(ftpPath.lastIndexOf("/") + 1);
-
-			// 进入文件所在目录,注意编码格式,以能够正确识别中文目录
-
-			//ftp.changeWorkingDirectory(new String(dir.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
 
 			// 检验文件是否存在
 			ftp.changeWorkingDirectory(ftpPath);
@@ -97,6 +82,7 @@
 							}
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
+							//删除 ftp 文件
 							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 						}else if(substring1.equals("o")){
 							//获取对象字符串
@@ -105,8 +91,11 @@
 							DataHanlder.handler(json);
 							//删除本地文件
 							MysqlCenlint.deletess(fileName);
+							//删除 ftp 文件
 							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 						}
+						//删除本地文件,ftp 文件没有对应读取的不删除
+						MysqlCenlint.deletess(fileName);
 						is.close();
 						ftp.completePendingCommand();
 					}
@@ -118,26 +107,15 @@
 			MysqlCenlint.deletess(fileName);
 			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 			e.printStackTrace();
-
 		} finally {
-
 			if (ftp != null) {
-
 				try {
-
 					ftp.disconnect();
-
 				} catch (IOException e) {
-
 					e.printStackTrace();
-
 				}
-
 			}
-
 		}
-
 		return false;
-
 	}
 }

--
Gitblit v1.9.3