Bump poi-scratchpad from 3.12 to 5.2.1 in /server

Bumps poi-scratchpad from 3.12 to 5.2.1.

---
updated-dependencies:
- dependency-name: org.apache.poi:poi-scratchpad
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/maven.yml

@@ -0,0 +1,24 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.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/

.workflow/BranchPipeline.yml

@@ -0,0 +1,53 @@
+version: '1.0'
+name: branch-pipeline
+displayName: BranchPipeline
+stages:
+  - stage:
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        # 支持6、7、8、9、10、11六个版本
+        jdkVersion: 8
+        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+        mavenVersion: 3.3.9
+        # 构建命令
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
+            path:
+              - ./server/target
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_maven
+  - stage:
+    name: release
+    displayName: 发布
+    steps:
+      - step: publish@release_artifacts
+        name: publish_release_artifacts
+        displayName: '发布'
+        # 上游上传制品任务的产出
+        dependArtifact: output
+        # 发布制品版本号
+        version: '1.0.0.0'
+        # 是否开启版本号自增，默认开启
+        autoIncrement: true
+triggers:
+  push:
+    branches:
+      exclude:
+        - master
+      include:
+        - .*

.workflow/MasterPipeline.yml

@@ -0,0 +1,51 @@
+version: '1.0'
+name: master-pipeline
+displayName: MasterPipeline
+stages:
+  - stage:
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        # 支持6、7、8、9、10、11六个版本
+        jdkVersion: 8
+        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+        mavenVersion: 3.3.9
+        # 构建命令
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
+            path:
+              - ./server/target
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_maven
+  - stage:
+    name: release
+    displayName: 发布
+    steps:
+      - step: publish@release_artifacts
+        name: publish_release_artifacts
+        displayName: '发布'
+        # 上游上传制品任务的产出
+        dependArtifact: output
+        # 发布制品版本号
+        version: '1.0.0.0'
+        # 是否开启版本号自增，默认开启
+        autoIncrement: true
+triggers:
+  push:
+    branches:
+      include:
+        - master

.workflow/PRPipeline.yml

@@ -0,0 +1,40 @@
+version: '1.0'
+name: pr-pipeline
+displayName: PRPipeline
+stages:
+  - stage:
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        # 支持6、7、8、9、10、11六个版本
+        jdkVersion: 8
+        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+        mavenVersion: 3.3.9
+        # 构建命令
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
+            path:
+              - ./server/target
+      - step: publish@general_artifacts
+        name: publish_general_artifacts
+        displayName: 上传制品
+        # 上游构建任务定义的产物名，默认BUILD_ARTIFACT
+        dependArtifact: BUILD_ARTIFACT
+        # 构建产物制品库，默认default，系统默认创建
+        artifactRepository: default
+        # 上传到制品库时的制品命名，默认output
+        artifactName: output
+        dependsOn: build_maven
+triggers:
+  pr:
+    branches:
+      include:
+        - master

.workflow/pipeline-20220716.yml

@@ -0,0 +1,36 @@
+version: '1.0'
+name: pipeline-20220716
+displayName: pipeline-20220716
+triggers:
+  trigger: manual
+  push:
+    branches:
+      prefix:
+        - ''
+stages:
+  - name: stage-8b46aafe
+    displayName: 未命名
+    strategy: naturally
+    trigger: auto
+    executor: []
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        jdkVersion: '8'
+        mavenVersion: 3.3.9
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        artifacts:
+          - name: BUILD_ARTIFACT
+            path:
+              - ./server/target
+        settings: []
+        caches:
+          - ~/.m2
+        notify: []
+        strategy:
+          retry: '0'
+permissions:
+  - role: admin
+    members: []

Dockerfile

@@ -1,32 +1,5 @@
-FROM ubuntu:20.04
+FROM keking/kkfileview-jdk:4.1.1
 MAINTAINER chenjh "842761733@qq.com"
