From 61f1e5ead66144dc9786bc39b81e8d4dad372b34 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期三, 11 九月 2024 11:15:39 +0800 Subject: [PATCH] 专网代码调整 --- ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/sync/VideoPulSync.java | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 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..17bbfed 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; @@ -43,7 +44,7 @@ this.baseMapper = baseMapper; } -// @Scheduled(cron = "0 0/1 * * * ?") + @Scheduled(cron = "0 0/1 * * * ?") public void get() throws IOException { System.out.println("鍚屾涓婁紶......"); @@ -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