From 5116a6d021a3e8c052394e3f9fbc408671802b7f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 11 九月 2024 10:51:16 +0800
Subject: [PATCH] oss表增加逻辑删除，保证同步删除失败下一次也能继续
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java
index 192eda8..5209940 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
+import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.oss.core.OssClient;
import org.dromara.common.oss.entity.SynchronousRequest;
@@ -59,11 +60,16 @@
InputStream input = FtpApche.downloadFileFromDailyDir(str);
byte[] fileBytesByName = FtpApche.getFileBytesByName(input);
OssClient storage = OssFactory.instance();
- UploadResult uploadResult = storage.upload(input,getPath(fileName),fileName.substring(14,fileName.length()));
- FtpApche.deleteFile(str);
MultipartFile file = new MockMultipartFile(fileName,fileName, fileName.substring(14,fileName.length()), input);
- buildResultEntity(fileName, fileName.substring(14,fileName.length()), "minio", uploadResult, file,
- password, fileBytesByName);
+// UploadResult uploadResult = storage.upload(input,getPath(fileName),"multipart/form-data; charset=ISO-8859-1");
+ UploadResult uploadResult;
+// try {
+ uploadResult = storage.uploadSuffix2(fileBytesByName, getPath(fileName), "multipart/form-data; charset=ISO-8859-1");
+
+ FtpApche.deleteFile(str);
+ input.close();
+// buildResultEntity(fileName, fileName.substring(14,fileName.length()), "minio", uploadResult, file,
+// password, fileBytesByName);
}
--
Gitblit v1.8.0