-ADD jodconverter-web/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 &&\
-	apt-get install -y locales && apt-get install -y language-pack-zh-hans &&\
-	localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 && locale-gen zh_CN.UTF-8 &&\
-	apt-get install -y tzdata && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime &&\
-	apt-get install -y libxrender1 && apt-get install -y libxt6 && apt-get install -y libxext-dev && apt-get install -y libfreetype6-dev &&\
-	apt-get install -y wget && apt-get install -y ttf-mscorefonts-installer && apt-get install -y fontconfig &&\
-	apt-get install ttf-wqy-microhei &&\
-	apt-get install ttf-wqy-zenhei &&\
-	apt-get install xfonts-wqy &&\
-    cd /tmp &&\
-	wget https://kkfileview.keking.cn/server-jre-8u251-linux-x64.tar.gz &&\
-	wget https://kkfileview.keking.cn/Apache_OpenOffice_4.1.6_Linux_x86-64_install-deb_zh-CN.tar.gz -cO openoffice_deb.tar.gz &&\
-	tar -zxf /tmp/server-jre-8u251-linux-x64.tar.gz && mv /tmp/jdk1.8.0_251 /usr/local/ &&\
-	tar -zxf /tmp/openoffice_deb.tar.gz && cd /tmp/zh-CN/DEBS &&\
-	dpkg -i *.deb && dpkg -i desktop-integration/openoffice4.1-debian-menus_4.1.6-9790_all.deb &&\
-	rm -rf /tmp/* && rm -rf /var/lib/apt/lists/* &&\
-    cd /usr/share/fonts/chienes &&\
-    mkfontscale &&\
-    mkfontdir &&\
-    fc-cache -fv
-ENV JAVA_HOME /usr/local/jdk1.8.0_251
-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"]
+ADD server/target/kkFileView-*.tar.gz /opt/
+ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-4.1.0-SNAPSHOT/bin
+ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.1.0-SNAPSHOT/config/application.properties","-jar","/opt/kkFileView-4.1.0-SNAPSHOT/bin/kkFileView-4.1.0-SNAPSHOT.jar"]

README.en.md

@@ -1,4 +1,4 @@
-# file-online-preview
+# kkFileView
 
 [![GitHub license](https://img.shields.io/github/license/kekingcn/kkFileView.svg?style=flat-square)](https://github.com/kekingcn/kkFileView/blob/master/LICENSE)
 

README.md

@@ -1,15 +1,15 @@
-# file-online-preview
+# kkFileView
 此项目为文件文档在线预览项目解决方案，对标业内付费产品有【[永中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,79 @@ 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年7月6日，v4.0.0 版本发布 ：
+
+1. 底层集成OpenOffice替换为LibreOffice，Office文件兼容性增强，预览效果提升
+2. 修复压缩文件目录穿越漏洞
+3. 修复PPT预览使用PDF模式无效
+4. 修复PPT图片预览模式前端显示异常
+5. 新增功能：首页文件上传功能可通过配置实时开启或禁用
+6. 优化增加Office进程关闭日志
+7. 优化Windows环境下，查找Office组件逻辑(内置的LibreOffice优先)
+8. 优化启动Office进程改同步执行
+
+> 2021年6月17日，v3.6.0 版本发布 ：
+
+ofd 类型文件支持版本，本次版本重要功能均由社区开发贡献，感谢 @gaoxingzaq、@zhangxiaoxiao9527 的代码贡献
+1. 新增 ofd 类型文件预览支持，ofd 是国产的类似 pdf 格式的文件
+2. 新增了 ffmpeg 视频文件转码预览支持，打开转码功能后，理论上支持所有主流视频的预览，如 rm、rmvb、flv 等
+3. 美化了 ppt、pptx 类型文件预览效果，比之前版本好看太多
+4. 更新了 pdfbox、xstream、common-io 等依赖的版本
+
+> 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 +226,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)

docker/kkfileview-jdk/Dockerfile

@@ -0,0 +1,38 @@
+FROM ubuntu:20.04
+MAINTAINER chenjh "842761733@qq.com"
+# 内置一些常用的中文字体，避免普遍性乱码
+COPY fonts/* /usr/share/fonts/chinese/
+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 &&\
+	apt-get install -y locales && apt-get install -y language-pack-zh-hans &&\
+	localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 && locale-gen zh_CN.UTF-8 &&\
+    export DEBIAN_FRONTEND=noninteractive &&\
+	apt-get install -y tzdata && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime &&\
+	apt-get install -y libxrender1 && apt-get install -y libxt6 && apt-get install -y libxext-dev && apt-get install -y libfreetype6-dev &&\
+	apt-get install -y wget && apt-get install -y ttf-mscorefonts-installer && apt-get install -y fontconfig &&\
+	apt-get install ttf-wqy-microhei &&\
+	apt-get install ttf-wqy-zenhei &&\
+	apt-get install xfonts-wqy &&\
+    cd /tmp &&\
+	wget https://kkfileview.keking.cn/server-jre-8u251-linux-x64.tar.gz &&\
+	tar -zxf /tmp/server-jre-8u251-linux-x64.tar.gz && mv /tmp/jdk1.8.0_251 /usr/local/ &&\
+
+#	安装 libreoffice
+    apt-get install -y libxinerama1 libcairo2 libcups2 libx11-xcb1 &&\
+    wget https://kkfileview.keking.cn/LibreOffice_7.1.4_Linux_x86-64_deb.tar.gz -cO libreoffice_deb.tar.gz &&\
+    tar -zxf /tmp/libreoffice_deb.tar.gz && cd /tmp/LibreOffice_7.1.4.2_Linux_x86-64_deb/DEBS &&\
+    dpkg -i *.deb &&\
+
+#   清理临时文件
+	rm -rf /tmp/* && rm -rf /var/lib/apt/lists/* &&\
+    cd /usr/share/fonts/chinese &&\
+    mkfontscale &&\
+    mkfontdir &&\
+    fc-cache -fv
+
+ENV JAVA_HOME /usr/local/jdk1.8.0_251
+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
+ENTRYPOINT ["java","-version"]

docker/kkfileview-jdk/docker build.txt

@@ -0,0 +1,2 @@
+# 执行如下命令构建基础镜像，加快kkfileview docker镜像构建与发布
+docker build --tag keking/kkfileview-jdk:4.1.1 .

jodconverter-core/pom.xml

@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         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>
-    <repositories>
-        <repository>
-            <!-- required for org.hyperic:sigar -->
-            <id>jboss-public-repository-group</id>
-            <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openoffice</groupId>
-            <artifactId>juh</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openoffice</groupId>
-            <artifactId>ridl</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openoffice</groupId>
-            <artifactId>unoil</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-        <dependency>
-            <!-- for the command line tool -->
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.1</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.hyperic</groupId>
-            <artifactId>sigar</artifactId>
-            <version>1.6.5.132</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.json</groupId>
-            <artifactId>json</artifactId>
-            <version>20090211</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>6.0.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <!--   要将源码放上去，需要加入这个插件    -->
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.1</version>
-                <configuration>
-                    <attach>true</attach>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>compile</phase>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.7.2</version>
-                <configuration>
-                    <!-- don't run tests in parallel -->
-                    <perCoreThreadCount>false</perCoreThreadCount>
-                    <threadCount>1</threadCount>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>2.3.1</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.artofsolving.jodconverter.cli.Convert</mainClass>
-                            <addClasspath>true</addClasspath>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.2-beta-5</version>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/dist.xml</descriptor>
-                    </descriptors>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.7</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.4</version>
-            </plugin>
-        </plugins>
-    </reporting>
-    <!-- distribute目录 -->
-    <distributionManagement>
-        <repository>
-            <id>repo</id>
-            <name>User Project Releases</name>
-            <url>http://192.168.1.204:8081/nexus/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>repo</id>
-            <name>User Project SNAPSHOTS</name>
-            <url>http://192.168.1.204:8081/nexus/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-</project>

jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java

@@ -1,183 +0,0 @@
-//
-// JODConverter - Java OpenDocument Converter
-// Copyright 2004-2012 Mirko Nasato and contributors
-//
-// JODConverter is Open Source software, you can redistribute it and/or
-// modify it under either (at your option) of the following licenses
-//
-// 1. The GNU Lesser General Public License v3 (or later)
-//    -> http://www.gnu.org/licenses/lgpl-3.0.txt
-// 2. The Apache License, Version 2.0
-//    -> http://www.apache.org/licenses/LICENSE-2.0.txt
-//
-package org.artofsolving.jodconverter.office;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import org.artofsolving.jodconverter.util.PlatformUtils;
-
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.uno.UnoRuntime;
-
-public class OfficeUtils {
-
-    public static final String SERVICE_DESKTOP = "com.sun.star.frame.Desktop";
-    public static final String OFFICE_HOME_KEY = "office.home";
-    public static final String DEFAULT_OFFICE_HOME_VALUE = "default";
-
-    private OfficeUtils() {
-        throw new AssertionError("utility class must not be instantiated");
-    }
-
-    public static <T> T cast(Class<T> type, Object object) {
-        return (T) UnoRuntime.queryInterface(type, object);
-    }
-
-    public static PropertyValue property(String name, Object value) {
-        PropertyValue propertyValue = new PropertyValue();
-        propertyValue.Name = name;
-        propertyValue.Value = value;
-        return propertyValue;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static PropertyValue[] toUnoProperties(Map<String,?> properties) {
-        PropertyValue[] propertyValues = new PropertyValue[properties.size()];
-        int i = 0;
-        for (Map.Entry<String,?> entry : properties.entrySet()) {
-            Object value = entry.getValue();
-            if (value instanceof Map) {
-                Map<String,Object> subProperties = (Map<String,Object>) value;
-                value = toUnoProperties(subProperties);
-            }
-            propertyValues[i++] = property((String) entry.getKey(), value);
-        }
-        return propertyValues;
-    }
-
-    public static String toUrl(File file) {
-        String path = file.toURI().getRawPath();
-        String url = path.startsWith("//") ? "file:" + path : "file://" + path;
-        return url.endsWith("/") ? url.substring(0, url.length() - 1) : url;
-    }
-
-    public static File getDefaultOfficeHome() {
-        Properties properties = new Properties();
-        String customizedConfigPath = getCustomizedConfigPath();
-        try {
-            BufferedReader bufferedReader = new BufferedReader(new FileReader(customizedConfigPath));
-            properties.load(bufferedReader);
-            restorePropertiesFromEnvFormat(properties);
-        } catch (Exception e) {}
-        String officeHome = properties.getProperty(OFFICE_HOME_KEY);
-        if (officeHome != null && !DEFAULT_OFFICE_HOME_VALUE.equals(officeHome)) {
-            return new File(officeHome);
-        }
-        if (PlatformUtils.isWindows()) {
-            // %ProgramFiles(x86)% on 64-bit machines; %ProgramFiles% on 32-bit ones
-            String homePath = OfficeUtils.getHomePath();
-            String programFiles = System.getenv("ProgramFiles(x86)");
-            if (programFiles == null) {
-                programFiles = System.getenv("ProgramFiles");
-            }
-            return findOfficeHome(
-                programFiles + File.separator + "OpenOffice 4",
-                programFiles + File.separator + "LibreOffice 4",
-                homePath + File.separator + "office"
-            );
-        } else if (PlatformUtils.isMac()) {
-            return findOfficeHome(
-                "/Applications/OpenOffice.org.app/Contents",
-                "/Applications/OpenOffice.app/Contents",
-                "/Applications/LibreOffice.app/Contents"
-            );
-        } else {
-            // Linux or other *nix variants
-            return findOfficeHome(
-                "/opt/openoffice.org3",
-                "/opt/openoffice",
-                "/opt/libreoffice",
-                "/opt/openoffice4",
-                "/usr/lib/openoffice",
-                "/usr/lib/libreoffice"
-            );
-        }
-    }
-
-    private static File findOfficeHome(String... knownPaths) {
-        for (String path : knownPaths) {
-            File home = new File(path);
-            if (getOfficeExecutable(home).isFile()) {
-                return home;
-            }
-        }
-        return null;
-    }
-
-    public static File getOfficeExecutable(File officeHome) {
-        if (PlatformUtils.isMac()) {
-            return new File(officeHome, "MacOS/soffice");
-        } else {
-            return new File(officeHome, "program/soffice.bin");
-        }
-    }
-
-    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 支持从环境变量获取值
-     * @param properties
-     */
-    public synchronized static void restorePropertiesFromEnvFormat(Properties properties) {
-        Iterator<Map.Entry<Object, Object>> iterator = properties.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry<Object, Object> entry = iterator.next();
-            String key = entry.getKey().toString();
-            String value = entry.getValue().toString();
-            if (value.trim().startsWith("${") && value.trim().endsWith("}")) {
-                int beginIndex = value.indexOf(":");
-                if (beginIndex < 0) {
-                    beginIndex = value.length() - 1;
-                }
-                int endIndex = value.length() - 1;
-                String envKey = value.substring(2, beginIndex);
-                String envValue = System.getenv(envKey);
-                if (envValue == null || "".equals(envValue.trim())) {
-                    value = value.substring(beginIndex + 1, endIndex);
-                } else {
-                    value = envValue;
-                }
-                properties.setProperty(key, value);
-            }
-        }
-    }
-
-}

jodconverter-web/pom.xml

@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.8.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>cn.keking</groupId>
-    <artifactId>kkFileView</artifactId>
-    <version>2.2.1</version>
-
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.8</java.version>
-    </properties>
-    <repositories>
-        <repository>
-            <!-- required for org.hyperic:sigar -->
-            <id>jboss-public-repository-group</id>
-            <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
-        </repository>
-    </repositories>
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-            <version>4.11</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>cn.keking</groupId>
-            <artifactId>jodconverter-core</artifactId>
-            <version>1.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-io</artifactId>
-                    <groupId>commons-io</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
-        </dependency>
-        <!-- REDISSON -->
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson</artifactId>
-            <version>3.2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>3.12</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-scratchpad</artifactId>
-            <version>3.12</version>
-        </dependency>
-        <dependency>
-            <groupId>fr.opensagres.xdocreport</groupId>
-            <artifactId>org.apache.poi.xwpf.converter.core</artifactId>
-            <version>1.0.5</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>poi</artifactId>
-                    <groupId>org.apache.poi</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>fr.opensagres.xdocreport</groupId>
-            <artifactId>org.apache.poi.xwpf.converter.xhtml</artifactId>
-            <version>1.0.5</version>
-        </dependency>
-        <dependency>
-            <groupId>fr.opensagres.xdocreport</groupId>
-            <artifactId>fr.opensagres.xdocreport.document</artifactId>
-            <version>1.0.5</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-        </dependency>
-        <!-- 解压(apache) -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>1.19</version>
-        </dependency>
-        <!-- 解压(rar)-->
-        <dependency>
-            <groupId>com.github.junrar</groupId>
-            <artifactId>junrar</artifactId>
-            <version>4.0.0</version>
-        </dependency>
-        <!-- 解压(7z)-->
-        <dependency>
-            <groupId>org.tukaani</groupId>
-            <artifactId>xz</artifactId>
-            <version>1.8</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.jchardet</groupId>
-            <artifactId>jchardet</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>antlr</groupId>
-            <artifactId>antlr</artifactId>
-            <version>2.7.7</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <!-- FTP -->
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-            <version>3.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.15</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>19.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-            <artifactId>concurrentlinkedhashmap-lru</artifactId>
-            <version>1.4.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.rocksdb</groupId>
-            <artifactId>rocksdbjni</artifactId>
-            <version>5.17.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <version>2.0.15</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox-tools</artifactId>
-            <version>2.0.15</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aspose</groupId>
-            <artifactId>aspose-cad</artifactId>
-            <version>19.9</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/aspose-cad-19.9.jar</systemPath>
-        </dependency>
-    </dependencies>
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/config</directory>
-                <excludes>
-                    <exclude>${build.exclude.resource}</exclude>
-                </excludes>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <includeSystemScope>true</includeSystemScope>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>src/main/assembly/assembly.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

