From 551eeb0390a7e1f0d2844706df7fae45fa76f71c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com> Date: Tue, 9 Jul 2019 10:03:26 +0800 Subject: [PATCH] =?UTF-8?q?2.1.1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- jodconverter-web/pom.xml | 2 +- jodconverter-web/src/main/bin/startup.bat | 2 +- jodconverter-web/src/main/bin/startup.sh | 2 +- pom.xml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f529ff72..3642b18a 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.1-SNAPSHOT/bin -ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider","-Dspring.config.location=/opt/kkFileView-2.1.1-SNAPSHOT/conf/application.properties","-jar","/opt/kkFileView-2.1.1-SNAPSHOT/bin/kkFileView-2.1.1-SNAPSHOT.jar"] \ No newline at end of file +ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-2.1.1/bin +ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider","-Dspring.config.location=/opt/kkFileView-2.1.1/conf/application.properties","-jar","/opt/kkFileView-2.1.1/bin/kkFileView-2.1.1.jar"] \ No newline at end of file diff --git a/jodconverter-web/pom.xml b/jodconverter-web/pom.xml index 06a544e7..879f9f0b 100644 --- a/jodconverter-web/pom.xml +++ b/jodconverter-web/pom.xml @@ -12,7 +12,7 @@ cn.keking kkFileView - 2.1.1-SNAPSHOT + 2.1.1 diff --git a/jodconverter-web/src/main/bin/startup.bat b/jodconverter-web/src/main/bin/startup.bat index 252913dd..72f28b2e 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.1-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.1.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 5ffcdb3b..35c7d4c2 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 -Dfile.encoding=UTF-8 -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=../conf/application.properties -jar kkFileView-2.1.1-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.1.jar > ../log/kkFileView.log 2>&1 & diff --git a/pom.xml b/pom.xml index 0e710c4a..7f6a8537 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ cn.keking filepreview - 2.1.1-SNAPSHOT + 2.1.1 jodconverter-core jodconverter-web