From 67f416634f95c81e618123b826e18a57ae08220d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 17:55:30 +0800
Subject: [PATCH] 11.6

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OssController.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OssController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OssController.java
index a33a054..f5c9caa 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OssController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OssController.java
@@ -1,7 +1,7 @@
 package com.ruoyi.admin.controller;
 
+import com.ruoyi.admin.utils.TencentCosUtil;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.ObsUploadUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
+import javax.annotation.Resource;
 
 /**
  * @author HJL
@@ -24,17 +24,17 @@
 @Api(tags = "公共-文件上传")
 public class OssController {
 
+    @Resource
+    private TencentCosUtil tencentCosUtil;
+
     @PostMapping("/upload")
     @ApiOperation(value = "文件上传", tags = "公共-文件上传")
     @ApiImplicitParams({
             @ApiImplicitParam(value = "文件", name = "file", dataType = "MultipartFile", required = true)
     })
     public R<String> upload(@RequestParam("file") MultipartFile file) {
-        try {
-            return R.ok(ObsUploadUtil.obsUpload(file), "");
-        } catch (IOException e) {
-            return R.fail("文件上传失败!");
-        }
+        String s = tencentCosUtil.upLoadFile(file);
+        return R.ok(s, s);
     }
 
 }

--
Gitblit v1.7.1