Bump commons-io from 1.4 to 2.7 in /office-plugin

Bumps commons-io from 1.4 to 2.7. Signed-off-by: dependabot[bot] <support@github.com>
Bump xstream from 1.4.15 to 1.4.16 in /server
2026-03-30 12:41:03 +00:00 · 2021-04-26 20:46:04 +00:00 · 2021-04-19 13:32:13 +08:00 · 2021-04-19 13:31:50 +08:00 · 2021-04-19 13:31:50 +08:00 · 2021-04-19 13:31:50 +08:00
4401 changed files with 7166 additions and 3812 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@ target/

 ### NetBeans ###
 nbproject/private/
-build/
 nbbuild/
 dist/
 nbdist/
@@ -27,5 +26,5 @@ nbdist/
 ### VS Code ###
 .vscode/

-jodconverter-web/src/main/cache/
-jodconverter-web/src/main/file/
+server/src/main/cache/
+server/src/main/file/
--- a/6
+++ b/6
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 MAINTAINER chenjh "842761733@qq.com"
-ADD jodconverter-web/target/kkFileView-*.tar.gz /opt/
+ADD server/target/kkFileView-*.tar.gz /opt/
 COPY fonts/* /usr/share/fonts/chienes/
 RUN echo "deb http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse" > /etc/apt/sources.list &&\
 	apt-get clean && apt-get update &&\
@@ -28,5 +28,5 @@ ENV CLASSPATH $JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
 ENV PATH $PATH:$JAVA_HOME/bin
 ENV LANG zh_CN.UTF-8
 ENV LC_ALL zh_CN.UTF-8
-ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-2.2.1/bin
-ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider","-Dspring.config.location=/opt/kkFileView-2.2.1/config/application.properties","-jar","/opt/kkFileView-2.2.1/bin/kkFileView-2.2.1.jar"]
+ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-3.5.1/bin
+ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider","-Dspring.config.location=/opt/kkFileView-3.5.1/config/application.properties","-jar","/opt/kkFileView-3.5.1/bin/kkFileView-3.5.1.jar"]
--- a/README.md
+++ b/README.md
@@ -2,14 +2,14 @@
 此项目为文件文档在线预览项目解决方案，对标业内付费产品有【[永中office](http://dcs.yozosoft.com/)】【[office365](http://www.officeweb365.com/)】【[idocv](https://www.idocv.com/)】等，在取得公司高层同意后以Apache协议开源出来反哺社区，在此特别感谢@唐老大的支持以及@端木详笑的贡献。该项目使用流行的spring boot搭建，易上手和部署，基本支持主流办公文档的在线预览，如doc,docx,Excel,pdf,txt,zip,rar,图片等等
 ### 项目特性

-1. 支持office，pdf, cad等办公文档
-1. 支持txt,java,php,py,md,js,css等所有纯文本
-1. 支持zip,rar,jar,tar,gzip等压缩包
-1. 支持jpg，jpeg，png，gif等图片预览（翻转，缩放，镜像）
-1. 使用spring boot开发，预览服务搭建部署非常简便
-1. rest接口提供服务，跨平台特性(java,php,python,go,php，....)都支持，应用接入简单方便
+1. 支持 office, pdf, cad 等办公文档
+1. 支持 txt, xml(渲染), md(渲染), java, php, py, js, css 等所有纯文本
+1. 支持 zip, rar, jar, tar, gzip 等压缩包
+1. 支持 jpg, jpeg, png, gif, tif, tiff 等图片预览（翻转，缩放，镜像）
+1. 使用 spring-boot 开发，预览服务搭建部署非常简便
+1. rest 接口提供服务，跨语言、跨平台特性(java,php,python,go,php，....)都支持，应用接入简单方便
 1. 抽象预览服务接口，方便二次开发，非常方便添加其他类型文件预览支持
-1. 最最重要Apache协议开源，代码pull下来想干嘛就干嘛
+1. 最最重要 Apache 协议开源，代码 pull 下来想干嘛就干嘛

 ### 官网及文档

@@ -26,7 +26,7 @@
 1. English document：https://gitee.com/kekingcn/file-online-preview/blob/master/README.en.md

 ### 联系我们，加入组织
-> 我们会用心回答解决大家在项目使用中的问题，也请大家在提问前至少Google或baidu过，珍爱生命远离无效的交流沟通
+> 我们会用心回答解决大家在项目使用中的问题，也请大家在提问前至少 Google 或 baidu 过，珍爱生命远离无效的交流沟通

 ![](./doc/KK开源技术交流2群群聊二维码.png) 

@@ -99,16 +99,60 @@ pdf预览模式预览效果如下
 - jodconverter
 > 依赖外部环境
 - redis (可选，默认不用)
- OpenOffice或者LibreOffice(Windows下已内置，Linux会自动安装，Mac OS下需要手动安装)
+- OpenOffice 或者 LibreOffice( Windows 下已内置，Linux 脚本启动模式会自动安装，Mac OS 下需要手动安装)

-1. 第一步：pull项目https://github.com/kekingcn/file-online-preview.git
+1. 第一步：pull 项目 https://github.com/kekingcn/file-online-preview.git

-3. 第二步：运行FilePreviewApplication的main方法，服务启动后，访问http://localhost:8012/
+3. 第二步：运行 ServerMain 的 main 方法，服务启动后，访问 http://localhost:8012/
 会看到如下界面，代表服务启动成功
+   
 ![输入图片说明](https://gitee.com/uploads/images/2017/1213/100221_ea15202e_492218.png "屏幕截图.png")

 ### 历史更新记录

+> 2021年1月28日 ：
+
+2020农历年最后一个版本发布，主要包含了部分 UI 改进，和解决了 QQ 群友、 Issue 里反馈的 Bug 修复，最最重要的是发个新版，过个好年
+
+1. 引入galimatias,解决不规范文件名导致文件下载异常
+2. 更新index接入演示界面UI风格
+3. 更新markdown文件预览UI风格
+4. 更新XML文件预览UI风格，调整类文本预览架构，更方便扩展
+5. 更新simTxT文件预览UI风格
+6. 调整多图连续预览上下翻图的UI
+7. 采用apache-common-io包简化所有的文件下载io操作
+8. XML文件预览支持切换纯文本模式
+9. 增强url base64解码失败时的提示信息
+10. 修复导包错误以及图片预览 bug
+11. 修复发行包运行时找不到日志目录的问题
+12. 修复压缩包内多图连续预览的bug
+13. 修复大小写文件类型后缀没通用匹配的问题
+14. 指定Base64转码采用Apache Commons-code中的实现，修复base64部分jdk版本下出现的异常
+15. 修复类文本类型HTML文件预览的bug
+16. 修复：dwg文件预览时无法在jpg和pdf两种类型之间切换
+17. escaping of dangerous characters to prevent reflected xss
+18. 修复重复编码导致文档转图片预览失败的问题&编码规范
+
+> 2020年12月27日 ：
+
+2020年年终大版本更新，架构全面设计，代码全面重构，代码质量全面提升，二次开发更便捷，欢迎拉源码品鉴，提issue、pr共同建设
+
+1. 架构模块调整,大量的代码重构，代码质量提升N个等级，欢迎品鉴
+2. 增强XML文件预览效果，新增XML文档数结构预览
+3. 新增markdown文件预览支持，预览支持md渲染和源文本切换支持
+4. 切换底层web server为jetty，解决这个issue：https://github.com/kekingcn/kkFileView/issues/168
+5. 引入cpdetector，解决文件编码识别问题
+6. url采用base64+urlencode双编码，彻底解决各种奇葩文件名预览问题
+7. 新增配置项office.preview.switch.disabled，控制offic文件预览切换开关
+8. 优化文本类型文件预览逻辑，采用Base64传输内容，避免预览时再次请求文件内容
+9. office预览图片模式禁用图片放大效果，达到图片和pdf预览效果一致的体验
+10. 直接代码静态设置pdfbox兼容低版本jdk，在IDEA中运行也不会有警告提示 
+11. 移除guava、hutool等非必须的工具包，减少代码体积
+12. Office组件加载异步化，提速应用启动速度最快到5秒内
+13. 合理设置预览消费队列的线程数
+14. 修复压缩包里文件再次预览失败的bug
+15. 修复图片预览的bug
+
 > 2020年05月20日 ：
 1. 新增支持全局水印，并支持通过参数动态改变水印内容
 2. 新增支持CAD文件预览
@@ -163,5 +207,13 @@ pdf预览模式预览效果如下
 1. 引入pdf.js预览doc等文件，支持doc标题生成pdf预览菜单，支持手机端预览

 ### 使用登记
-如果这个项目解决了你的实际问题，可在https://gitee.com/kekingcn/file-online-preview/issues/IGSBV
+如果这个项目解决了你的实际问题，可在 https://gitee.com/kekingcn/file-online-preview/issues/IGSBV
 登记下，如果节省了你的三方预览服务费用，也愿意支持下的话，可点击下方【捐助】请作者喝杯咖啡，也是非常感谢
+
+### Stars 趋势图
+#### Gitee
+[![Stargazers over time](https://whnb.wang/img/kekingcn/file-online-preview)](https://whnb.wang/kekingcn/file-online-preview?e=86400)
+
+#### GitHub
+
+[![Stargazers over time](https://starchart.cc/kekingcn/kkFileView.svg)](https://starchart.cc/kekingcn/kkFileView)
--- a/jodconverter-web/src/main/java/cn/keking/FilePreviewApplication.java
+++ b/jodconverter-web/src/main/java/cn/keking/FilePreviewApplication.java
@@ -1,15 +0,0 @@
-package cn.keking;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-@SpringBootApplication
-@EnableScheduling
-@ComponentScan(value = "cn.keking.*")
-public class FilePreviewApplication {
-	public static void main(String[] args) {
-        SpringApplication.run(FilePreviewApplication.class, args);
-	}
-}
--- a/jodconverter-web/src/main/java/cn/keking/config/RFCConfig.java
+++ b/jodconverter-web/src/main/java/cn/keking/config/RFCConfig.java
@@ -1,19 +0,0 @@
-package cn.keking.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author chenjh
- * @since 2020/5/18 13:41
- */
-@Configuration
-public class RFCConfig {
-
-    @Bean
-    public Boolean setRequestTargetAllow() {
-        // RFC 7230，RFC 3986规范不允许url相关特殊字符，手动指定Tomcat url允许特殊符号， 如{}做入参，其他符号按需添加。见tomcat的HttpParser源码。
-        System.setProperty("tomcat.util.http.parser.HttpParser.requestTargetAllow", "|{}");
-        return true;
-    }
-}
--- a/jodconverter-web/src/main/java/cn/keking/hutool/HexUtil.java
+++ b/jodconverter-web/src/main/java/cn/keking/hutool/HexUtil.java
@@ -1,388 +0,0 @@
-package cn.keking.hutool;
-
-import java.awt.*;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-
-/**
- * 十六进制（简写为hex或下标16）在数学中是一种逢16进1的进位制，一般用数字0到9和字母A到F表示（其中:A~F即10~15）。<br>
- * 例如十进制数57，在二进制写作111001，在16进制写作39。<br>
- * 像java,c这样的语言为了区分十六进制和十进制数值,会在十六进制数的前面加上 0x,比如0x20是十进制的32,而不是十进制的20<br>
- * <p>
- * 参考：https://my.oschina.net/xinxingegeya/blog/287476
- *
- * @author Looly
- */
-public class HexUtil {
-
-	/**
-	 * 用于建立十六进制字符的输出的小写字符数组
-	 */
-	private static final char[] DIGITS_LOWER = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-	/**
-	 * 用于建立十六进制字符的输出的大写字符数组
-	 */
-	private static final char[] DIGITS_UPPER = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
-	/**
-	 * 判断给定字符串是否为16进制数<br>
-	 * 如果是，需要使用对应数字类型对象的<code>decode</code>方法解码<br>
-	 * 例如：{@code Integer.decode}方法解码int类型的16进制数字
-	 *
-	 * @param value 值
-	 * @return 是否为16进制
-	 */
-	public static boolean isHexNumber(String value) {
-		final int index = (value.startsWith("-") ? 1 : 0);
-		if (value.startsWith("0x", index) || value.startsWith("0X", index) || value.startsWith("#", index)) {
-			try {
-				Long.decode(value);
-			} catch (NumberFormatException e) {
-				return false;
-			}
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	// ---------------------------------------------------------------------------------------------------- encode
-
-	/**
-	 * 将字节数组转换为十六进制字符数组
-	 *
-	 * @param data byte[]
-	 * @return 十六进制char[]
-	 */
-	public static char[] encodeHex(byte[] data) {
-		return encodeHex(data, true);
-	}
-
-	/**
-	 * 将字节数组转换为十六进制字符数组
-	 *
-	 * @param str     字符串
-	 * @param charset 编码
-	 * @return 十六进制char[]
-	 */
-	public static char[] encodeHex(String str, Charset charset) {
-		return encodeHex(StrUtil.bytes(str, charset), true);
-	}
-
-	/**
-	 * 将字节数组转换为十六进制字符数组
-	 *
-	 * @param data        byte[]
-	 * @param toLowerCase <code>true</code> 传换成小写格式 ， <code>false</code> 传换成大写格式
-	 * @return 十六进制char[]
-	 */
-	public static char[] encodeHex(byte[] data, boolean toLowerCase) {
-		return encodeHex(data, toLowerCase ? DIGITS_LOWER : DIGITS_UPPER);
-	}
-
-	/**
-	 * 将字节数组转换为十六进制字符串
-	 *
-	 * @param data byte[]
-	 * @return 十六进制String
-	 */
-	public static String encodeHexStr(byte[] data) {
-		return encodeHexStr(data, true);
-	}
-
-	/**
-	 * 将字节数组转换为十六进制字符串，结果为小写
-	 *
-	 * @param data    被编码的字符串
-	 * @param charset 编码
-	 * @return 十六进制String
-	 */
-	public static String encodeHexStr(String data, Charset charset) {
-		return encodeHexStr(StrUtil.bytes(data, charset), true);
-	}
-
-	/**
-	 * 将字节数组转换为十六进制字符串，结果为小写，默认编码是UTF-8
-	 *
-	 * @param data 被编码的字符串
-	 * @return 十六进制String
-	 */
-	public static String encodeHexStr(String data) {
-		return encodeHexStr(data, StandardCharsets.UTF_8);
-	}
-
-	/**
-	 * 将字节数组转换为十六进制字符串
-	 *
-	 * @param data        byte[]
-	 * @param toLowerCase <code>true</code> 传换成小写格式 ， <code>false</code> 传换成大写格式
-	 * @return 十六进制String
-	 */
-	public static String encodeHexStr(byte[] data, boolean toLowerCase) {
-		return encodeHexStr(data, toLowerCase ? DIGITS_LOWER : DIGITS_UPPER);
-	}
-
-	// ---------------------------------------------------------------------------------------------------- decode
-
-	/**
-	 * 将十六进制字符数组转换为字符串，默认编码UTF-8
-	 *
-	 * @param hexStr 十六进制String
-	 * @return 字符串
-	 */
-	public static String decodeHexStr(String hexStr) {
-		return decodeHexStr(hexStr, StandardCharsets.UTF_8);
-	}
-
-	/**
-	 * 将十六进制字符数组转换为字符串
-	 *
-	 * @param hexStr  十六进制String
-	 * @param charset 编码
-	 * @return 字符串
-	 */
-	public static String decodeHexStr(String hexStr, Charset charset) {
-		if (StrUtil.isEmpty(hexStr)) {
-			return hexStr;
-		}
-		return decodeHexStr(hexStr.toCharArray(), charset);
-	}
-
-	/**
-	 * 将十六进制字符数组转换为字符串
-	 *
-	 * @param hexData 十六进制char[]
-	 * @param charset 编码
-	 * @return 字符串
-	 */
-	public static String decodeHexStr(char[] hexData, Charset charset) {
-		return StrUtil.str(decodeHex(hexData), charset);
-	}
-
-	/**
-	 * 将十六进制字符数组转换为字节数组
-	 *
-	 * @param hexData 十六进制char[]
-	 * @return byte[]
-	 * @throws RuntimeException 如果源十六进制字符数组是一个奇怪的长度，将抛出运行时异常
-	 */
-	public static byte[] decodeHex(char[] hexData) {
-
-		int len = hexData.length;
-
-		if ((len & 0x01) != 0) {
-			throw new RuntimeException("Odd number of characters.");
-		}
-
-		byte[] out = new byte[len >> 1];
-
-		// two characters form the hex value.
-		for (int i = 0, j = 0; j < len; i++) {
-			int f = toDigit(hexData[j], j) << 4;
-			j++;
-			f = f | toDigit(hexData[j], j);
-			j++;
-			out[i] = (byte) (f & 0xFF);
-		}
-
-		return out;
-	}
-
-	/**
-	 * 将十六进制字符串解码为byte[]
-	 *
-	 * @param hexStr 十六进制String
-	 * @return byte[]
-	 */
-	public static byte[] decodeHex(String hexStr) {
-		if (StrUtil.isEmpty(hexStr)) {
-			return null;
-		}
-		return decodeHex(hexStr.toCharArray());
-	}
-
-	// ---------------------------------------------------------------------------------------- Color
-
-	/**
-	 * 将{@link Color}编码为Hex形式
-	 *
-	 * @param color {@link Color}
-	 * @return Hex字符串
-	 * @since 3.0.8
-	 */
-	public static String encodeColor(Color color) {
-		return encodeColor(color, "#");
-	}
-
-	/**
-	 * 将{@link Color}编码为Hex形式
-	 *
-	 * @param color  {@link Color}
-	 * @param prefix 前缀字符串，可以是#、0x等
-	 * @return Hex字符串
-	 * @since 3.0.8
-	 */
-	public static String encodeColor(Color color, String prefix) {
-		final StringBuilder builder = new StringBuilder(prefix);
-		String colorHex;
-		colorHex = Integer.toHexString(color.getRed());
-		if (1 == colorHex.length()) {
-			builder.append('0');
-		}
-		builder.append(colorHex);
-		colorHex = Integer.toHexString(color.getGreen());
-		if (1 == colorHex.length()) {
-			builder.append('0');
-		}
-		builder.append(colorHex);
-		colorHex = Integer.toHexString(color.getBlue());
-		if (1 == colorHex.length()) {
-			builder.append('0');
-		}
-		builder.append(colorHex);
-		return builder.toString();
-	}
-
-	/**
-	 * 将Hex颜色值转为
-	 *
-	 * @param hexColor 16进制颜色值，可以以#开头，也可以用0x开头
-	 * @return {@link Color}
-	 * @since 3.0.8
-	 */
-	public static Color decodeColor(String hexColor) {
-		return Color.decode(hexColor);
-	}
-
-	/**
-	 * 将指定int值转换为Unicode字符串形式，常用于特殊字符（例如汉字）转Unicode形式<br>
-	 * 转换的字符串如果u后不足4位，则前面用0填充，例如：
-	 *
-	 * <pre>
-	 * '我' =》\u4f60
-	 * </pre>
-	 *
-	 * @param value int值，也可以是char
-	 * @return Unicode表现形式
-	 */
-	public static String toUnicodeHex(int value) {
-		final StringBuilder builder = new StringBuilder(6);
-
-		builder.append("\\u");
-		String hex = toHex(value);
-		int len = hex.length();
-		if (len < 4) {
-			builder.append("0000", 0, 4 - len);// 不足4位补0
-		}
-		builder.append(hex);
-
-		return builder.toString();
-	}
-
-	/**
-	 * 将指定char值转换为Unicode字符串形式，常用于特殊字符（例如汉字）转Unicode形式<br>
-	 * 转换的字符串如果u后不足4位，则前面用0填充，例如：
-	 *
-	 * <pre>
-	 * '我' =》\u4f60
-	 * </pre>
-	 *
-	 * @param ch char值
-	 * @return Unicode表现形式
-	 * @since 4.0.1
-	 */
-	public static String toUnicodeHex(char ch) {
-		return "\\u" +//
-				DIGITS_LOWER[(ch >> 12) & 15] +//
-				DIGITS_LOWER[(ch >> 8) & 15] +//
-				DIGITS_LOWER[(ch >> 4) & 15] +//
-				DIGITS_LOWER[(ch) & 15];
-	}
-
-	/**
-	 * 转为16进制字符串
-	 *
-	 * @param value int值
-	 * @return 16进制字符串
-	 * @since 4.4.1
-	 */
-	public static String toHex(int value) {
-		return Integer.toHexString(value);
-	}
-
-	/**
-	 * 转为16进制字符串
-	 *
-	 * @param value int值
-	 * @return 16进制字符串
-	 * @since 4.4.1
-	 */
-	public static String toHex(long value) {
-		return Long.toHexString(value);
-	}
-
-	/**
-	 * 将byte值转为16进制并添加到{@link StringBuilder}中
-	 *
-	 * @param builder     {@link StringBuilder}
-	 * @param b           byte
-	 * @param toLowerCase 是否使用小写
-	 * @since 4.4.1
-	 */
-	public static void appendHex(StringBuilder builder, byte b, boolean toLowerCase) {
-		final char[] toDigits = toLowerCase ? DIGITS_LOWER : DIGITS_UPPER;
-
-		int high = (b & 0xf0) >>> 4;//高位
-		int low = b & 0x0f;//低位
-		builder.append(toDigits[high]);
-		builder.append(toDigits[low]);
-	}
-
-	// ---------------------------------------------------------------------------------------- Private method start
-
-	/**
-	 * 将字节数组转换为十六进制字符串
-	 *
-	 * @param data     byte[]
-	 * @param toDigits 用于控制输出的char[]
-	 * @return 十六进制String
-	 */
-	private static String encodeHexStr(byte[] data, char[] toDigits) {
-		return new String(encodeHex(data, toDigits));
-	}
-
-	/**
-	 * 将字节数组转换为十六进制字符数组
-	 *
-	 * @param data     byte[]
-	 * @param toDigits 用于控制输出的char[]
-	 * @return 十六进制char[]
-	 */
-	private static char[] encodeHex(byte[] data, char[] toDigits) {
-		final int len = data.length;
-		final char[] out = new char[len << 1];//len*2
-		// two characters from the hex value.
-		for (int i = 0, j = 0; i < len; i++) {
-			out[j++] = toDigits[(0xF0 & data[i]) >>> 4];// 高位
-			out[j++] = toDigits[0x0F & data[i]];// 低位
-		}
-		return out;
-	}
-
-	/**
-	 * 将十六进制字符转换成一个整数
-	 *
-	 * @param ch    十六进制char
-	 * @param index 十六进制字符在字符数组中的位置
-	 * @return 一个整数
-	 * @throws RuntimeException 当ch不是一个合法的十六进制字符时，抛出运行时异常
-	 */
-	private static int toDigit(char ch, int index) {
-		int digit = Character.digit(ch, 16);
-		if (digit == -1) {
-			throw new RuntimeException("Illegal hexadecimal character " + ch + " at index " + index);
-		}
-		return digit;
-	}
-	// ---------------------------------------------------------------------------------------- Private method end
-}
--- a/jodconverter-web/src/main/java/cn/keking/hutool/StrUtil.java
+++ b/jodconverter-web/src/main/java/cn/keking/hutool/StrUtil.java
@@ -1,283 +0,0 @@
-package cn.keking.hutool;
-
-import java.nio.charset.Charset;
-
-/**
- * 字符串工具类
- * 
- * @author xiaoleilu
- *
- */
-public class StrUtil {
-
-	public static final String EMPTY = "";
-
-	/**
-	 * 是否空白符<br>
-	 * 空白符包括空格、制表符、全角空格和不间断空格<br>
-	 *
-	 * @see Character#isWhitespace(int)
-	 * @see Character#isSpaceChar(int)
-	 * @param c 字符
-	 * @return 是否空白符
-	 * @since 4.0.10
-	 */
-	public static boolean isBlankChar(int c) {
-		return Character.isWhitespace(c) || Character.isSpaceChar(c) || c == '\ufeff' || c == '\u202a';
-	}
-
-	/**
-	 * 是否空白符<br>
-	 * 空白符包括空格、制表符、全角空格和不间断空格<br>
-	 *
-	 * @param c 字符
-	 * @return 是否空白符
-	 * @see Character#isWhitespace(int)
-	 * @see Character#isSpaceChar(int)
-	 * @since 4.0.10
-	 */
-	public static boolean isBlankChar(char c) {
-		return isBlankChar((int) c);
-	}
-
-	/**
-	 * 字符串是否为空白 空白的定义如下： <br>
-	 * 1、为null <br>
-	 * 2、为不可见字符（如空格）<br>
-	 * 3、""<br>
-	 *
-	 * @param str 被检测的字符串
-	 * @return 是否为空
-	 */
-	public static boolean isBlank(CharSequence str) {
-		int length;
-
-		if ((str == null) || ((length = str.length()) == 0)) {
-			return true;
-		}
-
-		for (int i = 0; i < length; i++) {
-			// 只要有一个非空字符即为非空字符串
-			if (false == isBlankChar(str.charAt(i))) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * 字符串是否为空，空的定义如下:<br>
-	 * 1、为null <br>
-	 * 2、为""<br>
-	 * 
-	 * @param str 被检测的字符串
-	 * @return 是否为空
-	 */
-	public static boolean isEmpty(CharSequence str) {
-		return str == null || str.length() == 0;
-	}
-
-	/**
-	 * 编码字符串
-	 *
-	 * @param str 字符串
-	 * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
-	 * @return 编码后的字节码
-	 */
-	public static byte[] bytes(CharSequence str, Charset charset) {
-		if (str == null) {
-			return null;
-		}
-
-		if (null == charset) {
-			return str.toString().getBytes();
-		}
-		return str.toString().getBytes(charset);
-	}
-
-	/**
-	 * {@link CharSequence} 转为字符串，null安全
-	 *
-	 * @param cs {@link CharSequence}
-	 * @return 字符串
-	 */
-	public static String str(CharSequence cs) {
-		return null == cs ? null : cs.toString();
-	}
-
-	/**
-	 * 解码字节码
-	 *
-	 * @param data 字符串
-	 * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
-	 * @return 解码后的字符串
-	 */
-	public static String str(byte[] data, Charset charset) {
-		if (data == null) {
-			return null;
-		}
-
-		if (null == charset) {
-			return new String(data);
-		}
-		return new String(data, charset);
-	}
-
-	/**
-	 * 改进JDK subString<br>
-	 * index从0开始计算，最后一个字符为-1<br>
-	 * 如果from和to位置一样，返回 "" <br>
-	 * 如果from或to为负数，则按照length从后向前数位置，如果绝对值大于字符串长度，则from归到0，to归到length<br>
-	 * 如果经过修正的index中from大于to，则互换from和to example: <br>
-	 * abcdefgh 2 3 =》 c <br>
-	 * abcdefgh 2 -3 =》 cde <br>
-	 *
-	 * @param str String
-	 * @param fromIndex 开始的index（包括）
-	 * @param toIndex 结束的index（不包括）
-	 * @return 字串
-	 */
-	public static String sub(CharSequence str, int fromIndex, int toIndex) {
-		if (isEmpty(str)) {
-			return str(str);
-		}
-		int len = str.length();
-
-		if (fromIndex < 0) {
-			fromIndex = len + fromIndex;
-			if (fromIndex < 0) {
-				fromIndex = 0;
-			}
-		} else if (fromIndex > len) {
-			fromIndex = len;
-		}
-
-		if (toIndex < 0) {
-			toIndex = len + toIndex;
-			if (toIndex < 0) {
-				toIndex = len;
-			}
-		} else if (toIndex > len) {
-			toIndex = len;
-		}
-
-		if (toIndex < fromIndex) {
-			int tmp = fromIndex;
-			fromIndex = toIndex;
-			toIndex = tmp;
-		}
-
-		if (fromIndex == toIndex) {
-			return EMPTY;
-		}
-
-		return str.toString().substring(fromIndex, toIndex);
-	}
-
-	/**
-	 * 切割指定位置之前部分的字符串
-	 *
-	 * @param string 字符串
-	 * @param toIndex 切割到的位置（不包括）
-	 * @return 切割后的剩余的前半部分字符串
-	 */
-	public static String subPre(CharSequence string, int toIndex) {
-		return sub(string, 0, toIndex);
-	}
-
-	/**
-	 * 切割指定位置之后部分的字符串
-	 *
-	 * @param string 字符串
-	 * @param fromIndex 切割开始的位置（包括）
-	 * @return 切割后后剩余的后半部分字符串
-	 */
-	public static String subSuf(CharSequence string, int fromIndex) {
-		if (isEmpty(string)) {
-			return null;
-		}
-		return sub(string, fromIndex, string.length());
-	}
-
-	/**
-	 * 指定范围内查找指定字符
-	 *
-	 * @param str 字符串
-	 * @param searchChar 被查找的字符
-	 * @param start 起始位置，如果小于0，从0开始查找
-	 * @param end 终止位置，如果超过str.length()则默认查找到字符串末尾
-	 * @return 位置
-	 */
-	public static int indexOf(final CharSequence str, char searchChar, int start, int end) {
-		final int len = str.length();
-		if (start < 0 || start > len) {
-			start = 0;
-		}
-		if (end > len || end < 0) {
-			end = len;
-		}
-		for (int i = start; i < end; i++) {
-			if (str.charAt(i) == searchChar) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * 指定范围内查找指定字符
-	 *
-	 * @param str 字符串
-	 * @param searchChar 被查找的字符
-	 * @param start 起始位置，如果小于0，从0开始查找
-	 * @return 位置
-	 */
-	public static int indexOf(final CharSequence str, char searchChar, int start) {
-		if (str instanceof String) {
-			return ((String) str).indexOf(searchChar, start);
-		} else {
-			return indexOf(str, searchChar, start, -1);
-		}
-	}
-
-	/**
-	 * 指定范围内查找指定字符
-	 *
-	 * @param str 字符串
-	 * @param searchChar 被查找的字符
-	 * @return 位置
-	 */
-	public static int indexOf(final CharSequence str, char searchChar) {
-		return indexOf(str, searchChar, 0);
-	}
-
-	/**
-	 * 如果字符串是<code>null</code>，则返回指定默认字符串，否则返回字符串本身。
-	 *
-	 * <pre>
-	 * nullToDefault(null, &quot;default&quot;)  = &quot;default&quot;
-	 * nullToDefault(&quot;&quot;, &quot;default&quot;)    = &quot;&quot;
-	 * nullToDefault(&quot;  &quot;, &quot;default&quot;)  = &quot;  &quot;
-	 * nullToDefault(&quot;bat&quot;, &quot;default&quot;) = &quot;bat&quot;
-	 * </pre>
-	 *
-	 * @param str 要转换的字符串
-	 * @param defaultStr 默认字符串
-	 *
-	 * @return 字符串本身或指定的默认字符串
-	 */
-	public static String nullToDefault(CharSequence str, String defaultStr) {
-		return (str == null) ? defaultStr : str.toString();
-	}
-
-	/**
-	 * 当给定字符串为null时，转换为Empty
-	 *
-	 * @param str 被转换的字符串
-	 * @return 转换后的字符串
-	 */
-	public static String nullToEmpty(CharSequence str) {
-		return nullToDefault(str, EMPTY);
-	}
-}
--- a/jodconverter-web/src/main/java/cn/keking/hutool/URLEncoder.java
+++ b/jodconverter-web/src/main/java/cn/keking/hutool/URLEncoder.java
@@ -1,232 +0,0 @@
-package cn.keking.hutool;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Serializable;
-import java.nio.charset.Charset;
-import java.util.BitSet;
-
-/**
- * URL编码，数据内容的类型是 application/x-www-form-urlencoded。
- * 
- * <pre>
- * 1.字符"a"-"z"，"A"-"Z"，"0"-"9"，"."，"-"，"*"，和"_" 都不会被编码;
- * 2.将空格转换为%20 ;
- * 3.将非文本内容转换成"%xy"的形式,xy是两位16进制的数值;
- * 4.在每个 name=value 对之间放置 &amp; 符号。
- * </pre>
- * 
- * @author looly,
- *
- */
-public class URLEncoder implements Serializable{
-	private static final long serialVersionUID = 1L;
-
-	// --------------------------------------------------------------------------------------------- Static method start
-	/**
-	 * 默认{@link URLEncoder}<br>
-	 * 默认的编码器针对URI路径编码，定义如下：
-	 * 
-	 * <pre>
-	 * pchar = unreserved（不处理） / pct-encoded / sub-delims（子分隔符） / ":" / "@"
-	 * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
-	 * sub-delims = "!" / "$" / "&amp;" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
-	 * </pre>
-	 */
-	public static final URLEncoder DEFAULT = createDefault();
-	
-	/**
-	 * 用于查询语句的{@link URLEncoder}<br>
-	 * 编码器针对URI路径编码，定义如下：
-	 * 
-	 * <pre>
-	 * 0x20 ' ' =》 '+' 
-	 * 0x2A, 0x2D, 0x2E, 0x30 to 0x39, 0x41 to 0x5A, 0x5F, 0x61 to 0x7A as-is 
-	 * '*', '-', '.', '0' to '9', 'A' to 'Z', '_', 'a' to 'z' Also '=' and '&amp;' 不编码
-	 * 其它编码为 %nn 形式
-	 * </pre>
-	 * 
-	 * 详细见：https://www.w3.org/TR/html5/forms.html#application/x-www-form-urlencoded-encoding-algorithm
-	 */
-	public static final URLEncoder QUERY = createQuery();
-
-	/**
-	 * 创建默认{@link URLEncoder}<br>
-	 * 默认的编码器针对URI路径编码，定义如下：
-	 * 
-	 * <pre>
-	 * pchar = unreserved（不处理） / pct-encoded / sub-delims（子分隔符） / ":" / "@"
-	 * unreserved = ALPHA / DIGIT / "-" / "." / "_" / "~"
-	 * sub-delims = "!" / "$" / "&amp;" / "'" / "(" / ")" / "*" / "+" / "," / ";" / "="
-	 * </pre>
-	 * 
-	 * @return {@link URLEncoder}
-	 */
-	public static URLEncoder createDefault() {
-		final URLEncoder encoder = new URLEncoder();
-		encoder.addSafeCharacter('-');
-		encoder.addSafeCharacter('.');
-		encoder.addSafeCharacter('_');
-		encoder.addSafeCharacter('~');
-		// Add the sub-delims
-		encoder.addSafeCharacter('!');
-		encoder.addSafeCharacter('$');
-		encoder.addSafeCharacter('&');
-		encoder.addSafeCharacter('\'');
-		encoder.addSafeCharacter('(');
-		encoder.addSafeCharacter(')');
-		encoder.addSafeCharacter('*');
-		encoder.addSafeCharacter('+');
-		encoder.addSafeCharacter(',');
-		encoder.addSafeCharacter(';');
-		encoder.addSafeCharacter('=');
-		// Add the remaining literals
-		encoder.addSafeCharacter(':');
-		encoder.addSafeCharacter('@');
-		// Add '/' so it isn't encoded when we encode a path
-		encoder.addSafeCharacter('/');
-
-		return encoder;
-	}
-
-	/**
-	 * 创建用于查询语句的{@link URLEncoder}<br>
-	 * 编码器针对URI路径编码，定义如下：
-	 * 
-	 * <pre>
-	 * 0x20 ' ' =》 '+' 
-	 * 0x2A, 0x2D, 0x2E, 0x30 to 0x39, 0x41 to 0x5A, 0x5F, 0x61 to 0x7A as-is 
-	 * '*', '-', '.', '0' to '9', 'A' to 'Z', '_', 'a' to 'z' Also '=' and '&amp;' 不编码
-	 * 其它编码为 %nn 形式
-	 * </pre>
-	 * 
-	 * 详细见：https://www.w3.org/TR/html5/forms.html#application/x-www-form-urlencoded-encoding-algorithm
-	 * 
-	 * @return {@link URLEncoder}
-	 */
-	public static URLEncoder createQuery() {
-		final URLEncoder encoder = new URLEncoder();
-		// Special encoding for space
-		encoder.setEncodeSpaceAsPlus(true);
-		// Alpha and digit are safe by default
-		// Add the other permitted characters
-		encoder.addSafeCharacter('*');
-		encoder.addSafeCharacter('-');
-		encoder.addSafeCharacter('.');
-		encoder.addSafeCharacter('_');
-		encoder.addSafeCharacter('=');
-		encoder.addSafeCharacter('&');
-
-		return encoder;
-	}
-	// --------------------------------------------------------------------------------------------- Static method end
-
-	/** 存放安全编码 */
-	private final BitSet safeCharacters;
-	/** 是否编码空格为+ */
-	private boolean encodeSpaceAsPlus = false;
-
-	/**
-	 * 构造<br>
-	 * 
-	 * [a-zA-Z0-9]默认不被编码
-	 */
-	public URLEncoder() {
-		this(new BitSet(256));
-
-		for (char i = 'a'; i <= 'z'; i++) {
-			addSafeCharacter(i);
-		}
-		for (char i = 'A'; i <= 'Z'; i++) {
-			addSafeCharacter(i);
-		}
-		for (char i = '0'; i <= '9'; i++) {
-			addSafeCharacter(i);
-		}
-	}
-
-	/**
-	 * 构造
-	 * 
-	 * @param safeCharacters 安全字符，安全字符不被编码
-	 */
-	private URLEncoder(BitSet safeCharacters) {
-		this.safeCharacters = safeCharacters;
-	}
-
-	/**
-	 * 增加安全字符<br>
-	 * 安全字符不被编码
-	 * 
-	 * @param c 字符
-	 */
-	public void addSafeCharacter(char c) {
-		safeCharacters.set(c);
-	}
-
-	/**
-	 * 移除安全字符<br>
-	 * 安全字符不被编码
-	 * 
-	 * @param c 字符
-	 */
-	public void removeSafeCharacter(char c) {
-		safeCharacters.clear(c);
-	}
-
-	/**
-	 * 是否将空格编码为+
-	 * 
-	 * @param encodeSpaceAsPlus 是否将空格编码为+
-	 */
-	public void setEncodeSpaceAsPlus(boolean encodeSpaceAsPlus) {
-		this.encodeSpaceAsPlus = encodeSpaceAsPlus;
-	}
-
-	/**
-	 * 将URL中的字符串编码为%形式
-	 *
-	 * @param path 需要编码的字符串
-	 * @param charset 编码
-	 *
-	 * @return 编码后的字符串
-	 */
-	public String encode(String path, Charset charset) {
-
-		int maxBytesPerChar = 10;
-		final StringBuilder rewrittenPath = new StringBuilder(path.length());
-		ByteArrayOutputStream buf = new ByteArrayOutputStream(maxBytesPerChar);
-		OutputStreamWriter writer = new OutputStreamWriter(buf, charset);
-
-		int c;
-		for (int i = 0; i < path.length(); i++) {
-			c = path.charAt(i);
-			if (safeCharacters.get(c)) {
-				rewrittenPath.append((char) c);
-			} else if (encodeSpaceAsPlus && c == ' ') {
-				// 对于空格单独处理
-				rewrittenPath.append('+');
-			} else {
-				// convert to external encoding before hex conversion
-				try {
-					writer.write((char) c);
-					writer.flush();
-				} catch (IOException e) {
-					buf.reset();
-					continue;
-				}
-
-				byte[] ba = buf.toByteArray();
-				for (int j = 0; j < ba.length; j++) {
-					// Converting each byte in the buffer
-					byte toEncode = ba[j];
-					rewrittenPath.append('%');
-					HexUtil.appendHex(rewrittenPath, toEncode, false);
-				}
-				buf.reset();
-			}
-		}
-		return rewrittenPath.toString();
-	}
-}
--- a/jodconverter-web/src/main/java/cn/keking/hutool/URLUtil.java
+++ b/jodconverter-web/src/main/java/cn/keking/hutool/URLUtil.java
@@ -1,74 +0,0 @@
-package cn.keking.hutool;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * 统一资源定位符相关工具类
- *
- * @author xiaoleilu
- *
- */
-public class URLUtil {
-
-	/**
-	 * 标准化URL字符串，包括：
-	 *
-	 * <pre>
-	 * 1. 多个/替换为一个
-	 * </pre>
-	 *
-	 * @param url URL字符串
-	 * @return 标准化后的URL字符串
-	 */
-	public static String normalize(String url) {
-		return normalize(url, false, false);
-	}
-
-	/**
-	 * 标准化URL字符串，包括：
-	 *
-	 * <pre>
-	 * 1. 多个/替换为一个
-	 * </pre>
-	 *
-	 * @param url URL字符串
-	 * @param isEncodeBody 是否对URL中body部分的中文和特殊字符做转义（不包括http:和/）
-	 * @param isEncodeParam 是否对URL中参数部分的中文和特殊字符做转义
-	 * @return 标准化后的URL字符串
-	 * @since 4.4.1
-	 */
-	public static String normalize(String url, boolean isEncodeBody, boolean isEncodeParam) {
-		if (StrUtil.isBlank(url)) {
-			return url;
-		}
-		final int sepIndex = url.indexOf("://");
-		String pre;
-		String body;
-		if (sepIndex > 0) {
-			pre = StrUtil.subPre(url, sepIndex + 3);
-			body = StrUtil.subSuf(url, sepIndex + 3);
-		} else {
-			pre = "http://";
-			body = url;
-		}
-
-		final int paramsSepIndex = StrUtil.indexOf(body, '?');
-		String params = null;
-		if (paramsSepIndex > 0) {
-			params = StrUtil.subSuf(body, paramsSepIndex + 1);
-			body = StrUtil.subPre(body, paramsSepIndex);
-		}
-
-		// 去除开头的\或者/
-		body = body.replaceAll("^[\\\\/]+", StrUtil.EMPTY);
-		// 替换多个\或/为单个/
-		body = body.replace("\\", "/").replaceAll("//+", "/");
-		if (isEncodeBody) {
-			body = URLEncoder.DEFAULT.encode(body, StandardCharsets.UTF_8);
-			if (params != null) {
-				params = "?" + URLEncoder.DEFAULT.encode(params, StandardCharsets.UTF_8);
-			}
-		}
-		return pre + body + StrUtil.nullToEmpty(params);
-	}
-}
--- a/jodconverter-web/src/main/java/cn/keking/model/FileType.java
+++ b/jodconverter-web/src/main/java/cn/keking/model/FileType.java
@@ -1,27 +0,0 @@
-package cn.keking.model;
-
-/**
- * Created by kl on 2018/1/17.
- * Content :文件类型，文本，office，压缩包等等
- */
-public enum FileType {
-    picture("pictureFilePreviewImpl"),
-    compress("compressFilePreviewImpl"),
-    office("officeFilePreviewImpl"),
-    simText("simTextFilePreviewImpl"),
-    pdf("pdfFilePreviewImpl"),
-    other("otherFilePreviewImpl"),
-    media("mediaFilePreviewImpl"),
-    cad("cadFilePreviewImpl");
-
-    private final String instanceName;
-
-    FileType(String instanceName){
-        this.instanceName=instanceName;
-    }
-
-    public String getInstanceName() {
-        return instanceName;
-    }
-
-}
--- a/jodconverter-web/src/main/java/cn/keking/service/FilePreview.java
+++ b/jodconverter-web/src/main/java/cn/keking/service/FilePreview.java
@@ -1,12 +0,0 @@
-package cn.keking.service;
-
-import cn.keking.model.FileAttribute;
-import org.springframework.ui.Model;
-
-/**
- * Created by kl on 2018/1/17.
- * Content :
- */
-public interface FilePreview {
-    String filePreviewHandle(String url, Model model, FileAttribute fileAttribute);
-}
--- a/jodconverter-web/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java
+++ b/jodconverter-web/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java
@@ -1,71 +0,0 @@
-package cn.keking.service.impl;
-
-import cn.keking.config.ConfigConstants;
-import cn.keking.model.FileAttribute;
-import cn.keking.model.ReturnResponse;
-import cn.keking.service.FilePreview;
-import cn.keking.utils.DownloadUtils;
-import cn.keking.utils.FileUtils;
-import cn.keking.utils.ZipReader;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-
-/**
- * Created by kl on 2018/1/17.
- * Content :处理压缩包文件
- */
-@Service
-public class CompressFilePreviewImpl implements FilePreview {
-
-    private final FileUtils fileUtils;
-
-    private final DownloadUtils downloadUtils;
-
-    private final ZipReader zipReader;
-
-    public CompressFilePreviewImpl(FileUtils fileUtils,
-                                   DownloadUtils downloadUtils,
-                                   ZipReader zipReader) {
-        this.fileUtils = fileUtils;
-        this.downloadUtils = downloadUtils;
-        this.zipReader = zipReader;
-    }
-
-    @Override
-    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
-        String fileName=fileAttribute.getName();
-        String suffix=fileAttribute.getSuffix();
-        String fileTree = null;
-        // 判断文件名是否存在(redis缓存读取)
-        if (!StringUtils.hasText(fileUtils.getConvertedFile(fileName))  || !ConfigConstants.isCacheEnabled()) {
-            ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, fileName);
-            if (0 != response.getCode()) {
-                model.addAttribute("fileType", suffix);
-                model.addAttribute("msg", response.getMsg());
-                return "fileNotSupported";
-            }
-            String filePath = response.getContent();
-            if ("zip".equalsIgnoreCase(suffix) || "jar".equalsIgnoreCase(suffix) || "gzip".equalsIgnoreCase(suffix)) {
-                fileTree = zipReader.readZipFile(filePath, fileName);
-            } else if ("rar".equalsIgnoreCase(suffix)) {
-                fileTree = zipReader.unRar(filePath, fileName);
-            } else if ("7z".equalsIgnoreCase(suffix)) {
-                fileTree = zipReader.read7zFile(filePath, fileName);
-            }
-            if (fileTree != null && !"null".equals(fileTree) && ConfigConstants.isCacheEnabled()) {
-                fileUtils.addConvertedFile(fileName, fileTree);
-            }
-        } else {
-            fileTree = fileUtils.getConvertedFile(fileName);
-        }
-        if (fileTree != null && !"null".equals(fileTree)) {
-            model.addAttribute("fileTree", fileTree);
-            return "compress";
-        } else {
-            model.addAttribute("fileType", suffix);
-            model.addAttribute("msg", "压缩文件类型不受支持，尝试在压缩的时候选择RAR4格式");
-            return "fileNotSupported";
-        }
-    }
-}
--- a/jodconverter-web/src/main/java/cn/keking/service/impl/MediaFilePreviewImpl.java
+++ b/jodconverter-web/src/main/java/cn/keking/service/impl/MediaFilePreviewImpl.java
@@ -1,54 +0,0 @@
-package cn.keking.service.impl;
-
-import cn.keking.model.FileAttribute;
-import cn.keking.model.ReturnResponse;
-import cn.keking.service.FilePreview;
-import cn.keking.utils.DownloadUtils;
-import cn.keking.utils.FileUtils;
-import cn.keking.web.filter.BaseUrlFilter;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
-/**
- * @author : kl
- * @authorboke : kailing.pub
- * @create : 2018-03-25 上午11:58
- * @description:
- **/
-@Service
-public class MediaFilePreviewImpl implements FilePreview {
-
-    private final DownloadUtils downloadUtils;
-
-    private final FileUtils fileUtils;
-
-    public MediaFilePreviewImpl(DownloadUtils downloadUtils,
-                                FileUtils fileUtils) {
-        this.downloadUtils = downloadUtils;
-        this.fileUtils = fileUtils;
-    }
-
-    @Override
-    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
-        // 不是http开头，浏览器不能直接访问，需下载到本地
-        if (url != null && !url.toLowerCase().startsWith("http")) {
-            ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, fileAttribute.getName());
-            if (0 != response.getCode()) {
-                model.addAttribute("fileType", fileAttribute.getSuffix());
-                model.addAttribute("msg", response.getMsg());
-                return "fileNotSupported";
-            } else {
-                model.addAttribute("mediaUrl", BaseUrlFilter.getBaseUrl() + fileUtils.getRelativePath(response.getContent()));
-            }
-        } else {
-            model.addAttribute("mediaUrl", url);
-        }
-        model.addAttribute("mediaUrl", url);
-        String suffix=fileAttribute.getSuffix();
-        if ("flv".equalsIgnoreCase(suffix)) {
-            return "flv";
-        }
-        return "media";
-    }
-
-
-}
--- a/jodconverter-web/src/main/java/cn/keking/service/impl/OtherFilePreviewImpl.java
+++ b/jodconverter-web/src/main/java/cn/keking/service/impl/OtherFilePreviewImpl.java
@@ -1,20 +0,0 @@
-package cn.keking.service.impl;
-
-import cn.keking.model.FileAttribute;
-import cn.keking.service.FilePreview;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
-
-/**
- * Created by kl on 2018/1/17.
- * Content :其他文件
- */
-@Service
-public class OtherFilePreviewImpl implements FilePreview {
-    @Override
-    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
-        model.addAttribute("fileType",fileAttribute.getSuffix());
-        model.addAttribute("msg", "系统还不支持该格式文件的在线预览");
-        return "fileNotSupported";
-    }
-}
--- a/jodconverter-web/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java
+++ b/jodconverter-web/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java
@@ -1,99 +0,0 @@
-package cn.keking.service.impl;
-
-import cn.keking.config.ConfigConstants;
-import cn.keking.model.FileAttribute;
-import cn.keking.model.ReturnResponse;
-import cn.keking.service.FilePreview;
-import cn.keking.utils.DownloadUtils;
-import cn.keking.utils.FileUtils;
-import cn.keking.utils.PdfUtils;
-import cn.keking.web.filter.BaseUrlFilter;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
-
-import java.util.List;
-
-/**
- * Created by kl on 2018/1/17.
- * Content :处理pdf文件
- */
-@Service
-public class PdfFilePreviewImpl implements FilePreview {
-
-    private final FileUtils fileUtils;
-
-    private final PdfUtils pdfUtils;
-
-    private final DownloadUtils downloadUtils;
-
-    private static final String FILE_DIR = ConfigConstants.getFileDir();
-
-    public PdfFilePreviewImpl(FileUtils fileUtils,
-                              PdfUtils pdfUtils,
-                              DownloadUtils downloadUtils) {
-        this.fileUtils = fileUtils;
-        this.pdfUtils = pdfUtils;
-        this.downloadUtils = downloadUtils;
-    }
-
-    @Override
-    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
-        String suffix=fileAttribute.getSuffix();
-        String fileName=fileAttribute.getName();
-        String officePreviewType = model.asMap().get("officePreviewType") == null ? ConfigConstants.getOfficePreviewType() : model.asMap().get("officePreviewType").toString();
-        String baseUrl = BaseUrlFilter.getBaseUrl();
-        String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf";
-        String outFilePath = FILE_DIR + pdfName;
-        if (OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_ALL_IMAGES.equals(officePreviewType)) {
-            //当文件不存在时，就去下载
-            if (!fileUtils.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
-                ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, fileName);
-                if (0 != response.getCode()) {
-                    model.addAttribute("fileType", suffix);
-                    model.addAttribute("msg", response.getMsg());
-                    return "fileNotSupported";
-                }
-                outFilePath = response.getContent();
-                if (ConfigConstants.isCacheEnabled()) {
-                    // 加入缓存
-                    fileUtils.addConvertedFile(pdfName, fileUtils.getRelativePath(outFilePath));
-                }
-            }
-            List<String> imageUrls = pdfUtils.pdf2jpg(outFilePath, pdfName, baseUrl);
-            if (imageUrls == null || imageUrls.size() < 1) {
-                model.addAttribute("msg", "pdf转图片异常，请联系管理员");
-                model.addAttribute("fileType",fileAttribute.getSuffix());
-                return "fileNotSupported";
-            }
-            model.addAttribute("imgurls", imageUrls);
-            model.addAttribute("currentUrl", imageUrls.get(0));
-            if (OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType)) {
-                return "officePicture";
-            } else {
-                return "picture";
-            }
-        } else {
-            // 不是http开头，浏览器不能直接访问，需下载到本地
-            if (url != null && !url.toLowerCase().startsWith("http")) {
-                if (!fileUtils.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
-                    ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, pdfName);
-                    if (0 != response.getCode()) {
-                        model.addAttribute("fileType", suffix);
-                        model.addAttribute("msg", response.getMsg());
-                        return "fileNotSupported";
-                    }
-                    model.addAttribute("pdfUrl", fileUtils.getRelativePath(response.getContent()));
-                    if (ConfigConstants.isCacheEnabled()) {
-                        // 加入缓存
-                        fileUtils.addConvertedFile(pdfName, fileUtils.getRelativePath(outFilePath));
-                    }
-                } else {
-                    model.addAttribute("pdfUrl", pdfName);
-                }
-            } else {
-                model.addAttribute("pdfUrl", url);
-            }
-        }
-        return "pdf";
-    }
-}
--- a/jodconverter-web/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java
+++ b/jodconverter-web/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java
@@ -1,60 +0,0 @@
-package cn.keking.service.impl;
-
-import cn.keking.model.FileAttribute;
-import cn.keking.model.ReturnResponse;
-import cn.keking.service.FilePreview;
-import cn.keking.utils.DownloadUtils;
-import cn.keking.utils.FileUtils;
-import com.google.common.collect.Lists;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
-import org.springframework.web.context.request.RequestContextHolder;
-
-import java.util.List;
-
-/**
- * Created by kl on 2018/1/17.
- * Content :图片文件处理
- */
-@Service
-public class PictureFilePreviewImpl implements FilePreview {
-
-    private final FileUtils fileUtils;
-
-    private final DownloadUtils downloadUtils;
-
-    public PictureFilePreviewImpl(FileUtils fileUtils,
-                                  DownloadUtils downloadUtils) {
-        this.fileUtils = fileUtils;
-        this.downloadUtils = downloadUtils;
-    }
-
-    @Override
-    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
-        String fileKey = (String) RequestContextHolder.currentRequestAttributes().getAttribute("fileKey",0);
-        List<String> imgUrls = Lists.newArrayList(url);
-        try {
-            imgUrls.clear();
-            imgUrls.addAll(fileUtils.getImgCache(fileKey));
-        } catch (Exception e){
-            imgUrls = Lists.newArrayList(url);
-        }
-        // 不是http开头，浏览器不能直接访问，需下载到本地
-        if (url != null && !url.toLowerCase().startsWith("http")) {
-            ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, null);
-            if (0 != response.getCode()) {
-                model.addAttribute("fileType", fileAttribute.getSuffix());
-                model.addAttribute("msg", response.getMsg());
-                return "fileNotSupported";
-            } else {
-                String file = fileUtils.getRelativePath(response.getContent());
-                model.addAttribute("imgurls", Lists.newArrayList(file));
-                model.addAttribute("currentUrl", file);
-            }
-        } else {
-            model.addAttribute("imgurls", imgUrls);
-            model.addAttribute("currentUrl", url);
-        }
-        return "picture";
-    }
-}
--- a/jodconverter-web/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
+++ b/jodconverter-web/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
@@ -1,52 +0,0 @@
-package cn.keking.service.impl;
-
-import cn.keking.model.FileAttribute;
-import cn.keking.model.ReturnResponse;
-import cn.keking.service.FilePreview;
-import cn.keking.utils.DownloadUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-
-/**
- * Created by kl on 2018/1/17.
- * Content :处理文本文件
- */
-@Service
-public class SimTextFilePreviewImpl implements FilePreview {
-
-    private final DownloadUtils downloadUtils;
-
-    public SimTextFilePreviewImpl(DownloadUtils downloadUtils) {
-        this.downloadUtils = downloadUtils;
-    }
-
-    @Override
-    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute){
-        String fileName = fileAttribute.getName();
-        ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, fileName);
-        if (0 != response.getCode()) {
-            model.addAttribute("msg", response.getMsg());
-            model.addAttribute("fileType",fileAttribute.getSuffix());
-            return "fileNotSupported";
-        }
-        try {
-            File originFile = new File(response.getContent());
-            File previewFile = new File(response.getContent() + ".txt");
-            if (previewFile.exists()) {
-                previewFile.delete();
-            }
-            Files.copy(originFile.toPath(), previewFile.toPath());
-        } catch (IOException e) {
-            model.addAttribute("msg", e.getLocalizedMessage());
-            model.addAttribute("fileType",fileAttribute.getSuffix());
-            return "fileNotSupported";
-        }
-        model.addAttribute("ordinaryUrl", response.getMsg());
-        return "txt";
-    }
-
-}
--- a/jodconverter-web/src/main/java/cn/keking/utils/CadUtils.java
+++ b/jodconverter-web/src/main/java/cn/keking/utils/CadUtils.java
@@ -1,50 +0,0 @@
-package cn.keking.utils;
-
-import com.aspose.cad.Color;
-import com.aspose.cad.fileformats.cad.CadDrawTypeMode;
-import com.aspose.cad.imageoptions.CadRasterizationOptions;
-import com.aspose.cad.imageoptions.PdfOptions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-
-/**
- * @author chenjhc
- * @since 2019/11/21 14:34
- */
-@Component
-public class CadUtils {
-
-    private final Logger logger = LoggerFactory.getLogger(CadUtils.class);
-
-    public boolean cadToPdf(String inputFilePath, String outputFilePath)  {
-        com.aspose.cad.Image cadImage = com.aspose.cad.Image.load(inputFilePath);
-        CadRasterizationOptions cadRasterizationOptions = new CadRasterizationOptions();
-        cadRasterizationOptions.setLayouts(new String[]{"Model"});
-        cadRasterizationOptions.setNoScaling(true);
-        cadRasterizationOptions.setBackgroundColor(Color.getWhite());
-        cadRasterizationOptions.setPageWidth(cadImage.getWidth());
-        cadRasterizationOptions.setPageHeight(cadImage.getHeight());
-        cadRasterizationOptions.setPdfProductLocation("center");
-        cadRasterizationOptions.setAutomaticLayoutsScaling(true);
-        cadRasterizationOptions.setDrawType(CadDrawTypeMode.UseObjectColor);
-        PdfOptions pdfOptions = new PdfOptions();
-        pdfOptions.setVectorRasterizationOptions(cadRasterizationOptions);
-        File outputFile = new File(outputFilePath);
-        OutputStream stream;
-        try {
-            stream = new FileOutputStream(outputFile);
-            cadImage.save(stream, pdfOptions);
-            cadImage.close();
-            return true;
-        } catch (FileNotFoundException e) {
-            logger.error("PDFFileNotFoundException，inputFilePath：{}", inputFilePath, e);
-            return false;
-        }
-    }
-}
--- a/jodconverter-web/src/main/java/cn/keking/utils/DeleteFileUtil.java
+++ b/jodconverter-web/src/main/java/cn/keking/utils/DeleteFileUtil.java
@@ -1,82 +0,0 @@
-package cn.keking.utils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.util.Objects;
-
-public class DeleteFileUtil {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(DeleteFileUtil.class);
-
-    /**
-     * 删除单个文件
-     *
-     * @param fileName
-     *            要删除的文件的文件名
-     * @return 单个文件删除成功返回true，否则返回false
-     */
-    public static boolean deleteFile(String fileName) {
-        File file = new File(fileName);
-        // 如果文件路径所对应的文件存在，并且是一个文件，则直接删除
-        if (file.exists() && file.isFile()) {
-            if (file.delete()) {
-                LOGGER.info("删除单个文件" + fileName + "成功！");
-                return true;
-            } else {
-                LOGGER.info("删除单个文件" + fileName + "失败！");
-                return false;
-            }
-        } else {
-            LOGGER.info("删除单个文件失败：" + fileName + "不存在！");
-            return false;
-        }
-    }
-
-
-    /**
-     * 删除目录及目录下的文件
-     *
-     * @param dir
-     *            要删除的目录的文件路径
-     * @return 目录删除成功返回true，否则返回false
-     */
-    public static boolean deleteDirectory(String dir) {
-        // 如果dir不以文件分隔符结尾，自动添加文件分隔符
-        if (!dir.endsWith(File.separator)) {
-            dir = dir + File.separator;
-        }
-        File dirFile = new File(dir);
-        // 如果dir对应的文件不存在，或者不是一个目录，则退出
-        if ((!dirFile.exists()) || (!dirFile.isDirectory())) {
-            LOGGER.info("删除目录失败：" + dir + "不存在！");
-            return false;
-        }
-        boolean flag = true;
-        // 删除文件夹中的所有文件包括子目录
-        File[] files = dirFile.listFiles();
-        for (int i = 0; i < Objects.requireNonNull(files).length; i++) {
-            // 删除子文件
-            if (files[i].isFile()) {
-                flag = DeleteFileUtil.deleteFile(files[i].getAbsolutePath());
-                if (!flag) {
-                    break;
-                }
-            }  else if (files[i].isDirectory()) {
-                // 删除子目录
-                flag = DeleteFileUtil.deleteDirectory(files[i].getAbsolutePath());
-                if (!flag) {
-                    break;
-                }
-            }
-        }
-        dirFile.delete();
-        if (!flag) {
-            LOGGER.info("删除目录失败！");
-            return false;
-        }
-        return true;
-    }
-
-}
--- a/jodconverter-web/src/main/java/cn/keking/utils/DownloadUtils.java
+++ b/jodconverter-web/src/main/java/cn/keking/utils/DownloadUtils.java
@@ -1,176 +0,0 @@
-package cn.keking.utils;
-
-import cn.keking.config.ConfigConstants;
-import cn.keking.hutool.URLUtil;
-import cn.keking.model.FileAttribute;
-import cn.keking.model.FileType;
-import cn.keking.model.ReturnResponse;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.io.*;
-import java.net.*;
-import java.nio.charset.StandardCharsets;
-import java.util.UUID;
-
-/**
- * @author yudian-it
- */
-@Component
-public class DownloadUtils {
-
-    private final Logger logger = LoggerFactory.getLogger(DownloadUtils.class);
-
-    private final String fileDir = ConfigConstants.getFileDir();
-
-    private final FileUtils fileUtils;
-
-    public DownloadUtils(FileUtils fileUtils) {
-        this.fileUtils = fileUtils;
-    }
-
-    private static final String URL_PARAM_FTP_USERNAME = "ftp.username";
-    private static final String URL_PARAM_FTP_PASSWORD = "ftp.password";
-    private static final String URL_PARAM_FTP_CONTROL_ENCODING = "ftp.control.encoding";
-
-    /**
-     * @param fileAttribute fileAttribute
-     * @param fileName 文件名
-     * @return 本地文件绝对路径
-     */
-    public ReturnResponse<String> downLoad(FileAttribute fileAttribute, String  fileName) {
-        String urlStr = fileAttribute.getUrl();
-        String type = fileAttribute.getSuffix();
-        ReturnResponse<String> response = new ReturnResponse<>(0, "下载成功!!!", "");
-        UUID uuid = UUID.randomUUID();
-        if (null == fileName) {
-            fileName = uuid+ "."+type;
-        } else { // 文件后缀不一致时，以type为准(针对simText【将类txt文件转为txt】)
-            fileName = fileName.replace(fileName.substring(fileName.lastIndexOf(".") + 1), type);
-        }
-        String realPath = fileDir + fileName;
-        File dirFile = new File(fileDir);
-        if (!dirFile.exists()) {
-            dirFile.mkdirs();
-        }
-        try {
-            URL url = new URL(urlStr);
-            if (url.getProtocol() != null && (url.getProtocol().toLowerCase().startsWith("file")||url.getProtocol().toLowerCase().startsWith("http"))) {
-                byte[] bytes = getBytesFromUrl(urlStr);
-                OutputStream os = new FileOutputStream(new File(realPath));
-                saveBytesToOutStream(bytes, os);
-            } else if (url.getProtocol() != null && "ftp".equals(url.getProtocol().toLowerCase())) {
-                String ftpUsername = fileUtils.getUrlParameterReg(fileAttribute.getUrl(), URL_PARAM_FTP_USERNAME);
-                String ftpPassword = fileUtils.getUrlParameterReg(fileAttribute.getUrl(), URL_PARAM_FTP_PASSWORD);
-                String ftpControlEncoding = fileUtils.getUrlParameterReg(fileAttribute.getUrl(), URL_PARAM_FTP_CONTROL_ENCODING);
-                FtpUtils.download(fileAttribute.getUrl(), realPath, ftpUsername, ftpPassword, ftpControlEncoding);
-            } else {
-                response.setCode(1);
-                response.setContent(null);
-                response.setMsg("url不能识别url" + urlStr);
-            }
-            response.setContent(realPath);
-            response.setMsg(fileName);
-            if(FileType.simText.equals(fileAttribute.getType())){
-                convertTextPlainFileCharsetToUtf8(realPath);
-            }
-            return response;
-        } catch (IOException e) {
-            logger.error("文件下载失败，url：{}", urlStr, e);
-            response.setCode(1);
-            response.setContent(null);
-            if (e instanceof FileNotFoundException) {
-                response.setMsg("文件不存在!!!");
-            } else {
-                response.setMsg(e.getMessage());
-            }
-            return response;
-        }
-    }
-
-    public byte[] getBytesFromUrl(String urlStr) throws IOException {
-        InputStream is = getInputStreamFromUrl(urlStr);
-        if (is != null) {
-            return getBytesFromStream(is);
-        } else {
-            urlStr = URLUtil.normalize(urlStr, true, true);
-            is = getInputStreamFromUrl(urlStr);
-            if (is == null) {
-                logger.error("文件下载异常：url：{}", urlStr);
-                throw new IOException("文件下载异常：url：" + urlStr);
-            }
-            return getBytesFromStream(is);
-        }
-    }
-
-    public void saveBytesToOutStream(byte[] b, OutputStream os) throws IOException {
-        os.write(b);
-        os.close();
-    }
-
-    private InputStream getInputStreamFromUrl(String urlStr) {
-        try {
-            URL url = new URL(urlStr);
-            URLConnection connection = url.openConnection();
-            if (connection instanceof HttpURLConnection) {
-                connection.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
-            }
-            return connection.getInputStream();
-        } catch (IOException e) {
-            logger.warn("连接url异常：url：{}", urlStr);
-            return null;
-        }
-    }
-
-    private byte[] getBytesFromStream(InputStream is) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        byte[] buffer = new byte[1024];
-        int len = 0;
-        while ((len = is.read(buffer)) != -1) {
-            baos.write(buffer, 0, len);
-        }
-        byte[] b = baos.toByteArray();
-        is.close();
-        baos.close();
-        return b;
-    }
-
-  /**
-   * 转换文本文件编码为utf8
-   * 探测源文件编码,探测到编码切不为utf8则进行转码
-   * @param filePath 文件路径
-   */
-  private static void convertTextPlainFileCharsetToUtf8(String filePath) throws IOException {
-    File sourceFile = new File(filePath);
-    if(sourceFile.exists() && sourceFile.isFile() && sourceFile.canRead()) {
-      String encoding = null;
-      try {
-        FileCharsetDetector.Observer observer = FileCharsetDetector.guessFileEncoding(sourceFile);
-        // 为准确探测到编码,不适用猜测的编码
-        encoding = observer.isFound()?observer.getEncoding():null;
-        // 为准确探测到编码,可以考虑使用GBK  大部分文件都是windows系统产生的
-      } catch (IOException e) {
-        // 编码探测失败,
-        e.printStackTrace();
-      }
-      if(encoding != null && !"UTF-8".equals(encoding)){
-        // 不为utf8,进行转码
-        File tmpUtf8File = new File(filePath+".utf8");
-        Writer writer = new OutputStreamWriter(new FileOutputStream(tmpUtf8File), StandardCharsets.UTF_8);
-        Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(sourceFile),encoding));
-        char[] buf = new char[1024];
-        int read;
-        while ((read = reader.read(buf)) > 0){
-          writer.write(buf, 0, read);
-        }
-        reader.close();
-        writer.close();
-        // 删除源文件
-        sourceFile.delete();
-        // 重命名
-        tmpUtf8File.renameTo(sourceFile);
-      }
-    }
-  }
-}
--- a/jodconverter-web/src/main/java/cn/keking/utils/FileCharsetDetector.java
+++ b/jodconverter-web/src/main/java/cn/keking/utils/FileCharsetDetector.java
@@ -1,157 +0,0 @@
-package cn.keking.utils;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.mozilla.intl.chardet.nsDetector;
-import org.mozilla.intl.chardet.nsICharsetDetectionObserver;
-
-/**
- * 文本文件编码探测工具类
- *
- * @author HWliao
- * @date 2017-12-24
- */
-public class FileCharsetDetector {
-
-  /**
-   * 传入一个文件(File)对象，检查文件编码
-   *
-   * @param file File对象实例
-   * @return 文件编码，若无，则返回null
-   * @throws FileNotFoundException
-   * @throws IOException
-   */
-  public static Observer guessFileEncoding(File file)
-      throws FileNotFoundException, IOException {
-    return guessFileEncoding(file, new nsDetector());
-  }
-
-  /**
-   * <pre>
-   * 获取文件的编码
-   * @param file
-   *            File对象实例
-   * @param languageHint
-   *            语言提示区域代码 @see #nsPSMDetector ,取值如下：
-   *             1 : Japanese
-   *             2 : Chinese
-   *             3 : Simplified Chinese
-   *             4 : Traditional Chinese
-   *             5 : Korean
-   *             6 : Dont know(default)
-   * </pre>
-   *
-   * @return 文件编码，eg：UTF-8,GBK,GB2312形式(不确定的时候，返回可能的字符编码序列)；若无，则返回null
-   * @throws FileNotFoundException
-   * @throws IOException
-   */
-  public static Observer guessFileEncoding(File file, int languageHint)
-      throws FileNotFoundException, IOException {
-    return guessFileEncoding(file, new nsDetector(languageHint));
-  }
-
-  /**
-   * 获取文件的编码
-   *
-   * @param file
-   * @param det
-   * @return
-   * @throws FileNotFoundException
-   * @throws IOException
-   */
-  private static Observer guessFileEncoding(File file, nsDetector det)
-      throws FileNotFoundException, IOException {
-    // new Observer
-    Observer observer = new Observer();
-    // set Observer
-    // The Notify() will be called when a matching charset is found.
-    det.Init(observer);
-
-    BufferedInputStream imp = new BufferedInputStream(new FileInputStream(
-        file));
-    byte[] buf = new byte[1024];
-    int len;
-    boolean done = false;
-    boolean isAscii = false;
-
-    while ((len = imp.read(buf, 0, buf.length)) != -1) {
-      // Check if the stream is only ascii.
-      isAscii = det.isAscii(buf, len);
-      if (isAscii) {
-        break;
-      }
-      // DoIt if non-ascii and not done yet.
-      done = det.DoIt(buf, len, false);
-      if (done) {
-        break;
-      }
-    }
-    imp.close();
-    det.DataEnd();
-
-    if (isAscii) {
-      observer.encoding = "ASCII";
-      observer.found = true;
-    }
-
-    if (!observer.isFound()) {
-      String[] prob = det.getProbableCharsets();
-      // // 这里将可能的字符集组合起来返回
-      // for (int i = 0; i < prob.length; i++) {
-      // if (i == 0) {
-      // encoding = prob[i];
-      // } else {
-      // encoding += "," + prob[i];
-      // }
-      // }
-      if (prob.length > 0) {
-        // 在没有发现情况下,去第一个可能的编码
-        observer.encoding = prob[0];
-      } else {
-        observer.encoding = null;
-      }
-    }
-    return observer;
-  }
-
-  /**
-   * @author liaohongwei
-   * @Description: 文件字符编码观察者, 但判断出字符编码时候调用
-   * @date 2016年6月20日 下午2:27:06
-   */
-  public static class Observer implements nsICharsetDetectionObserver {
-
-    /**
-     * @Fields encoding : 字符编码
-     */
-    private String encoding = null;
-    /**
-     * @Fields found : 是否找到字符集
-     */
-    private boolean found = false;
-
-    @Override
-    public void Notify(String charset) {
-      this.encoding = charset;
-      this.found = true;
-    }
-
-    public String getEncoding() {
-      return encoding;
-    }
-
-    public boolean isFound() {
-      return found;
-    }
-
-    @Override
-    public String toString() {
-      return "Observer [encoding=" + encoding + ", found=" + found + "]";
-    }
-  }
-
-}
--- a/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
+++ b/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
@@ -1,337 +0,0 @@
-package cn.keking.utils;
-
-import cn.keking.config.ConfigConstants;
-import cn.keking.model.FileAttribute;
-import cn.keking.model.FileType;
-import cn.keking.service.cache.CacheService;
-import com.google.common.collect.Lists;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import java.io.*;
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- * @author yudian-it
- * @date 2017/11/13
- */
-@Component
-public class FileUtils {
-
-    private static final String DEFAULT_CONVERTER_CHARSET = System.getProperty("sun.jnu.encoding");
-
-    private final String fileDir = ConfigConstants.getFileDir();
-
-    private final CacheService cacheService;
-
-    public FileUtils(CacheService cacheService) {
-        this.cacheService = cacheService;
-    }
-
-    /**
-     * @return 已转换过的文件集合(缓存)
-     */
-    public Map<String, String> listConvertedFiles() {
-        return cacheService.getPDFCache();
-    }
-
-    /**
-     * @return 已转换过的文件，根据文件名获取
-     */
-    public String getConvertedFile(String key) {
-        return cacheService.getPDFCache(key);
-    }
-
-    /**
-     * @param key pdf本地路径
-     * @return 已将pdf转换成图片的图片本地相对路径
-     */
-    public Integer getConvertedPdfImage(String key) {
-        return cacheService.getPdfImageCache(key);
-    }
-
-    /**
-     * 查看文件类型(防止参数中存在.点号或者其他特殊字符，所以先抽取文件名，然后再获取文件类型)
-     *
-     * @param url url
-     * @return 文件类型
-     */
-    public FileType typeFromUrl(String url) {
-        String nonPramStr = url.substring(0, url.contains("?") ? url.indexOf("?") : url.length());
-        String fileName = nonPramStr.substring(nonPramStr.lastIndexOf("/") + 1);
-        return typeFromFileName(fileName);
-    }
-
-    private FileType typeFromFileName(String fileName) {
-        String[] simText = ConfigConstants.getSimText();
-        String[] media = ConfigConstants.getMedia();
-        String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
-        if (listPictureTypes().contains(fileType.toLowerCase())) {
-            return FileType.picture;
-        }
-        if (listArchiveTypes().contains(fileType.toLowerCase())) {
-            return FileType.compress;
-        }
-        if (listOfficeTypes().contains(fileType.toLowerCase())) {
-            return FileType.office;
-        }
-        if (Arrays.asList(simText).contains(fileType.toLowerCase())) {
-            return FileType.simText;
-        }
-        if (Arrays.asList(media).contains(fileType.toLowerCase())) {
-            return FileType.media;
-        }
-        if ("pdf".equalsIgnoreCase(fileType)) {
-            return FileType.pdf;
-        }
-        if ("dwg".equalsIgnoreCase(fileType)) {
-            return FileType.cad;
-        }
-        return FileType.other;
-    }
-    /**
-     * 从url中剥离出文件名
-     * @param url
-     *      格式如：http://keking.ufile.ucloud.com.cn/20171113164107_月度绩效表模板(新).xls?UCloudPublicKey=ucloudtangshd@weifenf.com14355492830001993909323&Expires=&Signature=I D1NOFtAJSPT16E6imv6JWuq0k=
-     * @return 文件名
-     */
-    public String getFileNameFromURL(String url) {
-        // 因为url的参数中可能会存在/的情况，所以直接url.lastIndexOf("/")会有问题
-        // 所以先从？处将url截断，然后运用url.lastIndexOf("/")获取文件名
-        String noQueryUrl = url.substring(0, url.contains("?") ? url.indexOf("?"): url.length());
-        return noQueryUrl.substring(noQueryUrl.lastIndexOf("/") + 1);
-    }
-
-    /**
-     * 从路径中获取文件负
-     * @param path
-     *      类似这种：C:\Users\yudian-it\Downloads
-     * @return 文件名
-     */
-    public String getFileNameFromPath(String path) {
-        return path.substring(path.lastIndexOf(File.separator) + 1);
-    }
-
-    public List<String> listPictureTypes(){
-        List<String> list = Lists.newArrayList();
-        list.add("jpg");
-        list.add("jpeg");
-        list.add("png");
-        list.add("gif");
-        list.add("bmp");
-        list.add("ico");
-        list.add("RAW");
-        return list;
-    }
-
-    public List<String> listArchiveTypes(){
-        List<String> list = Lists.newArrayList();
-        list.add("rar");
-        list.add("zip");
-        list.add("jar");
-        list.add("7-zip");
-        list.add("tar");
-        list.add("gzip");
-        list.add("7z");
-        return list;
-    }
-
-    public List<String> listOfficeTypes() {
-        List<String> list = Lists.newArrayList();
-        list.add("docx");
-        list.add("doc");
-        list.add("xls");
-        list.add("xlsx");
-        list.add("ppt");
-        list.add("pptx");
-        return list;
-    }
-
-    /**
-     * 获取相对路径
-     * @param absolutePath 绝对路径
-     * @return 相对路径
-     */
-    public String getRelativePath(String absolutePath) {
-        return absolutePath.substring(fileDir.length());
-    }
-
-    /**
-     * 添加转换后PDF缓存
-     * @param fileName pdf文件名
-     * @param value 缓存相对路径
-     */
-    public void addConvertedFile(String fileName, String value){
-        cacheService.putPDFCache(fileName, value);
-    }
-
-    /**
-     * 添加转换后图片组缓存
-     * @param pdfFilePath pdf文件绝对路径
-     * @param num 图片张数
-     */
-    public void addConvertedPdfImage(String pdfFilePath, int num){
-        cacheService.putPdfImageCache(pdfFilePath, num);
-    }
-
-    /**
-     * 获取redis中压缩包内图片文件
-     * @param fileKey fileKey
-     * @return 图片文件访问url列表
-     */
-    public List<String> getImgCache(String fileKey){
-        return cacheService.getImgCache(fileKey);
-    }
-
-    /**
-     * 设置redis中压缩包内图片文件
-     * @param fileKey fileKey
-     * @param imgs 图片文件访问url列表
-     */
-    public void putImgCache(String fileKey,List<String> imgs){
-        cacheService.putImgCache(fileKey, imgs);
-    }
-    /**
-     * 判断文件编码格式
-     * @param path 绝对路径
-     * @return 编码格式
-     */
-    public String getFileEncodeUTFGBK(String path){
-        String enc = Charset.forName("GBK").name();
-        File file = new File(path);
-        InputStream in;
-        try {
-            in = new FileInputStream(file);
-            byte[] b = new byte[3];
-            in.read(b);
-            in.close();
-            if (b[0] == -17 && b[1] == -69 && b[2] == -65) {
-                enc = StandardCharsets.UTF_8.name();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        System.out.println("文件编码格式为:" + enc);
-        return enc;
-    }
-
-    /**
-     * 对转换后的文件进行操作(改变编码方式)
-     * @param outFilePath 文件绝对路径
-     */
-    public void doActionConvertedFile(String outFilePath) {
-        StringBuilder sb = new StringBuilder();
-        try (InputStream inputStream = new FileInputStream(outFilePath);
-            BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, DEFAULT_CONVERTER_CHARSET))){
-            String line;
-            while(null != (line = reader.readLine())){
-                if (line.contains("charset=gb2312")) {
-                    line = line.replace("charset=gb2312", "charset=utf-8");
-                }
-                sb.append(line);
-            }
-            // 添加sheet控制头
-            sb.append("<script src=\"js/jquery-3.0.0.min.js\" type=\"text/javascript\"></script>");
-            sb.append("<script src=\"js/excel.header.js\" type=\"text/javascript\"></script>");
-            sb.append("<link rel=\"stylesheet\" href=\"bootstrap/css/bootstrap.min.css\">");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        // 重新写入文件
-        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();
-        }
-    }
-    /**
-     * 获取文件后缀
-     * @param url url
-     * @return 文件后缀
-     */
-    private String suffixFromUrl(String url) {
-        String nonPramStr = url.substring(0, url.contains("?") ? url.indexOf("?") : url.length());
-        String fileName = nonPramStr.substring(nonPramStr.lastIndexOf("/") + 1);
-        return suffixFromFileName(fileName);
-    }
-
-    private String suffixFromFileName(String fileName) {
-        return fileName.substring(fileName.lastIndexOf(".") + 1);
-    }
-
-    /**
-     * 获取url中的参数
-     * @param url url
-     * @param name 参数名
-     * @return 参数值
-     */
-    public String getUrlParameterReg(String url, String name) {
-        Map<String, String> mapRequest = new HashMap<>();
-        String strUrlParam = truncateUrlPage(url);
-        if (strUrlParam == null) {
-            return "";
-        }
-        //每个键值为一组
-        String[] arrSplit = strUrlParam.split("[&]");
-        for(String strSplit : arrSplit) {
-            String[] arrSplitEqual = strSplit.split("[=]");
-            //解析出键值
-            if(arrSplitEqual.length > 1) {
-                //正确解析
-                mapRequest.put(arrSplitEqual[0], arrSplitEqual[1]);
-            } else if (!arrSplitEqual[0].equals("")) {
-                //只有参数没有值，不加入
-                mapRequest.put(arrSplitEqual[0], "");
-            }
-        }
-        return mapRequest.get(name);
-    }
-
-    /**
-     * 去掉url中的路径，留下请求参数部分
-     * @param strURL url地址
-     * @return url请求参数部分
-     */
-    private String truncateUrlPage(String strURL) {
-        String strAllParam = null;
-        strURL = strURL.trim();
-        String[] arrSplit = strURL.split("[?]");
-        if(strURL.length() > 1)  {
-            if(arrSplit.length > 1) {
-                if(arrSplit[1] != null) {
-                    strAllParam=arrSplit[1];
-                }
-            }
-        }
-        return strAllParam;
-    }
-
-    /**
-     * 获取文件属性
-     * @param url url
-     * @return 文件属性
-     */
-    public FileAttribute getFileAttribute(String url) {
-        String fileName;
-        FileType type;
-        String suffix;
-        String fullFileName = getUrlParameterReg(url, "fullfilename");
-        if (!StringUtils.isEmpty(fullFileName)) {
-            fileName = fullFileName;
-            type = typeFromFileName(fileName);
-            suffix = suffixFromFileName(fileName);
-        } else {
-            fileName = getFileNameFromURL(url);
-            type = typeFromUrl(url);
-            suffix = suffixFromUrl(url);
-        }
-        return new FileAttribute(type,suffix,fileName,url);
-    }
-}
--- a/jodconverter-web/src/main/java/cn/keking/utils/PdfUtils.java
+++ b/jodconverter-web/src/main/java/cn/keking/utils/PdfUtils.java
@@ -1,78 +0,0 @@
-package cn.keking.utils;
-
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.rendering.ImageType;
-import org.apache.pdfbox.rendering.PDFRenderer;
-import org.apache.pdfbox.tools.imageio.ImageIOUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
-
-@Component
-public class PdfUtils {
-
-    private final Logger logger = LoggerFactory.getLogger(PdfUtils.class);
-
-    private final FileUtils fileUtils;
-
-    @Value("${server.tomcat.uri-encoding:UTF-8}")
-    private String uriEncoding;
-
-    public PdfUtils(FileUtils fileUtils) {
-        this.fileUtils = fileUtils;
-    }
-
-    public List<String> pdf2jpg(String pdfFilePath, String pdfName, String baseUrl) {
-        List<String> imageUrls = new ArrayList<>();
-        Integer imageCount = fileUtils.getConvertedPdfImage(pdfFilePath);
-        String imageFileSuffix = ".jpg";
-        String pdfFolder = pdfName.substring(0, pdfName.length() - 4);
-        String urlPrefix = null;
-        try {
-            urlPrefix = baseUrl + URLEncoder.encode(URLEncoder.encode(pdfFolder, uriEncoding).replaceAll("\\+", "%20"), uriEncoding);
-        } catch (UnsupportedEncodingException e) {
-            logger.error("UnsupportedEncodingException", e);
-            urlPrefix = baseUrl + pdfFolder;
-        }
-        if (imageCount != null && imageCount > 0) {
-            for (int i = 0; i < imageCount ; i++)
-            imageUrls.add(urlPrefix + "/" + i + imageFileSuffix);
-            return imageUrls;
-        }
-        try {
-            File pdfFile = new File(pdfFilePath);
-            PDDocument doc = PDDocument.load(pdfFile);
-            int pageCount = doc.getNumberOfPages();
-            PDFRenderer pdfRenderer = new PDFRenderer(doc);
-
-            int index = pdfFilePath.lastIndexOf(".");
-            String folder = pdfFilePath.substring(0, index);
-
-            File path = new File(folder);
-            if (!path.exists()) {
-                path.mkdirs();
-            }
-            String imageFilePath;
-            for (int pageIndex = 0; pageIndex < pageCount; pageIndex++) {
-                imageFilePath = folder + File.separator + pageIndex + imageFileSuffix;
-                BufferedImage image = pdfRenderer.renderImageWithDPI(pageIndex, 105, ImageType.RGB);
-                ImageIOUtil.writeImage(image, imageFilePath, 105);
-                imageUrls.add(urlPrefix + "/" + pageIndex + imageFileSuffix);
-            }
-            doc.close();
-            fileUtils.addConvertedPdfImage(pdfFilePath, pageCount);
-        } catch (IOException e) {
-            logger.error("Convert pdf to jpg exception, pdfFilePath：{}", pdfFilePath, e);
-        }
-        return imageUrls;
-    }
-}
--- a/jodconverter-web/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
+++ b/jodconverter-web/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
@@ -1,110 +0,0 @@
-package cn.keking.web.controller;
-
-import cn.keking.config.ConfigConstants;
-import cn.keking.model.FileAttribute;
-import cn.keking.service.FilePreview;
-import cn.keking.service.FilePreviewFactory;
-
-import cn.keking.service.cache.CacheService;
-import cn.keking.utils.DownloadUtils;
-import cn.keking.utils.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @author yudian-it
- */
-@Controller
-public class OnlinePreviewController {
-
-    private final Logger logger = LoggerFactory.getLogger(OnlinePreviewController.class);
-
-    private final FilePreviewFactory previewFactory;
-
-    private final CacheService cacheService;
-
-    private final FileUtils fileUtils;
-
-    private final DownloadUtils downloadUtils;
-
-    public OnlinePreviewController(FilePreviewFactory filePreviewFactory,
-                                   FileUtils fileUtils,
-                                   CacheService cacheService,
-                                   DownloadUtils downloadUtils) {
-        this.previewFactory = filePreviewFactory;
-        this.fileUtils = fileUtils;
-        this.cacheService = cacheService;
-        this.downloadUtils = downloadUtils;
-    }
-
-
-    @RequestMapping(value = "/onlinePreview")
-    public String onlinePreview(String url, Model model, HttpServletRequest req) {
-        FileAttribute fileAttribute = fileUtils.getFileAttribute(url);
-        req.setAttribute("fileKey", req.getParameter("fileKey"));
-        model.addAttribute("pdfDownloadDisable", ConfigConstants.getPdfDownloadDisable());
-        model.addAttribute("officePreviewType", req.getParameter("officePreviewType"));
-        FilePreview filePreview = previewFactory.get(fileAttribute);
-        logger.info("预览文件url：{}，previewType：{}", url, fileAttribute.getType());
-        return filePreview.filePreviewHandle(url, model, fileAttribute);
-    }
-
-    @RequestMapping(value = "picturesPreview")
-    public String picturesPreview(Model model, HttpServletRequest req) throws UnsupportedEncodingException {
-        String urls = req.getParameter("urls");
-        String currentUrl = req.getParameter("currentUrl");
-        logger.info("预览文件url：{}，urls：{}", currentUrl, urls);
-        // 路径转码
-        String decodedUrl = URLDecoder.decode(urls, "utf-8");
-        String decodedCurrentUrl = URLDecoder.decode(currentUrl, "utf-8");
-        // 抽取文件并返回文件列表
-        String[] imgs = decodedUrl.split("\\|");
-        List imgurls = Arrays.asList(imgs);
-        model.addAttribute("imgurls", imgurls);
-        model.addAttribute("currentUrl",decodedCurrentUrl);
-        return "picture";
-    }
-
-    /**
-     * 根据url获取文件内容
-     * 当pdfjs读取存在跨域问题的文件时将通过此接口读取
-     *
-     * @param urlPath url
-     * @param response response
-     */
-    @RequestMapping(value = "/getCorsFile", method = RequestMethod.GET)
-    public void getCorsFile(String urlPath, HttpServletResponse response) {
-        logger.info("下载跨域pdf文件url：{}", urlPath);
-        try {
-            byte[] bytes = downloadUtils.getBytesFromUrl(urlPath);
-            downloadUtils.saveBytesToOutStream(bytes, response.getOutputStream());
-        } catch (IOException e) {
-            logger.error("下载跨域pdf文件异常，url：{}", urlPath, e);
-        }
-    }
-
-    /**
-     * 通过api接口入队
-     * @param url 请编码后在入队
-     */
-    @RequestMapping("/addTask")
-    @ResponseBody
-    public String addQueueTask(String url) {
-        logger.info("添加转码队列url：{}", url);
-        cacheService.addQueueTask(url);
-        return "success";
-    }
-
-}
--- a/jodconverter-web/src/main/log/.gitkeep
+++ b/jodconverter-web/src/main/log/.gitkeep
--- a/jodconverter-web/src/main/office/readme.txt
+++ b/jodconverter-web/src/main/office/readme.txt
@@ -1,144 +0,0 @@
-
-======================================================================
-OpenOffice 4.1.6 ReadMe
-======================================================================
-
-
-有关此自述文件的最新更新，请参阅  http://www.openoffice.org/welcome/readme.html
-
-该文件包含有关此程序的重要信息。请在开始操作之前仔细阅读这些信息。
-
-负责此产品开发的 Apache OpenOffice.org 社区诚挚邀请您加入社区并成为社区成员。作为新用户，您可以查看 OpenOffice 社区站点上的有用信息，网址为 http://openoffice.apache.org
-
-也可以阅读下面来了解如何参与 Apache OpenOffice 项目。
-
-OpenOffice 对任何用户确实是免费的吗？
----------------------------------------------------------------------
-
-OpenOffice 对所有用户都是免费的。您可以获得此 OpenOffice 的副本，将其安装到您所需要的任何计算机上，并将其用于您需要的任何用途（包括商业、政府、公共管理和教育用途）。要了解详情，请参见 OpenOffice 随附的许可文本或 http://www.openoffice.org/license.html
-
-为什么 OpenOffice 对任何用户都是免费的？
----------------------------------------------------------------------
-
-现今，您可以免费使用 OpenOffice 的副本，这是由于个人贡献者和社区发起人已经设计、开发、测试、翻译、评注、支持、营销以及通过许多其他方式帮助 OpenOffice 成为今天 - 世界上最主要的开源办公软件。
-
-如果您欣赏他们的努力， 并且愿意帮助Apache OpenOffice可以继续发展，您可以考虑为这个项目做出贡献，具体请参考http://openoffice.apache.org/get-involved.html，还可以参考http://www.apache.org/foundation/contributing.html来了解如何捐助这个项目。任何人都可以贡献其中。
-
----------------------------------------------------------------------
-安装注意事项
----------------------------------------------------------------------
-
-OpenOffice 要求一个较新版本的JAVA运行环境以使用它的全部功能； JAVA可以从http://java.com 下载。
-
-系统要求
----------------------------------------------------------------------
-
-* 微软 Windows XP, Vista, Windows 7 或者 Windows 8
-* Pentium III 或更高系列处理器
-* 256 MB RAM（建议使用 512 MB RAM）
-* 高达 1.5 GB 的硬盘可用空间
-* 1024x768 分辨率（建议使用更高分辨率），至少 256 色
-
-请注意，安装过程中需要拥有管理员权限。
-
-通过使用下列含有该安装程序的命令行开关项，可以强制或禁止将 OpenOffice 注册为 Microsoft Office 格式默认的应用程序：
-
-* /msoreg=1 强制将 OpenOffice 注册为 Microsoft Office 格式默认的应用程序。
-* /msoreg=0 禁止将 OpenOffice 注册为 Microsoft Office 格式默认的应用程序。
-
-如果您使用 setup /a 执行管理安装，则需要确保系统上安装了 msvcr100.dll 文件。OpenOffice 需要此文件才能在管理安装后启动。您可以从 http://www.microsoft.com/en-us/download/details.aspx?id=5555 获取该文件。
-
-请注意，安装过程中需要拥有管理员权限。
-
-请确定您系统上的临时目录中有足够可用的内存空间，并且已获得读、写及运行的访问权限。开始安装前请关闭其他所有应用程序。
-
----------------------------------------------------------------------
-程序启动时出现的问题
----------------------------------------------------------------------
-
-显卡驱动程序经常会引发 OpenOffice 启动问题（例如应用程序挂起）和屏幕显示问题。如果出现这些问题，请更新您的显卡驱动程序或尝试使用操作系统附带的图形驱动程序。如果显示三维对象时出现问题，则经常可以通过禁用“工具”-“选项”- OpenOffice -“视图”-“三维视图”下的“使用 OpenGL”选项得到解决。
-
----------------------------------------------------------------------
-Windows 下的 ALPS/Synaptics 笔记本触摸板
----------------------------------------------------------------------
-
-由于 Windows 驱动的问题, 您将不能通过使用 ALPS/Synaptics 触摸板的滚动条控制 OpenOffice 的上下滚动。
-
-如果想要使用触摸板的滚动条，需要把下面几行内容添加到配置文件 "C:\Program Files\Synaptics\SynTP\SynTPEnh.ini" 中，然后重新启动您的计算机：
-
-[OpenOffice]
-
-FC = "SALFRAME"
-
-SF = 0x10000000
-
-SF |= 0x00004000
-
-在 Windows 的不同版本中配置文件的位置可能会不同。
-
----------------------------------------------------------------------
-快捷键
----------------------------------------------------------------------
-
-OpenOffice 中只能够使用操作系统尚未预设的快捷键（组合键）。如果 OpenOffice 帮助中描述的一些组合键在使用 OpenOffice 时根本无法起作用，您就需要检查一下这些快捷键是否已经被操作系统占用。要解除此类冲突，您可以更改操作系统指定的快捷键。另外，您也可以更改 OpenOffice 中绝大部分的快捷键。有关此主题的详细信息，请参阅 OpenOffice 帮助或操作系统的帮助文档。
-
----------------------------------------------------------------------
-OpenOffice 中以当前文档格式发送电子邮件时出现的问题
----------------------------------------------------------------------
-
-当通过“文件”-“发送”-“文档作为电子邮件”或“文档作为 PDF 附件”发送文档时可能会发生问题（程序崩溃或中止）。这是由于 Windows 系统文件 "Mapi" (Messaging Application Programming Interface) 导致了一些文件版本上的问题。不幸的是，我们无法确定哪些版本有问题。有关详细信息，请访问 http://www.microsoft.com 以在知识库中搜索 "mapi dll"。
-
----------------------------------------------------------------------
-辅助功能的重要提示
----------------------------------------------------------------------
-
-有关 OpenOffice 中辅助功能的详细信息，请参见 http://www.openoffice.org/access/
-
----------------------------------------------------------------------
-用户支持
----------------------------------------------------------------------
-
-主支持页 http://support.openoffice.org/ 提供了各种可能的方法来帮助您使用 OpenOffice。您的问题可能已得到回答 - 可以在 http://forum.openoffice.org 查看社区论坛，或在 http://openoffice.apache.org/mailing-lists.html 搜索 "users@openoffice.apache.org" 邮件列表的存档。或者，您也可以将问题发送至 users@openoffice.apache.org。以下网页介绍了如何订阅此列表（获取电子邮件响应）：http://openoffice.apache.org/mailing-lists.html。
-
-您还可以查阅常见问题解答部分，网址为 http://wiki.openoffice.org/wiki/Documentation/FAQ。
-
----------------------------------------------------------------------
-报告错误和问题
----------------------------------------------------------------------
-
-OpenOffice 网站中的 BugZilla, 是我们用于报告、跟踪和解决错误与问题的机制。我们鼓励所有用户利用这种权利，并欢迎您报告在您的特定平台上出现的问题。热心的问题报告是用户群体对正在开发和改进的办公套件可做的最重要贡献之一。
-
----------------------------------------------------------------------
-涉及
----------------------------------------------------------------------
-
-您在该重要的开源项目发展中的积极参与将会对 OpenOffice 社区非常有帮助。
-
-作为一名用户，您已经是本套件开发过程中重要的一环，我们鼓励您成为更加活跃的社区长期贡献者。请加入并查看用户页面 http://openoffice.apache.org/get-involved.html
-
-开始方式
----------------------------------------------------------------------
-
-订阅一个或多个邮件列表是开始做出贡献的最佳途径，经过一段时间的邮件阅读，并且逐步借助归档邮件使自己熟悉更多的从 OpenOffice 源代码在2000年10月发布以来的讨论话题。当您觉得适当的时候，您只需要发送一封邮件做自我介绍并加入讨论。
-
-订阅邮件
----------------------------------------------------------------------
-
-在http://openoffice.apache.org/mailing-lists.html中有一些您可以订阅的关于 OpenOffice 的邮件列表。
-
-* 新闻: announce@openoffice.apache.org *推荐所有用户订阅* (低流量)
-* 主用户论坛: users@openoffice.apache.org *更容易看到各种讨论* (高流量)
-* 通用项目开发和讨论邮件列表：dev@openoffice.apache.org (高流量)
-
-Joining the Project
----------------------------------------------------------------------
-
-您可以为这个重要的开源项目做出主要的贡献，即使您的软件设计和编码经验有限。是的，您可以！
-
-在 http://openoffice.apache.org/get-involved.html 中你将会发现一些概览，范围从本地化、质量保障、用户支持到一些真正核心编码的项目工程，你可以从它们开始。如果你不是一名程序员，你可以进行其他帮助，如完善文档或从事市场推广。OpenOffice 的市场推广可以是零散的，也可以借鉴传统的推广开源软件的商业手段，并且我们需要使产品可以不受语言和文化的限制，所以你要做的可以仅仅是把这个办公套件的信息传播出去或者告诉你的朋友。
-
-你可以通过加入市场推广的邮件列表 marketing@openoffice.apache.org 来提供帮助，在那里你可以建立所在国家和本地社区内新闻、媒体、政府机构、顾问、学校、Linux用户群和开发者的通讯联系点。
-
-我们希望您能够愉快地使用新的 OpenOffice 4.1.6 并在线加入我们。
-
-Apache OpenOffice 社区
--- a/jodconverter-web/src/main/resources/web/flv.ftl
+++ b/jodconverter-web/src/main/resources/web/flv.ftl
@@ -1,66 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title>多媒体文件预览</title>
-    <script src="js/flv.min.js"type="text/javascript"></script>
-    <script src="js/watermark.js" type="text/javascript"></script>
-</head>
-<style>
-    * {
-        margin: 0;
-        padding: 0;
-    }
-    html, body {
-        height: 100%;
-        width: 100%;
-    }
-    body {
-        background-color: #404040;
-    }
-    .m {
-        width: 1024px;
-        margin: 0 auto;
-    }
-</style>
-<body>
-<div class="m">
-    <video width="1024" id="videoElement"></video>
-</div>
-<script>
-    if (flvjs.isSupported()) {
-        var videoElement = document.getElementById('videoElement');
-        var flvPlayer = flvjs.createPlayer({
-            type: 'flv',
-            url: '${mediaUrl}'
-        });
-        flvPlayer.attachMediaElement(videoElement);
-        flvPlayer.load();
-        flvPlayer.play();
-    }
-    /*初始化水印*/
-    window.onload = function() {
-        var watermarkTxt = '${watermarkTxt}';
-        if (watermarkTxt !== '') {
-            watermark.init({
-                watermark_txt: '${watermarkTxt}',
-                watermark_x: 0,
-                watermark_y: 0,
-                watermark_rows: 0,
-                watermark_cols: 0,
-                watermark_x_space: ${watermarkXSpace},
-                watermark_y_space: ${watermarkYSpace},
-                watermark_font: '${watermarkFont}',
-                watermark_fontsize: '${watermarkFontsize}',
-                watermark_color:'${watermarkColor}',
-                watermark_alpha: ${watermarkAlpha},
-                watermark_width: ${watermarkWidth},
-                watermark_height: ${watermarkHeight},
-                watermark_angle: ${watermarkAngle},
-            });
-        }
-    }
-</script>
-</body>
-
-</html>
--- a/jodconverter-web/src/main/resources/web/html.ftl
+++ b/jodconverter-web/src/main/resources/web/html.ftl
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
-    <style type="text/css">
-        * {
-            margin: 0;
-            padding: 0;
-        }
-        html, body {
-            height: 100%;
-            width: 100%;
-        }
-    </style>
-</head>
-<body>
-    <iframe src="${pdfUrl}" width="100%" frameborder="0"></iframe>
-</body>
-<script src="js/watermark.js" type="text/javascript"></script>
-<script type="text/javascript">
-    document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight-10;
-    /**
-     * 页面变化调整高度
-     */
-    window.onresize = function(){
-        var fm = document.getElementsByTagName("iframe")[0];
-        fm.height = window.document.documentElement.clientHeight-10;
-    }
-    /*初始化水印*/
-    window.onload = function() {
-        var watermarkTxt = '${watermarkTxt}';
-        if (watermarkTxt !== '') {
-            watermark.init({
-                watermark_txt: '${watermarkTxt}',
-                watermark_x: 0,
-                watermark_y: 0,
-                watermark_rows: 0,
-                watermark_cols: 0,
-                watermark_x_space: ${watermarkXSpace},
-                watermark_y_space: ${watermarkYSpace},
-                watermark_font: '${watermarkFont}',
-                watermark_fontsize: '${watermarkFontsize}',
-                watermark_color:'${watermarkColor}',
-                watermark_alpha: ${watermarkAlpha},
-                watermark_width: ${watermarkWidth},
-                watermark_height: ${watermarkHeight},
-                watermark_angle: ${watermarkAngle},
-            });
-        }
-    }
-</script>
-</html>
--- a/jodconverter-web/src/main/resources/web/index.ftl
+++ b/jodconverter-web/src/main/resources/web/index.ftl
@@ -1,247 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0" />
-    <title>kkFileView演示首页</title>
-    <link rel="stylesheet" href="css/viewer.min.css" />
-    <link rel="stylesheet" href="css/loading.css" />
-    <link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="bootstrap-table/bootstrap-table.min.css" />
-    <link rel="stylesheet" href="gitalk/gitalk.css" />
-    <script type="text/javascript" src="js/jquery-3.0.0.min.js"></script>
-    <script type="text/javascript" src="js/jquery.form.min.js"></script>
-    <script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
-    <script type="text/javascript" src="bootstrap-table/bootstrap-table.min.js"></script>
-    <script type="text/javascript" src="gitalk/gitalk.min.js"></script>
-</head>
-
-<body>
-<h1>文件预览项目接入和测试界面</h1>
-<div class="panel-group" id="accordion">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion"
-                   href="#collapseOne">
-                    接入说明
-                </a>
-            </h4>
-        </div>
-        <div id="collapseOne" class="panel-collapse collapse">
-            <div class="panel-body">
-                <div>
-                    如果你的项目需要接入文件预览项目，达到对docx、excel、ppt、jpg等文件的预览效果，那么通过在你的项目中加入下面的代码就可以
-                    成功实现：
-                    <pre style="background-color: #2f332a;color: #cccccc">
-var url = 'http://127.0.0.1:8080/file/test.txt'; //要预览文件的访问地址
-window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(url));
-                    </pre>
-                </div>
-                <div>
-                    新增多图片同时预览功能，接口如下：
-                    <pre style="background-color: #2f332a;color: #cccccc">
-var fileUrl =url1+"|"+"url2";//多文件使用“|”字符隔开
-window.open('http://127.0.0.1:8012/picturesPreview?urls='+encodeURIComponent(fileUrl));
-                    </pre>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion"
-                   href="#collapseTwo">
-                    预览测试
-                </a>
-            </h4>
-        </div>
-        <div id="collapseTwo" class="panel-collapse collapse">
-            <div class="panel-body">
-                <div style="padding: 10px">
-                    <form enctype="multipart/form-data" id="fileUpload">
-                        <input type="file" name="file" />
-                        <input type="button" id="btnsubmit" value=" 上 传 " />
-                    </form>
-                </div>
-                <div>
-                    <table id="table" data-pagination="true"></table>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion"
-                   href="#collapseThree">
-                    更新记录
-                </a>
-            </h4>
-        </div>
-        <div id="collapseThree" class="panel-collapse collapse in">
-            <div class="panel-body">
-                <div>
-                    2020年05月20日 ：<br>
-                        1. 新增支持全局水印，并支持通过参数动态改变水印内容<br>
-                        2. 新增支持CAD文件预览<br>
-                        3. 新增base.url配置，支持使用nginx反向代理和使用context-path<br>
-                        4. 支持所有配置项支持从环境变量里读取，方便Docker镜像部署和集群中大规模使用<br>
-                        5. 支持配置限信任站点（只能预览来自信任点的文件源），保护预览服务不被滥用<br>
-                        6. 支持配置自定义缓存清理时间（cron表达式）<br>
-                        7. 全部能识别的纯文本直接预览，不用再转跳下载，如.md .java .py等<br>
-                        8. 支持配置限制转换后的PDF文件下载<br>
-                        9. 优化maven打包配置，解决 .sh 脚本可能出现换行符问题<br>
-                        10. 将前端所有CDN依赖放到本地，方便没有外网连接的用户使用<br>
-                        11. 首页评论服务由搜狐畅言切换到Gitalk<br>
-                        12. 修复url中包含特殊字符可能会引起的预览异常<br>
-                        13. 修复转换文件队列addTask异常<br>
-                        14. 修复其他已经问题<br>
-                        15. 官网建设：<a href="https://kkfileview.keking.cn">https://kkfileview.keking.cn</a><br>
-                        16. 官方Docker镜像仓库建设：<a href="https://hub.docker.com/r/keking/kkfileview">https://hub.docker.com/r/keking/kkfileview</a><br><br>
-
-                    2019年06月18日 ：<br>
-                        1. 支持自动清理缓存及预览文件<br>
-                        2. 支持http/https下载流url文件预览<br>
-                        3. 支持FTP url文件预览<br>
-                        4. 加入Docker构建<br><br>
-
-                    2019年04月08日 ：<br>
-                        1. 缓存及队列实现抽象，提供JDK和REDIS两种实现(REDIS成为可选依赖)<br>
-                        2. 打包方式提供zip和tar.gz包，并提供一键启动脚本<br><br>
-
-                    2018年01月19日 ：<br>
-                        1. 大文件入队提前处理<br>
-                        1. 新增addTask文件转换入队接口<br>
-                        1. 采用redis队列，支持kkFIleView接口和异构系统入队两种方式<br><br>
-
-                    2018年01月15日 ：<br>
-                        1.首页新增社会化评论框<br><br>
-
-                    2018年01月12日 ：<br>
-                        1.新增多图片同时预览<br>
-                        2.支持压缩包内图片轮番预览<br><br>
-
-                    2018年01月02日 ：<br>
-                        1.修复txt等文本编码问题导致预览乱码<br>
-                        2.修复项目模块依赖引入不到的问题<br>
-                        3.新增spring boot profile，支持多环境配置<br>
-                        4.引入pdf.js预览doc等文件，支持doc标题生成pdf预览菜单，支持手机端预览<br><br>
-
-                    2017年12月12日：<br>
-                        1.项目gitee开源:<a href="https://gitee.com/kekingcn/file-online-preview" target="_blank">https://gitee.com/kekingcn/file-online-preview</a><br>
-                        2.项目github开源:<a href="https://github.com/kekingcn/kkFileView" target="_blank">https://github.com/kekingcn/kkFileView</a>
-                </div>
-            </div>
-        </div>
-        <div class="panel-body">
-            <div id = "comments"></div>
-        </div>
-
-    </div>
-</div>
-
-<div class="loading_container">
-    <div class="spinner">
-        <div class="spinner-container container1">
-            <div class="circle1"></div>
-            <div class="circle2"></div>
-            <div class="circle3"></div>
-            <div class="circle4"></div>
-        </div>
-        <div class="spinner-container container2">
-            <div class="circle1"></div>
-            <div class="circle2"></div>
-            <div class="circle3"></div>
-            <div class="circle4"></div>
-        </div>
-        <div class="spinner-container container3">
-            <div class="circle1"></div>
-            <div class="circle2"></div>
-            <div class="circle3"></div>
-            <div class="circle4"></div>
-        </div>
-    </div>
-</div>
-<script>
-    function deleteFile(fileName) {
-        $.ajax({
-            url: '${baseUrl}deleteFile?fileName=' + encodeURIComponent(fileName),
-            success: function (data) {
-                // 删除完成，刷新table
-                if (1 == data.code) {
-                    alert(data.msg);
-                } else{
-                    $('#table').bootstrapTable('refresh', {});
-                }
-            },
-            error: function (data) {
-                console.log(data);
-            }
-        })
-    }
-    $(function () {
-        $('#table').bootstrapTable({
-            url: 'listFiles',
-            columns: [{
-                field: 'fileName',
-                title: '文件名'
-            }, {
-                field: 'action',
-                title: '操作'
-            },]
-        }).on('pre-body.bs.table', function (e,data) {
-            // 每个data添加一列用来操作
-            $(data).each(function (index, item) {
-                item.action = "<a class='btn btn-default' target='_blank' href='${baseUrl}onlinePreview?url="+ encodeURIComponent('${baseUrl}' + item.fileName) +"'>预览</a>" +
-                    "<a class='btn btn-default' href='javascript:void(0);' onclick='deleteFile(\""+item.fileName+"\")'>删除</a>";
-            });
-            return data;
-        }).on('post-body.bs.table', function (e,data) {
-            return data;
-        });
-
-
-        function showLoadingDiv() {
-            var height = window.document.documentElement.clientHeight - 1;
-            $(".loading_container").css("height", height).show();
-        }
-
-        $("#btnsubmit").click(function () {
-            showLoadingDiv();
-            $("#fileUpload").ajaxSubmit({
-                success: function (data) {
-                    // 上传完成，刷新table
-                    if (1 == data.code) {
-                        alert(data.msg);
-                    } else {
-                        $('#table').bootstrapTable('refresh', {});
-                    }
-                    $(".loading_container").hide();
-                },
-                error: function () {
-                    alert('上传失败，请联系管理员');
-                    $(".loading_container").hide();
-                },
-                url: 'fileUpload', /*设置post提交到的页面*/
-                type: "post", /*设置表单以post方法提交*/
-                dataType: "json" /*设置返回值类型为文本*/
-            });
-        });
-        var gitalk = new Gitalk({
-            clientID: '525d7f16e17aab08cef5',
-            clientSecret: 'd1154e3aee5c8f1cbdc918b5c97a4f4157e0bfd9',
-            repo: 'kkFileView',
-            owner: 'kekingcn',
-            admin: ['kekingcn,klboke,gitchenjh'],
-            language: 'zh-CN',
-            id: location.pathname,
-            distractionFreeMode: false
-        })
-        gitalk.render((document.getElementById('comments')))
-    });
-</script>
-</body>
-</html>
--- a/jodconverter-web/src/main/resources/web/media.ftl
+++ b/jodconverter-web/src/main/resources/web/media.ftl
@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-cn">
-<head>
-    <meta charset="utf-8" />
-    <title>多媒体文件预览</title>
-    <link rel="stylesheet" href="plyr/plyr.css" />
-    <script type="text/javascript" src="plyr/plyr.js"></script>
-    <script type="text/javascript" src="js/watermark.js"></script>
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-        }
-        html, body {
-            height: 100%;
-            width: 100%;
-        }
-        body {
-            background-color: #404040;
-        }
-        .m {
-            width: 1024px;
-            margin: 0 auto;
-        }
-    </style>
-</head>
-<body>
-<div class="m">
-    <video>
-        <source src="${mediaUrl}" />
-    </video>
-</div>
-<script>
-    plyr.setup();
-    window.onload = function() {
-        var watermarkTxt = '${watermarkTxt}';
-        if (watermarkTxt !== '') {
-            watermark.init({
-                watermark_txt: '${watermarkTxt}',
-                watermark_x: 0,
-                watermark_y: 0,
-                watermark_rows: 0,
-                watermark_cols: 0,
-                watermark_x_space: ${watermarkXSpace},
-                watermark_y_space: ${watermarkYSpace},
-                watermark_font: '${watermarkFont}',
-                watermark_fontsize: '${watermarkFontsize}',
-                watermark_color:'${watermarkColor}',
-                watermark_alpha: ${watermarkAlpha},
-                watermark_width: ${watermarkWidth},
-                watermark_height: ${watermarkHeight},
-                watermark_angle: ${watermarkAngle},
-            });
-        }
-    }
-</script>
-</body>
-</html>
--- a/jodconverter-web/src/main/resources/web/officePicture.ftl
+++ b/jodconverter-web/src/main/resources/web/officePicture.ftl
@@ -1,79 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title>PDF图片预览</title>
-    <script src="js/lazyload.js"></script>
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-        }
-        html, body {
-            height: 100%;
-            width: 100%;
-        }
-        body {
-            background-color: #404040;
-        }
-        .container {
-            width: 100%;
-            height: 100%;
-        }
-        .img-area {
-            text-align: center
-        }
-
-    </style>
-</head>
-<body>
-<div class="container">
-    <#list imgurls as img>
-        <div class="img-area">
-            <img class="my-photo" alt="loading" title="查看大图" style="cursor: pointer;" data-src="${img}" src="images/loading.gif" onclick="changePreviewType('allImages')">
-        </div>
-    </#list>
-</div>
-<img src="images/pdf.svg" width="63" height="63" style="position: fixed; cursor: pointer; top: 40%; right: 48px; z-index: 999;" alt="使用PDF预览" title="使用PDF预览" onclick="changePreviewType('pdf')"/>
-<script src="js/watermark.js" type="text/javascript"></script>
-<script>
-    window.onload = function () {
-        /*初始化水印*/
-        var watermarkTxt = '${watermarkTxt}';
-        if (watermarkTxt !== '') {
-            watermark.init({
-                watermark_txt: '${watermarkTxt}',
-                watermark_x: 0,
-                watermark_y: 0,
-                watermark_rows: 0,
-                watermark_cols: 0,
-                watermark_x_space: ${watermarkXSpace},
-                watermark_y_space: ${watermarkYSpace},
-                watermark_font: '${watermarkFont}',
-                watermark_fontsize: '${watermarkFontsize}',
-                watermark_color:'${watermarkColor}',
-                watermark_alpha: ${watermarkAlpha},
-                watermark_width: ${watermarkWidth},
-                watermark_height: ${watermarkHeight},
-                watermark_angle: ${watermarkAngle},
-            });
-        }
-        checkImgs();
-    };
-    window.onscroll = throttle(checkImgs);
-    function changePreviewType(previewType) {
-        var url = window.location.href;
-        if (url.indexOf("officePreviewType=image") != -1) {
-            url = url.replace("officePreviewType=image", "officePreviewType="+previewType);
-        } else {
-            url = url + "&officePreviewType="+previewType;
-        }
-        if ('allImages' == previewType) {
-            window.open(url)
-        } else {
-            window.location.href = url;
-        }
-    }
-</script>
-</body>
-</html>
--- a/jodconverter-web/src/main/resources/web/pdf.ftl
+++ b/jodconverter-web/src/main/resources/web/pdf.ftl
@@ -1,74 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
-    <title>PDF预览</title>
-    <style type="text/css">
-        * {
-            margin: 0;
-            padding: 0;
-        }
-        html, body {
-            height: 100%;
-            width: 100%;
-        }
-    </style>
-</head>
-<body>
-    <#if pdfUrl?contains("http://") || pdfUrl?contains("https://")>
-        <#assign finalUrl="${pdfUrl}">
-    <#else>
-        <#assign finalUrl="${baseUrl}${pdfUrl}">
-    </#if>
-    <iframe src="" width="100%" frameborder="0"></iframe>
-
-    <img src="images/jpg.svg" width="63" height="63" style="position: fixed; cursor: pointer; top: 40%; right: 48px; z-index: 999;" alt="使用图片预览" title="使用图片预览" onclick="goForImage()"/>
-
-</body>
-<script src="js/watermark.js" type="text/javascript"></script>
-<script type="text/javascript">
-    document.getElementsByTagName('iframe')[0].src = "${baseUrl}pdfjs/web/viewer.html?base=${baseUrl}&file="+encodeURIComponent('${finalUrl}')+"&disabledownload=${pdfDownloadDisable}";
-    document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight-10;
-    /**
-     * 页面变化调整高度
-     */
-    window.onresize = function(){
-        var fm = document.getElementsByTagName("iframe")[0];
-        fm.height = window.document.documentElement.clientHeight-10;
-    }
-
-    function goForImage() {
-        var url = window.location.href;
-        if (url.indexOf("officePreviewType=pdf") != -1) {
-            url = url.replace("officePreviewType=pdf", "officePreviewType=image");
-        } else {
-            url = url + "&officePreviewType=image";
-        }
-        window.location.href=url;
-    }
-    /*初始化水印*/
-    window.onload = function() {
-        var watermarkTxt = '${watermarkTxt}';
-        if (watermarkTxt !== '') {
-            watermark.init({
-                watermark_txt: '${watermarkTxt}',
-                watermark_x: 0,
-                watermark_y: 0,
-                watermark_rows: 0,
-                watermark_cols: 0,
-                watermark_x_space: ${watermarkXSpace},
-                watermark_y_space: ${watermarkYSpace},
-                watermark_font: '${watermarkFont}',
-                watermark_fontsize: '${watermarkFontsize}',
-                watermark_color:'${watermarkColor}',
-                watermark_alpha: ${watermarkAlpha},
-                watermark_width: ${watermarkWidth},
-                watermark_height: ${watermarkHeight},
-                watermark_angle: ${watermarkAngle},
-            });
-        }
-    }
-</script>
-</html>
--- a/jodconverter-web/src/main/resources/web/picture.ftl
+++ b/jodconverter-web/src/main/resources/web/picture.ftl
@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <title>图片预览</title>
-    <link rel="stylesheet" href="css/viewer.min.css">
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-        }
-        html, body {
-            height: 100%;
-            width: 100%;
-        }
-        body {
-            background-color: #404040;
-        }
-        #dowebok { width: 800px; margin: 0 auto; font-size: 0;}
-        #dowebok li {  display: inline-block;width: 50px;height: 50px; margin-left: 1%; padding-top: 1%;}
-        /*#dowebok li img { width: 200%;}*/
-    </style>
-</head>
-<body>
-<ul id="dowebok">
-    <#list imgurls as img>
-        <#if img?contains("http://") || img?contains("https://")>
-            <#assign img="${img}">
-        <#else>
-            <#assign img="${baseUrl}${img}">
-        </#if>
-        <li><img id="${img}"  url="${img}" src="${img}" width="1px" height="1px"></li>
-    </#list>
-</ul>
-<script src="js/jquery-3.0.0.min.js"></script>
-<script src="js/viewer.min.js"></script>
-<script src="js/watermark.js" type="text/javascript"></script>
-<script>
-    var viewer = new Viewer(document.getElementById('dowebok'), {
-        url: 'src',
-        navbar: false,
-        button: false,
-        backdrop: false,
-        loop : true
-    });
-    document.getElementById("${currentUrl}").click();
-    // 修改下一页按钮的样式和位置
-    $(function () {
-        var outHandler = function(){
-            $(this).css('background-color','rgba(0, 0, 0, 0)');
-        };
-        var overHandler = function(){
-            $(this).css('background-color','rgba(0, 0, 0, .5)');
-        };
-        var next = $("li[data-action=next]");
-        var prev = $("li[data-action=prev]");
-        var viewerToolBar = $(".viewer-footer");
-        // 覆盖按钮父类原始样式
-        viewerToolBar.css("overflow", "visible");
-        // 获取文档高度、宽度
-        var clientHeight = window.innerHeight;
-        var clientWidth = window.innerWidth;
-        // 调整样式
-        var styleCss = {},nextCss={},prevCss={};
-        styleCss.position = "absolute";
-        styleCss.top = -clientHeight;
-        styleCss.width = clientWidth*0.1;
-        styleCss.height = clientHeight + 52;
-        // 覆盖原始样式
-        styleCss.backgroundColor='rgba(0, 0, 0, 0)';
-        styleCss.borderRadius='inherit';
-        nextCss.right = "0";
-        prevCss.left = "0";
-        next.css($.extend(nextCss, styleCss));
-        prev.css($.extend(prevCss, styleCss));
-        next.on('mouseout',outHandler);
-        next.on('mouseover',overHandler);
-        prev.on('mouseout',outHandler);
-        prev.on('mouseover',overHandler);
-    });
-    /*初始化水印*/
-    window.onload = function() {
-        var watermarkTxt = '${watermarkTxt}';
-        if (watermarkTxt !== '') {
-            watermark.init({
-                watermark_txt: '${watermarkTxt}',
-                watermark_x: 0,
-                watermark_y: 0,
-                watermark_rows: 0,
-                watermark_cols: 0,
-                watermark_x_space: ${watermarkXSpace},
-                watermark_y_space: ${watermarkYSpace},
-                watermark_font: '${watermarkFont}',
-                watermark_fontsize: '${watermarkFontsize}',
-                watermark_color:'${watermarkColor}',
-                watermark_alpha: ${watermarkAlpha},
-                watermark_width: ${watermarkWidth},
-                watermark_height: ${watermarkHeight},
-                watermark_angle: ${watermarkAngle},
-            });
-        }
-    }
-</script>
-</body>
-
-</html>
--- a/jodconverter-web/src/test/java/cn/keking/FilePreviewApplicationTests.java
+++ b/jodconverter-web/src/test/java/cn/keking/FilePreviewApplicationTests.java
@@ -1,16 +0,0 @@
-package cn.keking;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest
-public class FilePreviewApplicationTests {
-
-	@Test
-	public void contextLoads() {
-	}
-
-}
--- a/jodconverter-core/pom.xml
+++ b/jodconverter-core/pom.xml
@@ -3,13 +3,15 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
-    <groupId>cn.keking</groupId>
-    <artifactId>jodconverter-core</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
+
+    <parent>
+        <artifactId>filepreview</artifactId>
+        <groupId>cn.keking</groupId>
+        <version>3.5.1</version>
+    </parent>
+
+    <artifactId>office-plugin</artifactId>
+
    <repositories>
        <repository>
            <!-- required for org.hyperic:sigar -->