jodconverter-web/src/main/assembly/assembly.xml

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
-        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
-    <id>make-assembly</id>
-    <formats>
-        <format>zip</format>
-        <format>tar.gz</format>
-    </formats>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>src/main/bin</directory>
-            <outputDirectory>${file.separator}bin</outputDirectory>
-            <includes>
-                <include>*.sh</include>
-            </includes>
-            <fileMode>755</fileMode>
-            <lineEnding>unix</lineEnding>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/bin</directory>
-            <outputDirectory>${file.separator}bin</outputDirectory>
-            <includes>
-                <include>*.bat</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/config</directory>
-            <outputDirectory>${file.separator}config</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/log</directory>
-            <outputDirectory>${file.separator}log</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/office</directory>
-            <outputDirectory>${file.separator}office</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}</directory>
-            <outputDirectory>${file.separator}bin</outputDirectory>
-            <includes>
-                <include>*.jar</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>

jodconverter-web/src/main/bin/install.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-cd /tmp
-
-install_redhat() {
-    wget https://kkfileview.keking.cn/Apache_OpenOffice_4.1.6_Linux_x86-64_install-rpm_zh-CN.tar.gz -cO openoffice_rpm.tar.gz && tar zxf /tmp/openoffice_rpm.tar.gz && cd /tmp/zh-CN/RPMS
-   if [ $? -eq 0 ];then
-     yum install -y libXext.x86_64
-     yum groupinstall -y  "X Window System"
-     rpm -Uvih *.rpm
-     echo 'install desktop service ...'
-     rpm -Uvih desktop-integration/openoffice4.1.6-redhat-menus-4.1.6-9790.noarch.rpm
-     echo 'install finshed...'
-   else
-     echo 'download package error...'
-   fi
-}
-
-install_ubuntu() {
-   wget  https://kkfileview.keking.cn/Apache_OpenOffice_4.1.6_Linux_x86-64_install-deb_zh-CN.tar.gz  -cO openoffice_deb.tar.gz && tar zxf /tmp/openoffice_deb.tar.gz && cd /tmp/zh-CN/DEBS
-   echo $?
- if [ $? -eq 0 ];then
-     apt-get install -y libxrender1
-     apt-get install -y libxt6
-     apt-get install -y libxext-dev
-     apt-get install -y libfreetype6-dev
-     dpkg -i *.deb
-     echo 'install desktop service ...'
-     dpkg -i desktop-integration/openoffice4.1-debian-menus_4.1.6-9790_all.deb
-     echo 'install finshed...'
-  else
-    echo 'download package error...'
- fi
-}
-
-
-if [ -f "/etc/redhat-release" ]; then
-  yum install -y wget
-  install_redhat
-else
-  apt-get install -y wget
-  install_ubuntu
-fi

jodconverter-web/src/main/bin/shutdown.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-kill -15 `ps -ef|grep kkFileView|awk 'NR==1{print $2}'`

jodconverter-web/src/main/bin/startup.bat

@@ -1,9 +0,0 @@
-@echo off
-set "KKFILEVIEW_BIN_FOLDER=%cd%"
-cd "%KKFILEVIEW_BIN_FOLDER%"
-echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER%
-echo Starting kkFileView...
-echo Please check log file in ../log/kkFileView.log for more information
-echo You can get help in our official homesite: https://kkFileView.keking.cn
-echo If this project is helpful to you, please star it on https://gitee.com/kekingcn/file-online-preview/stargazers
-java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=..\config\application.properties -jar kkFileView-2.2.1.jar -> ..\log\kkFileView.log

jodconverter-web/src/main/bin/startup.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-DIR_HOME=("/opt/openoffice.org3" "/opt/libreoffice" "/opt/openoffice4" "/usr/lib/openoffice" "/usr/lib/libreoffice")
-FLAG=
-OFFICE_HOME=
-KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")";pwd)
-export KKFILEVIEW_BIN_FOLDER=$KKFILEVIEW_BIN_FOLDER
-cd $KKFILEVIEW_BIN_FOLDER
-echo "Using KKFILEVIEW_BIN_FOLDER $KKFILEVIEW_BIN_FOLDER"
-grep 'office\.home' ../config/application.properties | grep '!^#'
-if [ $? -eq 0 ]; then
-  echo "Using customized office.home"
-else 
- for i in ${DIR_HOME[@]}
-  do
-    if [ -f $i"/program/soffice.bin" ]; then
-      FLAG=true
-      OFFICE_HOME=${i}
-      break
-    fi
-  done
-  if [ ! -n "${FLAG}" ]; then
-    echo "Installing OpenOffice"
-    sh ./install.sh
-  else 
-    echo "Detected office component has been installed in $OFFICE_HOME"
-  fi
-fi
-echo "Starting kkFileView..."
-echo "Please execute ./showlog.sh to check log for more information"
-echo "You can get help in our official homesite: https://kkFileView.keking.cn"
-echo "If this project is helpful to you, please star it on https://gitee.com/kekingcn/file-online-preview/stargazers"
-nohup java -Dfile.encoding=UTF-8 -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=../config/application.properties -jar kkFileView-2.2.1.jar > ../log/kkFileView.log 2>&1 &

jodconverter-web/src/main/config/application.properties

@@ -1,88 +0,0 @@
-#######################################不可动态配置，需要重启生效#######################################
-server.port = ${KK_SERVER_PORT:8012}
-server.context-path = ${KK_CONTEXT_PATH:/}
-spring.http.encoding.charset = utf8
-## Freemarker 配置
-spring.freemarker.template-loader-path = classpath:/web/
-spring.freemarker.cache = false
-spring.freemarker.charset = UTF-8
-spring.freemarker.check-template-location = true
-spring.freemarker.content-type = text/html
-spring.freemarker.expose-request-attributes = true
-spring.freemarker.expose-session-attributes = true
-spring.freemarker.request-context-attribute = request
-spring.freemarker.suffix = .ftl
-
-server.tomcat.uri-encoding = UTF-8
-#文件上传限制
-spring.http.multipart.max-request-size=500MB
-spring.http.multipart.max-file-size=500MB
-
-#文件资源路径（默认为打包根路径下的file目录下）
-#file.dir = D:\\kkFileview\\
-file.dir = ${KK_FILE_DIR:default}
-#openoffice home路径
-#office.home = C:\\Program Files (x86)\\OpenOffice 4
-office.home = ${KK_OFFICE_HOME:default}
-
-#缓存实现类型，不配默认为内嵌RocksDB(type = default)实现，可配置为redis(type = redis)实现（需要配置spring.redisson.address等参数）和 JDK 内置对象实现（type = jdk）,
-cache.type =  ${KK_CACHE_TYPE:jdk}
-#redis连接，只有当cache.type = redis时才有用
-spring.redisson.address = ${KK_SPRING_REDISSON_ADDRESS:127.0.0.1:6379}
-spring.redisson.password = ${KK_SPRING_REDISSON_PASSWORD:123456}
-#缓存是否自动清理 true 为开启，注释掉或其他值都为关闭
-cache.clean.enabled = ${KK_CACHE_CLEAN_ENABLED:true}
-#缓存自动清理时间，cache.clean.enabled = true时才有用，cron表达式，基于Quartz cron
-cache.clean.cron = ${KK_CACHE_CLEAN_CRON:0 0 3 * * ?}
-
-#######################################可在运行时动态配置#######################################
-#提供预览服务的地址，默认从请求url读，如果使用nginx等反向代理，需要手动设置
-#base.url = https://file.keking.cn
-base.url = ${KK_BASE_URL:default}
-
-#信任站点，多个用','隔开，设置了之后，会限制只能预览来自信任站点列表的文件，默认不限制
-#trust.host = file.keking.cn,kkfileview.keking.cn
-trust.host = ${KK_TRUST_HOST:default}
-
-#是否启用缓存
-cache.enabled = ${KK_CACHE_ENABLED:true}
-
-#文本类型，默认如下，可自定义添加
-simText = ${KK_SIMTEXT:txt,html,htm,asp,jsp,xml,json,properties,md,gitignore,log,java,py,c,cpp,sql,sh,bat,m,bas,prg,cmd}
-#多媒体类型，默认如下，可自定义添加
-media = ${KK_MEDIA:mp3,wav,mp4,flv}
-#office类型文档(word ppt)样式，默认为图片(image)，可配置为pdf（预览时也有按钮切换）
-office.preview.type = ${KK_OFFICE_PREVIEW_TYPE:image}
-#是否禁止下载转换生成的pdf文件
-pdf.download.disable = ${KK_PDF_DOWNLOAD_DISABLE:true}
-
-#预览源为FTP时 FTP用户名，可在ftp url后面加参数ftp.username=ftpuser指定，不指定默认用配置的
-ftp.username = ${KK_FTP_USERNAME:ftpuser}
-#预览源为FTP时 FTP密码，可在ftp url后面加参数ftp.password=123456指定，不指定默认用配置的
-ftp.password = ${KK_FTP_PASSWORD:123456}
-#预览源为FTP时, FTP连接默认ControlEncoding(根据FTP服务器操作系统选择，Linux一般为UTF-8，Windows一般为GBK)，可在ftp url后面加参数ftp.control.encoding=UTF-8指定，不指定默认用配置的
-ftp.control.encoding = ${KK_FTP_CONTROL_ENCODING:UTF-8}
-
-#水印内容
-#例：watermark.txt = ${WATERMARK_TXT:凯京科技内部文件，严禁外泄}
-#如需取消水印，内容设置为空即可，例：watermark.txt = ${WATERMARK_TXT:}
-watermark.txt = ${WATERMARK_TXT:}
-#水印x轴间隔
-watermark.x.space = ${WATERMARK_X_SPACE:10}
-#水印y轴间隔
-watermark.y.space = ${WATERMARK_Y_SPACE:10}
-#水印字体
-watermark.font = ${WATERMARK_FONT:微软雅黑}
-#水印字体大小
-watermark.fontsize = ${WATERMARK_FONTSIZE:18px}
-#水印字体颜色
-watermark.color = ${WATERMARK_COLOR:black}
-#水印透明度，要求设置在大于等于0.005，小于1
-watermark.alpha = ${WATERMARK_ALPHA:0.2}
-#水印宽度
-watermark.width = ${WATERMARK_WIDTH:180}
-#水印高度
-watermark.height = ${WATERMARK_HEIGHT:80}
-#水印倾斜度数，要求设置在大于等于0，小于90
-watermark.angle = ${WATERMARK_ANGLE:10}
-

