From f36dac411bab5e86dcc46ba504f4833b33363c46 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 30 十月 2024 18:38:31 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java
index 5a6fbd5..f6dac5f 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java
@@ -1,6 +1,7 @@
package com.doumee.core.utils;
import java.io.*;
+import java.util.Date;
import java.util.UUID;
import lombok.extern.slf4j.Slf4j;
@@ -236,6 +237,8 @@
}
public boolean uploadInputstream(InputStream inputStream, String remote) {
// 璁剧疆PassiveMode浼犺緭
+ Date d1 = new Date();
+ log.info("涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(d1));
try {
ftpClient.enterLocalPassiveMode();
// 璁剧疆浠ヤ簩杩涘埗娴佺殑鏂瑰紡浼犺緭
@@ -259,6 +262,8 @@
}else{
log.error("涓婁紶鏂囦欢澶辫触======================="+remote);
}
+ Date d2= new Date();
+ log.info("涓婁紶鏂囦欢鎴愬姛=============缁撴潫========="+DateUtil.getPlusTime2(d2) +"鑰楁椂绉掞細"+( (d2.getTime()-d1.getTime()) /1000));
return result;
}catch (Exception e){
e.printStackTrace();
@@ -267,7 +272,7 @@
return false;
}
- public boolean uploadInputstreamBatch(InputStream inputStream, String remote, Boolean close) {
+ public boolean uploadInputstreamBatch(InputStream inputStream, String remote, Boolean close , Integer index ) {
// 璁剧疆PassiveMode浼犺緭
try {
ftpClient.enterLocalPassiveMode();
@@ -279,7 +284,7 @@
if (remote.contains("/")) {
remoteFileName = remote.substring(remote.lastIndexOf("/") + 1);
// 鍒涘缓鏈嶅姟鍣ㄨ繙绋嬬洰褰曠粨鏋勶紝鍒涘缓澶辫触鐩存帴杩斿洖
- if (StringUtils.equals(CreateDirecroty(remote, ftpClient), "2")) {
+ if (Constants.equalsInteger(index,Constants.ONE) && StringUtils.equals(CreateDirecroty(remote, ftpClient), "2")) {
log.error("鍒涘缓ftp鐩綍澶辫触======================="+remote);
return false;
}
--
Gitblit v1.9.3