From 588fd7b47b6caf30562e1267a27f5898a5c2671f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 27 四月 2026 17:34:41 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/YueKeDuo
---
ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
index dc6b2c6..f2aec29 100644
--- a/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
+++ b/ManagementYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/util/UploadUtil.java
@@ -19,6 +19,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.io.File;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -38,7 +39,7 @@
/**
* 上传图片(上传到项目的webapp/static/img)
*/
- /* @RequestMapping("/image")
+ @RequestMapping("/image")
public String image(@RequestPart("file") MultipartFile picture) {
String pictureName = UUID.randomUUID().toString() + ".jpg";
try {
@@ -49,8 +50,8 @@
log.error(e.getMessage(), e);
throw new GunsException(BizExceptionEnum.UPLOAD_ERROR);
}
- return pictureName;
- }*/
+ return gunsProperties.getPictureServerAddress()+pictureName;
+ }
/**
* 多图片上传使用
@@ -81,23 +82,23 @@
private ITImgMidService itImgMidService;
- @RequestMapping("/image")
- @ResponseBody
- public ResultUtil image1(@RequestPart("file") MultipartFile file, HttpServletRequest request) {
- try {
- String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
-
-// String pictureName = OssUploadUtil.ossUpload(request, file);
- System.out.println("mediaResp");
-// MediaResp mediaResp = MediaExample.uploadImage(picture);
-// System.out.println("------"+mediaResp);
-// String pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
- return ResultUtil.success(pictureName);
- } catch (Exception e1) {
- e1.printStackTrace();
- return null;
- }
- }
+// @RequestMapping("/image")
+// @ResponseBody
+// public ResultUtil image1(@RequestPart("file") MultipartFile file, HttpServletRequest request) {
+// try {
+// String pictureName = UUID.randomUUID().toString() + "." + ToolUtil.getFileSuffix(file.getOriginalFilename());
+//
+//// String pictureName = OssUploadUtil.ossUpload(request, file);
+// System.out.println("mediaResp");
+//// MediaResp mediaResp = MediaExample.uploadImage(picture);
+//// System.out.println("------"+mediaResp);
+//// String pictureName = ObsUploadUtil.obsUpload(super.getHttpServletRequest(), picture);
+// return ResultUtil.success(pictureName);
+// } catch (Exception e1) {
+// e1.printStackTrace();
+// return null;
+// }
+// }
/**
* 上传文件
--
Gitblit v1.7.1