@@ -22,7 +24,7 @@
        <dependency>
            <groupId>commons-io</groupId>
            <artifactId>commons-io</artifactId>
-            <version>1.4</version>
+            <version>2.7</version>
        </dependency>
        <dependency>
            <groupId>org.openoffice</groupId>
--- a/jodconverter-core/src/main/assembly/dist.xml
+++ b/jodconverter-core/src/main/assembly/dist.xml
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/AbstractConversionTask.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/AbstractConversionTask.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/OfficeDocumentConverter.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/OfficeDocumentConverter.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/OfficeDocumentUtils.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/OfficeDocumentUtils.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/StandardConversionTask.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/StandardConversionTask.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/cli/Convert.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/cli/Convert.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/DefaultDocumentFormatRegistry.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/DefaultDocumentFormatRegistry.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/DocumentFamily.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/DocumentFamily.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/DocumentFormat.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/DocumentFormat.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/DocumentFormatRegistry.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/DocumentFormatRegistry.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/JsonDocumentFormatRegistry.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/JsonDocumentFormatRegistry.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/SimpleDocumentFormatRegistry.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/document/SimpleDocumentFormatRegistry.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/DefaultOfficeManagerConfiguration.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/DefaultOfficeManagerConfiguration.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/ExternalOfficeManager.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/ExternalOfficeManager.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/ExternalOfficeManagerConfiguration.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/ExternalOfficeManagerConfiguration.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/ManagedOfficeProcess.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/ManagedOfficeProcess.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/ManagedOfficeProcessSettings.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/ManagedOfficeProcessSettings.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/NamedThreadFactory.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/NamedThreadFactory.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeConnection.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeConnection.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeConnectionEvent.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeConnectionEvent.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeConnectionEventListener.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeConnectionEventListener.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeConnectionProtocol.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeConnectionProtocol.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeContext.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeContext.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeException.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeException.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeManager.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeManager.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeProcess.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeProcess.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeTask.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeTask.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java
@@ -19,6 +19,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;

