From 21d5926429b6ff2207995888705ac21861508ead Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 9 Dec 2025 14:06:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/common/CommonController.java | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java index ab2eb210d..3c73661be 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java @@ -12,17 +12,13 @@ import com.jsowell.framework.config.ServerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; @@ -205,6 +201,7 @@ public class CommonController { @CrossOrigin @PostMapping("/uploadOSS") public AjaxResult uploadFileOSS(MultipartFile file) throws Exception { + log.info("上传到阿里云oss, 文件大小:{}", getSize(file.getSize())); try { String url = AliyunOssUploadUtils.uploadFile(file); AjaxResult ajax = AjaxResult.success(); @@ -220,6 +217,34 @@ public class CommonController { } } + /** + * 获取文件大小 + * + * @param size + * @return + */ + public static String getSize(long size) { + StringBuilder bytes = new StringBuilder(); + DecimalFormat format = new DecimalFormat("###.0"); + if (size >= 1024 * 1024 * 1024) { + double i = (size / (1024.0 * 1024.0 * 1024.0)); + bytes.append(format.format(i)).append("GB"); + } else if (size >= 1024 * 1024) { + double i = (size / (1024.0 * 1024.0)); + bytes.append(format.format(i)).append("MB"); + } else if (size >= 1024) { + double i = (size / (1024.0)); + bytes.append(format.format(i)).append("KB"); + } else { + if (size <= 0) { + bytes.append("0B"); + } else { + bytes.append((int) size).append("B"); + } + } + return bytes.toString(); + } + /** * 上传蓝牙升级程序到阿里云oss * http://localhost:8080/common/uploadBlueToothFile2OSS From c7ceaacc368c9dd197324fee8f42b66b72762d62 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 9 Dec 2025 14:06:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/web/controller/common/CommonController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java index 3c73661be..f20ee019f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java @@ -209,7 +209,7 @@ public class CommonController { ajax.put("fileName", FileUtils.getName(url)); ajax.put("newFileName", FileUtils.getName(url)); ajax.put("originalFilename", file.getOriginalFilename()); - log.info("图片上传成功 url:{}", url); + log.info("上传到阿里云oss, 图片上传成功 url:{}", url); return ajax; }catch (Exception e){ log.error("上传到阿里云oss error, ", e);