From eed192e049abc0ece428f9c5256ba860951d2ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com> Date: Fri, 17 Feb 2023 17:04:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=B8=8B=E8=BD=BD):=20=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=87=BA=E7=8E=B0=E5=A4=9A=E4=BD=99=E7=A9=BA?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qiwenshare/file/service/FiletransferService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qiwenshare/file/service/FiletransferService.java b/src/main/java/com/qiwenshare/file/service/FiletransferService.java index 2d6230d..03e5e2f 100644 --- a/src/main/java/com/qiwenshare/file/service/FiletransferService.java +++ b/src/main/java/com/qiwenshare/file/service/FiletransferService.java @@ -1,5 +1,6 @@ package com.qiwenshare.file.service; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -264,7 +265,7 @@ public class FiletransferService implements IFiletransferService { public void downloadFile(HttpServletResponse httpServletResponse, DownloadFileDTO downloadFileDTO) { UserFile userFile = userFileMapper.selectById(downloadFileDTO.getUserFileId()); - if (userFile.getIsDir() == 0) { + if (userFile.isFile()) { FileBean fileBean = fileMapper.selectById(userFile.getFileId()); Downloader downloader = ufopFactory.getDownloader(fileBean.getStorageType()); @@ -309,7 +310,7 @@ public class FiletransferService implements IFiletransferService { try { for (String userFileId : userFileIds) { UserFile userFile1 = userFileMapper.selectById(userFileId); - if (userFile1.getIsDir() == 0) { + if (userFile1.isFile()) { FileBean fileBean = fileMapper.selectById(userFile1.getFileId()); Downloader downloader = ufopFactory.getDownloader(fileBean.getStorageType()); if (downloader == null) { @@ -321,7 +322,7 @@ public class FiletransferService implements IFiletransferService { InputStream inputStream = downloader.getInputStream(downloadFile); BufferedInputStream bis = new BufferedInputStream(inputStream); try { - QiwenFile qiwenFile = new QiwenFile(userFile1.getFilePath().replaceFirst(filePath, ""), userFile1.getFileName() + "." + userFile1.getExtendName(), false); + QiwenFile qiwenFile = new QiwenFile(StrUtil.removePrefix(userFile1.getFilePath(), filePath), userFile1.getFileName() + "." + userFile1.getExtendName(), false); zos.putNextEntry(new ZipEntry(qiwenFile.getPath())); byte[] buffer = new byte[1024]; @@ -342,7 +343,7 @@ public class FiletransferService implements IFiletransferService { } } } else { - QiwenFile qiwenFile = new QiwenFile(userFile1.getFilePath(), userFile1.getFileName(), true); + QiwenFile qiwenFile = new QiwenFile(StrUtil.removePrefix(userFile1.getFilePath(), filePath), userFile1.getFileName(), true); // 空文件夹的处理 zos.putNextEntry(new ZipEntry(qiwenFile.getPath() + QiwenFile.separator)); // 没有文件，不需要文件的copy