+import org.artofsolving.jodconverter.util.ConfigUtils;
 import org.artofsolving.jodconverter.util.PlatformUtils;

 import com.sun.star.beans.PropertyValue;
@@ -55,7 +56,7 @@ public class OfficeUtils {
                Map<String,Object> subProperties = (Map<String,Object>) value;
                value = toUnoProperties(subProperties);
            }
-            propertyValues[i++] = property((String) entry.getKey(), value);
+            propertyValues[i++] = property(entry.getKey(), value);
        }
        return propertyValues;
    }
@@ -68,7 +69,7 @@ public class OfficeUtils {

    public static File getDefaultOfficeHome() {
        Properties properties = new Properties();
-        String customizedConfigPath = getCustomizedConfigPath();
+        String customizedConfigPath = ConfigUtils.getCustomizedConfigPath();
        try {
            BufferedReader bufferedReader = new BufferedReader(new FileReader(customizedConfigPath));
            properties.load(bufferedReader);
@@ -80,7 +81,7 @@ public class OfficeUtils {
        }
        if (PlatformUtils.isWindows()) {
            // %ProgramFiles(x86)% on 64-bit machines; %ProgramFiles% on 32-bit ones
-            String homePath = OfficeUtils.getHomePath();
+            String  officePluginPath = ConfigUtils.getOfficePluginPath();
            String programFiles = System.getenv("ProgramFiles(x86)");
            if (programFiles == null) {
                programFiles = System.getenv("ProgramFiles");
@@ -88,7 +89,7 @@ public class OfficeUtils {
            return findOfficeHome(
                programFiles + File.separator + "OpenOffice 4",
                programFiles + File.separator + "LibreOffice 4",
-                homePath + File.separator + "office"
+                officePluginPath + File.separator + "windows-office"
            );
        } else if (PlatformUtils.isMac()) {
            return findOfficeHome(
@@ -127,30 +128,7 @@ public class OfficeUtils {
        }
    }

-    public static String getHomePath() {
-        String userDir = System.getenv("KKFILEVIEW_BIN_FOLDER");
-        if (userDir == null) {
-            userDir = System.getProperty("user.dir");
-        }
-        if (userDir.endsWith("bin")) {
-            userDir = userDir.substring(0, userDir.length() - 4);
-        } else {
-            String separator = File.separator;
-            if (userDir.contains("jodconverter-web")) {
-                userDir = userDir + separator + "src" + separator +  "main";
-            } else {
-                userDir = userDir + separator + "jodconverter-web" + separator + "src" + separator + "main";
-            }
-        }
-        return userDir;
-    }

-    public static String getCustomizedConfigPath() {
-        String homePath = OfficeUtils.getHomePath();
-        String separator = java.io.File.separator;
-        String configFilePath = homePath + separator + "config" + separator + "application.properties";
-        return configFilePath;
-    }

    /**
     * SpringBoot application.properties 支持从环境变量获取值
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/PooledOfficeManager.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/PooledOfficeManager.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/PooledOfficeManagerSettings.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/PooledOfficeManagerSettings.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/ProcessPoolOfficeManager.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/ProcessPoolOfficeManager.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/RetryTimeoutException.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/RetryTimeoutException.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/Retryable.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/Retryable.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/SuspendableThreadPoolExecutor.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/SuspendableThreadPoolExecutor.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/TemporaryException.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/TemporaryException.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/UnoUrl.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/UnoUrl.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/process/LinuxProcessManager.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/process/LinuxProcessManager.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/process/ProcessManager.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/process/ProcessManager.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/process/ProcessQuery.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/process/ProcessQuery.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/process/PureJavaProcessManager.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/process/PureJavaProcessManager.java
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/process/SigarProcessManager.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/process/SigarProcessManager.java
--- a/office-plugin/src/main/java/org/artofsolving/jodconverter/util/ConfigUtils.java
+++ b/office-plugin/src/main/java/org/artofsolving/jodconverter/util/ConfigUtils.java
@@ -0,0 +1,54 @@
+package org.artofsolving.jodconverter.util;
+
+
+import java.io.File;
+
+/**
+ * @author : kl
+ **/
+public class ConfigUtils {
+
+    private static final String MAIN_DIRECTORY_NAME = "server";
+    private static final String OFFICE_PLUGIN_NAME = "office-plugin";
+
+    public static String getHomePath() {
+        String userDir = System.getenv("KKFILEVIEW_BIN_FOLDER");
+        if (userDir == null) {
+            userDir = System.getProperty("user.dir");
+        }
+        if (userDir.endsWith("bin")) {
+            userDir = userDir.substring(0, userDir.length() - 4);
+        } else {
+            String separator = File.separator;
+            if (userDir.contains(MAIN_DIRECTORY_NAME)) {
+                userDir = userDir + separator + "src" + separator +  "main";
+            } else {
+                userDir = userDir + separator + MAIN_DIRECTORY_NAME + separator + "src" + separator + "main";
+            }
+        }
+        return userDir;
+    }
+
+
+    public static String getOfficePluginPath() {
+        String userDir = System.getenv("KKFILEVIEW_BIN_FOLDER");
+        if (userDir == null) {
+            userDir = System.getProperty("user.dir");
+        }
+        if (userDir.endsWith("bin")) {
+            userDir = userDir.substring(0, userDir.length() - 4);
+        } else {
+            String separator = File.separator;
+            if (!userDir.contains(OFFICE_PLUGIN_NAME)) {
+                userDir = userDir + separator + OFFICE_PLUGIN_NAME;
+            }
+        }
+        return userDir;
+    }
+
+    public static String getCustomizedConfigPath() {
+        String homePath = getHomePath();
+        String separator = java.io.File.separator;
+        return homePath + separator + "config" + separator + "application.properties";
+    }
+}
--- a/jodconverter-core/src/main/java/org/artofsolving/jodconverter/util/PlatformUtils.java
+++ b/jodconverter-core/src/main/java/org/artofsolving/jodconverter/util/PlatformUtils.java
--- a/jodconverter-core/src/main/resources/document-formats.js
+++ b/jodconverter-core/src/main/resources/document-formats.js
--- a/jodconverter-web/src/main/office/help/idxcaption.xsl
+++ b/jodconverter-web/src/main/office/help/idxcaption.xsl
--- a/jodconverter-web/src/main/office/help/idxcontent.xsl
+++ b/jodconverter-web/src/main/office/help/idxcontent.xsl
--- a/jodconverter-web/src/main/office/help/main_transform.xsl
+++ b/jodconverter-web/src/main/office/help/main_transform.xsl
--- a/jodconverter-web/src/main/office/help/zh-CN/default.css
+++ b/jodconverter-web/src/main/office/help/zh-CN/default.css
--- a/jodconverter-web/src/main/office/help/zh-CN/err.html
+++ b/jodconverter-web/src/main/office/help/zh-CN/err.html
--- a/jodconverter-web/src/main/office/help/zh-CN/highcontrast1.css
+++ b/jodconverter-web/src/main/office/help/zh-CN/highcontrast1.css
--- a/jodconverter-web/src/main/office/help/zh-CN/highcontrast2.css
+++ b/jodconverter-web/src/main/office/help/zh-CN/highcontrast2.css
--- a/jodconverter-web/src/main/office/help/zh-CN/highcontrastblack.css
+++ b/jodconverter-web/src/main/office/help/zh-CN/highcontrastblack.css
--- a/jodconverter-web/src/main/office/help/zh-CN/highcontrastwhite.css
+++ b/jodconverter-web/src/main/office/help/zh-CN/highcontrastwhite.css
--- a/jodconverter-web/src/main/office/help/zh-CN/sbasic.cfg
+++ b/jodconverter-web/src/main/office/help/zh-CN/sbasic.cfg
--- a/jodconverter-web/src/main/office/help/zh-CN/sbasic.db
+++ b/jodconverter-web/src/main/office/help/zh-CN/sbasic.db
--- a/jodconverter-web/src/main/office/help/zh-CN/sbasic.ht
+++ b/jodconverter-web/src/main/office/help/zh-CN/sbasic.ht
--- a/jodconverter-web/src/main/office/help/zh-CN/sbasic.idxl/_0.cfs
+++ b/jodconverter-web/src/main/office/help/zh-CN/sbasic.idxl/_0.cfs
--- a/jodconverter-web/src/main/office/help/zh-CN/sbasic.idxl/_0.cfx
+++ b/jodconverter-web/src/main/office/help/zh-CN/sbasic.idxl/_0.cfx
--- a/jodconverter-web/src/main/office/help/zh-CN/sbasic.idxl/segments.gen
+++ b/jodconverter-web/src/main/office/help/zh-CN/sbasic.idxl/segments.gen
--- a/jodconverter-web/src/main/office/help/zh-CN/sbasic.idxl/segments_2
+++ b/jodconverter-web/src/main/office/help/zh-CN/sbasic.idxl/segments_2
--- a/jodconverter-web/src/main/office/help/zh-CN/sbasic.jar
+++ b/jodconverter-web/src/main/office/help/zh-CN/sbasic.jar
--- a/jodconverter-web/src/main/office/help/zh-CN/sbasic.key
+++ b/jodconverter-web/src/main/office/help/zh-CN/sbasic.key
--- a/jodconverter-web/src/main/office/help/zh-CN/sbasic.tree
+++ b/jodconverter-web/src/main/office/help/zh-CN/sbasic.tree
--- a/jodconverter-web/src/main/office/help/zh-CN/scalc.cfg
+++ b/jodconverter-web/src/main/office/help/zh-CN/scalc.cfg
--- a/jodconverter-web/src/main/office/help/zh-CN/scalc.db
+++ b/jodconverter-web/src/main/office/help/zh-CN/scalc.db
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dependabot[bot]	bbeaea14c3	Bump commons-io from 1.4 to 2.7 in /office-plugin Bumps commons-io from 1.4 to 2.7. Signed-off-by: dependabot[bot] <support@github.com>	2021-04-26 20:46:04 +00:00
dependabot[bot]	2bb0dd545d	Bump xstream from 1.4.15 to 1.4.16 in /server Bumps [xstream](https://github.com/x-stream/xstream) from 1.4.15 to 1.4.16. - [Release notes](https://github.com/x-stream/xstream/releases) - [Commits](https://github.com/x-stream/xstream/commits) Signed-off-by: dependabot[bot] <support@github.com>	2021-04-19 13:32:13 +08:00
youken9980	ac2115114c	修正Redis服务器没有设置密码，但客户端向其发送身份验证请求的问题	2021-04-19 13:31:50 +08:00
youken9980	831550d847	修正office.preview.switch.disabled引用了错误常量的问题	2021-04-19 13:31:50 +08:00
youken9980	1fa7b4a911	修正区分大小写的文件系统中，文件后缀名为大写时，系统提示该文件类型不支持的问题	2021-04-19 13:31:50 +08:00
zhangxiaoxiao9527	bcdb5ce0e6	集成视频格式转换功能1.0（基于javacv）	2021-04-19 13:29:25 +08:00
gitchenjh	a3485dd9b7	Merge pull request #230 from gitchenjh/master 3.5.1版	2021-04-06 17:47:07 +08:00
陈精华	5a28b89f46	3.5.1版	2021-04-06 16:45:18 +08:00
陈精华	58b1b50c2e	修复：pdf.js 跨域问题	2021-04-06 16:44:40 +08:00
kl	8f75df15e2	修复 tif、tiff 文件预览初始内存太小预览失败的问题	2021-03-26 10:05:58 +08:00
gitchenjh	9883d3b064	assembly打包区分windows和linux assembly打包区分windows和linux	2021-03-19 09:47:16 +08:00
kl	e477ce7048	修复打包插件	2021-03-19 09:45:04 +08:00
陈精华	0985aed0b0	assembly打包区分windows和linux,修复windows发行包启动报找不到找不到office组件	2021-03-19 09:41:01 +08:00
kl	2ffda7a1a6	更新版本到 3.5	2021-03-18 20:20:42 +08:00
kl	5cad4aa93e	文本预览转义处理	2021-03-18 20:12:50 +08:00
gitchenjh	2a61449ce1	Merge pull request #221 from gitchenjh/master 修复：pom编译版本	2021-03-18 17:42:24 +08:00
陈精华	fe0b42c5e3	修复：pom编译版本	2021-03-18 17:38:53 +08:00
kl	6ccc724839	office plugin 转换进程、任务超时可配置	2021-03-12 21:32:01 +08:00
kl	56cdeffaa9	新增 wps 文档预览支持	2021-03-02 17:29:49 +08:00
13540823418	5633eb4111	1.优化项目目录结构之后，windows下启动报错“找不到office组件” 2.import代码错误修复	2021-02-25 15:13:07 +08:00
fengzehao	6255c8dbbc	modify some bug	2021-02-19 13:36:47 +08:00
kl	1fd7d5df88	新增依赖 highlightjs 代码文件预览高亮支持	2021-02-19 10:15:20 +08:00
chenkailing	01213c5d02	移除针对 tomcat 的配置	2021-02-10 12:53:27 +08:00
chenkailing	49685e545b	移除多余的 repositories 配置	2021-02-10 01:03:19 +08:00
chenkailing	2542a24675	优化项目结构、优化 maven 结构	2021-02-10 00:58:13 +08:00
chenkailing	28d3e05ca9	简化启动脚本	2021-02-09 21:44:58 +08:00
chenkailing	00fbb5cd74	Merge branch 'master' of https://github.com/kekingcn/kkFileView	2021-02-09 21:39:21 +08:00
kl	fbafcd5c92	新增 tiff 、tif 图像文件格式预览支持	2021-02-08 18:11:43 +08:00
kl	376a90772d	新增 tiff 、tif 图像文件格式预览支持	2021-02-08 18:02:49 +08:00
kl	4f4e75859d	新增 kkFIleView 的 banner 信息	2021-02-08 15:16:24 +08:00
kl	679459f53b	更新 spring-boot 到最新的 v2.4.2 版本	2021-02-07 18:34:35 +08:00
kl	8baef0d873	gitee star增长趋势图获取增加缓存时间设置	2021-02-07 18:01:53 +08:00
kl	d01dddf9e3	动态获取演示页访问地址的端口信息	2021-02-04 11:38:45 +08:00
kl	d61e5236d0	新增启动完成，打印启动耗时、演示页访问地址	2021-02-04 11:33:56 +08:00
kl	d514e6dc0f	更新 README.md	2021-02-04 09:51:41 +08:00
kl	188d2def2d	1、新增 github stars 增长趋势图	2021-02-03 18:23:47 +08:00
kl	17d64ad963	1、补充发版信息 2、新增 stars 增长趋势图	2021-02-03 18:01:55 +08:00
kl	d95fbe02bd	简化下载文件 io 操作	2021-01-28 15:55:42 +08:00
gitchenjh	212526d989	Merge pull request #209 from gitchenjh/master 修复：jodd.io.NetUtil.downloadFile下载大于16M文件报错问题	2021-01-28 15:43:05 +08:00
陈精华	ef5052e7ea	修复：jodd.io.NetUtil.downloadFile下载大于16M文件报错问题	2021-01-28 15:42:05 +08:00
kl	3531af4a46	更新版本到 3.3.1	2021-01-28 09:29:18 +08:00
范青锋	b2f6fb3a00	修复重复编码导致文档转图片预览失败的问题&编码规范 URLEncoder.encode(URLEncoder.encode(pdfFolder, uriEncoding).replaceAll("\+", "%20"), uriEncoding); 这里encode了两次，导致图片预览失败。	2021-01-23 14:09:16 +08:00
chenkailing	996da0862c	移除 Apache-common-text 包，采用 spring 内置的 HtmlUtils 处理 xss 问题	2021-01-23 13:13:29 +08:00
chenkailing	50dd7c1b83	移除 Apache-common-text 包，采用 spring 内置的 HtmlUtils 处理 xss 问题	2021-01-23 13:12:31 +08:00
hunterale	2dd067170b	escaping of dangerous characters to prevent reflected xss	2021-01-22 12:08:06 +08:00
ale	e635ca86c5	escaping of dangerous characters	2021-01-22 12:08:06 +08:00
gitchenjh	8bd36e37a3	Merge pull request #204 from gitchenjh/master 修复：dwg文件预览时无法在jpg和pdf两种类型之间切换	2021-01-21 15:48:27 +08:00
陈精华	b3b2f7c407	修复：dwg文件预览时无法在jpg和pdf两种类型之间切换	2021-01-21 15:47:13 +08:00
dependabot[bot]	f1ad3d44ff	Bump poi from 3.12 to 3.17 in /server Bumps poi from 3.12 to 3.17. Signed-off-by: dependabot[bot] <support@github.com>	2021-01-18 13:37:56 +08:00
kl	ee6ff50244	解码url时，默认UTF-8编码	2021-01-18 13:36:45 +08:00
chenkailing	196741d5dc	加回 apache-commons-io 包依赖，office组件中有依赖，后续再统一吧	2021-01-09 17:08:05 +08:00
chenkailing	374c06472f	移除 apache-commons-io 包依赖，采用jodd的io工具替代	2021-01-09 15:39:01 +08:00
kl	12c85c60c7	XML文件预览支持切换纯文本模式	2020-12-31 13:28:25 +08:00
kl	4747ee93b2	修复类文本类型HTML文件预览的bug	2020-12-29 18:37:50 +08:00
kl	5ec53c4b33	指定Base64转码采用Apache Commons-code中的实现，修复base64部分jdk版本下出现的异常	2020-12-29 18:32:24 +08:00
kl	ee7f7f50cc	修复大小写文件类型后缀没通用匹配的问题	2020-12-29 09:29:16 +08:00
chenkailing	92869e8d6c	文本文件编码默认UTF-8输出到页面	2020-12-28 23:56:38 +08:00
kl	c66dda239f	采用apache-common-io包简化所有的文件下载io操作	2020-12-28 18:31:12 +08:00
kl	e927760c40	调整多图连续预览上下翻图的UI	2020-12-28 16:45:11 +08:00
kl	8783f9059a	修复压缩包内多图连续预览的bug	2020-12-28 16:45:11 +08:00
kl	12e1239267	前端模板抽象出通用的header，将水印等初始化内容挪到通用header里	2020-12-28 16:45:11 +08:00
kl	7c963193ef	更新simTxT文件预览UI风格	2020-12-28 14:54:42 +08:00
kl	bce9a624d7	更新XML文件预览UI风格，调整类文本预览架构，更方便扩展	2020-12-28 14:54:42 +08:00
kl	dac3606b4e	更新markdown文件预览UI风格	2020-12-28 14:54:42 +08:00
kl	eb00385d76	更新index接入演示界面UI风格	2020-12-28 13:36:40 +08:00
kl	986f562266	引入galimatias,解决不规范文件名导致文件下载异常	2020-12-28 11:43:27 +08:00
kl	11d0441ed4	加回漏掉的pdfjs	2020-12-28 11:22:59 +08:00
kl	ef46e2c51e	增强url base64解码失败时的提示信息	2020-12-28 11:22:59 +08:00
kl	0a3c03f18b	修复发行包运行时找不到日志目录的问题	2020-12-28 11:22:59 +08:00
chenkailing	7a7e1a1855	修复导包错误以及图片预览bug	2020-12-27 19:18:52 +08:00
chenkailing	f530f441d5	更新版本到3.3.0	2020-12-27 16:54:30 +08:00
chenkailing	10160e8104	添加2020年最后的发版信息	2020-12-27 16:42:03 +08:00
chenkailing	602e80ee9e	独立flv文件预览实现	2020-12-27 15:17:35 +08:00
chenkailing	9c83860e1b	抽象通用的预览异常接口实现	2020-12-27 14:48:07 +08:00
chenkailing	1f1970232b	精简util模块，ReturenResponse重构	2020-12-27 14:07:46 +08:00
chenkailing	594bd895ec	修复压缩包里文件再次预览失败的bug	2020-12-27 12:38:05 +08:00
chenkailing	486c09b24a	文件url采用base64加encodeURI双重编码，彻底解决各种奇葩文件名导致的下载异常	2020-12-27 01:46:12 +08:00
chenkailing	aaf396fbc8	忽略log目录	2020-12-26 19:28:45 +08:00
chenkailing	4e01d6f5f3	忽略file目录	2020-12-26 19:23:00 +08:00
chenkailing	342c391a9b	引入cpdetector解决文件编码识别问题	2020-12-26 19:23:00 +08:00
chenkailing	f2d929e6fa	修改Dockerfile跟随模块变动	2020-12-26 17:42:40 +08:00
chenkailing	41cdc227b3	调整项目模块，jodconverter-core重命名为office-plugin。jdocnverter-web重命名为server	2020-12-26 17:42:40 +08:00
chenkailing	0f4f1d580b	1、抽象整理FileType的获取逻辑 2、合理设置预览消费队列的线程数	2020-12-26 16:44:57 +08:00
chenkailing	37c37868a3	Office组件启动异步化，提速应用启动速度到5秒内	2020-12-26 02:32:42 +08:00
chenkailing	01218e4a5c	设置pdfbox兼容低版本jdk	2020-12-26 02:11:29 +08:00
chenkailing	f6d54902e9	移除tomcat，采用jetty Server	2020-12-26 02:03:45 +08:00
chenkailing	5a559aa868	修复图片预览bug，移除guava	2020-12-26 01:53:30 +08:00
chenkailing	9b0f381c06	1.office预览图片模式禁用图片放大效果，达到图片和pdf预览效果一致的体验	2020-12-26 01:00:20 +08:00
kl	c1802b2487	预览逻辑重构	2020-12-26 01:00:20 +08:00
kl	d4b11a4056	优化文本类型预览逻辑	2020-12-25 21:03:19 +08:00
kl	da1553920b	增强了xml的预览效果	2020-12-25 20:44:59 +08:00
kl	d787813bc6	新增配置项office.preview.switch.disabled，控制offic文件预览切换开关	2020-12-25 18:21:15 +08:00
dependabot[bot]	4a3886e41a	Bump xstream from 1.4.6 to 1.4.15 in /jodconverter-web Bumps [xstream](https://github.com/x-stream/xstream) from 1.4.6 to 1.4.15. - [Release notes](https://github.com/x-stream/xstream/releases) - [Commits](https://github.com/x-stream/xstream/commits) Signed-off-by: dependabot[bot] <support@github.com>	2020-12-25 17:01:12 +08:00
kl	cf1f833d60	新增markdown格式预览支持	2020-12-25 17:00:15 +08:00