From 1e18bf59b59677887eb7684efbdaf33aff3d2b3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=A4=A7?= <1504665037@qq.com> Date: Sat, 24 Jan 2026 17:18:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E8=88=AA=E7=BA=BF?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=88=AA=E7=BA=BF=E4=B8=8A=E4=BC=A0=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/file/controller/SysFileController.java | 9 ++++----- .../java/com/ruoyi/file/service/ISysFileService.java | 4 +--- .../com/ruoyi/file/service/LocalSysFileServiceImpl.java | 4 ++-- .../com/ruoyi/file/service/MinioSysFileServiceImpl.java | 4 ++-- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ruoyi/file/controller/SysFileController.java b/src/main/java/com/ruoyi/file/controller/SysFileController.java index aeb0f9c..12554b2 100644 --- a/src/main/java/com/ruoyi/file/controller/SysFileController.java +++ b/src/main/java/com/ruoyi/file/controller/SysFileController.java @@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import java.io.ByteArrayOutputStream; - /** * 文件请求处理 * @@ -66,11 +64,12 @@ public class SysFileController { * 文件流上传请求 */ @PostMapping("uploadStream") - public R uploadFileByStream(String filename, String extension, ByteArrayOutputStream out) { + public R uploadFileByStream(String filename, String extension, String data) { try { - return R.ok(sysFileService.uploadFileByStream(filename, extension, out)); + + return R.ok(sysFileService.uploadFileByData(filename, extension, data)); } catch (Exception e) { - log.error("删除文件失败", e); + log.error("上传文件失败", e); return R.fail(e.getMessage()); } } diff --git a/src/main/java/com/ruoyi/file/service/ISysFileService.java b/src/main/java/com/ruoyi/file/service/ISysFileService.java index 2c8fa00..9c9a4c4 100644 --- a/src/main/java/com/ruoyi/file/service/ISysFileService.java +++ b/src/main/java/com/ruoyi/file/service/ISysFileService.java @@ -2,8 +2,6 @@ package com.ruoyi.file.service; import org.springframework.web.multipart.MultipartFile; -import java.io.ByteArrayOutputStream; - /** * 文件上传接口 * @@ -36,5 +34,5 @@ public interface ISysFileService { * @param out 上传的流 * @return 访问地址 */ - String uploadFileByStream(String filename, String extension, ByteArrayOutputStream out) throws Exception; + String uploadFileByData(String filename, String extension, String out) throws Exception; } diff --git a/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java b/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java index 11a6a58..8cb09bd 100644 --- a/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java +++ b/src/main/java/com/ruoyi/file/service/LocalSysFileServiceImpl.java @@ -71,8 +71,8 @@ public class LocalSysFileServiceImpl implements ISysFileService { * @return 访问地址 */ @Override - public String uploadFileByStream(String filename, String extension, ByteArrayOutputStream out) throws Exception { - try (ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray())) { + public String uploadFileByData(String filename, String extension, String out) throws Exception { + try (ByteArrayInputStream in = new ByteArrayInputStream(out.getBytes())) { String fileName = FileUploadUtils.extractFilename(filename, extension); return FileUploadUtils.uploadByStream(localFilePath, fileName, in); } catch (Exception e) { diff --git a/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java b/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java index 2d02240..8c87d7b 100644 --- a/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java +++ b/src/main/java/com/ruoyi/file/service/MinioSysFileServiceImpl.java @@ -75,8 +75,8 @@ public class MinioSysFileServiceImpl implements ISysFileService { } @Override - public String uploadFileByStream(String filename, String extension, ByteArrayOutputStream out) throws Exception { - try (ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray())) { + public String uploadFileByData(String filename, String extension, String out) throws Exception { + try (ByteArrayInputStream in = new ByteArrayInputStream(out.getBytes())) { String fileName = FileUploadUtils.extractFilename(filename, extension); String contentType = FileUploadUtils.getContentType(extension); // 获取文件类型 PutObjectArgs args = PutObjectArgs.builder()