gitee
/
file-online-preview
mirror of https://gitee.com/kekingcn/file-online-preview
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

新增 支持压缩包密码 修复LINUX下中文乱码 解压支持文件目录 

新增 支持压缩包密码 修复LINUX下中文乱码 解压支持文件目录

Signed-off-by: 高雄 <admin@cxcp.com>
pull/84/head
高雄 2023-04-03 07:08:04 +00:00 committed by Gitee
parent 1807dbd615
commit d646d72a26
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java
View File

@ -9,6 +9,7 @@ import cn.keking.service.FileHandlerService;
import cn.keking.service.CompressFileReader; import cn.keking.service.CompressFileReader;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
@ -21,7 +22,6 @@ public class CompressFilePreviewImpl implements FilePreview {
private final FileHandlerService fileHandlerService; private final FileHandlerService fileHandlerService;
private final CompressFileReader compressFileReader; private final CompressFileReader compressFileReader;
private final OtherFilePreviewImpl otherFilePreview; private final OtherFilePreviewImpl otherFilePreview;
public CompressFilePreviewImpl(FileHandlerService fileHandlerService, CompressFileReader compressFileReader, OtherFilePreviewImpl otherFilePreview) { public CompressFilePreviewImpl(FileHandlerService fileHandlerService, CompressFileReader compressFileReader, OtherFilePreviewImpl otherFilePreview) {
this.fileHandlerService = fileHandlerService; this.fileHandlerService = fileHandlerService;
this.compressFileReader = compressFileReader; this.compressFileReader = compressFileReader;
@ -31,6 +31,7 @@ public class CompressFilePreviewImpl implements FilePreview {
@Override @Override
public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) { public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
String fileName=fileAttribute.getName(); String fileName=fileAttribute.getName();
String filePassword = fileAttribute.getFilePassword();
String fileTree; String fileTree;
// 判断文件名是否存在(redis缓存读取) // 判断文件名是否存在(redis缓存读取)
if (!StringUtils.hasText(fileHandlerService.getConvertedFile(fileName)) || !ConfigConstants.isCacheEnabled()) { if (!StringUtils.hasText(fileHandlerService.getConvertedFile(fileName)) || !ConfigConstants.isCacheEnabled()) {
@ -39,8 +40,15 @@ public class CompressFilePreviewImpl implements FilePreview {
return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg()); return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg());
} }
String filePath = response.getContent(); String filePath = response.getContent();
fileTree = compressFileReader.unRar(filePath, fileName); fileTree = compressFileReader.unRar(filePath, filePassword,fileName);
if (fileTree != null && !"null".equals(fileTree)) { if ("Password".equals(fileTree)) {
model.addAttribute("needFilePassword", true);
return EXEL_FILE_PREVIEW_PAGE;
}
if ("error".equals(fileTree) ) {
return otherFilePreview.notSupportedFile(model, fileAttribute, "解压失败：密码错误或者其他错误....");
}
if (!ObjectUtils.isEmpty(fileTree)) {
if (ConfigConstants.isCacheEnabled()) { if (ConfigConstants.isCacheEnabled()) {
// 加入缓存 // 加入缓存
fileHandlerService.addConvertedFile(fileName, fileTree); fileHandlerService.addConvertedFile(fileName, fileTree);
@ -49,7 +57,8 @@ public class CompressFilePreviewImpl implements FilePreview {
} else { } else {
fileTree = fileHandlerService.getConvertedFile(fileName); fileTree = fileHandlerService.getConvertedFile(fileName);
} }
if (fileTree != null && !"null".equals(fileTree)) { if (!ObjectUtils.isEmpty(fileTree)) {
model.addAttribute("fileName", fileName);
model.addAttribute("fileTree", fileTree); model.addAttribute("fileTree", fileTree);
return COMPRESS_FILE_PREVIEW_PAGE; return COMPRESS_FILE_PREVIEW_PAGE;
} else { } else {