From fb766b5ff9f913561f76aa747c76eae5c3678589 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期五, 08 十二月 2023 14:08:54 +0800
Subject: [PATCH] 三方同步
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 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..276429f 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
@@ -4,11 +4,15 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONArray;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.constant.CacheNames;
import org.dromara.common.core.domain.R;
import org.dromara.common.core.validate.QueryGroup;
import org.dromara.common.oss.entity.SynchronousRequest;
+import org.dromara.common.oss.entity.VideoRequest;
import org.dromara.common.redis.utils.CacheUtils;
import org.dromara.common.redis.utils.QueueUtils;
import org.dromara.common.web.core.BaseController;
@@ -18,6 +22,7 @@
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.domain.SysOss;
import org.dromara.system.domain.bo.SysOssBo;
+import org.dromara.system.domain.properties.Boundary;
import org.dromara.system.domain.vo.SysOssUploadVo;
import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.mapper.SysOssMapper;
@@ -25,6 +30,7 @@
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.constraints.NotEmpty;
import lombok.RequiredArgsConstructor;
+import org.dromara.system.uitil.HttpUtils;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -32,6 +38,7 @@
import java.io.IOException;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -48,6 +55,7 @@
@RequestMapping("/resource/oss")
public class SysOssController extends BaseController {
+ private final Boundary boundary;
private final ISysOssService ossService;
private final SysOssMapper ossMapper;
/**
@@ -73,14 +81,14 @@
}
/**
- * 涓婁紶OSS瀵硅薄瀛樺偍
+ * 涓婁紶OSS瀵硅薄瀛樺偍 瑙嗛涓撶綉
*
* @param file 鏂囦欢
*/
@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 +99,7 @@
//娣诲姞闃熷垪鏁版嵁
- QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.HOURS);
+ QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.DAYS);
log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", "OSS", oss.getOssId());
SysOssUploadVo uploadVo = new SysOssUploadVo();
uploadVo.setUrl(oss.getUrl());
@@ -99,6 +107,39 @@
uploadVo.setOssId(oss.getOssId().toString());
uploadVo.setPassword(oss.getPassword());
return R.ok(uploadVo);
+ }
+
+// /**
+// * 涓婁紶OSS瀵硅薄瀛樺偍 浜掕仈缃�
+// *
+// * @param file 鏂囦欢
+// */
+// @SaCheckPermission("system:oss:upload")
+// @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
+// @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+// public R<String> upload(@RequestPart("file") MultipartFile file) throws IOException {
+// if (ObjectUtil.isNull(file)) {
+// return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+// }
+// VideoRequest request = new VideoRequest();
+// request.setFile(file);
+// request.setFileName(file.getOriginalFilename());
+// String post = post(request);
+// String password = post.substring(post.indexOf("password\":\"") + 9, post.indexOf("\"}"));
+// return R.ok(password);
+// }
+
+ private String post(VideoRequest request) throws IOException {
+ HashMap<String, String> headers = new HashMap<>(3);
+ String requestUrl = boundary.getChief() + "/resource/synchronization/uploadTwo";
+ ObjectMapper objectMapper = new ObjectMapper();
+ objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);
+ headers.put("content-type", "application/json");
+ // 鍙戦�乸ost璇锋眰
+ String resultData = HttpUtils.sendPostRequest2(requestUrl, request);
+ // 骞舵帴鏀惰繑鍥炵粨鏋�
+ System.out.println(resultData);
+ return resultData;
}
/**
@@ -127,7 +168,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 +200,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