From ca77a052f3af47697cd3cf0a4f71468feb8455af Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 31 十二月 2025 13:42:48 +0800
Subject: [PATCH] yys 巡检bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
index 31fc707..5336744 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
@@ -1,10 +1,14 @@
package com.ruoyi.web.controller.common;
-import java.util.ArrayList;
-import java.util.List;
-
import com.ruoyi.basic.service.StorageBlobService;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.FileUtils;
+import com.ruoyi.framework.config.ServerConfig;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
@@ -16,13 +20,9 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.framework.config.ServerConfig;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 閫氱敤璇锋眰澶勭悊
@@ -142,9 +142,18 @@
* minio閫氱敤涓婁紶璇锋眰锛堝涓級
*/
@PostMapping("/minioUploads")
- public R minioUploadFiles(List<MultipartFile> files, String bucketName) throws Exception
+ public R minioUploadFiles(List<MultipartFile> files, String bucketName,Long type) throws Exception
{
- return R.ok(storageBlobService.updateStorageBlobs(files, bucketName));
+ return R.ok(storageBlobService.updateStorageBlobs(files, bucketName,type));
+ }
+
+ /**
+ * 鏂囦欢涓婁紶閫氱敤涓婁紶璇锋眰锛堝涓級
+ */
+ @PostMapping("/commonUploads")
+ public R uploads(List<MultipartFile> files, String bucketName,Long type) throws Exception
+ {
+ return R.ok(storageBlobService.uploads(files, bucketName,type));
}
/**
--
Gitblit v1.9.3