From 26e2592813b9263124d518d238262910e817d323 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 10:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UediterController.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UediterController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UediterController.java
index f460a3f..ad5a7e0 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UediterController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UediterController.java
@@ -105,8 +105,7 @@
             try {
             	//文件上传,具体根据实际替换
                 //File upload, replace according to actual situation
-                pictureName = OBSUploadUtil.inputStreamUpload(picture);
- 
+                pictureName = OssUploadUtil.ossUpload("img/", picture);
                 String result = "{'original': '" + picture.getOriginalFilename() + "', 'state': 'SUCCESS', 'url': '" + pictureName + "'}";
                 if (callback == null) {
                     return JSON.parseObject(result);

--
Gitblit v1.7.1