From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改

---
 src/main/java/org/springblade/modules/FTP/monitor.java |  152 +++++++++++++++++++++-----------------------------
 1 files changed, 63 insertions(+), 89 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/monitor.java b/src/main/java/org/springblade/modules/FTP/monitor.java
index 25fcbc9..52f72be 100644
--- a/src/main/java/org/springblade/modules/FTP/monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/monitor.java
@@ -8,32 +8,26 @@
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.io.InputStream;
+
+import static org.springblade.common.config.FtpConfig.*;
+
 
 @Component
 public class monitor {
-	//ftp服务器IP地址
-	private static String ftpHost = "192.168.0.105";
-	//ftp服务器端口
-	private static int ftpPort = 21;
-	//ftp服务器用户名
-	private static String ftpUserName = "yly";
-	//ftp服务器密码
-	private static String ftpPassword = "Yly@123";
-	//ftp服务器路径
-	private static String ftpPath = "anbao/";
-	//本地路径
-	private static String localPath = "D:\\anbao";
+
 	//文件名
 	//private static String fileName = "nsql.json";
 
 
-	@Scheduled(cron = "*/30 * * * * ?")
+//	@Scheduled(cron = "*/30 * * * * ?")
 	public static boolean isFTPFileExist() {
 
 		FTPClient ftp = new FTPClient();
-
+		String fileName = null;
 		try {
 
+//			System.out.println("ftpHost = " + ftpHost);
 			// 连接ftp服务器
 
 			ftp.connect(ftpHost, ftpPort);
@@ -42,8 +36,9 @@
 
 			ftp.login(ftpUserName, ftpPassword);
 
-			// 检验登陆操作的返回码是否正确
+//			System.out.println("ftp.getReplyCode() = " + ftp.getReplyCode());
 
+			// 检验登陆操作的返回码是否正确
 			if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
 
 				ftp.disconnect();
@@ -52,6 +47,7 @@
 
 			}
 
+			//被动模式,文件上传不成功会有提示
 			ftp.enterLocalActiveMode();
 
 			// 设置文件类型为二进制,与ASCII有区别
@@ -61,7 +57,6 @@
 			// 设置编码格式
 
 			ftp.setControlEncoding("GBK");
-
 			// 提取绝对地址的目录以及文件名
 
 			//ftpPath = ftpPath.replace("ftp://" + ftpHost + ":" + ftpPort + "/", "");
@@ -75,87 +70,66 @@
 			//ftp.changeWorkingDirectory(new String(dir.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
 
 			// 检验文件是否存在
+			ftp.changeWorkingDirectory(ftpPath);
 			FTPFile[] files = ftp.listFiles();
-			if (files.length==0){
+			if (files.length == 0) {
 				return false;
-			}
-			for (FTPFile file : files){
-				String fileName = file.getName();
-				//把文件下载到本地
-				FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
-				//
-				String s = OutJson.TestJson(fileName);
-				//sql语句
-				String sql = OutJson.stringReplace(s);
-				String[] split = sql.split(";");//以逗号分割
-				for (String sqls : split) {
-					//判断是否是新增,删除,修改
-					String substring = sqls.substring(0, 2);
-					//新增
-					if (substring.equals("in")) {
-						//运行sql语句
-						MysqlCenlint.inster(sqls);
-					}
-					//修改
-					else if (substring.equals("up")) {
-						MysqlCenlint.update(sqls);
-					}
-					//删除
-					else {
-						MysqlCenlint.delete(sqls);
+			} else {
+				for (FTPFile file : files) {
+					 fileName = file.getName();
+					InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
+					if (null == is) {
+						return false;
+					} else {
+						String substring1 = fileName.substring(0, 1);
+						if (substring1.equals("w")) {
+							//把文件下载到本地
+							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+							//
+							String s = OutJson.TestJson(fileName);
+							//sql语句
+							String sql = OutJson.stringReplace(s);
+							String[] split = sql.split(";");//以逗号分割
+							for (String sqls : split) {
+								//判断是否是新增,删除,修改
+								String substring = sqls.substring(0, 2);
+								//新增
+								if (substring.equals("in")) {
+									//运行sql语句
+									MysqlCenlint.inster(sqls);
+								}
+								//修改
+								else if (substring.equals("up")) {
+									MysqlCenlint.update(sqls);
+								}
+								//删除
+								else {
+									MysqlCenlint.delete(sqls);
+								}
+							}
+							//删除本地文件
+//						MysqlCenlint.deletes(fileName);
+							MysqlCenlint.deletess(fileName);
+							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							is.close();
+							ftp.completePendingCommand();
+						}
+						else {
+							//把文件下载到本地
+							FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, minioPath, fileName);
+							//MysqlCenlint.deletess(fileName);
+							FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+							is.close();
+							ftp.completePendingCommand();
+						}
 					}
 				}
-				//删除本地文件
-				MysqlCenlint.deletes(fileName);
-				FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
-				//is.close();
-				ftp.completePendingCommand();
 				return true;
 			}
 
-			//InputStream is = ftp.retrieveFileStream(new String(file.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
-
-//			if (is == null || ftp.getReplyCode() == FTPReply.FILE_UNAVAILABLE) {
-//				return false;
-//
-//			}
-//
-//			if (is != null) {
-//				//把文件下载到本地
-//				FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
-//				//
-//				String s = OutJson.TestJson();
-//				//sql语句
-//				String sql = OutJson.stringReplace(s);
-//				String[] split = sql.split(";");//以逗号分割
-//				for (String sqls : split) {
-//					//判断是否是新增,删除,修改
-//					String substring = sqls.substring(0, 2);
-//					//新增
-//					if (substring.equals("in")) {
-//						//运行sql语句
-//						MysqlCenlint.inster(sqls);
-//					}
-//					//修改
-//					else if (substring.equals("up")) {
-//						MysqlCenlint.update(sqls);
-//					}
-//					//删除
-//					else {
-//						MysqlCenlint.delete(sqls);
-//					}
-//				}
-//				//删除本地文件
-//				MysqlCenlint.delete();
-//				FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", "nsql.json");
-//				is.close();
-//				ftp.completePendingCommand();
-//
-//			}
-
-
 		} catch (Exception e) {
-
+			MysqlCenlint.deletess(fileName);
+			FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
 			e.printStackTrace();
 
 		} finally {

--
Gitblit v1.9.3