jodconverter-web/src/main/config/freemarker_implicit.ftl

@@ -1,14 +0,0 @@
-[#ftl]
-[#-- @implicitly included --]
-[#-- @ftlvariable name="imgurls" type="String" --]
-[#-- @ftlvariable name="watermarkAngle" type="String" --]
-[#-- @ftlvariable name="watermarkHeight" type="String" --]
-[#-- @ftlvariable name="watermarkWidth" type="String" --]
-[#-- @ftlvariable name="watermarkAlpha" type="String" --]
-[#-- @ftlvariable name="watermarkColor" type="String" --]
-[#-- @ftlvariable name="watermarkFontsize" type="String" --]
-[#-- @ftlvariable name="watermarkFont" type="String" --]
-[#-- @ftlvariable name="watermarkYSpace" type="String" --]
-[#-- @ftlvariable name="watermarkXSpace" type="String" --]
-[#-- @ftlvariable name="watermarkTxt" type="String" --]
-[#-- @ftlvariable name="ordinaryUrl" type="String" --]

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);
-	}
-}

jodconverter-web/src/main/java/cn/keking/config/ConfigConstants.java

@@ -1,205 +0,0 @@
-package cn.keking.config;
-
-import org.artofsolving.jodconverter.office.OfficeUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.Set;
-
-/**
- * @author: chenjh
- * @since: 2019/4/10 17:22
- */
-@Component
-public class ConfigConstants {
-
-    private static Boolean CACHE_ENABLED;
-    private static String[] SIM_TEXT = {};
-    private static String[] MEDIA = {};
-    private static String OFFICE_PREVIEW_TYPE;
-    private static String FTP_USERNAME;
-    private static String FTP_PASSWORD;
-    private static String FTP_CONTROL_ENCODING;
-    private static String BASE_URL;
-    private static String FILE_DIR = OfficeUtils.getHomePath() + File.separator + "file" + File.separator;
-    private static CopyOnWriteArraySet<String> TRUST_HOST_SET;
-    private static String PDF_DOWNLOAD_DISABLE;
-
-    public static final String DEFAULT_CACHE_ENABLED = "true";
-    public static final String DEFAULT_TXT_TYPE = "txt,html,htm,asp,jsp,xml,json,properties,md,gitignore,log,java,py,c,cpp,sql,sh,bat,m,bas,prg,cmd";
-    public static final String DEFAULT_MEDIA_TYPE = "mp3,wav,mp4,flv";
-    public static final String DEFAULT_OFFICE_PREVIEW_TYPE = "image";
-    public static final String DEFAULT_FTP_USERNAME = null;
-    public static final String DEFAULT_FTP_PASSWORD = null;
-    public static final String DEFAULT_FTP_CONTROL_ENCODING = "UTF-8";
-    public static final String DEFAULT_BASE_URL = "default";
-    public static final String DEFAULT_FILE_DIR_VALUE = "default";
-    public static final String DEFAULT_TRUST_HOST = "default";
-    public static final String DEFAULT_PDF_DOWNLOAD_DISABLE = "true";
-
-    public static Boolean isCacheEnabled() {
-        return CACHE_ENABLED;
-    }
-
-    @Value("${cache.enabled:true}")
-    public void setCacheEnabled(String cacheEnabled) {
-        setCacheEnabledValueValue(Boolean.parseBoolean(cacheEnabled));
-    }
-
-    public static void setCacheEnabledValueValue(Boolean cacheEnabled) {
-        CACHE_ENABLED = cacheEnabled;
-    }
-
-    public static String[] getSimText() {
-        return SIM_TEXT;
-    }
-
-    @Value("${simText:txt,html,htm,asp,jsp,xml,json,properties,md,gitignore,log,java,py,c,cpp,sql,sh,bat,m,bas,prg,cmd}")
-    public void setSimText(String simText) {
-        String[] simTextArr = simText.split(",");
-        setSimTextValue(simTextArr);
-    }
-
-    public static void setSimTextValue(String[] simText) {
-        SIM_TEXT = simText;
-    }
-
-    public static String[] getMedia() {
-        return MEDIA;
-    }
-
-    @Value("${media:mp3,wav,mp4,flv}")
-    public void setMedia(String media) {
-        String[] mediaArr = media.split(",");
-        setMediaValue(mediaArr);
-    }
-
-    public static void setMediaValue(String[] Media) {
-        MEDIA = Media;
-    }
-
-    public static String getOfficePreviewType() {
-        return OFFICE_PREVIEW_TYPE;
-    }
-
-    @Value("${office.preview.type:image}")
-    public void setOfficePreviewType(String officePreviewType) {
-        setOfficePreviewTypeValue(officePreviewType);
-    }
-
-    public static void setOfficePreviewTypeValue(String officePreviewType) {
-        OFFICE_PREVIEW_TYPE = officePreviewType;
-    }
-
-    public static String getFtpUsername() {
-        return FTP_USERNAME;
-    }
-
-    @Value("${ftp.username:}")
-    public void setFtpUsername(String ftpUsername) {
-        setFtpUsernameValue(ftpUsername);
-    }
-
-    public static void setFtpUsernameValue(String ftpUsername) {
-        FTP_USERNAME = ftpUsername;
-    }
-
-    public static String getFtpPassword() {
-        return FTP_PASSWORD;
-    }
-
-    @Value("${ftp.password:}")
-    public void setFtpPassword(String ftpPassword) {
-        setFtpPasswordValue(ftpPassword);
-    }
-
-    public static void setFtpPasswordValue(String ftpPassword) {
-        FTP_PASSWORD = ftpPassword;
-    }
-
-    public static String getFtpControlEncoding() {
-        return FTP_CONTROL_ENCODING;
-    }
-
-    @Value("${ftp.control.encoding:UTF-8}")
-    public void setFtpControlEncoding(String ftpControlEncoding) {
-        setFtpControlEncodingValue(ftpControlEncoding);
-    }
-
-    public static void setFtpControlEncodingValue(String ftpControlEncoding) {
-        FTP_CONTROL_ENCODING = ftpControlEncoding;
-    }
-
-    public static String getBaseUrl() {
-        return BASE_URL;
-    }
-
-    @Value("${base.url:default}")
-    public void setBaseUrl(String baseUrl) {
-        setBaseUrlValue(baseUrl);
-    }
-
-    public static void setBaseUrlValue(String baseUrl) {
-        BASE_URL = baseUrl;
-    }
-
-    public static String getFileDir() {
-        return FILE_DIR;
-    }
-
-    @Value("${file.dir:default}")
-    public void setFileDir(String fileDir) {
-        setFileDirValue(fileDir);
-    }
-
-    public static void setFileDirValue(String fileDir) {
-        if (!DEFAULT_FILE_DIR_VALUE.equals(fileDir.toLowerCase())) {
-            if (!fileDir.endsWith(File.separator)) {
-                fileDir = fileDir + File.separator;
-            }
-            FILE_DIR = fileDir;
-        }
-    }
-
-    @Value("${trust.host:default}")
-    public void setTrustHost(String trustHost) {
-        setTrustHostValue(trustHost);
-    }
-
-    public static void setTrustHostValue(String trustHost) {
-        CopyOnWriteArraySet<String> trustHostSet;
-        if (DEFAULT_TRUST_HOST.equals(trustHost.toLowerCase())) {
-            trustHostSet = new CopyOnWriteArraySet<>();
-        } else {
-            String[] trustHostArray = trustHost.toLowerCase().split(",");
-            trustHostSet = new CopyOnWriteArraySet<>(Arrays.asList(trustHostArray));
-            setTrustHostSet(trustHostSet);
-        }
-        setTrustHostSet(trustHostSet);
-    }
-
-    public static Set<String> getTrustHostSet() {
-        return TRUST_HOST_SET;
-    }
-
-    private static void setTrustHostSet(CopyOnWriteArraySet<String> trustHostSet) {
-        ConfigConstants.TRUST_HOST_SET = trustHostSet;
-    }
-
-    public static String getPdfDownloadDisable() {
-        return PDF_DOWNLOAD_DISABLE;
-    }
-
-
-    @Value("${pdf.download.disable:true}")
-    public void setPdfDownloadDisable(String pdfDownloadDisable) {
-        setPdfDownloadDisableValue(pdfDownloadDisable);
-    }
-    public static void setPdfDownloadDisableValue(String pdfDownloadDisable) {
-        PDF_DOWNLOAD_DISABLE = pdfDownloadDisable;
-    }
-
-}

jodconverter-web/src/main/java/cn/keking/config/ConfigRefreshComponent.java

@@ -1,109 +0,0 @@
-package cn.keking.config;
-
-import org.artofsolving.jodconverter.office.OfficeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Properties;
-
-/**
- * @auther: chenjh
- * @time: 2019/4/10 16:16
- * @description 每隔1s读取并更新一次配置文件
- */
-@Component
-public class ConfigRefreshComponent {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigRefreshComponent.class);
-
-    @PostConstruct
-    void refresh() {
-        Thread configRefreshThread = new Thread(new ConfigRefreshThread());
-        configRefreshThread.start();
-    }
-
-    static class ConfigRefreshThread implements Runnable {
-        @Override
-        public void run() {
-            try {
-                Properties properties = new Properties();
-                String text;
-                String media;
-                boolean cacheEnabled;
-                String[] textArray;
-                String[] mediaArray;
-                String officePreviewType;
-                String ftpUsername;
-                String ftpPassword;
-                String ftpControlEncoding;
-                String configFilePath = OfficeUtils.getCustomizedConfigPath();
-                String baseUrl;
-                String trustHost;
-                String pdfDownloadDisable;
-                while (true) {
-                    FileReader fileReader = new FileReader(configFilePath);
-                    BufferedReader bufferedReader = new BufferedReader(fileReader);
-                    properties.load(bufferedReader);
-                    OfficeUtils.restorePropertiesFromEnvFormat(properties);
-                    cacheEnabled = Boolean.parseBoolean(properties.getProperty("cache.enabled", ConfigConstants.DEFAULT_CACHE_ENABLED));
-                    text = properties.getProperty("simText", ConfigConstants.DEFAULT_TXT_TYPE);
-                    media = properties.getProperty("media", ConfigConstants.DEFAULT_MEDIA_TYPE);
-                    officePreviewType = properties.getProperty("office.preview.type", ConfigConstants.DEFAULT_OFFICE_PREVIEW_TYPE);
-                    ftpUsername = properties.getProperty("ftp.username", ConfigConstants.DEFAULT_FTP_USERNAME);
-                    ftpPassword = properties.getProperty("ftp.password", ConfigConstants.DEFAULT_FTP_PASSWORD);
-                    ftpControlEncoding = properties.getProperty("ftp.control.encoding", ConfigConstants.DEFAULT_FTP_CONTROL_ENCODING);
-                    textArray = text.split(",");
-                    mediaArray = media.split(",");
-                    baseUrl = properties.getProperty("base.url", ConfigConstants.DEFAULT_BASE_URL);
-                    trustHost = properties.getProperty("trust.host", ConfigConstants.DEFAULT_TRUST_HOST);
-                    pdfDownloadDisable = properties.getProperty("pdf.download.disable", ConfigConstants.DEFAULT_PDF_DOWNLOAD_DISABLE);
-                    ConfigConstants.setCacheEnabledValueValue(cacheEnabled);
-                    ConfigConstants.setSimTextValue(textArray);
-                    ConfigConstants.setMediaValue(mediaArray);
-                    ConfigConstants.setOfficePreviewTypeValue(officePreviewType);
-                    ConfigConstants.setFtpUsernameValue(ftpUsername);
-                    ConfigConstants.setFtpPasswordValue(ftpPassword);
-                    ConfigConstants.setFtpControlEncodingValue(ftpControlEncoding);
-                    ConfigConstants.setBaseUrlValue(baseUrl);
-                    ConfigConstants.setTrustHostValue(trustHost);
-                    ConfigConstants.setPdfDownloadDisableValue(pdfDownloadDisable);
-                    setWatermarkConfig(properties);
-                    bufferedReader.close();
-                    fileReader.close();
-                    Thread.sleep(1000L);
-                }
-            } catch (IOException | InterruptedException e) {
-                LOGGER.error("读取配置文件异常", e);
-            }
-        }
-
-        private void setWatermarkConfig(Properties properties) {
-            String watermarkTxt = properties.getProperty("watermark.txt", WatermarkConfigConstants.DEFAULT_WATERMARK_TXT);
-            String watermarkXSpace = properties.getProperty("watermark.x.space", WatermarkConfigConstants.DEFAULT_WATERMARK_X_SPACE);
-            String watermarkYSpace = properties.getProperty("watermark.y.space", WatermarkConfigConstants.DEFAULT_WATERMARK_Y_SPACE);
-            String watermarkFont = properties.getProperty("watermark.font", WatermarkConfigConstants.DEFAULT_WATERMARK_FONT);
-            String watermarkFontsize = properties.getProperty("watermark.fontsize", WatermarkConfigConstants.DEFAULT_WATERMARK_FONTSIZE);
-            String watermarkColor = properties.getProperty("watermark.color", WatermarkConfigConstants.DEFAULT_WATERMARK_COLOR);
-            String watermarkAlpha = properties.getProperty("watermark.alpha", WatermarkConfigConstants.DEFAULT_WATERMARK_ALPHA);
-            String watermarkWidth = properties.getProperty("watermark.width", WatermarkConfigConstants.DEFAULT_WATERMARK_WIDTH);
-            String watermarkHeight = properties.getProperty("watermark.height", WatermarkConfigConstants.DEFAULT_WATERMARK_HEIGHT);
-            String watermarkAngle = properties.getProperty("watermark.angle", WatermarkConfigConstants.DEFAULT_WATERMARK_ANGLE);
-            WatermarkConfigConstants.setWatermarkTxtValue(watermarkTxt);
-            WatermarkConfigConstants.setWatermarkXSpaceValue(watermarkXSpace);
-            WatermarkConfigConstants.setWatermarkYSpaceValue(watermarkYSpace);
-            WatermarkConfigConstants.setWatermarkFontValue(watermarkFont);
-            WatermarkConfigConstants.setWatermarkFontsizeValue(watermarkFontsize);
-            WatermarkConfigConstants.setWatermarkColorValue(watermarkColor);
-            WatermarkConfigConstants.setWatermarkAlphaValue(watermarkAlpha);
-            WatermarkConfigConstants.setWatermarkWidthValue(watermarkWidth);
-            WatermarkConfigConstants.setWatermarkHeightValue(watermarkHeight);
-            WatermarkConfigConstants.setWatermarkAngleValue(watermarkAngle);
-
-        }
-    }
-}

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;
-    }
-}

jodconverter-web/src/main/java/cn/keking/config/WebConfig.java

@@ -1,27 +0,0 @@
-package cn.keking.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-/**
- * @author: chenjh
- * @since: 2019/4/16 20:04
- */
-@Configuration
-public class WebConfig extends WebMvcConfigurerAdapter {
-
-    private final static Logger LOGGER = LoggerFactory.getLogger(WebConfig.class);
-    /**
-     * 访问外部文件配置
-     */
-    @Override
-    public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        String filePath = ConfigConstants.getFileDir();
-        LOGGER.info("Add resource locations: {}", filePath);
-        registry.addResourceHandler("/**").addResourceLocations("classpath:/META-INF/resources/","classpath:/resources/","classpath:/static/","classpath:/public/","file:" + filePath);
-        super.addResourceHandlers(registry);
-    }
-}

jodconverter-web/src/main/java/cn/keking/extend/ControlDocumentFormatRegistry.java

@@ -1,157 +0,0 @@
-package cn.keking.extend;
-
-import org.artofsolving.jodconverter.document.DocumentFamily;
-import org.artofsolving.jodconverter.document.DocumentFormat;
-import org.artofsolving.jodconverter.document.SimpleDocumentFormatRegistry;
-
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * 重写了DefaultDocumentFormatRegistry类，因为要添加自定义行为，比如字符编码。。。
- * @author yudian-it
- * @date 2017/12/5
- */
-public class ControlDocumentFormatRegistry extends SimpleDocumentFormatRegistry {
-
-    public ControlDocumentFormatRegistry() {
-        DocumentFormat pdf = new DocumentFormat("Portable Document Format", "pdf", "application/pdf");
-        pdf.setStoreProperties(DocumentFamily.TEXT, Collections.singletonMap("FilterName", "writer_pdf_Export"));
-        pdf.setStoreProperties(DocumentFamily.SPREADSHEET, Collections.singletonMap("FilterName", "calc_pdf_Export"));
-        pdf.setStoreProperties(DocumentFamily.PRESENTATION, Collections.singletonMap("FilterName", "impress_pdf_Export"));
-        pdf.setStoreProperties(DocumentFamily.DRAWING, Collections.singletonMap("FilterName", "draw_pdf_Export"));
-        addFormat(pdf);
-
-        DocumentFormat swf = new DocumentFormat("Macromedia Flash", "swf", "application/x-shockwave-flash");
-        swf.setStoreProperties(DocumentFamily.PRESENTATION, Collections.singletonMap("FilterName", "impress_flash_Export"));
-        swf.setStoreProperties(DocumentFamily.DRAWING, Collections.singletonMap("FilterName", "draw_flash_Export"));
-        addFormat(swf);
-
-        // disabled because it's not always available
-        //DocumentFormat xhtml = new DocumentFormat("XHTML", "xhtml", "application/xhtml+xml");
-        //xhtml.setStoreProperties(DocumentFamily.TEXT, Collections.singletonMap("FilterName", "XHTML Writer File"));
-        //xhtml.setStoreProperties(DocumentFamily.SPREADSHEET, Collections.singletonMap("FilterName", "XHTML Calc File"));
-        //xhtml.setStoreProperties(DocumentFamily.PRESENTATION, Collections.singletonMap("FilterName", "XHTML Impress File"));
-        //addFormat(xhtml);
-
-        DocumentFormat html = new DocumentFormat("HTML", "html", "text/html");
-        // HTML is treated as Text when supplied as input, but as an output it is also
-        // available for exporting Spreadsheet and Presentation formats
-        html.setInputFamily(DocumentFamily.TEXT);
-        html.setStoreProperties(DocumentFamily.TEXT, Collections.singletonMap("FilterName", "HTML (StarWriter)"));
-        Map<String,Object> htmlLoadAndStoreProperties = new LinkedHashMap<>();
-        htmlLoadAndStoreProperties.put("FilterName", "HTML (StarCalc)");
-        htmlLoadAndStoreProperties.put("FilterOptions", "utf8");
-        html.setStoreProperties(DocumentFamily.SPREADSHEET, htmlLoadAndStoreProperties);
-        html.setStoreProperties(DocumentFamily.PRESENTATION, Collections.singletonMap("FilterName", "impress_html_Export"));
-        addFormat(html);
-
-        DocumentFormat odt = new DocumentFormat("OpenDocument Text", "odt", "application/vnd.oasis.opendocument.text");
-        odt.setInputFamily(DocumentFamily.TEXT);
-        odt.setStoreProperties(DocumentFamily.TEXT, Collections.singletonMap("FilterName", "writer8"));
-        addFormat(odt);
-
-        DocumentFormat sxw = new DocumentFormat("OpenOffice.org 1.0 Text Document", "sxw", "application/vnd.sun.xml.writer");
-        sxw.setInputFamily(DocumentFamily.TEXT);
-        sxw.setStoreProperties(DocumentFamily.TEXT, Collections.singletonMap("FilterName", "StarOffice XML (Writer)"));
-        addFormat(sxw);
-
-        DocumentFormat doc = new DocumentFormat("Microsoft Word", "doc", "application/msword");
-        doc.setInputFamily(DocumentFamily.TEXT);
-        doc.setStoreProperties(DocumentFamily.TEXT, Collections.singletonMap("FilterName", "MS Word 97"));
-        addFormat(doc);
-
-        DocumentFormat docx = new DocumentFormat("Microsoft Word 2007 XML", "docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document");
-        docx.setInputFamily(DocumentFamily.TEXT);
-        addFormat(docx);
-
-        DocumentFormat rtf = new DocumentFormat("Rich Text Format", "rtf", "text/rtf");
-        rtf.setInputFamily(DocumentFamily.TEXT);
-        rtf.setStoreProperties(DocumentFamily.TEXT, Collections.singletonMap("FilterName", "Rich Text Format"));
-        addFormat(rtf);
-
-        DocumentFormat wpd = new DocumentFormat("WordPerfect", "wpd", "application/wordperfect");
-        wpd.setInputFamily(DocumentFamily.TEXT);
-        addFormat(wpd);
-
-        DocumentFormat txt = new DocumentFormat("Plain Text", "txt", "text/plain");
-        txt.setInputFamily(DocumentFamily.TEXT);
-        Map<String,Object> txtLoadAndStoreProperties = new LinkedHashMap<>();
-        txtLoadAndStoreProperties.put("FilterName", "Text (encoded)");
-        txtLoadAndStoreProperties.put("FilterOptions", "utf8");
-        txt.setLoadProperties(txtLoadAndStoreProperties);
-        txt.setStoreProperties(DocumentFamily.TEXT, txtLoadAndStoreProperties);
-        addFormat(txt);
-
-        DocumentFormat wikitext = new DocumentFormat("MediaWiki wikitext", "wiki", "text/x-wiki");
-        wikitext.setStoreProperties(DocumentFamily.TEXT, Collections.singletonMap("FilterName", "MediaWiki"));
-        //addFormat(wikitext);
-
-        DocumentFormat ods = new DocumentFormat("OpenDocument Spreadsheet", "ods", "application/vnd.oasis.opendocument.spreadsheet");
-        ods.setInputFamily(DocumentFamily.SPREADSHEET);
-        ods.setStoreProperties(DocumentFamily.SPREADSHEET, Collections.singletonMap("FilterName", "calc8"));
-        addFormat(ods);
-
-        DocumentFormat sxc = new DocumentFormat("OpenOffice.org 1.0 Spreadsheet", "sxc", "application/vnd.sun.xml.calc");
-        sxc.setInputFamily(DocumentFamily.SPREADSHEET);
-        sxc.setStoreProperties(DocumentFamily.SPREADSHEET, Collections.singletonMap("FilterName", "StarOffice XML (Calc)"));
-        addFormat(sxc);
-
-        DocumentFormat xls = new DocumentFormat("Microsoft Excel", "xls", "application/vnd.ms-excel");
-        xls.setInputFamily(DocumentFamily.SPREADSHEET);
-        xls.setStoreProperties(DocumentFamily.SPREADSHEET, Collections.singletonMap("FilterName", "MS Excel 97"));
-        addFormat(xls);
-
-        DocumentFormat xlsx = new DocumentFormat("Microsoft Excel 2007 XML", "xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-        xlsx.setInputFamily(DocumentFamily.SPREADSHEET);
-        addFormat(xlsx);
-
-        DocumentFormat csv = new DocumentFormat("Comma Separated Values", "csv", "text/csv");
-        csv.setInputFamily(DocumentFamily.SPREADSHEET);
-        Map<String,Object> csvLoadAndStoreProperties = new LinkedHashMap<>();
-        csvLoadAndStoreProperties.put("FilterName", "Text - txt - csv (StarCalc)");
-        csvLoadAndStoreProperties.put("FilterOptions", "44,34,0");  // Field Separator: ','; Text Delimiter: '"'
-        csv.setLoadProperties(csvLoadAndStoreProperties);
-        csv.setStoreProperties(DocumentFamily.SPREADSHEET, csvLoadAndStoreProperties);
-        addFormat(csv);
-
-        DocumentFormat tsv = new DocumentFormat("Tab Separated Values", "tsv", "text/tab-separated-values");
-        tsv.setInputFamily(DocumentFamily.SPREADSHEET);
-        Map<String,Object> tsvLoadAndStoreProperties = new LinkedHashMap<>();
-        tsvLoadAndStoreProperties.put("FilterName", "Text - txt - csv (StarCalc)");
-        tsvLoadAndStoreProperties.put("FilterOptions", "9,34,0");  // Field Separator: '\t'; Text Delimiter: '"'
-        tsv.setLoadProperties(tsvLoadAndStoreProperties);
-        tsv.setStoreProperties(DocumentFamily.SPREADSHEET, tsvLoadAndStoreProperties);
-        addFormat(tsv);
-
-        DocumentFormat odp = new DocumentFormat("OpenDocument Presentation", "odp", "application/vnd.oasis.opendocument.presentation");
-        odp.setInputFamily(DocumentFamily.PRESENTATION);
-        odp.setStoreProperties(DocumentFamily.PRESENTATION, Collections.singletonMap("FilterName", "impress8"));
-        addFormat(odp);
-
-        DocumentFormat sxi = new DocumentFormat("OpenOffice.org 1.0 Presentation", "sxi", "application/vnd.sun.xml.impress");
-        sxi.setInputFamily(DocumentFamily.PRESENTATION);
-        sxi.setStoreProperties(DocumentFamily.PRESENTATION, Collections.singletonMap("FilterName", "StarOffice XML (Impress)"));
-        addFormat(sxi);
-
-        DocumentFormat ppt = new DocumentFormat("Microsoft PowerPoint", "ppt", "application/vnd.ms-powerpoint");
-        ppt.setInputFamily(DocumentFamily.PRESENTATION);
-        ppt.setStoreProperties(DocumentFamily.PRESENTATION, Collections.singletonMap("FilterName", "MS PowerPoint 97"));
-        addFormat(ppt);
-
-        DocumentFormat pptx = new DocumentFormat("Microsoft PowerPoint 2007 XML", "pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation");
-        pptx.setInputFamily(DocumentFamily.PRESENTATION);
-        addFormat(pptx);
-
-        DocumentFormat odg = new DocumentFormat("OpenDocument Drawing", "odg", "application/vnd.oasis.opendocument.graphics");
-        odg.setInputFamily(DocumentFamily.DRAWING);
-        odg.setStoreProperties(DocumentFamily.DRAWING, Collections.singletonMap("FilterName", "draw8"));
-        addFormat(odg);
-
-        DocumentFormat svg = new DocumentFormat("Scalable Vector Graphics", "svg", "image/svg+xml");
-        svg.setStoreProperties(DocumentFamily.DRAWING, Collections.singletonMap("FilterName", "draw_svg_Export"));
-        addFormat(svg);
-    }
-
-}

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
-}

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);
-	}
-}

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();
-	}
-}

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);
-	}
-}

