From fb766b5ff9f913561f76aa747c76eae5c3678589 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期五, 08 十二月 2023 14:08:54 +0800
Subject: [PATCH] 三方同步
---
ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java | 2
ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java | 2
ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java | 4
ruoyi-admin/src/main/resources/application-prod.yml | 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 2
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java | 94 ++++++------
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java | 188 +++++++++++++-------------
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java | 24 +-
ruoyi-admin/src/main/resources/application-dev.yml | 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 72 +++++-----
11 files changed, 197 insertions(+), 197 deletions(-)
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
index a1bf9ba..57a117d 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -194,8 +194,8 @@
* 鑷姩娉ㄥ唽骞剁櫥褰�
*/
// @SaCheckPermission("system:user:auto")
- @PutMapping(value = "auto")
- public R<LoginVo> auto(@Validated @RequestBody RegisterBody user) {
+ @GetMapping(value = "auto")
+ public R<LoginVo> auto(RegisterBody user) {
AutoLoginUtil.padding(user);
String clientId = "e5cd7e4891bf95d1d19206ce24a7b32e";
//pc
diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
index c5aaea3..e0ef425 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/service/SysRegisterService.java
@@ -78,7 +78,7 @@
SysUserVo sysUserVo = userMapper.selectUserByUserName(username);
SysUserRole userRole = new SysUserRole();
userRole.setUserId(sysUserVo.getUserId());
- userRole.setRoleId(Long.valueOf(RoleType.INTERNET.getType()));
+ userRole.setRoleId(Long.valueOf(RoleType.VIDEO.getType()));
userRoleMapper.insert(userRole);
recordLogininfor(tenantId, username, Constants.REGISTER, MessageUtils.message("user.register.success"));
}
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 8b4ae91..1767212 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -129,7 +129,7 @@
# 鍛戒护绛夊緟瓒呮椂锛屽崟浣嶏細姣
timeout: 3000
# 鍙戝竷鍜岃闃呰繛鎺ユ睜澶у皬
- subscriptionConnectionPoolSize: 50
+ subscriptionConnectionPoolSize: 100
--- # mail 閭欢鍙戦��
mail:
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index a2c2bed..2d96cc0 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -105,7 +105,7 @@
spring.data:
redis:
# 鍦板潃
- host: 123.207.71.245
+ host: 162.14.79.111
# 绔彛锛岄粯璁や负6379
port: 16379
password: 234#Wersdf!
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 6d6628d..1c892de 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -256,7 +256,7 @@
--- # websocket
websocket:
- enabled: true
+ enabled: false
# 璺緞
path: /resource/websocket
# 璁剧疆璁块棶婧愬湴鍧�
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java
index 30d109e..c6680c9 100644
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java
@@ -20,7 +20,7 @@
* @author zendwang
*/
@AutoConfiguration
-@ConditionalOnProperty(value = "websocket.enabled", havingValue = "true")
+@ConditionalOnProperty(value = "websocket.enabled", havingValue = "false")
@EnableConfigurationProperties(WebSocketProperties.class)
@EnableWebSocket
public class WebSocketConfig {
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java
index bdbf033..af6af50 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisPubSubController.java
@@ -1,47 +1,47 @@
-package org.dromara.demo.controller;
-
-import org.dromara.common.core.domain.R;
-import org.dromara.common.redis.utils.RedisUtils;
-import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * Redis 鍙戝竷璁㈤槄 婕旂ず妗堜緥
- *
- * @author Lion Li
- */
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/demo/redis/pubsub")
-public class RedisPubSubController {
-
- /**
- * 鍙戝竷娑堟伅
- *
- * @param key 閫氶亾Key
- * @param value 鍙戦�佸唴瀹�
- */
- @GetMapping("/pub")
- public R<Void> pub(String key, String value) {
- RedisUtils.publish(key, value, consumer -> {
- System.out.println("鍙戝竷閫氶亾 => " + key + ", 鍙戦�佸�� => " + value);
- });
- return R.ok("鎿嶄綔鎴愬姛");
- }
-
- /**
- * 璁㈤槄娑堟伅
- *
- * @param key 閫氶亾Key
- */
- @GetMapping("/sub")
- public R<Void> sub(String key) {
- RedisUtils.subscribe(key, String.class, msg -> {
- System.out.println("璁㈤槄閫氶亾 => " + key + ", 鎺ユ敹鍊� => " + msg);
- });
- return R.ok("鎿嶄綔鎴愬姛");
- }
-
-}
+//package org.dromara.demo.controller;
+//
+//import org.dromara.common.core.domain.R;
+//import org.dromara.common.redis.utils.RedisUtils;
+//import lombok.RequiredArgsConstructor;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RestController;
+//
+///**
+// * Redis 鍙戝竷璁㈤槄 婕旂ず妗堜緥
+// *
+// * @author Lion Li
+// */
+//@RequiredArgsConstructor
+//@RestController
+//@RequestMapping("/demo/redis/pubsub")
+//public class RedisPubSubController {
+//
+// /**
+// * 鍙戝竷娑堟伅
+// *
+// * @param key 閫氶亾Key
+// * @param value 鍙戦�佸唴瀹�
+// */
+// @GetMapping("/pub")
+// public R<Void> pub(String key, String value) {
+// RedisUtils.publish(key, value, consumer -> {
+// System.out.println("鍙戝竷閫氶亾 => " + key + ", 鍙戦�佸�� => " + value);
+// });
+// return R.ok("鎿嶄綔鎴愬姛");
+// }
+//
+// /**
+// * 璁㈤槄娑堟伅
+// *
+// * @param key 閫氶亾Key
+// */
+// @GetMapping("/sub")
+// public R<Void> sub(String key) {
+// RedisUtils.subscribe(key, String.class, msg -> {
+// System.out.println("璁㈤槄閫氶亾 => " + key + ", 鎺ユ敹鍊� => " + msg);
+// });
+// return R.ok("鎿嶄綔鎴愬姛");
+// }
+//
+//}
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java
index edd10ff..34f9a02 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java
@@ -1,94 +1,94 @@
-package org.dromara.demo.controller.queue;
-
-import cn.dev33.satoken.annotation.SaIgnore;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.redis.utils.QueueUtils;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * 寤惰繜闃熷垪 婕旂ず妗堜緥
- * <p>
- * 杞婚噺绾ч槦鍒� 閲嶉噺绾ф暟鎹噺 璇蜂娇鐢� MQ
- * 渚嬪: 鍒涘缓璁㈠崟30鍒嗛挓鍚庤繃鏈熷鐞�
- * <p>
- * 闆嗙兢娴嬭瘯閫氳繃 鍚屼竴涓暟鎹彧浼氳娑堣垂涓�娆� 鍋氬ソ浜嬪姟琛ュ伩
- * 闆嗙兢娴嬭瘯娴佺▼ 涓ゅ彴闆嗙兢鍒嗗埆寮�鍚闃� 鍦ㄥ叾涓竴鍙板彂閫佹暟鎹� 瑙傚療鎺ユ敹娑堟伅鐨勮寰�
- *
- * @author Lion Li
- * @version 3.6.0
- */
-@SaIgnore
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/demo/queue/delayed")
-public class DelayedQueueController {
-
- /**
- * 璁㈤槄闃熷垪
- *
- * @param queueName 闃熷垪鍚�
- */
- @GetMapping("/subscribe")
- public R<Void> subscribe(String queueName) {
- log.info("閫氶亾: {} 鐩戝惉涓�......", queueName);
- // 椤圭洰鍒濆鍖栬缃竴娆″嵆鍙�
- QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> {
- // 瑙傚療鎺ユ敹鏃堕棿
- log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", queueName, orderNum);
-
- });
- return R.ok("鎿嶄綔鎴愬姛");
- }
-
- /**
- * 娣诲姞闃熷垪鏁版嵁
- *
- * @param queueName 闃熷垪鍚�
- * @param orderNum 璁㈠崟鍙�
-// * @param time 寤惰繜鏃堕棿(绉�)
- */
- @GetMapping("/add")
- public R<Void> add(@RequestParam("queueName") String queueName, @RequestParam("orderNum")String orderNum) {
- QueueUtils.addDelayedQueueObject(queueName, orderNum, 5, TimeUnit.SECONDS);
- // 瑙傚療鍙戦�佹椂闂�
- log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", queueName, orderNum);
- return R.ok("鎿嶄綔鎴愬姛");
- }
-
- /**
- * 鍒犻櫎闃熷垪鏁版嵁
- *
- * @param queueName 闃熷垪鍚�
- * @param orderNum 璁㈠崟鍙�
- */
- @GetMapping("/remove")
- public R<Void> remove(String queueName, String orderNum) {
- if (QueueUtils.removeDelayedQueueObject(queueName, orderNum)) {
- log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, orderNum);
- } else {
- return R.fail("鎿嶄綔澶辫触");
- }
- return R.ok("鎿嶄綔鎴愬姛");
- }
-
- /**
- * 閿�姣侀槦鍒�
- *
- * @param queueName 闃熷垪鍚�
- */
- @GetMapping("/destroy")
- public R<Void> destroy(String queueName) {
- // 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
- QueueUtils.destroyDelayedQueue(queueName);
- return R.ok("鎿嶄綔鎴愬姛");
- }
-
-}
+//package org.dromara.demo.controller.queue;
+//
+//import cn.dev33.satoken.annotation.SaIgnore;
+//import org.dromara.common.core.domain.R;
+//import org.dromara.common.redis.utils.QueueUtils;
+//import lombok.RequiredArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.web.bind.annotation.GetMapping;
+//import org.springframework.web.bind.annotation.RequestMapping;
+//import org.springframework.web.bind.annotation.RequestParam;
+//import org.springframework.web.bind.annotation.RestController;
+//
+//import java.util.concurrent.TimeUnit;
+//
+///**
+// * 寤惰繜闃熷垪 婕旂ず妗堜緥
+// * <p>
+// * 杞婚噺绾ч槦鍒� 閲嶉噺绾ф暟鎹噺 璇蜂娇鐢� MQ
+// * 渚嬪: 鍒涘缓璁㈠崟30鍒嗛挓鍚庤繃鏈熷鐞�
+// * <p>
+// * 闆嗙兢娴嬭瘯閫氳繃 鍚屼竴涓暟鎹彧浼氳娑堣垂涓�娆� 鍋氬ソ浜嬪姟琛ュ伩
+// * 闆嗙兢娴嬭瘯娴佺▼ 涓ゅ彴闆嗙兢鍒嗗埆寮�鍚闃� 鍦ㄥ叾涓竴鍙板彂閫佹暟鎹� 瑙傚療鎺ユ敹娑堟伅鐨勮寰�
+// *
+// * @author Lion Li
+// * @version 3.6.0
+// */
+//@SaIgnore
+//@Slf4j
+//@RequiredArgsConstructor
+//@RestController
+//@RequestMapping("/demo/queue/delayed")
+//public class DelayedQueueController {
+//
+// /**
+// * 璁㈤槄闃熷垪
+// *
+// * @param queueName 闃熷垪鍚�
+// */
+// @GetMapping("/subscribe")
+// public R<Void> subscribe(String queueName) {
+// log.info("閫氶亾: {} 鐩戝惉涓�......", queueName);
+// // 椤圭洰鍒濆鍖栬缃竴娆″嵆鍙�
+// QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> {
+// // 瑙傚療鎺ユ敹鏃堕棿
+// log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", queueName, orderNum);
+//
+// });
+// return R.ok("鎿嶄綔鎴愬姛");
+// }
+//
+// /**
+// * 娣诲姞闃熷垪鏁版嵁
+// *
+// * @param queueName 闃熷垪鍚�
+// * @param orderNum 璁㈠崟鍙�
+//// * @param time 寤惰繜鏃堕棿(绉�)
+// */
+// @GetMapping("/add")
+// public R<Void> add(@RequestParam("queueName") String queueName, @RequestParam("orderNum")String orderNum) {
+// QueueUtils.addDelayedQueueObject(queueName, orderNum, 5, TimeUnit.SECONDS);
+// // 瑙傚療鍙戦�佹椂闂�
+// log.info("閫氶亾: {} , 鍙戦�佹暟鎹�: {}", queueName, orderNum);
+// return R.ok("鎿嶄綔鎴愬姛");
+// }
+//
+// /**
+// * 鍒犻櫎闃熷垪鏁版嵁
+// *
+// * @param queueName 闃熷垪鍚�
+// * @param orderNum 璁㈠崟鍙�
+// */
+// @GetMapping("/remove")
+// public R<Void> remove(String queueName, String orderNum) {
+// if (QueueUtils.removeDelayedQueueObject(queueName, orderNum)) {
+// log.info("閫氶亾: {} , 鍒犻櫎鏁版嵁: {}", queueName, orderNum);
+// } else {
+// return R.fail("鎿嶄綔澶辫触");
+// }
+// return R.ok("鎿嶄綔鎴愬姛");
+// }
+//
+// /**
+// * 閿�姣侀槦鍒�
+// *
+// * @param queueName 闃熷垪鍚�
+// */
+// @GetMapping("/destroy")
+// public R<Void> destroy(String queueName) {
+// // 鐢ㄥ畬浜嗕竴瀹氳閿�姣� 鍚﹀垯浼氫竴鐩村瓨鍦�
+// QueueUtils.destroyDelayedQueue(queueName);
+// return R.ok("鎿嶄綔鎴愬姛");
+// }
+//
+//}
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";
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
index cbb70db..d5ee534 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
@@ -52,18 +52,18 @@
log.info("鍒濆鍖朞SS閰嶇疆鎴愬姛");
log.info("閫氶亾: {} 鐩戝惉涓�......", "OSS");
// 椤圭洰鍒濆鍖栬缃竴娆″嵆鍙�
-// QueueUtils.subscribeBlockingQueue("OSS", (String ossId) -> {
-// // 瑙傚療鎺ユ敹鏃堕棿
-// log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", "OSS", ossId);
-// SysOssVo vo = ossMapper.selectVoById(ossId);
-// client.delete( vo.getUrl());
-// ossMapper.deleteById(Long.valueOf(ossId));
-// try {
-// HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",ossId);
-// } catch (IOException e) {
-// throw new RuntimeException(e);
-// }
-// });
+ QueueUtils.subscribeBlockingQueue("OSS", (String ossId) -> {
+ // 瑙傚療鎺ユ敹鏃堕棿
+ log.info("閫氶亾: {}, 鏀跺埌鏁版嵁: {}", "OSS", ossId);
+ SysOssVo vo = ossMapper.selectVoById(ossId);
+ client.delete( vo.getUrl());
+ ossMapper.deleteById(Long.valueOf(ossId));
+ try {
+ HttpUtils.sendDeleteRequest(boundary.getVideo() + "/resource/synchronization/delete",ossId);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ });
}
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
index 43eb3e5..22d6d70 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -231,7 +231,7 @@
request.setCreateBy("1731588854831022081");
request.setOssId(String.valueOf(oss.getOssId()));
// request.setOssId();
- post(request);
+// post(request);
SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
return this.matchingUrl(sysOssVo);
--
Gitblit v1.8.0