open-source/file-online-preview
1
0
Fork 0
mirror of https://gitee.com/kekingcn/file-online-preview.git synced 2026-03-14 21:23:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

重构压缩文件判断逻辑 (#517)

Browse Source 
* 重构压缩文件判断逻辑

* 重构压缩文件判断逻辑，移除无用的代码
This commit is contained in:
kl
2023-12-21 11:19:29 +08:00
committed by GitHub
parent a54cd75469
commit 8ac8cd8487
11 changed files with 158 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
server/src/main/java/cn/keking/service/FileHandlerService.java
View File

@@ -135,11 +135,11 @@ public class FileHandlerService implements InitializingBean {
/**
* 获取redis中压缩包内图片文件
*
* @param fileKey fileKey
* @param compressFileKey compressFileKey
* @return 图片文件访问url列表
*/
public List<String> getImgCache(String fileKey) {
return cacheService.getImgCache(fileKey);
public List<String> getImgCache(String compressFileKey) {
return cacheService.getImgCache(compressFileKey);
}
/**
@@ -153,13 +153,15 @@ public class FileHandlerService implements InitializingBean {
}
/**
cad定义线程池
* cad定义线程池
*/
private ExecutorService pool = null;
@Override
public void afterPropertiesSet() throws Exception {
pool = Executors.newFixedThreadPool(ConfigConstants.getCadThread());
}
/**
* 对转换后的文件进行操作(改变编码方式)
*
@@ -168,8 +170,7 @@ public class FileHandlerService implements InitializingBean {
public void doActionConvertedFile(String outFilePath) {
String charset = EncodingDetects.getJavaEncode(outFilePath);
StringBuilder sb = new StringBuilder();
try (InputStream inputStream = new FileInputStream(outFilePath);
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, charset))) {
try (InputStream inputStream = new FileInputStream(outFilePath); BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, charset))) {
String line;
while (null != (line = reader.readLine())) {
if (line.contains("charset=gb2312")) {
@@ -185,8 +186,7 @@ public class FileHandlerService implements InitializingBean {
e.printStackTrace();
}
// 重新写入文件
try (FileOutputStream fos = new FileOutputStream(outFilePath);
BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8))) {
try (FileOutputStream fos = new FileOutputStream(outFilePath); BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8))) {
writer.write(sb.toString());
} catch (IOException e) {
e.printStackTrace();
@@ -195,8 +195,9 @@ public class FileHandlerService implements InitializingBean {
/**
* 获取本地 pdf 转 image 后的 web 访问地址
*
* @param pdfFilePath pdf文件名
* @param index 图片索引
* @param index 图片索引
* @return 图片访问地址
*/
private String getPdf2jpgUrl(String pdfFilePath, int index) {
@@ -215,11 +216,11 @@ public class FileHandlerService implements InitializingBean {
/**
* 获取缓存中的 pdf 转换成 jpg 图片集
*
* @param pdfFilePath pdf文件路径
* @param pdfName pdf文件名称
* @return 图片访问集合
*/
private List<String> loadPdf2jpgCache(String pdfFilePath, String pdfName, String fileKey) {
private List<String> loadPdf2jpgCache(String pdfFilePath) {
List<String> imageUrls = new ArrayList<>();
Integer imageCount = this.getPdf2jpgCache(pdfFilePath);
if (Objects.isNull(imageCount)) {
@@ -237,18 +238,17 @@ public class FileHandlerService implements InitializingBean {
* fileNameFilePath pdf文件路径
* pdfFilePath pdf输出文件路径
* pdfName pdf文件名称
* loadPdf2jpgCache 图片访问集合
* loadPdf2jpgCache 图片访问集合
*/
public List<String> pdf2jpg(String fileNameFilePath,String pdfFilePath, String pdfName, FileAttribute fileAttribute) throws Exception {
public List<String> pdf2jpg(String fileNameFilePath, String pdfFilePath, String pdfName, FileAttribute fileAttribute) throws Exception {
boolean forceUpdatedCache = fileAttribute.forceUpdatedCache();
boolean usePasswordCache = fileAttribute.getUsePasswordCache();
String filePassword = fileAttribute.getFilePassword();
String fileKey = fileAttribute.getFileKey();
String pdfPassword = null;
PDDocument doc = null;
PdfReader pdfReader = null;
if (!forceUpdatedCache) {
List<String> cacheResult = this.loadPdf2jpgCache(pdfFilePath, pdfName,fileKey);
List<String> cacheResult = this.loadPdf2jpgCache(pdfFilePath);
if (!CollectionUtils.isEmpty(cacheResult)) {
return cacheResult;
}
@@ -259,7 +259,7 @@ public class FileHandlerService implements InitializingBean {
if (!pdfFile.exists()) {
return null;
}
doc = PDDocument.load(pdfFile,filePassword);
doc = PDDocument.load(pdfFile, filePassword);
doc.setResourceCache(new NotResourceCache());
int pageCount = doc.getNumberOfPages();
PDFRenderer pdfRenderer = new PDFRenderer(doc);
@@ -278,8 +278,8 @@ public class FileHandlerService implements InitializingBean {
imageUrls.add(imageUrl);
}
try {
if (!ObjectUtils.isEmpty(filePassword)){ //获取到密码 判断是否是加密文件
pdfReader = new PdfReader(fileNameFilePath); //读取PDF文件 通过异常获取该文件是否有密码字符
if (!ObjectUtils.isEmpty(filePassword)) { //获取到密码 判断是否是加密文件
pdfReader = new PdfReader(fileNameFilePath); //读取PDF文件 通过异常获取该文件是否有密码字符
}
} catch (Exception e) { //获取异常方法 判断是否有加密字符串
Throwable[] throwableArray = ExceptionUtils.getThrowables(e);
@@ -304,7 +304,7 @@ public class FileHandlerService implements InitializingBean {
this.addPdf2jpgCache(pdfFilePath, pageCount);
}
} catch (IOException e) {
if (!e.getMessage().contains(PDF_PASSWORD_MSG) ) {
if (!e.getMessage().contains(PDF_PASSWORD_MSG)) {
logger.error("Convert pdf to jpg exception, pdfFilePath：{}", pdfFilePath, e);
}
throw new Exception(e);
@@ -323,9 +323,9 @@ public class FileHandlerService implements InitializingBean {
* @param outputFilePath pdf输出文件路径
* @return 转换是否成功
*/
public String cadToPdf(String inputFilePath, String outputFilePath ,String cadPreviewType ,String fileKey) throws Exception {
public String cadToPdf(String inputFilePath, String outputFilePath, String cadPreviewType, FileAttribute fileAttribute) throws Exception {
final InterruptionTokenSource source = new InterruptionTokenSource();//CAD延时
if (!ObjectUtils.isEmpty(fileKey)) { //判断 是压缩包的创建新的目录
if (fileAttribute.isCompressFile()) { //判断 是压缩包的创建新的目录
int index = outputFilePath.lastIndexOf("/"); //截取最后一个斜杠的前面的内容
String folder = outputFilePath.substring(0, index);
File path = new File(folder);
@@ -348,7 +348,7 @@ public class FileHandlerService implements InitializingBean {
cadRasterizationOptions.setDrawType(1);
SvgOptions SvgOptions = null;
PdfOptions pdfOptions = null;
TiffOptions TiffOptions = null;
TiffOptions TiffOptions = null;
switch (cadPreviewType) { //新增格式方法
case "svg":
SvgOptions = new SvgOptions();
@@ -408,17 +408,16 @@ public class FileHandlerService implements InitializingBean {
}
return "true";
}
/**
*
* @param str 原字符串（待截取原串）
* @param str 原字符串（待截取原串）
* @param posStr 指定字符串
* @return 截取截取指定字符串之后的数据
*/
public static String getSubString(String str, String posStr){
public static String getSubString(String str, String posStr) {
return str.substring(str.indexOf(posStr) + posStr.length());
}
/**
* 获取文件属性
*
@@ -429,16 +428,13 @@ public class FileHandlerService implements InitializingBean {
FileAttribute attribute = new FileAttribute();
String suffix;
FileType type;
String fileName; //原始文件名
String cacheName; //缓存文件名
String cachePrefixName; //缓存文件名统一去除文件后缀名
String cacheListName; //缓存列表文件名称
String originFileName; //原始文件名
String outFilePath; //生成文件的路径
String originFilePath; //原始文件路径
String fullFileName = WebUtils.getUrlParameterReg(url, "fullfilename");
String fileKey = WebUtils.getUrlParameterReg(url, "kkCompressfileKey"); //压缩包指定特殊符号
String compressFileKey = WebUtils.getUrlParameterReg(url, "kkCompressfileKey"); //压缩包指定特殊符号
if (StringUtils.hasText(fullFileName)) {
fileName = fullFileName;
originFileName = fullFileName;
type = FileType.typeFromFileName(fullFileName);
suffix = KkFileUtils.suffixFromFileName(fullFileName);
// 移除fullfilename参数
@@ -448,61 +444,44 @@ public class FileHandlerService implements InitializingBean {
url = url.replace("fullfilename=" + fullFileName, "");
}
} else {
fileName = WebUtils.getFileNameFromURL(url);
originFileName = WebUtils.getFileNameFromURL(url);
type = FileType.typeFromUrl(url);
suffix = WebUtils.suffixFromUrl(url);
}
if (!ObjectUtils.isEmpty(fileKey)) { //判断是否使用特定压缩包符号
boolean isCompressFile = !ObjectUtils.isEmpty(compressFileKey);
if (isCompressFile) { //判断是否使用特定压缩包符号
try {
// http://127.0.0.1:8012/各类型文件1 - 副本.zip_/各类型文件/正常预览/PPT转的PDF.pdf?kkCompressfileKey=各类型文件1 - 副本.zip_
// http://127.0.0.1:8012/preview/各类型文件1 - 副本.zip_/各类型文件/正常预览/PPT转的PDF.pdf?kkCompressfileKey=各类型文件1 - 副本.zip_ 获取路径就会错误 需要下面的方法
URL urll = new URL(url);
String _Path = urll.getPath(); //获取url路径
String urlStrr = getSubString(_Path, fileKey); //反代情况下添加前缀,只获取有压缩包字符的路径
fileName = fileKey + urlStrr.trim(); //拼接完整路径
String urlStrr = getSubString(_Path, compressFileKey); //反代情况下添加前缀,只获取有压缩包字符的路径
originFileName = compressFileKey + urlStrr.trim(); //拼接完整路径
attribute.setSkipDownLoad(true);
} catch (MalformedURLException e) {
e.printStackTrace();
}
}
url = WebUtils.encodeUrlFileName(url);
if(UrlEncoderUtils.hasUrlEncoded(fileName)){ //判断文件名是否转义
if (UrlEncoderUtils.hasUrlEncoded(originFileName)) { //判断文件名是否转义
try {
fileName = URLDecoder.decode(fileName, uriEncoding).replaceAll("\\+", "%20");
originFileName = URLDecoder.decode(originFileName, uriEncoding).replaceAll("\\+", "%20");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
}
fileName = KkFileUtils.htmlEscape(fileName); //文件名处理
boolean isHtml = suffix.equalsIgnoreCase("xls") || suffix.equalsIgnoreCase("xlsx") || suffix.equalsIgnoreCase("csv") || suffix.equalsIgnoreCase("xlsm") || suffix.equalsIgnoreCase("xlt") || suffix.equalsIgnoreCase("xltm") || suffix.equalsIgnoreCase("et") || suffix.equalsIgnoreCase("ett") || suffix.equalsIgnoreCase("xlam");
cachePrefixName = fileName.substring(0, fileName.lastIndexOf(".") ) + suffix+"."; //这里统一文件名处理 下面更具类型 各自添加后缀
if(type.equals(FileType.OFFICE)){
cacheName = cachePrefixName +(isHtml ? "html" : "pdf"); //生成文件添加类型后缀 防止同名文件
}else if(type.equals(FileType.PDF)){
cacheName = fileName;
}else if(type.equals(FileType.MEDIACONVERT)){
cacheName = cachePrefixName +"mp4" ;
}else if(type.equals(FileType.CAD)){
String cadPreviewType = ConfigConstants.getCadPreviewType();
cacheName = cachePrefixName + cadPreviewType ; //生成文件添加类型后缀 防止同名文件
}else if(type.equals(FileType.COMPRESS)){
cacheName = fileName;
}else if(type.equals(FileType.TIFF)){
cacheName = cachePrefixName + ConfigConstants.getTifPreviewType();
}else {
cacheName = fileName;
}
if (!ObjectUtils.isEmpty(fileKey)) { //判断是否使用特定压缩包符号
cacheName = "_decompression"+ cacheName;
}
outFilePath = fileDir + cacheName;
originFilePath = fileDir + fileName;
cacheListName = cachePrefixName+"ListName"; //文件列表缓存文件名
originFileName = KkFileUtils.htmlEscape(originFileName); //文件名处理
boolean isHtmlView = suffix.equalsIgnoreCase("xls") || suffix.equalsIgnoreCase("xlsx") || suffix.equalsIgnoreCase("csv") || suffix.equalsIgnoreCase("xlsm") || suffix.equalsIgnoreCase("xlt") || suffix.equalsIgnoreCase("xltm") || suffix.equalsIgnoreCase("et") || suffix.equalsIgnoreCase("ett") || suffix.equalsIgnoreCase("xlam");
String cacheFilePrefixName = originFileName.substring(0, originFileName.lastIndexOf(".")) + suffix + "."; //这里统一文件名处理 下面更具类型 各自添加后缀
String cacheFileName = this.getCacheFileName(type, originFileName, cacheFilePrefixName, isHtmlView, isCompressFile);
outFilePath = fileDir + cacheFileName;
originFilePath = fileDir + originFileName;
String cacheListName = cacheFilePrefixName + "ListName"; //文件列表缓存文件名
attribute.setType(type);
attribute.setName(fileName);
attribute.setCacheName(cacheName);
attribute.setName(originFileName);
attribute.setCacheName(cacheFileName);
attribute.setCacheListName(cacheListName);
attribute.setIsHtml(isHtml);
attribute.setHtmlView(isHtmlView);
attribute.setOutFilePath(outFilePath);
attribute.setOriginFilePath(originFilePath);
attribute.setSuffix(suffix);
@@ -510,12 +489,13 @@ public class FileHandlerService implements InitializingBean {
if (req != null) {
String officePreviewType = req.getParameter("officePreviewType");
String forceUpdatedCache = req.getParameter("forceUpdatedCache");
String usePasswordCache =req.getParameter("usePasswordCache");
String usePasswordCache = req.getParameter("usePasswordCache");
if (StringUtils.hasText(officePreviewType)) {
attribute.setOfficePreviewType(officePreviewType);
}
if (StringUtils.hasText(fileKey)) {
attribute.setFileKey(fileKey);
if (StringUtils.hasText(compressFileKey)) {
attribute.setCompressFile(isCompressFile);
attribute.setCompressFileKey(compressFileKey);
}
if ("true".equalsIgnoreCase(forceUpdatedCache)) {
attribute.setForceUpdatedCache(true);
@@ -533,7 +513,7 @@ public class FileHandlerService implements InitializingBean {
if ("true".equalsIgnoreCase(usePasswordCache)) {
attribute.setUsePasswordCache(true);
}
String kkProxyAuthorization = req.getHeader( "kk-proxy-authorization");
String kkProxyAuthorization = req.getHeader("kk-proxy-authorization");
attribute.setKkProxyAuthorization(kkProxyAuthorization);
}
@@ -541,6 +521,35 @@ public class FileHandlerService implements InitializingBean {
return attribute;
}
/**
* 获取缓存的文件名
*
* @return 文件名
*/
private String getCacheFileName(FileType type, String originFileName, String cacheFilePrefixName, boolean isHtmlView, boolean isCompressFile) {
String cacheFileName;
if (type.equals(FileType.OFFICE)) {
cacheFileName = cacheFilePrefixName + (isHtmlView ? "html" : "pdf"); //生成文件添加类型后缀 防止同名文件
} else if (type.equals(FileType.PDF)) {
cacheFileName = originFileName;
} else if (type.equals(FileType.MEDIACONVERT)) {
cacheFileName = cacheFilePrefixName + "mp4";
} else if (type.equals(FileType.CAD)) {
String cadPreviewType = ConfigConstants.getCadPreviewType();
cacheFileName = cacheFilePrefixName + cadPreviewType; //生成文件添加类型后缀 防止同名文件
} else if (type.equals(FileType.COMPRESS)) {
cacheFileName = originFileName;
} else if (type.equals(FileType.TIFF)) {
cacheFileName = cacheFilePrefixName + ConfigConstants.getTifPreviewType();
} else {
cacheFileName = originFileName;
}
if (isCompressFile) { //判断是否使用特定压缩包符号
cacheFileName = "_decompression" + cacheFileName;
}
return cacheFileName;
}
/**
* @return 已转换过的视频文件集合(缓存)
*/