jodconverter-web/src/main/java/cn/keking/model/FileAttribute.java

@@ -1,58 +0,0 @@
-package cn.keking.model;
-
-/**
- * Created by kl on 2018/1/17.
- * Content :
- */
-public class FileAttribute {
-
-    private FileType type;
-
-    private String suffix;
-
-    private String name;
-
-    private String url;
-
-    public FileAttribute() {
-    }
-
-    public FileAttribute(FileType type, String suffix, String name, String url) {
-        this.type = type;
-        this.suffix = suffix;
-        this.name = name;
-        this.url = url;
-    }
-
-    public FileType getType() {
-        return type;
-    }
-
-    public void setType(FileType type) {
-        this.type = type;
-    }
-
-    public String getSuffix() {
-        return suffix;
-    }
-
-    public void setSuffix(String suffix) {
-        this.suffix = suffix;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-}

jodconverter-web/src/main/java/cn/keking/model/FileType.java

@@ -1,29 +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"),
-    markdown("markdownFilePreviewImpl"),
-    cad("cadFilePreviewImpl");
-
-
-    private final String instanceName;
-
-    FileType(String instanceName){
-        this.instanceName=instanceName;
-    }
-
-    public String getInstanceName() {
-        return instanceName;
-    }
-
-}

jodconverter-web/src/main/java/cn/keking/model/ReturnResponse.java

