From 624c9eec90d59297800f03276f8518daa1bd9f94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 09:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
index 0727730..b82646f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java
@@ -27,6 +27,7 @@
import com.dsh.guns.modular.system.service.IRoleService;
import com.dsh.guns.modular.system.service.IUserService;
import com.dsh.guns.modular.system.transfer.UserDto;
+import com.dsh.guns.modular.system.util.OssUploadUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -379,20 +380,33 @@
/**
* 上传图片
*/
- @RequestMapping(method = RequestMethod.POST, path = "/upload")
+ @RequestMapping(method = RequestMethod.POST, path = "/uploadImg")
@ResponseBody
- public String upload(@RequestPart("file") MultipartFile picture) {
-
- String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(picture.getOriginalFilename());
+ public String uploadImg(@RequestPart("file") MultipartFile picture) {
+ String pictureName = "";
try {
- String fileSavePath = gunsProperties.getFileUploadPath();
- picture.transferTo(new File(fileSavePath + pictureName));
- } catch (Exception e) {
- throw new GunsException(BizExceptionEnum.UPLOAD_ERROR);
+ pictureName = OssUploadUtil.ossUpload("img/", picture);
+ }catch (Exception e){
+ e.printStackTrace();
}
return pictureName;
}
+
+
+ @RequestMapping(method = RequestMethod.POST, path = "/uploadFile")
+ @ResponseBody
+ public String uploadFile(@RequestPart("file") MultipartFile picture) {
+ String pictureName = "";
+ try {
+ pictureName = OssUploadUtil.ossUpload("video/", picture);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return pictureName;
+ }
+
+
/**
* 判断当前登录的用户是否有操作这个用户的权限
*/
--
Gitblit v1.7.1