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 | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 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 d9b7da5..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
@@ -80,55 +80,55 @@
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<String> upload(@RequestPart("file") MultipartFile file) throws IOException {
+ public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) throws IOException {
if (ObjectUtil.isNull(file)) {
return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
- VideoRequest request = new VideoRequest();
+ SysOssVo oss = ossService.upload(file);
+ SynchronousRequest request = new SynchronousRequest();
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);
+
+
+
+ //娣诲姞闃熷垪鏁版嵁
+ 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瀵硅薄瀛樺偍 浜掕仈缃�
+// *
+// * @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";
--
Gitblit v1.8.0