@@ -1,57 +0,0 @@
-package cn.keking.model;
-
-import java.io.Serializable;
-
-/**
- * 接口返回值结构
- * @author yudian-it
- * @date 2017/11/17
- */
-public class ReturnResponse<T> implements Serializable{
-    private static final long serialVersionUID = 313975329998789878L;
-    /**
-     * 返回状态
-     * 0. 成功
-     * 1. 失败
-     */
-    private int code;
-
-    /**
-     * 返回状态描述
-     * XXX成功
-     * XXX失败
-     */
-    private String msg;
-
-    private T content;
-
-    public ReturnResponse(int code, String msg, T content) {
-        this.code = code;
-        this.msg = msg;
-        this.content = content;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public T getContent() {
-        return content;
-    }
-
-    public void setContent(T content) {
-        this.content = content;
-    }
-}

jodconverter-web/src/main/java/cn/keking/service/FileConvertQueueTask.java

@@ -1,92 +0,0 @@
-package cn.keking.service;
-
-import cn.keking.model.FileAttribute;
-import cn.keking.model.FileType;
-import cn.keking.service.cache.CacheService;
-import cn.keking.utils.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.ExtendedModelMap;
-import javax.annotation.PostConstruct;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * Created by kl on 2018/1/19.
- * Content :消费队列中的转换文件
- */
-@Service
-public class FileConvertQueueTask {
-
-    private final Logger logger = LoggerFactory.getLogger(getClass());
-
-    private final FilePreviewFactory previewFactory;
-
-    private final CacheService cacheService;
-
-    private final FileUtils fileUtils;
-
-    public FileConvertQueueTask(FilePreviewFactory previewFactory,
-                                CacheService cacheService,
-                                FileUtils fileUtils) {
-        this.previewFactory = previewFactory;
-        this.cacheService = cacheService;
-        this.fileUtils=fileUtils;
-    }
-
-    @PostConstruct
-    public void startTask(){
-        ExecutorService executorService = Executors.newFixedThreadPool(3);
-        executorService.submit(new ConvertTask(previewFactory, cacheService, fileUtils));
-        logger.info("队列处理文件转换任务启动完成 ");
-    }
-
-    static class ConvertTask implements Runnable {
-
-        private final Logger logger = LoggerFactory.getLogger(ConvertTask.class);
-
-        private final FilePreviewFactory previewFactory;
-
-        private final CacheService cacheService;
-
-        private final FileUtils fileUtils;
-
-        public ConvertTask(FilePreviewFactory previewFactory,
-                           CacheService cacheService,
-                           FileUtils fileUtils) {
-            this.previewFactory = previewFactory;
-            this.cacheService = cacheService;
-            this.fileUtils=fileUtils;
-        }
-
-        @Override
-        public void run() {
-            while (true) {
-                String url = null;
-                try {
-                    url = cacheService.takeQueueTask();
-                    if(url != null){
-                        FileAttribute fileAttribute = fileUtils.getFileAttribute(url);
-                        FileType fileType = fileAttribute.getType();
-                        logger.info("正在处理预览转换任务，url：{}，预览类型：{}", url, fileType);
-                        if(fileType.equals(FileType.compress) || fileType.equals(FileType.office) || fileType.equals(FileType.cad)) {
-                            FilePreview filePreview = previewFactory.get(fileAttribute);
-                            filePreview.filePreviewHandle(url, new ExtendedModelMap(), fileAttribute);
-                        } else {
-                            logger.info("预览类型无需处理，url：{}，预览类型：{}", url, fileType);
-                        }
-                    }
-                } catch (Exception e) {
-                    try {
-                        Thread.sleep(1000*10);
-                    } catch (Exception ex){
-                        ex.printStackTrace();
-                    }
-                    logger.info("处理预览转换任务异常，url：{}", url, e);
-                }
-            }
-        }
-    }
-
-}

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);
-}

