From badc83cad7a47ec00af8a45a3d1ecddb696bb17b Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期三, 06 十二月 2023 15:12:26 +0800
Subject: [PATCH] 修改
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 124 ++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 14 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 73ada3b..d9b7da5 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
@@ -2,21 +2,35 @@
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;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery;
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;
import org.dromara.system.service.ISysOssService;
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.*;
@@ -24,21 +38,26 @@
import java.io.IOException;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* 鏂囦欢涓婁紶 鎺у埗灞�
*
* @author Lion Li
*/
+@Slf4j
+//@SaIgnore
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/resource/oss")
public class SysOssController extends BaseController {
+ private final Boundary boundary;
private final ISysOssService ossService;
-
+ private final SysOssMapper ossMapper;
/**
* 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
*/
@@ -61,24 +80,66 @@
return R.ok(list);
}
+// /**
+// * 涓婁紶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) throws IOException {
+// if (ObjectUtil.isNull(file)) {
+// return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+// }
+// SysOssVo oss = ossService.upload(file);
+// SynchronousRequest request = new SynchronousRequest();
+// request.setFile(file);
+//
+//
+//
+// //娣诲姞闃熷垪鏁版嵁
+// QueueUtils.addDelayedQueueObject("OSS", oss.getOssId().toString(), 1, TimeUnit.DAYS);
+// log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", "OSS", oss.getOssId());
+// SysOssUploadVo uploadVo = new SysOssUploadVo();
+// uploadVo.setUrl(oss.getUrl());
+// uploadVo.setFileName(oss.getOriginalName());
+// uploadVo.setOssId(oss.getOssId().toString());
+// uploadVo.setPassword(oss.getPassword());
+// return R.ok(uploadVo);
+// }
+
/**
- * 涓婁紶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<String> upload(@RequestPart("file") MultipartFile file) throws IOException {
if (ObjectUtil.isNull(file)) {
return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
- SysOssVo oss = ossService.upload(file);
- SysOssUploadVo uploadVo = new SysOssUploadVo();
- uploadVo.setUrl(oss.getUrl());
- uploadVo.setFileName(oss.getOriginalName());
- uploadVo.setOssId(oss.getOssId().toString());
- return R.ok(uploadVo);
+ 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;
}
/**
@@ -87,9 +148,14 @@
* @param ossId OSS瀵硅薄ID
*/
@SaCheckPermission("system:oss:download")
- @GetMapping("/download/{ossId}")
- public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
+ @GetMapping("/download/{ossId}/{password}")
+ public R<String> download(@PathVariable Long ossId, @PathVariable String password, HttpServletResponse response) throws IOException {
+ SysOss oss = ossMapper.selectById(ossId);
+ if(!oss.getPassword().equals(password)){
+ return R.fail("鎻愬彇鐮侀敊璇紒");
+ }
ossService.download(ossId, response);
+ return R.ok();
}
/**
@@ -99,10 +165,40 @@
*/
@SaCheckPermission("system:oss:remove")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ossIds}")
+ @DeleteMapping("/{ossIds}/{password}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ossIds) {
- return toAjax(ossService.deleteWithValidByIds(List.of(ossIds), true));
+ @PathVariable Long[] ossIds,
+ @PathVariable String password) throws Exception {
+ return ossService.deleteWithValidByIds(List.of(ossIds), true,password) ? R.ok() : R.fail("鎻愬彇鐮侀敊璇紒");
}
+ /**
+ * 鏌ョ湅OSS瀵硅薄瀛樺偍涓存椂瀵嗙爜
+ *
+ * @param ossId OSS瀵硅薄ID
+ */
+ @SaCheckPermission("system:oss:view")
+ @GetMapping("/{ossId}")
+ public R<String> view(@PathVariable Long ossId) {
+ return ossService.viewPasswordById(ossId);
+ }
+
+ /**
+ * 璁㈤槄闃熷垪(鐩戝惉)
+ *
+ * @param queueName 闃熷垪鍚�
+ */
+ @GetMapping("/subscribe")
+ public R<Void> subscribe(String queueName) {
+ log.info("閫氶亾: {} 鐩戝惉涓�......", queueName);
+ // 椤圭洰鍒濆鍖栬缃竴娆″嵆鍙�
+ QueueUtils.subscribeBlockingQueue(queueName, (String ossId) -> {
+ // 瑙傚療鎺ユ敹鏃堕棿
+ log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", queueName, ossId);
+// ossMapper.deleteById(Long.valueOf(ossId));
+ });
+ return R.ok("鎿嶄綔鎴愬姛");
+ }
+
+
}
--
Gitblit v1.8.0