From 516fd8a4c6d998c2c4177f13421ed01b616f4d73 Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期三, 22 十一月 2023 17:40:14 +0800
Subject: [PATCH] 同步controller
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java | 4 +-
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java | 17 ++++++--
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java | 40 ++++++++++++++++++++
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java | 15 -------
4 files changed, 55 insertions(+), 21 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java
new file mode 100644
index 0000000..8a3ffa4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SynchronizationController.java
@@ -0,0 +1,40 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.oss.entity.SynchronousRequest;
+import org.dromara.system.domain.vo.SysOssVo;
+import org.dromara.system.service.ISysOssService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@SaIgnore
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/resource/synchronization")
+public class SynchronizationController {
+
+ private final ISysOssService ossService;
+
+ /**
+ * 涓婁紶鍚屾
+ * @param
+ * @return
+ */
+ @PostMapping(value = "/upload")
+ public R synchronization(SynchronousRequest request) {
+ if (ObjectUtil.isNull(request.getFile())) {
+ return R.fail("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+ }
+ log.info("ossId:{},path:{}",request.getOssId(),request.getPath());
+ SysOssVo oss = ossService.upload2(request);
+ 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 23440ee..faa6697 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
@@ -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:{},path:{}",request.getOssId(),request.getPath());
- SysOssVo oss = ossService.upload2(request);
- return R.ok();
- }
+
}
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 5cdae2b..aab3816 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
@@ -251,7 +251,7 @@
storage.delete(sysOss.getUrl());
if(sysOss.getPassword().equals(password)){
baseMapper.deleteById(sysOss.getOssId());
- HttpUtils.sendDeleteRequest("http://192.168.3.43/resource/oss",String.valueOf(sysOss.getOssId()),password);
+ HttpUtils.sendDeleteRequest("http://192.168.3.43/resource/oss",new Long[]{sysOss.getOssId()},password);
return true;
}
return false;
@@ -289,7 +289,7 @@
private String post(SynchronousRequest request) throws IOException {
HashMap<String, String> headers = new HashMap<>(3);
- String requestUrl = "http://192.168.3.43:8080/resource/oss/synchronization";
+ String requestUrl = "http://192.168.3.43:8080/resource/synchronization/upload";
ObjectMapper objectMapper = new ObjectMapper();
String jsonString = "";
try {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
index 532ab79..bf84b54 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/uitil/HttpUtils.java
@@ -148,15 +148,22 @@
/**
* 鍒犻櫎鍚屾
* @param url
- * @param parameter
+// * @param parameter
* @throws Exception
*/
- public static void sendDeleteRequest(String url, String parameter, String password) throws Exception {
- // 鎷兼帴URL鍜屽弬鏁�
- String deleteUrl = url + "/" + parameter + "/" + password;
+ public static void sendDeleteRequest(String url, Long[] parameters, String password) throws Exception {
+ // 鏋勫缓URL
+ StringBuilder deleteUrl = new StringBuilder(url);
+ deleteUrl.append("/");
+ for (int i = 0; i < parameters.length; i++) {
+ deleteUrl.append(parameters[i]);
+ if (i < parameters.length - 1) {
+ deleteUrl.append("/");
+ }
+ }
// 鍒涘缓URL瀵硅薄鍜孒ttpURLConnection瀵硅薄
- URL obj = new URL(deleteUrl);
+ URL obj = new URL(deleteUrl.toString());
HttpURLConnection con = (HttpURLConnection) obj.openConnection();
// 璁剧疆璇锋眰鏂规硶涓篋ELETE
--
Gitblit v1.8.0