From f4ba01314a5e2780d5108d4bf59a23cbbeb4d5c8 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期一, 04 十二月 2023 13:45:25 +0800
Subject: [PATCH] 合并
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 17 ++---------------
1 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
index 23440ee..690abf2 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
@@ -91,7 +91,7 @@
//娣诲姞闃熷垪鏁版嵁
- QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.HOURS);
+ QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 300, TimeUnit.SECONDS);
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", "OSS", oss.getOssId());
SysOssUploadVo uploadVo = new SysOssUploadVo();
uploadVo.setUrl(oss.getUrl());
@@ -159,18 +159,5 @@
return R.ok("鎿嶄綔鎴愬姛");
}
- /**
- * 鍚屾
- * @param
- * @return
- */
- @PostMapping(value = "/synchronization")
- public R synchronization(SynchronousRequest request) {
- if (ObjectUtil.isNull(request.getFile())) {
- return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
- }
- log.info("ossId:{},path:{}",request.getOssId(),request.getPath());
- SysOssVo oss = ossService.upload2(request);
- return R.ok();
- }
+
}
--
Gitblit v1.8.0