github/kkFileView
1
0
Fork 0
mirror of https://github.com/kekingcn/kkFileView.git synced 2026-04-19 18:28:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

!51 实现预览加密的（受密码保护）office文件

Browse Source 
* 1. 修复getCorsFile接口高危安全漏洞
* 1. 优化密码错误提示（“密码错误，请重新输入密码。”）
* 1. 修复PPT重复预览bug，此bug导致ppt每次预览会执行两次转换（请求两次onlinePreview接口），在大文件尤其耗时（双倍时…
* 1. 【加密office预览】优化受密码保护的office文件检查逻辑，提升旧文件格式的兼容性
* 1. 【加密office预览】优化office文件是否受密码保护判断逻辑，避免兼容性误判
* 1. 【加密office预览】优化重新输入密码提示。
* 1. 【加密office预览】优化当密码输入错误后，不是抛出异常，而是提示用户重新输入
* 1. 优化prompt提示框的输入密码提示样式
* 1. 实现基于userToken缓存加密文件，没有userToken的加密文件不缓存
* 1. 优化docker构建方案，使用分层构建方式，采用层级缓存解决构建慢发布慢等问题。从原本5分钟左右缩短至几秒
* 1. 加密文件暂时不缓存（后续基于用户token实现，基于用户缓存）
* 1. 优化office文件下载逻辑，跳过重复下载（大量节约带宽与磁盘空间）。
* 1. 修复预览不同类型的加密office文件bug
* 实现预览加密的（受密码保护）office文件
This commit is contained in:
yl-yue
2022-07-21 03:19:46 +00:00
committed by 陈精华
parent 04703aa03c
commit acffcbfe98
26 changed files with 746 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
office-plugin/src/main/java/org/artofsolving/jodconverter/OfficeDocumentConverter.java
View File

@@ -12,18 +12,18 @@
//
package org.artofsolving.jodconverter;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
import com.sun.star.document.UpdateDocMode;
import org.apache.commons.io.FilenameUtils;
import org.artofsolving.jodconverter.document.DefaultDocumentFormatRegistry;
import org.artofsolving.jodconverter.document.DocumentFormat;
import org.artofsolving.jodconverter.document.DocumentFormatRegistry;
import org.artofsolving.jodconverter.model.FileProperties;
import org.artofsolving.jodconverter.office.OfficeException;
import org.artofsolving.jodconverter.office.OfficeManager;
import com.sun.star.document.UpdateDocMode;
import java.io.File;
import java.util.HashMap;
import java.util.Map;
public class OfficeDocumentConverter {
@@ -60,14 +60,22 @@ public class OfficeDocumentConverter {
public void convert(File inputFile, File outputFile) throws OfficeException {
String outputExtension = FilenameUtils.getExtension(outputFile.getName());
DocumentFormat outputFormat = formatRegistry.getFormatByExtension(outputExtension);
convert(inputFile, outputFile, outputFormat);
convert(inputFile, outputFile, outputFormat, null);
}
public void convert(File inputFile, File outputFile, DocumentFormat outputFormat) throws OfficeException {
public void convert(File inputFile, File outputFile, FileProperties fileProperties) throws OfficeException {
String outputExtension = FilenameUtils.getExtension(outputFile.getName());
DocumentFormat outputFormat = formatRegistry.getFormatByExtension(outputExtension);
convert(inputFile, outputFile, outputFormat, fileProperties);
}
public void convert(File inputFile, File outputFile, DocumentFormat outputFormat, FileProperties fileProperties) throws OfficeException {
String inputExtension = FilenameUtils.getExtension(inputFile.getName());
DocumentFormat inputFormat = formatRegistry.getFormatByExtension(inputExtension);
Map<String, Object> properties = fileProperties.toMap();
properties.putAll(defaultLoadProperties);
StandardConversionTask conversionTask = new StandardConversionTask(inputFile, outputFile, outputFormat);
conversionTask.setDefaultLoadProperties(defaultLoadProperties);
conversionTask.setDefaultLoadProperties(properties);
conversionTask.setInputFormat(inputFormat);
officeManager.execute(conversionTask);
}