浏览代码

2.2.1迭代,docker镜像底层使用ubuntu

陈精华 4 年之前
父节点
当前提交
7c4fc42247

+ 4 - 15
.gitignore

@@ -24,19 +24,8 @@ nbdist/
 .nb-gradle/
 /*.iml
 
-**/target/
-.classpath
-.project
-**/.settings
-**/build/
-**/.externalToolBuilders/
-*.iml
-**/.idea/
-**/disconf
-**/rpc.properties
-/producer/tmp
-/.temfile
-.temfile
-convertedFile/
+### VS Code ###
+.vscode/
+
 jodconverter-web/src/main/cache/
-jodconverter-web/src/main/file/
+jodconverter-web/src/main/file/

文件差异内容过多而无法显示
+ 0 - 99610
0001-maven-pdf.js-bcmap-pdf.js-2.4.567.patch


文件差异内容过多而无法显示
+ 20 - 29
Dockerfile


+ 1 - 1
jodconverter-web/pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>cn.keking</groupId>
     <artifactId>kkFileView</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1-SNAPSHOT</version>
 
 
     <properties>

+ 4 - 0
jodconverter-web/src/main/bin/install.sh

@@ -19,6 +19,10 @@ 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

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

@@ -6,4 +6,4 @@ 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.0.jar -> ..\log\kkFileView.log
+java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=..\config\application.properties -jar kkFileView-2.2.1-SNAPSHOT.jar -> ..\log\kkFileView.log

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

@@ -29,4 +29,4 @@ 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.0.jar > ../log/kkFileView.log 2>&1 &
+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-SNAPSHOT.jar > ../log/kkFileView.log 2>&1 &

+ 1 - 1
pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>cn.keking</groupId>
     <artifactId>filepreview</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1-SNAPSHOT</version>
     <modules>
         <module>jodconverter-core</module>
         <module>jodconverter-web</module>