From 9ddf06bee3dbd1dde785e2ac7be808c8ee22d56d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 23 Aug 2021 08:58:44 +0800
Subject: [PATCH] 1.首页接口调整

---
 src/main/java/org/springblade/modules/FTP/monitor.java |   27 ++++++++++-----------------
 1 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/main/java/org/springblade/modules/FTP/monitor.java b/src/main/java/org/springblade/modules/FTP/monitor.java
index 25fb817..d432e76 100644
--- a/src/main/java/org/springblade/modules/FTP/monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/monitor.java
@@ -8,21 +8,13 @@
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.io.InputStream;
+
+import static org.springblade.common.constant.FtpConstant.*;
 
 @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";
 
@@ -36,7 +28,7 @@
 
 			// 连接ftp服务器
 
-			ftp.connect(ftpHost, ftpPort);
+			ftp.connect(ftpHost_dev, ftpPort);
 
 			// 登陆
 
@@ -82,10 +74,11 @@
 			else {
 				for (FTPFile file : files){
 					String fileName = file.getName();
+					InputStream is = ftp.retrieveFileStream(new String(fileName.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
 					String substring1 = fileName.substring(0, 1);
 					if (substring1.equals("w")) {
 						//把文件下载到本地
-						FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+						FtpUtil.downloadFtpFile(ftpHost_dev, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
 						//
 						String s = OutJson.TestJson(fileName);
 						//sql语句
@@ -109,10 +102,10 @@
 							}
 						}
 						//删除本地文件
-						MysqlCenlint.deletes(fileName);
+//						MysqlCenlint.deletes(fileName);
 						MysqlCenlint.deletess(fileName);
-						FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
-						//is.close();
+						FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+						is.close();
 						ftp.completePendingCommand();
 					}
 				}

--
Gitblit v1.9.3