open-source/file-online-preview
1
0
Fork 0
mirror of https://gitee.com/kekingcn/file-online-preview.git synced 2026-04-16 05:13:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复压缩获取路径错误，图片合集路径错误，水印问题等BUG

Browse Source
This commit is contained in:
gaoxiongzaq
2024-05-27 14:21:11 +08:00
parent 0a4ae41b0c
commit 48ac926289
6 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/src/main/java/cn/keking/service/CompressFileReader.java
View File

@@ -20,6 +20,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.RandomAccessFile;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -48,7 +49,6 @@ public class CompressFileReader {
if (fileAttribute.isCompressFile()) {
folderName = "_decompression" + folderName;
}
Path folderPath = Paths.get(fileDir, folderName + packagePath);
Files.createDirectories(folderPath);
@@ -67,14 +67,18 @@ public class CompressFileReader {
}
return data.length;
}, filePassword);
if (result != ExtractOperationResult.OK) {
throw new Exception("Failed to extract RAR file.");
ExtractOperationResult result1 = ExtractOperationResult.valueOf("WRONG_PASSWORD");
if (result1.equals(result)) {
throw new Exception("Password");
}else {
throw new Exception("Failed to extract RAR file.");
}
}
FileType type = FileType.typeFromUrl(filePathInsideArchive.toString());
if (type.equals(FileType.PICTURE)) {
imgUrls.add(baseUrl + folderPath.relativize(filePathInsideArchive).toString().replace("\\", "/"));
if (type.equals(FileType.PICTURE)) { //图片缓存到集合，为了特殊符号需要进行编码
imgUrls.add(baseUrl + URLEncoder.encode(fileName + packagePath+"/"+ folderPath.relativize(filePathInsideArchive).toString().replace("\\", "/"), "UTF-8"));
}
}
}
@@ -106,4 +110,4 @@ public class CompressFileReader {
}
}
}