From ef96dbc9278ebae4af204cca9de98c63f0d6328e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 20 九月 2023 19:16:21 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/UserMgrController.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 b82646f..ee71eca 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
@@ -19,7 +19,6 @@
import com.dsh.guns.core.exception.GunsException;
import com.dsh.guns.core.log.LogObjectHolder;
import com.dsh.guns.core.util.SinataUtil;
-import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.controller.util.MD5;
import com.dsh.guns.modular.system.factory.UserFactory;
import com.dsh.guns.modular.system.model.Role;
@@ -28,6 +27,7 @@
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 com.dsh.guns.modular.system.util.ResultUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@@ -36,12 +36,9 @@
import org.springframework.web.multipart.MultipartFile;
import javax.naming.NoPermissionException;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
-import java.io.File;
-import java.util.Date;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
/**
* 系统管理员控制器
@@ -382,14 +379,18 @@
*/
@RequestMapping(method = RequestMethod.POST, path = "/uploadImg")
@ResponseBody
- public String uploadImg(@RequestPart("file") MultipartFile picture) {
- String pictureName = "";
+ public ResultUtil uploadImg(@RequestPart("file") MultipartFile picture, HttpServletResponse response) {
+ String value = "";
try {
- pictureName = OssUploadUtil.ossUpload("img/", picture);
+ value = OssUploadUtil.ossUpload("img/", picture);
}catch (Exception e){
e.printStackTrace();
}
- return pictureName;
+ System.out.println("图片返回地址-------"+value);
+ Map<String, String> map = new HashMap<>();
+ map.put("value",value);
+// return ResultUtil.success(0,map);
+ return ResultUtil.getResult(0,null,null,map);
}
--
Gitblit v1.7.1