From 6460fb8ee91d6882269028c599d518611aead76b Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 11 九月 2024 22:52:03 +0800 Subject: [PATCH] 公安内网端代码初始化 --- ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 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..7f24d17 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; @@ -52,19 +53,15 @@ return; } for (String str : list) { - //瀵嗙爜 - String password = str.substring(0,6); - //鏂囦欢鍚嶇О - String fileName = str.substring(6,str.length()); + String password = str.substring(0, 6); + String fileName = str.substring(6, str.length()); 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())); + MockMultipartFile mockMultipartFile = new MockMultipartFile(fileName, fileName, fileName.substring(14, fileName.length()), input); + UploadResult uploadResult = storage.uploadSuffix2(fileBytesByName, getPath(fileName), "multipart/form-data; charset=ISO-8859-1"); 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); - + buildResultEntity(fileName, fileName.substring(14, fileName.length()), "minio", uploadResult, (MultipartFile)mockMultipartFile, password, fileBytesByName); } } -- Gitblit v1.8.0