From 9786fa82755ccb644b6775b1d6eab7b97666082b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com> Date: Wed, 19 Jun 2019 14:18:35 +0800 Subject: [PATCH] =?UTF-8?q?2.1.0=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- README.en.md | 20 ++++++++------------ README.md | 20 ++++++++------------ jodconverter-web/pom.xml | 2 +- jodconverter-web/src/main/bin/startup.bat | 2 +- jodconverter-web/src/main/bin/startup.sh | 2 +- 6 files changed, 21 insertions(+), 29 deletions(-) diff --git a/Dockerfile b/Dockerfile index ffc26ea7..94aff7d1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,5 +27,5 @@ RUN yum install -y kde-l10n-Chinese &&\ mkfontdir &&\ fc-cache -fv ENV LC_ALL zh_CN.UTF-8 -ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-2.1.0-SNAPSHOT/bin -ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider","-Dspring.config.location=/opt/kkFileView-2.1.0-SNAPSHOT/conf/application.properties","-jar","/opt/kkFileView-2.1.0-SNAPSHOT/bin/kkFileView-2.1.0-SNAPSHOT.jar"] \ No newline at end of file +ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-2.1.0/bin +ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider","-Dspring.config.location=/opt/kkFileView-2.1.0/conf/application.properties","-jar","/opt/kkFileView-2.1.0/bin/kkFileView-2.1.0.jar"] \ No newline at end of file diff --git a/README.en.md b/README.en.md index fd6a1f87..20ca512b 100644 --- a/README.en.md +++ b/README.en.md @@ -58,26 +58,22 @@ Considering space issues, the pictures of other types of documents will not be s - Jodconverter > Dependencies - Redis(Optional, Unnecessary by default) -- OpenOffice or LibreOffice +- OpenOffice or LibreOffice(Integrated on Windows, will be installed automatically on Linux, need to be manually installed on Mac OS) 1. First step：`git pull https://github.com/kekingcn/file-online-preview.git` -2. Second step：configure redis address and OpenOffice directory，such as -``` -##The folder for files which are uploaded to the server(Because of running as jar) -file.dir = C:\\Users\\yudian\\Desktop\\dev\\ -## openoffice configuration -office.home = C:\\Program Files (x86)\\OpenOffice 4 - -``` -'file.dir' is the real storage address of the converted files, please end with '/'. - -3. Third step：Run the main method of FilePreviewApplication.java.After starting,visit `http://localhost:8012/`. +2. Third step：Run the main method of FilePreviewApplication.java.After starting,visit `http://localhost:8012/`. If everything is ok,you will see the picture below. ![输入图片说明](https://gitee.com/uploads/images/2017/1213/100221_ea15202e_492218.png "屏幕截图.png") ### Changelog +> June 18th 2019 ： +1. Support automatic cleaning of cache and preview files +2. Support http/https stream url file preview +3. Support FTP url file preview +4. Add Docker build + > April 8th 2019 1. Cache and queue implementations abstract, providing JDK and REDIS implementations (REDIS becomes optional dependencies) 2. Provides zip and tar.gz packages, and provides a one-click startup script diff --git a/README.md b/README.md index 48e91dbf..4a263901 100644 --- a/README.md +++ b/README.md @@ -52,26 +52,22 @@ QQ群号：613025121 - jodconverter > 依赖外部环境 - redis (可选，默认不用) -- OpenOffice或者LibreOffice +- OpenOffice或者LibreOffice(Windows下已内置，Linux会自动安装，Mac OS下需要手动安装) 1. 第一步：pull项目https://github.com/kekingcn/file-online-preview.git -2. 第二步：配置OpenOffice目录，如 -``` -##资源映射路径(因为jar方式运行的原因) -file.dir = C:\\Users\\yudian\\Desktop\\dev\\ -## openoffice相关配置 -office.home = C:\\Program Files (x86)\\OpenOffice 4 - -``` -file.dir为转换文件实际存储地址，注意要以/结尾 - -3. 第三步：运行FilePreviewApplication的main方法，服务启动后，访问http://localhost:8012/ +3. 第二步：运行FilePreviewApplication的main方法，服务启动后，访问http://localhost:8012/ 会看到如下界面，代表服务启动成功 ![输入图片说明](https://gitee.com/uploads/images/2017/1213/100221_ea15202e_492218.png "屏幕截图.png") ### 历史更新记录 +> 2019年06月18日 ： +1. 支持自动清理缓存及预览文件 +2. 支持http/https下载流url文件预览 +3. 支持FTP url文件预览 +4. 加入Docker构建 + > 2019年04月08日 ： 1. 缓存及队列实现抽象，提供JDK和REDIS两种实现(REDIS成为可选依赖) 2. 打包方式提供zip和tar.gz包，并提供一键启动脚本 diff --git a/jodconverter-web/pom.xml b/jodconverter-web/pom.xml index 265e2e19..16c358aa 100644 --- a/jodconverter-web/pom.xml +++ b/jodconverter-web/pom.xml @@ -12,7 +12,7 @@ cn.keking kkFileView - 2.1.0-SNAPSHOT + 2.1.0 diff --git a/jodconverter-web/src/main/bin/startup.bat b/jodconverter-web/src/main/bin/startup.bat index 99541c3e..9b3e6d05 100644 --- a/jodconverter-web/src/main/bin/startup.bat +++ b/jodconverter-web/src/main/bin/startup.bat @@ -4,4 +4,4 @@ cd "%KKFILEVIEW_BIN_FOLDER%" echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER% echo Starting kkFileView... echo Please check log file for more information -java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=..\conf\application.properties -jar kkFileView-2.1.0-SNAPSHOT.jar -> ..\log\kkFileView.log \ No newline at end of file +java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=..\conf\application.properties -jar kkFileView-2.1.0.jar -> ..\log\kkFileView.log \ No newline at end of file diff --git a/jodconverter-web/src/main/bin/startup.sh b/jodconverter-web/src/main/bin/startup.sh index 403d52fa..a7649ddb 100644 --- a/jodconverter-web/src/main/bin/startup.sh +++ b/jodconverter-web/src/main/bin/startup.sh @@ -27,4 +27,4 @@ else fi echo "Starting kkFileView..." echo "Please check log file for more information" -nohup java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=../conf/application.properties -jar kkFileView-2.1.0-SNAPSHOT.jar > ../log/kkFileView.log 2>&1 & +nohup java -Dfile.encoding=UTF-8 -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=../conf/application.properties -jar kkFileView-2.1.0.jar > ../log/kkFileView.log 2>&1 &