From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)

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

diff --git a/src/main/java/org/springblade/modules/FTP/monitor.java b/src/main/java/org/springblade/modules/FTP/monitor.java
index 11c6d3e..0e567c1 100644
--- a/src/main/java/org/springblade/modules/FTP/monitor.java
+++ b/src/main/java/org/springblade/modules/FTP/monitor.java
@@ -10,26 +10,26 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import static org.springblade.common.constant.FtpConstant.*;
+import static org.springblade.common.config.FtpConfig.*;
+
 
 @Component
 public class monitor {
 
-//	@Scheduled(cron = "*/30 * * * * ?")
+	@Scheduled(cron = "*/30 * * * * ?")
 	public static boolean isFTPFileExist() {
 
 		FTPClient ftp = new FTPClient();
-
 		try {
 
 			// 连接ftp服务器
+//			System.out.println("ftpHost = " + ftpHost);
 
-			ftp.connect(ftpHost_dev, ftpPort);
+			ftp.connect(ftpHost, ftpPort);
 
 			// 登陆
 
 			ftp.login(ftpUserName, ftpPassword);
-
 			// 检验登陆操作的返回码是否正确
 
 			if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
@@ -63,6 +63,7 @@
 			//ftp.changeWorkingDirectory(new String(dir.getBytes("GBK"), FTP.DEFAULT_CONTROL_ENCODING));
 
 			// 检验文件是否存在
+			ftp.changeWorkingDirectory(ftpPath);
 			FTPFile[] files = ftp.listFiles();
 			if (files.length==0){
 				return false;
@@ -74,7 +75,7 @@
 					String substring1 = fileName.substring(0, 1);
 					if (substring1.equals("n")){
 						//把文件下载到本地
-						FtpUtil.downloadFtpFile(ftpHost_dev, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
+						FtpUtil.downloadFtpFile(ftpHost, ftpUserName, ftpPassword, ftpPort, ftpPath, localPath, fileName);
 						//
 						String s = OutJson.TestJson(fileName);
 						//sql语句
@@ -100,7 +101,7 @@
 						//删除本地文件
 						//MysqlCenlint.deletes(fileName);
 						MysqlCenlint.deletess(fileName);
-						FtpUtil.deleteFile(ftpHost_dev, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+						FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, ftpPath, fileName);
 						is.close();
 						ftp.completePendingCommand();
 					}
@@ -150,7 +151,7 @@
 
 
 		} catch (Exception e) {
-
+			System.out.println("ftp连接失败");
 			e.printStackTrace();
 
 		} finally {

--
Gitblit v1.9.3