From 4fd067b68c9cb438d802eae17474a19a9f3f87d3 Mon Sep 17 00:00:00 2001 From: none Date: Wed, 29 Mar 2023 09:44:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BE=E7=89=87=E5=92=8C?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9A=84=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E5=8E=BB=E6=8E=89=E6=89=A9=E5=B1=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../playedu/api/controller/backend/UploadController.java | 7 +++++-- .../xyz/playedu/api/service/impl/UploadServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/xyz/playedu/api/controller/backend/UploadController.java b/src/main/java/xyz/playedu/api/controller/backend/UploadController.java index 3587fc8..6dd5590 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/UploadController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/UploadController.java @@ -87,6 +87,9 @@ public class UploadController { if (type == null) { return JsonResponse.error("当前格式不支持上传"); } + String extension = req.getExtension(); + String originalFilename = req.getOriginalFilename().replaceAll("(?i)." + extension, ""); + // 合并视频文件 String url = minioService.merge(req.getFilename(), req.getUploadId()); @@ -95,8 +98,8 @@ public class UploadController { BCtx.getId(), req.getCategoryIds(), type, - req.getOriginalFilename(), - req.getExtension(), + originalFilename, + extension, req.getSize(), BackendConstant.STORAGE_DRIVER_MINIO, "", diff --git a/src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java index 7e875c5..c5ccf84 100644 --- a/src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/UploadServiceImpl.java @@ -60,7 +60,7 @@ public class UploadServiceImpl implements UploadService { } // 上传原文件的文件名 - fileInfo.setOriginalName(filename.replaceAll("." + fileInfo.getExtension(), "")); + fileInfo.setOriginalName(filename.replaceAll("(?i)." + fileInfo.getExtension(), "")); // 自定义新的存储文件名 fileInfo.setSaveName(HelperUtil.randomString(32) + "." + fileInfo.getExtension()); // 生成保存的相对路径