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 | 21 ++++-----------------
1 files changed, 4 insertions(+), 17 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 9b9ac96..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
@@ -80,7 +80,7 @@
@SaCheckPermission("system:oss:upload")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
@PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
- public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) {
+ public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException {
if (ObjectUtil.isNull(file)) {
return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
@@ -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());
@@ -127,7 +127,7 @@
@DeleteMapping("/{ossIds}/{password}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ossIds,
- @PathVariable String password) {
+ @PathVariable String password) throws Exception {
return ossService.deleteWithValidByIds(List.of(ossIds), true,password) ? R.ok() : R.fail("鎻愬彇鐮侀敊璇紒");
}
@@ -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:{}",request.getOssId());
- SysOssVo oss = ossService.upload2(request);
- return R.ok();
- }
+
}
--
Gitblit v1.8.0