From 6729c925673fcf41cf12f6f1b59d1489a6031731 Mon Sep 17 00:00:00 2001
From: admin <liwen611>
Date: 星期一, 25 三月 2024 13:32:18 +0800
Subject: [PATCH] 连接ftp代码调整
---
ruoyi-admin/src/main/java/com/ruoyi/utils/FtpUtils.java | 39 ++++++++++++++++++++++-----------------
ruoyi-admin/src/main/resources/application-druid.yml | 6 +++---
2 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/utils/FtpUtils.java b/ruoyi-admin/src/main/java/com/ruoyi/utils/FtpUtils.java
index 1408a59..6e1becc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/utils/FtpUtils.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/utils/FtpUtils.java
@@ -24,7 +24,7 @@
private static Logger logger = LoggerFactory.getLogger(FtpUtils.class);
private static final String DEFAULT_CHARSET = "UTF-8";
- private static final int DEFAULT_TIMEOUT = 60 * 1000;
+ private static final int DEFAULT_TIMEOUT = 6000 * 1000;
private static final String DAILY_FILE_PATH = "get";
static FTPClient ftpClient;
private volatile String ftpBasePath;
@@ -130,26 +130,31 @@
logger.info("username---"+username+"--host---"+host+"---port---"+port+"-----password-----"+password);
boolean flag = false;
try {
- ftpClient = new FTPClient();
- // 杩炴帴FTP鏈嶅姟鍣�
- ftpClient.connect(host, port);
- // 鐧婚檰FTP鏈嶅姟鍣�
- boolean login = ftpClient.login(username, password);
- // 涓枃鏀寔
- ftpClient.setControlEncoding(DEFAULT_CHARSET);
- // 璁剧疆鏂囦欢绫诲瀷涓轰簩杩涘埗锛堝鏋滀粠FTP涓嬭浇鎴栦笂浼犵殑鏂囦欢鏄帇缂╂枃浠剁殑鏃跺�欙紝涓嶈繘琛岃璁剧疆鍙兘浼氬鑷磋幏鍙栫殑鍘嬬缉鏂囦欢瑙ｅ帇澶辫触锛�
- ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
- ftpClient.enterLocalPassiveMode();
+ if (ftpClient!=null && !FTPReply.isPositiveCompletion(ftpClient.getReplyCode())) {
+ ftpClient = new FTPClient();
+ // 杩炴帴FTP鏈嶅姟鍣�
+ ftpClient.connect(host, port);
+ // 鐧婚檰FTP鏈嶅姟鍣�
+ boolean login = ftpClient.login(username, password);
+ // 涓枃鏀寔
+ ftpClient.setControlEncoding(DEFAULT_CHARSET);
+ // 璁剧疆鏂囦欢绫诲瀷涓轰簩杩涘埗锛堝鏋滀粠FTP涓嬭浇鎴栦笂浼犵殑鏂囦欢鏄帇缂╂枃浠剁殑鏃跺�欙紝涓嶈繘琛岃璁剧疆鍙兘浼氬鑷磋幏鍙栫殑鍘嬬缉鏂囦欢瑙ｅ帇澶辫触锛�
+ ftpClient.setFileType(FTPClient.BINARY_FILE_TYPE);
+ ftpClient.enterLocalPassiveMode();
// if (!ftpClient.login(username, password)) {
// disconnect();
// throw new IOException("涓嶈兘杩炴帴鍒拌鏈嶅姟 :" + host);
// }
- if (!FTPReply.isPositiveCompletion(ftpClient.getReplyCode())) {
- logger.error("杩炴帴FTP澶辫触锛岀敤鎴峰悕鎴栧瘑鐮侀敊璇��");
- disconnect();
+ if (!FTPReply.isPositiveCompletion(ftpClient.getReplyCode())) {
+ logger.error("杩炴帴FTP澶辫触锛岀敤鎴峰悕鎴栧瘑鐮侀敊璇��");
+ disconnect();
+ } else {
+ logger.info("FTP杩炴帴鎴愬姛!");
+ flag = true;
+ }
} else {
- logger.info("FTP杩炴帴鎴愬姛!");
+ logger.info("褰撳墠FTP澶勪簬杩炴帴鐘舵��,鏃犵嚎閲嶅杩炴帴!");
flag = true;
}
} catch (Exception e) {
@@ -665,14 +670,14 @@
logger.info("FTP鏂囦欢鍚嶄慨鏀瑰け璐�---------->>>>>鏂囦欢鍚嶏細"+split2[0]);
}
input.close();
- disconnect();
+ //disconnect();
return storeFlag;
}
} catch (Exception e) {
logger.error("FTP鏂囦欢涓婁紶澶辫触锛�", e);
} finally {
- disconnect();
+ //disconnect();
}
return false;
}
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 69dc283..f2877b0 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -21,7 +21,7 @@
# ftp鏈嶅姟鍣ㄥ瓨鏀炬枃浠跺湴鍧�
ftpPath: \YDJC\220181014860
# ftp鏈嶅姟鍣ㄥ湴鍧�
- ftpHost: 192.168.0.113
+ ftpHost: 192.168.1.18
# ftp鐢ㄦ埛鍚�
ftpUserName: ftpuser
# ftp瀵嗙爜
@@ -43,7 +43,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://82.157.32.74:6606/fzjk_mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.1.201:3306/fzjk_mine?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: sdAiRoot
#password: 123456
password: sdAiRoot123456..
@@ -102,7 +102,7 @@
# 鍦板潃
host: 192.168.1.201
# 绔彛锛岄粯璁や负6379
- port: 6679
+ port: 6379
# 鏁版嵁搴撶储寮�
database: 10
# 瀵嗙爜
--
Gitblit v1.8.0