From ef782c570290093218515ceb2d30ac910f8a7e93 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 11 六月 2024 11:07:16 +0800
Subject: [PATCH] 代码初始化
---
server/system_service/src/main/java/com/doumee/core/utils/FtpUtil.java | 4 ++--
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java | 2 +-
2 files changed, 3 insertions(+), 3 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..8712f61 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
@@ -267,7 +267,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 +279,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;
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
index eb12019..bb45612 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/common/PublicCloudController.java
@@ -101,7 +101,7 @@
String date = DateUtil.getNowShortDate();
String fName = date + "/" + UUID.randomUUID() + endType;
String fileName = folder + "/" + fName;
- boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()));
+ boolean r = ftp.uploadInputstreamBatch(is, fileName, Constants.equalsInteger(index ,fileList.size()),index);
if (r) {
JSONObject fileJSON = new JSONObject();
fileJSON.put("url", prefixPath + fileName);
--
Gitblit v1.9.3