From 0533bbabfe22484a84c85d13a391a1fd5cb949c2 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期二, 25 七月 2023 14:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java b/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
index 3c76221..fd62a92 100644
--- a/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
+++ b/ard-work/src/main/java/com/ruoyi/rongcloud/controller/RongCloudController.java
@@ -2,6 +2,7 @@
 
 import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
 import com.ruoyi.device.hiksdk.util.minio.MinioUtils;
 import com.ruoyi.rongcloud.service.RongCloudService;
@@ -37,13 +38,7 @@
         return AjaxResult.success(token);
     }
 
-    @PostMapping("/uploadPic")
-    @ApiOperation("涓婁紶鐢ㄦ埛澶村儚")
-    public AjaxResult uploadPic(MultipartFile file)
-    {
-        String url = MinioUtils.putObjectAndGetUrl("useravatar", file);
-        return AjaxResult.success(url);
-    }
+
 
     @PostMapping("/checkOnline")
     @ApiOperation("鏌ヨ鐢ㄦ埛鍦ㄧ嚎鐘舵��")

--
Gitblit v1.9.3