Skip to content

Commit 1d39360

Browse files
gitchenjhgitchenjh
committed
4.4.0版本发布
1 parent 8c76359 commit 1d39360

11 files changed

Lines changed: 64 additions & 24 deletions

File tree

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
FROM keking/kkfileview-base:4.4.0
22
ADD server/target/kkFileView-*.tar.gz /opt/
3-
ENV KKFILEVIEW_BIN_FOLDER=/opt/kkFileView-4.4.0-beta/bin
4-
ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.4.0-beta/config/application.properties","-jar","/opt/kkFileView-4.4.0-beta/bin/kkFileView-4.4.0-beta.jar"]
3+
ENV KKFILEVIEW_BIN_FOLDER=/opt/kkFileView-4.4.0/bin
4+
ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.4.0/config/application.properties","-jar","/opt/kkFileView-4.4.0/bin/kkFileView-4.4.0.jar"]

‎docker/kkfileview-base/Dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ RUN sed -i 's@//.*archive.ubuntu.com@//mirrors.aliyun.com@g' /etc/apt/sources.li
1010
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime &&\
1111
localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 &&\
1212
locale-gen zh_CN.UTF-8 &&\
13-
# 安装微软字体
1413
apt-get install -y --no-install-recommends ttf-mscorefonts-installer &&\
15-
# 安装文泉驿字体
1614
apt-get install -y --no-install-recommends ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy &&\
17-
# 清理临时文件
1815
apt-get autoremove -y &&\
1916
apt-get clean &&\
2017
rm -rf /var/lib/apt/lists/*

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>cn.keking</groupId>
88
<artifactId>kkFileView-parent</artifactId>
9-
<version>4.4.0-beta</version>
9+
<version>4.4.0</version>
1010

1111
<properties>
1212
<java.version>1.8</java.version>

‎server/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>kkFileView-parent</artifactId>
88
<groupId>cn.keking</groupId>
9-
<version>4.4.0-beta</version>
9+
<version>4.4.0</version>
1010
</parent>
1111

1212
<artifactId>kkFileView</artifactId>

‎server/src/main/bin/install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ install_redhat() {
88
yum install -y libSM.x86_64 libXrender.x86_64 libXext.x86_64
99
yum groupinstall -y "X Window System"
1010
yum localinstall -y *.rpm
11-
echo 'install finshed...'
11+
echo 'install finished...'
1212
else
1313
echo 'download package error...'
1414
fi
@@ -20,7 +20,7 @@ install_ubuntu() {
2020
if [ $? -eq 0 ];then
2121
apt-get install -y libxinerama1 libcairo2 libcups2 libx11-xcb1
2222
dpkg -i *.deb
23-
echo 'install finshed...'
23+
echo 'install finished...'
2424
else
2525
echo 'download package error...'
2626
fi

‎server/src/main/bin/startup.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ echo Please check log file in ../log/kkFileView.log for more information
77
echo You can get help in our official home site: https://kkview.cn
88
echo If you need further help, please join our kk opensource community: https://t.zsxq.com/09ZHSXbsQ
99
echo If this project is helpful to you, please star it on https://gitee.com/kekingcn/file-online-preview/stargazers
10-
java -Dspring.config.location=..\config\application.properties -jar kkFileView-4.4.0-beta.jar -> ..\log\kkFileView.log
10+
java -Dspring.config.location=..\config\application.properties -jar kkFileView-4.4.0.jar -> ..\log\kkFileView.log

‎server/src/main/bin/startup.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Description: v1.1：修改进程启动机制为pid形式。
1010
#############################
1111
#
12-
DIR_HOME=("/opt/openoffice.org3" "/opt/libreoffice" "/opt/libreoffice6.1" "/opt/libreoffice7.0" "/opt/libreoffice7.1" "/opt/libreoffice7.2" "/opt/libreoffice7.3" "/opt/libreoffice7.4" "/opt/libreoffice7.5" "/opt/libreoffice7.6" "/opt/openoffice4" "/usr/lib/openoffice" "/usr/lib/libreoffice")
12+
DIR_HOME=("/opt/openoffice.org3" "/opt/libreoffice" "/opt/libreoffice6.1" "/opt/libreoffice7.0" "/opt/libreoffice7.1" "/opt/libreoffice7.2" "/opt/libreoffice7.3" "/opt/libreoffice7.4" "/opt/libreoffice7.5" "/opt/libreoffice7.6" "/opt/libreoffice24.2" "/opt/libreoffice24.8" "/opt/libreoffice25.2" "/opt/openoffice4" "/usr/lib/openoffice" "/usr/lib/libreoffice")
1313
FLAG=
1414
OFFICE_HOME=
1515
KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")" || exit 1 ;pwd)
@@ -29,7 +29,7 @@ if [ -s "${PID_FILE}" ]; then
2929
else
3030
cd "$KKFILEVIEW_BIN_FOLDER" || exit 1
3131
echo "Using KKFILEVIEW_BIN_FOLDER $KKFILEVIEW_BIN_FOLDER"
32-
grep 'office\.home' ../config/application.properties | grep '!^#'
32+
grep 'office\.home' ../config/application.properties | grep -v '^#' | grep -v 'default'
3333
if [ $? -eq 0 ]; then
3434
echo "Using customized office.home"
3535
else
@@ -51,7 +51,7 @@ else
5151

5252
## 启动kkFileView
5353
echo "Starting kkFileView..."
54-
nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar kkFileView-4.4.0-beta.jar > ../log/kkFileView.log 2>&1 &
54+
nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar kkFileView-4.4.0.jar > ../log/kkFileView.log 2>&1 &
5555
echo "Please execute ./showlog.sh to check log for more information"
5656
echo "You can get help in our official home site: https://kkview.cn"
5757
echo "If you need further help, please join our kk opensource community: https://t.zsxq.com/09ZHSXbsQ"

‎server/src/main/config/application.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ server.port = ${KK_SERVER_PORT:8012}
33
server.servlet.context-path= ${KK_CONTEXT_PATH:/}
44
server.servlet.encoding.charset = utf-8
55
#启用GZIP压缩功能
6-
server.compression.enable= true
6+
server.compression.enabled = true
77
#允许压缩的响应缓冲区最小字节数，默认2048
88
server.compression.min-response-size = 2048
99
#压缩格式

‎server/src/main/java/cn/keking/utils/LocalOfficeUtils.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ public static File getDefaultOfficeHome() {
8686
"/opt/libreoffice7.4",
8787
"/opt/libreoffice7.5",
8888
"/opt/libreoffice7.6",
89+
"/opt/libreoffice24.2",
90+
"/opt/libreoffice24.8",
91+
"/opt/libreoffice25.2",
8992
"/usr/lib64/libreoffice",
9093
"/usr/lib/libreoffice",
9194
"/usr/local/lib64/libreoffice",

‎server/src/main/resources/banner.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
|_|\_\ |_|\_\ |_| |_| |_| \___| \/ |_| \___| \_/\_/
88

99
=> Spring Boot :: ${spring-boot.version}
10-
=> kkFileView :: 4.4.0-beta
10+
=> kkFileView :: 4.4.0
1111
=> Home site :: https://kkview.cn
1212
=> Github :: https://github.com/kekingcn/kkFileView
1313
=> Gitee :: https://gitee.com/kekingcn/file-online-preview

0 commit comments

Comments
 (0)