diff --git a/Dockerfile b/Dockerfile index 21188bbd..68a0688e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM keking/kkfileview-jdk:latest MAINTAINER chenjh "842761733@qq.com" ADD server/target/kkFileView-*.tar.gz /opt/ -ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-4.3.0-SNAPSHOT/bin -ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.3.0-SNAPSHOT/config/application.properties","-jar","/opt/kkFileView-4.3.0-SNAPSHOT/bin/kkFileView-4.3.0-SNAPSHOT.jar"] +ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-4.3.0/bin +ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.3.0/config/application.properties","-jar","/opt/kkFileView-4.3.0/bin/kkFileView-4.3.0.jar"] diff --git a/pom.xml b/pom.xml index eafd717f..d1f6b93e 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ cn.keking kkFileView-parent - 4.3.0-SNAPSHOT + 4.3.0 1.8 diff --git a/server/pom.xml b/server/pom.xml index 5952259d..32ba0c7d 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -6,7 +6,7 @@ kkFileView-parent cn.keking - 4.3.0-SNAPSHOT + 4.3.0 kkFileView @@ -336,7 +336,7 @@ false - src/main/assembly/dist-win32.xml + src/main/assembly/dist-linux.xml diff --git a/server/src/main/java/cn/keking/utils/WebUtils.java b/server/src/main/java/cn/keking/utils/WebUtils.java index 148e7192..6cb5dea2 100644 --- a/server/src/main/java/cn/keking/utils/WebUtils.java +++ b/server/src/main/java/cn/keking/utils/WebUtils.java @@ -157,6 +157,9 @@ public class WebUtils { String noQueryUrl = url.substring(0, url.contains("?") ? url.indexOf("?") : url.length()); int fileNameStartIndex = noQueryUrl.lastIndexOf('/') + 1; int fileNameEndIndex = noQueryUrl.lastIndexOf('.'); + if (fileNameEndIndex < fileNameStartIndex) { + return url; + } try { encodedFileName = URLEncoder.encode(noQueryUrl.substring(fileNameStartIndex, fileNameEndIndex), "UTF-8"); } catch (UnsupportedEncodingException e) {