From ac2873bd37eeb496b0e9dd62d66e9fc4b38ef39b Mon Sep 17 00:00:00 2001 From: qirong <2032486488@qq.com> Date: 星期五, 22 十二月 2023 13:38:26 +0800 Subject: [PATCH] ftp摆渡 --- ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java | 55 +++++++++++++++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 22 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java index d5ee534..0aaa2b2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java @@ -1,14 +1,15 @@ package org.dromara.system.runner; +import cn.hutool.extra.ftp.Ftp; import com.amazonaws.services.s3.AmazonS3; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.factory.OssFactory; import org.dromara.common.oss.properties.OssProperties; -import org.dromara.common.redis.utils.QueueUtils; import org.dromara.system.convert.SysOssConfigClassConvert; import org.dromara.system.domain.SysOssConfig; import org.dromara.system.domain.properties.Boundary; +import org.dromara.system.domain.properties.FtpConfig; import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.mapper.SysOssConfigMapper; import org.dromara.system.mapper.SysOssMapper; @@ -16,6 +17,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.dromara.system.service.ISysOssService; +import org.dromara.system.uitil.FtpApche; import org.dromara.system.uitil.HttpUtils; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; @@ -35,35 +37,44 @@ @Component public class SystemApplicationRunner implements ApplicationRunner { - private final Boundary boundary; +// private final FtpConfig ftpConfig; +// private final Boundary boundary; private final ISysOssConfigService ossConfigService; - private final SysOssMapper ossMapper; - private final SysOssConfigMapper sysOssConfigMapper; +// private final SysOssMapper ossMapper; +// private final SysOssConfigMapper sysOssConfigMapper; // private final AmazonS3 client; @Override public void run(ApplicationArguments args) throws Exception { +// FtpApche.connect(ftpConfig); +// log.info("杩炴帴ftp鏈嶅姟鎴愬姛"); ossConfigService.init(); //鍒濆鍖杘ssclient - List<SysOssConfig> collect = sysOssConfigMapper.selectList().stream().filter(e -> e.getStatus().equals("0")) - .collect(Collectors.toList()); - OssProperties properties = SysOssConfigClassConvert.INSTANCE.sysOssConfigToossProperties(collect.get(0)); - OssClient client = new OssClient("minio",properties); - log.info("鍒濆鍖朞SS閰嶇疆鎴愬姛"); - log.info("閫氶亾: {} 鐩戝惉涓�......", "OSS"); +// List<SysOssConfig> collect = sysOssConfigMapper.selectList().stream().filter(e -> e.getStatus().equals("0")) +// .collect(Collectors.toList()); +// OssProperties properties = SysOssConfigClassConvert.INSTANCE.sysOssConfigToossProperties(collect.get(0)); +// OssClient client = new OssClient("minio",properties); +// log.info("鍒濆鍖朞SS閰嶇疆鎴愬姛"); +// log.info("閫氶亾: {} 鐩戝惉涓�......", "OSS"); // 椤圭洰鍒濆鍖栬缃竴娆″嵆鍙� - QueueUtils.subscribeBlockingQueue("OSS", (String ossId) -> { - // 瑙傚療鎺ユ敹鏃堕棿 - log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", "OSS", ossId); - SysOssVo vo = ossMapper.selectVoById(ossId); - client.delete( vo.getUrl()); - ossMapper.deleteById(Long.valueOf(ossId)); - try { - HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",ossId); - } catch (IOException e) { - throw new RuntimeException(e); - } - }); +// QueueUtils.subscribeBlockingQueue("OSS", (String name) -> { +// // 瑙傚療鎺ユ敹鏃堕棿 +// log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", "OSS", name); +//// try { +//// HttpUtils.sendDeleteRequest2(boundary.getLocalhost() + "/resource/synchronization/uploadByFileName",name); +//// } catch (IOException e) { +//// throw new RuntimeException(e); +//// } +// +//// SysOssVo vo = ossMapper.selectVoById(ossId); +//// client.delete( vo.getUrl()); +//// ossMapper.deleteById(Long.valueOf(ossId)); +//// try { +//// HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",ossId); +//// } catch (IOException e) { +//// throw new RuntimeException(e); +//// } +// }); } } -- Gitblit v1.8.0