jodconverter-web/src/main/java/cn/keking/service/cache/impl/CacheServiceJDKImpl.java

@@ -1,134 +0,0 @@
-package cn.keking.service.cache.impl;
-
-import cn.keking.service.cache.CacheService;
-import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
-import com.googlecode.concurrentlinkedhashmap.Weighers;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-
-/**
- * @auther: chenjh
- * @time: 2019/4/2 17:21
- * @description
- */
-@Service
-@ConditionalOnExpression("'${cache.type:default}'.equals('jdk')")
-public class CacheServiceJDKImpl implements CacheService {
-
-    private Map<String, String> pdfCache;
-
-    private Map<String, List<String>> imgCache;
-
-    private Map<String, Integer> pdfImagesCache;
-
-    private static final int QUEUE_SIZE = 500000;
-
-    private final BlockingQueue<String> blockingQueue = new ArrayBlockingQueue<>(QUEUE_SIZE);
-
-    @Override
-    public void initPDFCachePool(Integer capacity) {
-        pdfCache = new ConcurrentLinkedHashMap.Builder<String, String>()
-                .maximumWeightedCapacity(capacity).weigher(Weighers.singleton())
-                .build();
-    }
-
-    @Override
-    public void initIMGCachePool(Integer capacity) {
-        imgCache = new ConcurrentLinkedHashMap.Builder<String, List<String>>()
-                .maximumWeightedCapacity(capacity).weigher(Weighers.singleton())
-                .build();
-    }
-
-    @Override
-    public void initPdfImagesCachePool(Integer capacity) {
-        pdfImagesCache = new ConcurrentLinkedHashMap.Builder<String, Integer>()
-                .maximumWeightedCapacity(capacity).weigher(Weighers.singleton())
-                .build();
-    }
-
-    @Override
-    public void putPDFCache(String key, String value) {
-        if (pdfCache == null) {
-            initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
-        }
-        pdfCache.put(key, value);
-    }
-
-    @Override
-    public void putImgCache(String key, List<String> value) {
-        if (imgCache == null) {
-            initIMGCachePool(CacheService.DEFAULT_IMG_CAPACITY);
-        }
-        imgCache.put(key, value);
-    }
-
-    @Override
-    public Map<String, String> getPDFCache() {
-        if (pdfCache == null) {
-            initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
-        }
-        return pdfCache;
-    }
-
-    @Override
-    public String getPDFCache(String key) {
-        if (pdfCache == null) {
-            initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
-        }
-        return pdfCache.get(key);
-    }
-
-    @Override
-    public Map<String, List<String>> getImgCache() {
-        if (imgCache == null) {
-            initPDFCachePool(CacheService.DEFAULT_IMG_CAPACITY);
-        }
-        return imgCache;
-    }
-
-    @Override
-    public List<String> getImgCache(String key) {
-        if (imgCache == null) {
-            initPDFCachePool(CacheService.DEFAULT_IMG_CAPACITY);
-        }
-        return imgCache.get(key);
-    }
-
-    @Override
-    public Integer getPdfImageCache(String key) {
-        if (pdfImagesCache == null) {
-            initPdfImagesCachePool(CacheService.DEFAULT_PDFIMG_CAPACITY);
-        }
-        return pdfImagesCache.get(key);
-    }
-
-    @Override
-    public void putPdfImageCache(String pdfFilePath, int num) {
-        if (pdfImagesCache == null) {
-            initPdfImagesCachePool(CacheService.DEFAULT_PDFIMG_CAPACITY);
-        }
-        pdfImagesCache.put(pdfFilePath, num);
-    }
-
-    @Override
-    public void cleanCache() {
-        initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
-        initIMGCachePool(CacheService.DEFAULT_IMG_CAPACITY);
-        initPdfImagesCachePool(CacheService.DEFAULT_PDFIMG_CAPACITY);
-    }
-
-    @Override
-    public void addQueueTask(String url) {
-        blockingQueue.add(url);
-    }
-
-    @Override
-    public String takeQueueTask() throws InterruptedException {
-        return blockingQueue.take();
-    }
-}

jodconverter-web/src/main/java/cn/keking/service/impl/CadFilePreviewImpl.java

@@ -1,89 +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.CadUtils;
-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 org.springframework.util.StringUtils;
-
-import static cn.keking.service.impl.OfficeFilePreviewImpl.getPreviewType;
-
-/**
- * @author chenjh
- * @since 2019/11/21 14:28
- */
-@Service
-public class CadFilePreviewImpl implements FilePreview {
-
-    private final FileUtils fileUtils;
-
-    private final DownloadUtils downloadUtils;
-
-    private final CadUtils cadUtils;
-
-    private final PdfUtils pdfUtils;
-
-    public CadFilePreviewImpl(FileUtils fileUtils,
-                              DownloadUtils downloadUtils,
-                              CadUtils cadUtils,
-                              PdfUtils pdfUtils) {
-        this.fileUtils = fileUtils;
-        this.downloadUtils = downloadUtils;
-        this.cadUtils = cadUtils;
-        this.pdfUtils = pdfUtils;
-
-    }
-
-    private static final String OFFICE_PREVIEW_TYPE_IMAGE = "image";
-    private static final String OFFICE_PREVIEW_TYPE_ALL_IMAGES = "allImages";
-    private static final String FILE_DIR = ConfigConstants.getFileDir();
-
-
-    @Override
-    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
-        // 预览Type，参数传了就取参数的，没传取系统默认
-        String officePreviewType = model.asMap().get("officePreviewType") == null ? ConfigConstants.getOfficePreviewType() : model.asMap().get("officePreviewType").toString();
-        String baseUrl = BaseUrlFilter.getBaseUrl();
-        String suffix=fileAttribute.getSuffix();
-        String fileName=fileAttribute.getName();
-        String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf";
-        String outFilePath = FILE_DIR + pdfName;
-        // 判断之前是否已转换过，如果转换过，直接返回，否则执行转换
-        if (!fileUtils.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
-            String filePath;
-            ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, null);
-            if (0 != response.getCode()) {
-                model.addAttribute("fileType", suffix);
-                model.addAttribute("msg", response.getMsg());
-                return "fileNotSupported";
-            }
-            filePath = response.getContent();
-            if (StringUtils.hasText(outFilePath)) {
-                boolean convertResult = cadUtils.cadToPdf(filePath, outFilePath);
-                if (!convertResult) {
-                    model.addAttribute("fileType", suffix);
-                    model.addAttribute("msg", "cad文件转换异常，请联系管理员");
-                    return "fileNotSupported";
-                }
-                if (ConfigConstants.isCacheEnabled()) {
-                    // 加入缓存
-                    fileUtils.addConvertedFile(pdfName, fileUtils.getRelativePath(outFilePath));
-                }
-            }
-        }
-        if (baseUrl != null && (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OFFICE_PREVIEW_TYPE_ALL_IMAGES.equals(officePreviewType))) {
-            return getPreviewType(model, fileAttribute, officePreviewType, baseUrl, pdfName, outFilePath, pdfUtils, OFFICE_PREVIEW_TYPE_IMAGE);
-        }
-        model.addAttribute("pdfUrl", pdfName);
-        return "pdf";
-    }
-
-
-}

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";
-        }
-    }
-}

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";
-    }
-
-
-}

jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java

@@ -1,101 +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.OfficeToPdf;
-import cn.keking.utils.PdfUtils;
-import cn.keking.web.filter.BaseUrlFilter;
-import org.springframework.stereotype.Service;
-import org.springframework.ui.Model;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-
-/**
- * Created by kl on 2018/1/17.
- * Content :处理office文件
- */
-@Service
-public class OfficeFilePreviewImpl implements FilePreview {
-
-    private final FileUtils fileUtils;
-
-    private final PdfUtils pdfUtils;
-
-    private final DownloadUtils downloadUtils;
-
-    private final OfficeToPdf officeToPdf;
-
-    public OfficeFilePreviewImpl(FileUtils fileUtils,
-                                 PdfUtils pdfUtils,
-                                 DownloadUtils downloadUtils,
-                                 OfficeToPdf officeToPdf) {
-        this.fileUtils = fileUtils;
-        this.pdfUtils = pdfUtils;
-        this.downloadUtils = downloadUtils;
-        this.officeToPdf = officeToPdf;
-    }
-
-    public static final String OFFICE_PREVIEW_TYPE_IMAGE = "image";
-    public static final String OFFICE_PREVIEW_TYPE_ALL_IMAGES = "allImages";
-    private static final String FILE_DIR = ConfigConstants.getFileDir();
-
-    @Override
-    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
-        // 预览Type，参数传了就取参数的，没传取系统默认
-        String officePreviewType = model.asMap().get("officePreviewType") == null ? ConfigConstants.getOfficePreviewType() : model.asMap().get("officePreviewType").toString();
-        String baseUrl = BaseUrlFilter.getBaseUrl();
-        String suffix=fileAttribute.getSuffix();
-        String fileName=fileAttribute.getName();
-        boolean isHtml = suffix.equalsIgnoreCase("xls") || suffix.equalsIgnoreCase("xlsx");
-        String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + (isHtml ? "html" : "pdf");
-        String outFilePath = FILE_DIR + pdfName;
-        // 判断之前是否已转换过，如果转换过，直接返回，否则执行转换
-        if (!fileUtils.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
-            String filePath;
-            ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, null);
-            if (0 != response.getCode()) {
-                model.addAttribute("fileType", suffix);
-                model.addAttribute("msg", response.getMsg());
-                return "fileNotSupported";
-            }
-            filePath = response.getContent();
-            if (StringUtils.hasText(outFilePath)) {
-                officeToPdf.openOfficeToPDF(filePath, outFilePath);
-                if (isHtml) {
-                    // 对转换后的文件进行操作(改变编码方式)
-                    fileUtils.doActionConvertedFile(outFilePath);
-                }
-                if (ConfigConstants.isCacheEnabled()) {
-                    // 加入缓存
-                    fileUtils.addConvertedFile(pdfName, fileUtils.getRelativePath(outFilePath));
-                }
-            }
-        }
-        if (!isHtml && baseUrl != null && (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OFFICE_PREVIEW_TYPE_ALL_IMAGES.equals(officePreviewType))) {
-            return getPreviewType(model, fileAttribute, officePreviewType, baseUrl, pdfName, outFilePath, pdfUtils, OFFICE_PREVIEW_TYPE_IMAGE);
-        }
-        model.addAttribute("pdfUrl", pdfName);
-        return isHtml ? "html" : "pdf";
-    }
-
-    static String getPreviewType(Model model, FileAttribute fileAttribute, String officePreviewType, String baseUrl, String pdfName, String outFilePath, PdfUtils pdfUtils, String officePreviewTypeImage) {
-        List<String> imageUrls = pdfUtils.pdf2jpg(outFilePath, pdfName, baseUrl);
-        if (imageUrls == null || imageUrls.size() < 1) {
-            model.addAttribute("msg", "office转图片异常，请联系管理员");
-            model.addAttribute("fileType",fileAttribute.getSuffix());
-            return "fileNotSupported";
-        }
-        model.addAttribute("imgurls", imageUrls);
-        model.addAttribute("currentUrl", imageUrls.get(0));
-        if (officePreviewTypeImage.equals(officePreviewType)) {
-            return "officePicture";
-        } else {
-            return "picture";
-        }
-    }
-}

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";
-    }
-}

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";
-    }
-}

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";
-    }
-}

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";
-    }
-
-}

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;
-        }
-    }
-}

jodconverter-web/src/main/java/cn/keking/utils/ConverterUtils.java

@@ -1,125 +0,0 @@
-package cn.keking.utils;
-
-import com.sun.star.document.UpdateDocMode;
-import cn.keking.extend.ControlDocumentFormatRegistry;
-import org.apache.commons.lang3.StringUtils;
-import org.artofsolving.jodconverter.OfficeDocumentConverter;
-import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration;
-import org.artofsolving.jodconverter.office.OfficeManager;
-import org.artofsolving.jodconverter.office.OfficeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * 创建文件转换器
- *
- * @author yudian-it
- * @date 2017/11/13
- */
-@Component
-public class ConverterUtils {
-
-    private final Logger logger = LoggerFactory.getLogger(ConverterUtils.class);
-
-    private OfficeManager officeManager;
-
-    @PostConstruct
-    public void initOfficeManager() {
-        File officeHome;
-        officeHome = OfficeUtils.getDefaultOfficeHome();
-        if (officeHome == null) {
-            throw new RuntimeException("找不到office组件，请确认'office.home'配置是否有误");
-        }
-        boolean killOffice = killProcess();
-        if (killOffice) {
-            logger.warn("检测到有正在运行的office进程，已自动结束该进程");
-        }
-        try {
-            DefaultOfficeManagerConfiguration configuration = new DefaultOfficeManagerConfiguration();
-            configuration.setOfficeHome(officeHome);
-            configuration.setPortNumber(8100);
-            // 设置任务执行超时为5分钟
-            configuration.setTaskExecutionTimeout(1000 * 60 * 5L);
-            // 设置任务队列超时为24小时
-            //configuration.setTaskQueueTimeout(1000 * 60 * 60 * 24L);
-            officeManager = configuration.buildOfficeManager();
-            officeManager.start();
-        } catch (Exception e) {
-            logger.error("启动office组件失败，请检查office组件是否可用");
-            throw e;
-        }
-    }
-
-    public OfficeDocumentConverter getDocumentConverter() {
-        OfficeDocumentConverter converter = new OfficeDocumentConverter(officeManager, new ControlDocumentFormatRegistry());
-        converter.setDefaultLoadProperties(getLoadProperties());
-        return converter;
-    }
-
-    private Map<String,?> getLoadProperties() {
-        Map<String,Object> loadProperties = new HashMap<>(10);
-        loadProperties.put("Hidden", true);
-        loadProperties.put("ReadOnly", true);
-        loadProperties.put("UpdateDocMode", UpdateDocMode.QUIET_UPDATE);
-        loadProperties.put("CharacterSet", StandardCharsets.UTF_8.name());
-        return loadProperties;
-    }
-
-    private boolean killProcess() {
-        boolean flag = false;
-        Properties props = System.getProperties();
-        try {
-            if (props.getProperty("os.name").toLowerCase().contains("windows")) {
-                Process p = Runtime.getRuntime().exec("cmd /c tasklist ");
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                InputStream os = p.getInputStream();
-                byte[] b = new byte[256];
-                while (os.read(b) > 0) {
-                    baos.write(b);
-                }
-                String s = baos.toString();
-                if (s.contains("soffice.bin")) {
-                    Runtime.getRuntime().exec("taskkill /im " + "soffice.bin" + " /f");
-                    flag = true;
-                }
-            } else {
-                Process p = Runtime.getRuntime().exec(new String[]{"sh","-c","ps -ef | grep " + "soffice.bin"});
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                InputStream os = p.getInputStream();
-                byte[] b = new byte[256];
-                while (os.read(b) > 0) {
-                    baos.write(b);
-                }
-                String s = baos.toString();
-                if (StringUtils.ordinalIndexOf(s, "soffice.bin", 3) > 0) {
-                    String[] cmd ={"sh","-c","kill -15 `ps -ef|grep " + "soffice.bin" + "|awk 'NR==1{print $2}'`"};
-                    Runtime.getRuntime().exec(cmd);
-                    flag = true;
-                }
-            }
-        } catch (IOException e) {
-            logger.error("检测office进程异常", e);
-        }
-        return flag;
-    }
-
-    @PreDestroy
-    public void destroyOfficeManager(){
-        if (null != officeManager && officeManager.isRunning()) {
-            officeManager.stop();
-        }
-    }
-
-}

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;
-    }
-
-}

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(realPath);
-                saveBytesToOutStream(bytes, os);
-            } else if (url.getProtocol() != null && "ftp".equalsIgnoreCase(url.getProtocol())) {
-                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);
-      }
-    }
-  }
-}