4.1.0版本发布

* 表单校验警告提示添加

Co-authored-by: wusongda <wusongda@keking.cn>

.github/workflows/maven.yml

@@ -0,0 +1,24 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Java CI with Maven
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+        cache: maven
+    - name: Build with Maven
+      run: mvn -B package --file pom.xml

.gitignore

@@ -25,6 +25,7 @@ nbdist/
 
 ### VS Code ###
 .vscode/
+.DS_Store
 
 server/src/main/cache/
 server/src/main/file/

.workflow/MasterPipeline.yml

@@ -0,0 +1,31 @@
+version: '1.0'
+name: master-pipeline
+displayName: MasterPipeline
+stages:
+  - stage:
+    name: compile
+    displayName: 编译
+    steps:
+      - step: build@maven
+        name: build_maven
+        displayName: Maven 构建
+        # 支持6、7、8、9、10、11六个版本
+        jdkVersion: 8
+        # 支持2.2.1、3.2.5、3.3.9、3.5.2、3.5.3、3.5.4、3.6.1、3.6.3八个版本
+        mavenVersion: 3.6.3
+        # 构建命令
+        commands:
+          - mvn -B clean package -Dmaven.test.skip=true
+        # 非必填字段，开启后表示将构建产物暂存，但不会上传到制品库中，7天后自动清除
+        artifacts:
+            # 构建产物名字，作为产物的唯一标识可向下传递，支持自定义，默认为BUILD_ARTIFACT。在下游可以通过${BUILD_ARTIFACT}方式引用来获取构建物地址
+          - name: BUILD_ARTIFACT
+            # 构建产物获取路径，是指代码编译完毕之后构建物的所在路径，如通常jar包在target目录下。当前目录为代码库根目录
+            path:
+              - ./server/target/kkFileView-*.tar.gz
+              - ./server/target/kkFileView-*.zip
+triggers:
+  push:
+    branches:
+      include:
+        - master

Dockerfile

@@ -1,41 +1,5 @@
-FROM ubuntu:20.04
+FROM keking/kkfileview-jdk:4.1.1
 MAINTAINER chenjh "842761733@qq.com"
 ADD server/target/kkFileView-*.tar.gz /opt/
-COPY fonts/* /usr/share/fonts/chinese/
-RUN echo "deb http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-security main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-updates main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-proposed main restricted universe multiverse\ndeb http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse\ndeb-src http://mirrors.aliyun.com/ubuntu/ focal-backports main restricted universe multiverse" > /etc/apt/sources.list &&\
-	apt-get clean && apt-get update &&\
-	apt-get install -y locales && apt-get install -y language-pack-zh-hans &&\
-	localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 && locale-gen zh_CN.UTF-8 &&\
-	apt-get install -y tzdata && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime &&\
-	apt-get install -y libxrender1 && apt-get install -y libxt6 && apt-get install -y libxext-dev && apt-get install -y libfreetype6-dev &&\
-	apt-get install -y wget && apt-get install -y ttf-mscorefonts-installer && apt-get install -y fontconfig &&\
-	apt-get install ttf-wqy-microhei &&\
-	apt-get install ttf-wqy-zenhei &&\
-	apt-get install xfonts-wqy &&\
-    cd /tmp &&\
-	wget https://kkfileview.keking.cn/server-jre-8u251-linux-x64.tar.gz &&\
-	tar -zxf /tmp/server-jre-8u251-linux-x64.tar.gz && mv /tmp/jdk1.8.0_251 /usr/local/ &&\
-
-#	安装 OpenOffice
-#	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 &&\
-#	dpkg -i *.deb && dpkg -i desktop-integration/openoffice4.1-debian-menus_4.1.6-9790_all.deb &&\
-
-#	安装 libreoffice
-    apt-get install -y libxinerama1 libcairo2 libcups2 libx11-xcb1 &&\
-    wget https://kkfileview.keking.cn/LibreOffice_7.1.4_Linux_x86-64_deb.tar.gz -cO libreoffice_deb.tar.gz &&\
-    tar -zxf /tmp/libreoffice_deb.tar.gz && cd /tmp/LibreOffice_7.1.4.2_Linux_x86-64_deb/DEBS &&\
-    dpkg -i *.deb &&\
-
-	rm -rf /tmp/* && rm -rf /var/lib/apt/lists/* &&\
-    cd /usr/share/fonts/chinese &&\
-    mkfontscale &&\
-    mkfontdir &&\
-    fc-cache -fv
-ENV JAVA_HOME /usr/local/jdk1.8.0_251
-ENV CLASSPATH $JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
-ENV PATH $PATH:$JAVA_HOME/bin
-ENV LANG zh_CN.UTF-8
-ENV LC_ALL zh_CN.UTF-8
-ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-4.0.0/bin
-ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.0.0/config/application.properties","-jar","/opt/kkFileView-4.0.0/bin/kkFileView-4.0.0.jar"]
+ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-4.1.0/bin
+ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dspring.config.location=/opt/kkFileView-4.1.0/config/application.properties","-jar","/opt/kkFileView-4.1.0/bin/kkFileView-4.1.0.jar"]

README.en.md

@@ -1,4 +1,4 @@
-# file-online-preview
+# kkFileView
 
 [![GitHub license](https://img.shields.io/github/license/kekingcn/kkFileView.svg?style=flat-square)](https://github.com/kekingcn/kkFileView/blob/master/LICENSE)
 

README.md

@@ -1,4 +1,4 @@
-# file-online-preview
+# kkFileView
 此项目为文件文档在线预览项目解决方案，对标业内付费产品有【[永中office](http://dcs.yozosoft.com/)】【[office365](http://www.officeweb365.com/)】【[idocv](https://www.idocv.com/)】等，在取得公司高层同意后以Apache协议开源出来反哺社区，在此特别感谢@唐老大的支持以及@端木详笑的贡献。该项目使用流行的spring boot搭建，易上手和部署，基本支持主流办公文档的在线预览，如doc,docx,Excel,pdf,txt,zip,rar,图片等等
 ### 项目特性
 
@@ -110,6 +110,19 @@ pdf预览模式预览效果如下
 
 ### 历史更新记录
 
+> 2022年12月14日，v4.1.0 版本发布 ：
+
+1. 全新首页视觉 @wsd7747 
+2. tif图片预览兼容多页tif的pdf转换、jpg转换，以及jpg在线多页预览功能 @zhangzhen1979
+3. 优化docker构建方案，使用分层构建方式 @yl-yue
+4. 实现基于userToken缓存加密文件 @yl-yue
+5. 实现加密word、ppt、excel文件预览 @yl-yue
+6. Linux & Docker镜像升级LibreOffice 7.3
+7. 更新OFD预览组件、更新tif预览组件、更新PPT水印支持
+8. 大量其他升级优化 & 已知问题修复
+
+感谢 @yl-yue @wsd7747 @zhangzhen1979 @tomhusky @shenghuadun @kischn.sun 的代码贡献
+
 > 2021年7月6日，v4.0.0 版本发布 ：
 
 1. 底层集成OpenOffice替换为LibreOffice，Office文件兼容性增强，预览效果提升

docker/kkfileview-jdk/Dockerfile

@@ -0,0 +1,38 @@
+FROM ubuntu:20.04
+MAINTAINER chenjh "842761733@qq.com"
+# 内置一些常用的中文字体，避免普遍性乱码
+COPY fonts/* /usr/share/fonts/chinese/
+RUN apt-get clean && apt-get update &&\
+	sed -i 's/http:\/\/archive.ubuntu.com/https:\/\/mirrors.aliyun.com/g' /etc/apt/sources.list &&\
+	sed -i 's/# deb/deb/g' /etc/apt/sources.list &&\
+	apt-get install -y --reinstall ca-certificates &&\
+	apt-get clean && apt-get update &&\
+	apt-get install -y locales language-pack-zh-hans &&\
+	localedef -i zh_CN -c -f UTF-8 -A /usr/share/locale/locale.alias zh_CN.UTF-8 && locale-gen zh_CN.UTF-8 &&\
+    export DEBIAN_FRONTEND=noninteractive &&\
+	apt-get install -y tzdata && ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime &&\
+	apt-get install -y fontconfig ttf-mscorefonts-installer ttf-wqy-microhei ttf-wqy-zenhei xfonts-wqy &&\
+	apt-get install -y wget &&\
+    cd /tmp &&\
+	wget https://kkfileview.keking.cn/server-jre-8u251-linux-x64.tar.gz &&\
+	tar -zxf /tmp/server-jre-8u251-linux-x64.tar.gz && mv /tmp/jdk1.8.0_251 /usr/local/ &&\
+
+# 安装 libreoffice
+    apt-get install -y libxrender1 libxinerama1 libxt6 libxext-dev libfreetype6-dev libcairo2 libcups2 libx11-xcb1 libnss3 &&\
+    wget https://kkfileview.keking.cn/LibreOffice_7.3.7_Linux_x86-64_deb.tar.gz -cO libreoffice_deb.tar.gz &&\
+    tar -zxf /tmp/libreoffice_deb.tar.gz && cd /tmp/LibreOffice_7.3.7.2_Linux_x86-64_deb/DEBS &&\
+    dpkg -i *.deb &&\
+
+#  清理临时文件
+	rm -rf /tmp/* && rm -rf /var/lib/apt/lists/* &&\
+    cd /usr/share/fonts/chinese &&\
+    mkfontscale &&\
+    mkfontdir &&\
+    fc-cache -fv
+
+ENV JAVA_HOME /usr/local/jdk1.8.0_251
+ENV CLASSPATH $JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
+ENV PATH $PATH:$JAVA_HOME/bin
+ENV LANG zh_CN.UTF-8
+ENV LC_ALL zh_CN.UTF-8
+CMD ["/bin/bash"]

docker/kkfileview-jdk/docker build.txt

@@ -0,0 +1,2 @@
+# 执行如下命令构建基础镜像，加快kkfileview docker镜像构建与发布
+docker build --tag keking/kkfileview-jdk:4.1.1 .

office-plugin/pom.xml

@@ -3,11 +3,10 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
     <parent>
-        <artifactId>filepreview</artifactId>
+        <artifactId>kkFileView-parent</artifactId>
         <groupId>cn.keking</groupId>
-        <version>4.0.0</version>
+        <version>4.1.0</version>
     </parent>
 
     <artifactId>office-plugin</artifactId>
@@ -27,19 +26,9 @@
             <version>2.7</version>
         </dependency>
         <dependency>
-            <groupId>org.openoffice</groupId>
-            <artifactId>juh</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openoffice</groupId>
-            <artifactId>ridl</artifactId>
-            <version>3.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.openoffice</groupId>
-            <artifactId>unoil</artifactId>
-            <version>3.2.1</version>
+            <groupId>org.libreoffice</groupId>
+            <artifactId>libreoffice</artifactId>
+            <version>7.1.4</version>
         </dependency>
         <dependency>
             <!-- for the command line tool -->
@@ -72,6 +61,7 @@
         <plugins>
             <!--   要将源码放上去，需要加入这个插件    -->
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
                 <version>2.1</version>
                 <configuration>
@@ -86,16 +76,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -142,21 +122,8 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.4</version>
+                <version>2.7</version>
             </plugin>
         </plugins>
     </reporting>
-    <!-- distribute目录 -->
-    <distributionManagement>
-        <repository>
-            <id>repo</id>
-            <name>User Project Releases</name>
-            <url>http://192.168.1.204:8081/nexus/content/repositories/releases</url>
-        </repository>
-        <snapshotRepository>
-            <id>repo</id>
-            <name>User Project SNAPSHOTS</name>
-            <url>http://192.168.1.204:8081/nexus/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
 </project>

office-plugin/src/main/java/org/artofsolving/jodconverter/AbstractConversionTask.java

@@ -12,18 +12,6 @@
 //
 package org.artofsolving.jodconverter;
 
-import static org.artofsolving.jodconverter.office.OfficeUtils.SERVICE_DESKTOP;
-import static org.artofsolving.jodconverter.office.OfficeUtils.cast;
-import static org.artofsolving.jodconverter.office.OfficeUtils.toUnoProperties;
-import static org.artofsolving.jodconverter.office.OfficeUtils.toUrl;
-
-import java.io.File;
-import java.util.Map;
-
-import org.artofsolving.jodconverter.office.OfficeContext;
-import org.artofsolving.jodconverter.office.OfficeException;
-import org.artofsolving.jodconverter.office.OfficeTask;
-
 import com.sun.star.frame.XComponentLoader;
 import com.sun.star.frame.XStorable;
 import com.sun.star.io.IOException;
@@ -32,6 +20,14 @@ import com.sun.star.lang.XComponent;
 import com.sun.star.task.ErrorCodeIOException;
 import com.sun.star.util.CloseVetoException;
 import com.sun.star.util.XCloseable;
+import org.artofsolving.jodconverter.office.OfficeContext;
+import org.artofsolving.jodconverter.office.OfficeException;
+import org.artofsolving.jodconverter.office.OfficeTask;
+
+import java.io.File;
+import java.util.Map;
+
+import static org.artofsolving.jodconverter.office.OfficeUtils.*;
 
 public abstract class AbstractConversionTask implements OfficeTask {
 
@@ -47,6 +43,7 @@ public abstract class AbstractConversionTask implements OfficeTask {
 
     protected abstract Map<String,?> getStoreProperties(File outputFile, XComponent document);
 
+    @Override
     public void execute(OfficeContext context) throws OfficeException {
         XComponent document = null;
         try {
@@ -79,6 +76,7 @@ public abstract class AbstractConversionTask implements OfficeTask {
         }
         XComponentLoader loader = cast(XComponentLoader.class, context.getService(SERVICE_DESKTOP));
         Map<String,?> loadProperties = getLoadProperties(inputFile);
+
         XComponent document = null;
         try {
             document = loader.loadComponentFromURL(toUrl(inputFile), "_blank", 0, toUnoProperties(loadProperties));

office-plugin/src/main/java/org/artofsolving/jodconverter/OfficeDocumentConverter.java

@@ -12,18 +12,18 @@
 //
 package org.artofsolving.jodconverter;
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
+import com.sun.star.document.UpdateDocMode;
 import org.apache.commons.io.FilenameUtils;
 import org.artofsolving.jodconverter.document.DefaultDocumentFormatRegistry;
 import org.artofsolving.jodconverter.document.DocumentFormat;
 import org.artofsolving.jodconverter.document.DocumentFormatRegistry;
+import org.artofsolving.jodconverter.model.FileProperties;
 import org.artofsolving.jodconverter.office.OfficeException;
 import org.artofsolving.jodconverter.office.OfficeManager;
 
-import com.sun.star.document.UpdateDocMode;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
 
 public class OfficeDocumentConverter {
 
@@ -60,14 +60,22 @@ public class OfficeDocumentConverter {
     public void convert(File inputFile, File outputFile) throws OfficeException {
         String outputExtension = FilenameUtils.getExtension(outputFile.getName());
         DocumentFormat outputFormat = formatRegistry.getFormatByExtension(outputExtension);
-        convert(inputFile, outputFile, outputFormat);
+        convert(inputFile, outputFile, outputFormat, null);
     }
 
-    public void convert(File inputFile, File outputFile, DocumentFormat outputFormat) throws OfficeException {
+    public void convert(File inputFile, File outputFile, FileProperties fileProperties) throws OfficeException {
+        String outputExtension = FilenameUtils.getExtension(outputFile.getName());
+        DocumentFormat outputFormat = formatRegistry.getFormatByExtension(outputExtension);
+        convert(inputFile, outputFile, outputFormat, fileProperties);
+    }
+
+    public void convert(File inputFile, File outputFile, DocumentFormat outputFormat, FileProperties fileProperties) throws OfficeException {
         String inputExtension = FilenameUtils.getExtension(inputFile.getName());
         DocumentFormat inputFormat = formatRegistry.getFormatByExtension(inputExtension);
+        Map<String, Object> properties = fileProperties.toMap();
+        properties.putAll(defaultLoadProperties);
         StandardConversionTask conversionTask = new StandardConversionTask(inputFile, outputFile, outputFormat);
-        conversionTask.setDefaultLoadProperties(defaultLoadProperties);
+        conversionTask.setDefaultLoadProperties(properties);
         conversionTask.setInputFormat(inputFormat);
         officeManager.execute(conversionTask);
     }

office-plugin/src/main/java/org/artofsolving/jodconverter/cli/Convert.java

@@ -14,6 +14,7 @@ package org.artofsolving.jodconverter.cli;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -86,7 +87,7 @@ public class Convert {
         DocumentFormatRegistry registry;
         if (commandLine.hasOption(OPTION_REGISTRY.getOpt())) {
             File registryFile = new File(commandLine.getOptionValue(OPTION_REGISTRY.getOpt()));
-            registry = new JsonDocumentFormatRegistry(FileUtils.readFileToString(registryFile));
+            registry = new JsonDocumentFormatRegistry(FileUtils.readFileToString(registryFile, Charset.defaultCharset()));
         } else {
             registry = new DefaultDocumentFormatRegistry();
         }

office-plugin/src/main/java/org/artofsolving/jodconverter/document/JsonDocumentFormatRegistry.java

@@ -14,6 +14,7 @@ package org.artofsolving.jodconverter.document;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,7 +26,7 @@ import org.json.JSONObject;
 public class JsonDocumentFormatRegistry extends SimpleDocumentFormatRegistry {
 
     public JsonDocumentFormatRegistry(InputStream input) throws JSONException, IOException {
-        readJsonArray(IOUtils.toString(input));
+        readJsonArray(IOUtils.toString(input, Charset.defaultCharset()));
     }
 
     public JsonDocumentFormatRegistry(String source) throws JSONException {

office-plugin/src/main/java/org/artofsolving/jodconverter/model/FileProperties.java

@@ -0,0 +1,34 @@
+package org.artofsolving.jodconverter.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by kl on 2018/1/17.
+ * Content :
+ */
+public class FileProperties {
+
+    private String filePassword;
+
+    public FileProperties() {
+    }
+
+    public Map<String, Object> toMap() {
+        Map<String, Object> map = new HashMap<>();
+        if (filePassword != null) {
+            map.put("Password", filePassword);
+        }
+
+        return map;
+    }
+
+    public String getFilePassword() {
+        return filePassword;
+    }
+
+    public void setFilePassword(String filePassword) {
+        this.filePassword = filePassword;
+    }
+
+}

office-plugin/src/main/java/org/artofsolving/jodconverter/office/OfficeProcess.java

@@ -16,6 +16,7 @@ import static org.artofsolving.jodconverter.process.ProcessManager.PID_NOT_FOUND
 import static org.artofsolving.jodconverter.process.ProcessManager.PID_UNKNOWN;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -134,11 +135,11 @@ class OfficeProcess {
             logger.fine("no %OFFICE_HOME%/basis-link found; assuming it's OOo 2.x and we don't need to append URE and Basic paths");
             return;
         }
-        String basisLinkText = FileUtils.readFileToString(basisLink).trim();
+        String basisLinkText = FileUtils.readFileToString(basisLink, Charset.defaultCharset()).trim();
         File basisHome = new File(officeHome, basisLinkText);
         File basisProgram = new File(basisHome, "program");
         File ureLink = new File(basisHome, "ure-link");
-        String ureLinkText = FileUtils.readFileToString(ureLink).trim();
+        String ureLinkText = FileUtils.readFileToString(ureLink, Charset.defaultCharset()).trim();
         File ureHome = new File(basisHome, ureLinkText);
         File ureBin = new File(ureHome, "bin");
         Map<String,String> environment = processBuilder.environment();

office-plugin/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java

@@ -104,9 +104,16 @@ public class OfficeUtils {
                 "/opt/openoffice.org3",
                 "/opt/openoffice",
                 "/opt/libreoffice",
+                "/opt/libreoffice6.0",
                 "/opt/libreoffice6.1",
+                "/opt/libreoffice6.2",
+                "/opt/libreoffice6.3",
+                "/opt/libreoffice6.4",
                 "/opt/libreoffice7.0",
                 "/opt/libreoffice7.1",
+                "/opt/libreoffice7.2",
+                "/opt/libreoffice7.3",
+                "/opt/libreoffice7.4",
                 "/opt/openoffice4",
                 "/usr/lib/openoffice",
                 "/usr/lib/libreoffice"

office-plugin/src/main/java/org/artofsolving/jodconverter/process/LinuxProcessManager.java

@@ -13,6 +13,7 @@
 package org.artofsolving.jodconverter.process;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -25,7 +26,6 @@ import org.apache.commons.io.IOUtils;
  * <p>
  * Should Work on Solaris too, except that the command line string
  * returned by <tt>ps</tt> there is limited to 80 characters and this affects
- * {@link #findPid(String)}.
  */
 public class LinuxProcessManager implements ProcessManager {
 
@@ -74,9 +74,7 @@ public class LinuxProcessManager implements ProcessManager {
     		command = args;
     	}
         Process process = new ProcessBuilder(command).start();
-        @SuppressWarnings("unchecked")
-        List<String> lines = IOUtils.readLines(process.getInputStream());
-        return lines;
+        return IOUtils.readLines(process.getInputStream(), Charset.defaultCharset());
     }
 
 }

office-plugin/src/main/java/org/artofsolving/jodconverter/util/ConfigUtils.java

@@ -20,7 +20,7 @@ public class ConfigUtils {
             userDir = userDir.substring(0, userDir.length() - 4);
         } else {
             String separator = File.separator;
-            if (userDir.contains(MAIN_DIRECTORY_NAME)) {
+            if (userDir.endsWith(MAIN_DIRECTORY_NAME)) {
                 userDir = userDir + separator + "src" + separator +  "main";
             } else {
                 userDir = userDir + separator + MAIN_DIRECTORY_NAME + separator + "src" + separator + "main";
@@ -29,22 +29,44 @@ public class ConfigUtils {
         return userDir;
     }
 
+    // 获取环境变量，如果找不到则返回默认值
+    @SuppressWarnings("SameParameterValue")
+    private static String getEnvOrDefault(String key, String def) {
+        String value = System.getenv(key);
+        return value == null ? def : value;
+    }
+
+    // 返回参数列表中第一个真实存在的路径，或者 null
+    private static String firstExists(File... paths) {
+        for (File path : paths) {
+            if (path.exists()) {
+                return path.getAbsolutePath();
+            }
+        }
+        return null;
+    }
 
     public static String getOfficePluginPath() {
-        String userDir = System.getenv("KKFILEVIEW_BIN_FOLDER");
-        if (userDir == null) {
-            userDir = System.getProperty("user.dir");
-        }
-        if (userDir.endsWith("bin")) {
-            userDir = userDir.substring(0, userDir.length() - 4);
+        String userDir = System.getProperty("user.dir");
+        String binFolder = getEnvOrDefault("KKFILEVIEW_BIN_FOLDER", userDir);
+
+        File pluginPath = new File(binFolder);
+
+        // 如果指定了 bin 或其父目录，则返回父目录
+        // 否则在当前目录和父目录中寻找 office-plugin
+        if (new File(pluginPath, "bin").exists()) {
+            return pluginPath.getAbsolutePath();
+
+        } else if (pluginPath.exists() && pluginPath.getName().equals("bin")) {
+            return pluginPath.getParentFile().getAbsolutePath();
+
         } else {
-            String separator = File.separator;
-            if (!userDir.contains(OFFICE_PLUGIN_NAME)) {
-                userDir = userDir + separator + OFFICE_PLUGIN_NAME;
+            return firstExists(
+                    new File(pluginPath, OFFICE_PLUGIN_NAME),
+                    new File(pluginPath.getParentFile(), OFFICE_PLUGIN_NAME)
+            );
             }
         }
-        return userDir;
-    }
 
     public static String getCustomizedConfigPath() {
         String homePath = getHomePath();

pom.xml

@@ -5,14 +5,43 @@
     <packaging>pom</packaging>
 
     <groupId>cn.keking</groupId>
-    <artifactId>filepreview</artifactId>
-    <version>4.0.0</version>
+    <artifactId>kkFileView-parent</artifactId>
+    <version>4.1.0</version>
 
     <properties>
         <java.version>1.8</java.version>
+
         <spring.boot.version>2.4.2</spring.boot.version>
+        <poi.version>5.2.2</poi.version>
+        <xdocreport.version>1.0.6</xdocreport.version>
+        <xstream.version>1.4.19</xstream.version>
+        <junrar.version>7.4.1</junrar.version>
+        <redisson.version>3.2.0</redisson.version>
+        <sevenzipjbinding.version>16.02-2.01</sevenzipjbinding.version>
+        <tukaani.version>1.8</tukaani.version>
+        <jchardet.version>1.0</jchardet.version>
+        <antlr.version>2.7.7</antlr.version>
+        <concurrentlinkedhashmap.version>1.4.2</concurrentlinkedhashmap.version>
+        <rocksdb.version>5.17.2</rocksdb.version>
+        <pdfbox.version>2.0.26</pdfbox.version>
+        <jai-imageio.version>1.4.0</jai-imageio.version>
+        <jbig2-imageio.version>3.0.4</jbig2-imageio.version>
+        <galimatias.version>0.2.1</galimatias.version>
+        <bytedeco.version>1.5.2</bytedeco.version>
+        <opencv.version>4.1.2-1.5.2</opencv.version>
+        <openblas.version>0.3.6-1.5.1</openblas.version>
+        <ffmpeg.version>4.2.1-1.5.2</ffmpeg.version>
+        <itext.version>2.1.7</itext.version>
+        <httpclient.version>3.1</httpclient.version>
+
+        <commons-cli.version>1.2</commons-cli.version>
+        <commons-net.version>3.6</commons-net.version>
+        <commons-lang3.version>3.7</commons-lang3.version>
+        <commons-compress.version>1.21</commons-compress.version>
+
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
+
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     </properties>
@@ -22,7 +51,7 @@
         <module>server</module>
     </modules>
 
-    <name>file-online-preview</name>
+    <name>kkFileView-parent</name>
     <description>专注文件在线预览服务</description>
     <url>https://github.com/kekingcn/kkFileView</url>
 

server/pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>filepreview</artifactId>
+        <artifactId>kkFileView-parent</artifactId>
         <groupId>cn.keking</groupId>
-        <version>4.0.0</version>
+        <version>4.1.0</version>
     </parent>
 
     <artifactId>kkFileView</artifactId>
@@ -25,9 +25,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
+            <groupId>cn.keking</groupId>
+            <artifactId>office-plugin</artifactId>
+            <version>${project.version}</version>
         </dependency>
+
+        <!-- web start -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -42,42 +45,32 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jetty</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>cn.keking</groupId>
-            <artifactId>office-plugin</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.7</version>
-        </dependency>
-        <!-- REDISSON -->
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson</artifactId>
-            <version>3.2.0</version>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
         </dependency>
+        <!-- web end -->
+
+        <!-- poi start -->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.17</version>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-scratchpad</artifactId>
-            <version>3.12</version>
+            <version>${poi.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${poi.version}</version>
         </dependency>
         <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>
             <artifactId>org.apache.poi.xwpf.converter.core</artifactId>
-            <version>1.0.5</version>
+            <version>${xdocreport.version}</version>
             <exclusions>
                 <exclusion>
                     <artifactId>poi</artifactId>
@@ -88,45 +81,220 @@
         <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>
             <artifactId>org.apache.poi.xwpf.converter.xhtml</artifactId>
-            <version>1.0.5</version>
+            <version>${xdocreport.version}</version>
         </dependency>
         <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>
             <artifactId>fr.opensagres.xdocreport.document</artifactId>
-            <version>1.0.5</version>
+            <version>${xdocreport.version}</version>
         </dependency>
+        <!-- poi start -->
+
+        <!-- 对 rar5 的支持 和其他众多压缩支持 可参考 package net.sf.sevenzipjbinding.ArchiveFormat; -->
+        <dependency>
+            <groupId>net.sf.sevenzipjbinding</groupId>
+            <artifactId>sevenzipjbinding</artifactId>
+            <version>${sevenzipjbinding.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.sevenzipjbinding</groupId>
+            <artifactId>sevenzipjbinding-all-platforms</artifactId>
+            <version>${sevenzipjbinding.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson</artifactId>
+            <version>${redisson.version}</version>
+        </dependency>
+
         <!-- 解压(apache) -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.21</version>
+            <version>${commons-compress.version}</version>
         </dependency>
         <!-- 解压(rar)-->
         <dependency>
             <groupId>com.github.junrar</groupId>
             <artifactId>junrar</artifactId>
-            <version>4.0.0</version>
+            <version>${junrar.version}</version>
         </dependency>
         <!-- 解压(7z)-->
         <dependency>
             <groupId>org.tukaani</groupId>
             <artifactId>xz</artifactId>
-            <version>1.8</version>
+            <version>${tukaani.version}</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.jchardet</groupId>
             <artifactId>jchardet</artifactId>
-            <version>1.0</version>
+            <version>${jchardet.version}</version>
         </dependency>
         <dependency>
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
-            <version>2.7.7</version>
+            <version>${antlr.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>${commons-cli.version}</version>
+        </dependency>
+
+        <!-- FTP -->
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>${commons-net.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+            <artifactId>concurrentlinkedhashmap-lru</artifactId>
+            <version>${concurrentlinkedhashmap.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.rocksdb</groupId>
+            <artifactId>rocksdbjni</artifactId>
+            <version>${rocksdb.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox</artifactId>
+            <version>${pdfbox.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox-tools</artifactId>
+            <version>${pdfbox.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jai-imageio</groupId>
+            <artifactId>jai-imageio-jpeg2000</artifactId>
+            <version>${jai-imageio.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jai-imageio</groupId>
+            <artifactId>jai-imageio-core</artifactId>
+            <version>${jai-imageio.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>jbig2-imageio</artifactId>
+            <version>${jbig2-imageio.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.aspose</groupId>
+            <artifactId>aspose-cad</artifactId>
+            <version>19.9</version>
+            <scope>system</scope>
+            <systemPath>${pom.basedir}/lib/aspose-cad-19.9.jar</systemPath>
+        </dependency>
+        <!-- 编码识别 -->
+        <dependency>
+            <groupId>cpdetector</groupId>
+            <artifactId>cpdetector</artifactId>
+            <version>1.04</version>
+            <scope>system</scope>
+            <systemPath>${pom.basedir}/lib/cpdetector-1.04.jar</systemPath>
+        </dependency>
+        <!-- url 规范化 -->
+        <dependency>
+            <groupId>io.mola.galimatias</groupId>
+            <artifactId>galimatias</artifactId>
+            <version>${galimatias.version}</version>
+        </dependency>
+
+        <!-- 以下是bytedeco 基于opencv ffmpeg封装的javacv，用于视频处理 -->
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacv</artifactId>
+            <version>${bytedeco.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>javacpp</artifactId>
+            <version>${bytedeco.version}</version>
+        </dependency>
+
+        <!-- 此版本中主要兼容linux和windows系统，如需兼容其他系统平台，请引入对应依赖即可 -->
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>opencv</artifactId>
+            <version>${opencv.version}</version>
+            <classifier>linux-x86_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>opencv</artifactId>
+            <version>${opencv.version}</version>
+            <classifier>windows-x86_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>openblas</artifactId>
+            <version>${openblas.version}</version>
+            <classifier>linux-x86_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>openblas</artifactId>
+            <version>${openblas.version}</version>
+            <classifier>windows-x86_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>ffmpeg</artifactId>
+            <version>${ffmpeg.version}</version>
+            <classifier>linux-x86_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.bytedeco</groupId>
+            <artifactId>ffmpeg</artifactId>
+            <version>${ffmpeg.version}</version>
+            <classifier>windows-x86_64</classifier>
+        </dependency>
+        <dependency>
+            <groupId>com.lowagie</groupId>
+            <artifactId>itext</artifactId>
+            <version>${itext.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.media</groupId>
+            <artifactId>jai_core</artifactId>
+            <version>1.1.3</version>
+            <scope>system</scope>
+            <systemPath>${pom.basedir}/lib/jai_core-1.1.3.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>javax.media</groupId>
+            <artifactId>jai_codec</artifactId>
+            <version>1.1.3</version>
+            <scope>system</scope>
+            <systemPath>${pom.basedir}/lib/jai_codec-1.1.3.jar</systemPath>
+        </dependency>
+
+        <!-- test dependency - start -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
+            <version>${httpclient.version}</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -135,121 +303,7 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.2</version>
-        </dependency>
-        <!-- FTP -->
-        <dependency>
-            <groupId>commons-net</groupId>
-            <artifactId>commons-net</artifactId>
-            <version>3.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-            <version>1.4.17</version>
-        </dependency>
-        <dependency>
-            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
-            <artifactId>concurrentlinkedhashmap-lru</artifactId>
-            <version>1.4.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.rocksdb</groupId>
-            <artifactId>rocksdbjni</artifactId>
-            <version>5.17.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox</artifactId>
-            <version>2.0.24</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>pdfbox-tools</artifactId>
-            <version>2.0.15</version>
-        </dependency>
-        <dependency>
-            <groupId>com.aspose</groupId>
-            <artifactId>aspose-cad</artifactId>
-            <version>19.9</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/aspose-cad-19.9.jar</systemPath>
-        </dependency>
-        <!-- 编码识别 -->
-        <dependency>
-            <groupId>cpdetector</groupId>
-            <artifactId>cpdetector</artifactId>
-            <version>1.04</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/cpdetector-1.04.jar</systemPath>
-        </dependency>
-        <!-- url 规范化 -->
-        <dependency>
-            <groupId>io.mola.galimatias</groupId>
-            <artifactId>galimatias</artifactId>
-            <version>0.2.1</version>
-        </dependency>
-
-        <!-- 以下是bytedeco 基于opencv ffmpeg封装的javacv，用于视频处理 -->
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>javacv</artifactId>
-            <version>1.5.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>javacpp</artifactId>
-            <version>1.5.2</version>
-        </dependency>
-
-        <!-- 此版本中主要兼容linux和windows系统，如需兼容其他系统平台，请引入对应依赖即可 -->
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>opencv</artifactId>
-            <version>4.1.2-1.5.2</version>
-            <classifier>linux-x86_64</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>opencv</artifactId>
-            <version>4.1.2-1.5.2</version>
-            <classifier>windows-x86_64</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>openblas</artifactId>
-            <version>0.3.6-1.5.1</version>
-            <classifier>linux-x86_64</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>openblas</artifactId>
-            <version>0.3.6-1.5.1</version>
-            <classifier>windows-x86_64</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>ffmpeg</artifactId>
-            <version>4.2.1-1.5.2</version>
-            <classifier>linux-x86_64</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bytedeco</groupId>
-            <artifactId>ffmpeg</artifactId>
-            <version>4.2.1-1.5.2</version>
-            <classifier>windows-x86_64</classifier>
-        </dependency>
-
-
+        <!-- test dependency - end -->
     </dependencies>
 
     <build>
@@ -283,7 +337,9 @@
                 </executions>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
+                <version>3.4.2</version>
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
@@ -303,5 +359,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

server/src/main/bin/install.sh

@@ -2,12 +2,12 @@
 cd /tmp
 
 install_redhat() {
-   wget https://kkfileview.keking.cn/LibreOffice_7.1.4_Linux_x86-64_rpm.tar.gz -cO LibreOffice_7_rpm.tar.gz && tar -zxf /tmp/LibreOffice_7_rpm.tar.gz && cd /tmp/LibreOffice_7.1.4.2_Linux_x86-64_rpm/RPMS
+   wget https://kkfileview.keking.cn/LibreOffice_7.3.7_Linux_x86-64_rpm.tar.gz -cO LibreOffice_7_rpm.tar.gz && tar -zxf /tmp/LibreOffice_7_rpm.tar.gz && cd /tmp/LibreOffice_7.3.7.2_Linux_x86-64_rpm/RPMS
    echo $?
    if [ $? -eq 0 ];then
-     yum install -y libXext.x86_64
+     yum install -y libSM.x86_64 libXrender.x86_64  libXext.x86_64
      yum groupinstall -y  "X Window System"
-     yum installlocalho
+     yum localinstall -y *.rpm
      echo 'install finshed...'
    else
      echo 'download package error...'
@@ -15,7 +15,7 @@ install_redhat() {
 }
 
 install_ubuntu() {
-   wget  https://kkfileview.keking.cn/LibreOffice_7.1.4_Linux_x86-64_deb.tar.gz  -cO LibreOffice_7_deb.gz && tar -zxf /tmp/LibreOffice_7_deb.tar.gz && cd /tmp/LibreOffice_7.1.4.2_Linux_x86-deb/RPMS
+   wget  https://kkfileview.keking.cn/LibreOffice_7.3.7_Linux_x86-64_deb.tar.gz  -cO LibreOffice_7_deb.tar.gz && tar -zxf /tmp/LibreOffice_7_deb.tar.gz && cd /tmp/LibreOffice_7.3.7.2_Linux_x86-64_deb/DEBS
    echo $?
  if [ $? -eq 0 ];then
      apt-get install -y libxinerama1 libcairo2 libcups2 libx11-xcb1

server/src/main/bin/shutdown.sh

@@ -1,2 +1,36 @@
 #!/bin/bash
-kill -15 `ps -ef|grep kkFileView|awk 'NR==1{print $2}'`
+#
+#
+#############################
+# Author:  sanxi
+# Version: 1.0
+# Date:    2021/09/17
+# Description: v1.0：修改kkFileView关闭进程机制  
+#############################
+#
+KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")" || exit 1 ;pwd)
+PID_FILE_NAME="kkFileView.pid"
+PID_FILE="${KKFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}"
+export KKFILEVIEW_BIN_FOLDER=$KKFILEVIEW_BIN_FOLDER
+#
+## pid文件是否存在
+if [ ! -e "$PID_FILE" ]; then
+    echo "kkFileView.pid文件不存在！"
+    exit 1
+else
+    ## 文件不为空代表程序正在运行，则循环关闭进程。
+    if [ -s "$PID_FILE" ]; then
+        # 读取pid文件内容，开启while循环读取每一行文本赋予给变量PID_FILE。
+        cat "${PID_FILE}" | while read PID;do
+            ## 如已读取完毕，则退出脚本。
+            [ -z "$PID" ] && exit 2
+            echo "正在停止进程：${PID}..."
+            ## 正常停止进程
+            kill -15 "${PID}" && echo "进程：${PID}停止成功！"
+        done
+        # 关闭所有进程后，重置pid。
+        cat /dev/null > "$PID_FILE"
+    else
+        echo "kkFileView进程尚未运行！"
+    fi
+fi

server/src/main/bin/startup.bat

@@ -5,5 +5,6 @@ echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER%
 echo Starting kkFileView...
 echo Please check log file in ../log/kkFileView.log for more information
 echo You can get help in our official home site: https://kkFileView.keking.cn
+echo If you need further help, please join our kk opensource community: https://t.zsxq.com/09ZHSXbsQ
 echo If this project is helpful to you, please star it on https://gitee.com/kekingcn/file-online-preview/stargazers
-java -Dspring.config.location=..\config\application.properties -jar kkFileView-4.0.0.jar -> ..\log\kkFileView.log
+java -Dspring.config.location=..\config\application.properties -jar kkFileView-4.1.0.jar -> ..\log\kkFileView.log

server/src/main/bin/startup.sh

@@ -1,10 +1,33 @@
 #!/bin/bash
-DIR_HOME=("/opt/openoffice.org3" "/opt/libreoffice" "/opt/libreoffice6.1" "/opt/libreoffice7.0" "/opt/libreoffice7.1" "/opt/openoffice4" "/usr/lib/openoffice" "/usr/lib/libreoffice" "/usr/lib64/libreoffice")
+#
+#
+#############################
+# First_Author:  凯京科技
+# Second_Author:  sanxi
+# Version: 1.1
+# Date:    2021/09/17
+# Description:  v1.1：修改进程启动机制为pid形式。
+#############################
+#
+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/openoffice4" "/usr/lib/openoffice" "/usr/lib/libreoffice")
 FLAG=
 OFFICE_HOME=
-KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")";pwd)
+KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")" || exit 1 ;pwd)
+PID_FILE_NAME="kkFileView.pid"
+PID_FILE="${KKFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}"
 export KKFILEVIEW_BIN_FOLDER=$KKFILEVIEW_BIN_FOLDER
-cd $KKFILEVIEW_BIN_FOLDER
+#
+## 如pid文件不存在则自动创建
+if [ ! -f ${PID_FILE_NAME} ]; then
+  touch "${KKFILEVIEW_BIN_FOLDER}/${PID_FILE_NAME}"
+fi
+## 判断当前是否有进程处于运行状态
+if [ -s "${PID_FILE}" ]; then
+  PID=$(cat "${PID_FILE}")
+  echo "进程已处于运行状态，进程号为：${PID}"
+  exit 1
+else
+  cd "$KKFILEVIEW_BIN_FOLDER" || exit 1
   echo "Using KKFILEVIEW_BIN_FOLDER $KKFILEVIEW_BIN_FOLDER"
   grep 'office\.home' ../config/application.properties | grep '!^#'
   if [ $? -eq 0 ]; then
@@ -12,21 +35,28 @@ if [ $? -eq 0 ]; then
   else
   for i in ${DIR_HOME[@]}
     do
-    if [ -f $i"/program/soffice.bin" ]; then
+      if [ -f "$i/program/soffice.bin" ]; then
         FLAG=true
         OFFICE_HOME=${i}
         break
       fi
     done
     if [ ! -n "${FLAG}" ]; then
-    echo "Installing OpenOffice"
+      echo "Installing LibreOffice"
       sh ./install.sh
     else
       echo "Detected office component has been installed in $OFFICE_HOME"
     fi
   fi
+
+  ## 启动kkFileView
   echo "Starting kkFileView..."
+  nohup java -Dfile.encoding=UTF-8 -Dspring.config.location=../config/application.properties -jar kkFileView-4.1.0.jar > ../log/kkFileView.log 2>&1 &
   echo "Please execute ./showlog.sh to check log for more information"
   echo "You can get help in our official home site: https://kkFileView.keking.cn"
+  echo "If you need further help, please join our kk opensource community: https://t.zsxq.com/09ZHSXbsQ"
   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 -Dspring.config.location=../config/application.properties -jar kkFileView-4.0.0.jar > ../log/kkFileView.log 2>&1 &
+  PROCESS=$(ps -ef | grep kkFileView | awk 'NR==1{print $2}')
+  # 启动成功后将进程号写入pid文件
+  echo "$PROCESS" > "$PID_FILE"
+fi

server/src/main/config/application.properties

@@ -22,9 +22,15 @@ office.plugin.server.ports = 2001,2002
 ## office 转换服务 task 超时时间，默认五分钟
 office.plugin.task.timeout = 5m
 
-#文件资源路径（默认为打包根路径下的file目录下）
+#预览生成资源路径（默认为打包根路径下的file目录下）
 #file.dir = D:\\kkFileview\\
 file.dir = ${KK_FILE_DIR:default}
+
+#允许预览的本地文件夹 默认不允许任何本地文件被预览
+#file.dir = D:\\kkFileview\\
+local.preview.dir = ${KK_LOCAL_PREVIEW_DIR:default}
+
+
 #openoffice home路径
 #office.home = C:\\Program Files (x86)\\OpenOffice 4
 office.home = ${KK_OFFICE_HOME:default}
@@ -65,8 +71,16 @@ office.preview.type = ${KK_OFFICE_PREVIEW_TYPE:image}
 #是否关闭office预览切换开关，默认为false，可配置为true关闭
 office.preview.switch.disabled = ${KK_OFFICE_PREVIEW_SWITCH_DISABLED:false}
 
+#是否禁止演示模式
+pdf.presentationMode.disable = ${KK_PDF_PRESENTATION_MODE_DISABLE:true}
+#是否禁止打开文件
+pdf.openFile.disable = ${KK_PDF_OPEN_FILE_DISABLE:true}
+#是否禁止打印转换生成的pdf文件
+pdf.print.disable = ${KK_PDF_PRINT_DISABLE:true}
 #是否禁止下载转换生成的pdf文件
 pdf.download.disable = ${KK_PDF_DOWNLOAD_DISABLE:true}
+#是否禁止bookmark
+pdf.bookmark.disable = ${KK_PDF_BOOKMARK_DISABLE:true}
 #是否禁用首页文件上传
 file.upload.disable = ${KK_FILE_UPLOAD_ENABLED:false}
 
@@ -100,3 +114,6 @@ watermark.height = ${WATERMARK_HEIGHT:80}
 #水印倾斜度数，要求设置在大于等于0，小于90
 watermark.angle = ${WATERMARK_ANGLE:10}
 
+#Tif类型图片浏览模式：tif（利用前端js插件浏览）；jpg（转换为jpg后前端显示）；pdf（转换为pdf后显示，便于打印）
+tif.preview.type = ${KK_TIF_PREVIEW_TYPE:tif}
+

server/src/main/config/freemarker_implicit.ftl

@@ -5,6 +5,8 @@
 [#-- @ftlvariable name="file" type="cn.keking.model.FileAttribute" --]
 [#-- @ftlvariable name="fileName" type="java.lang.String" --]
 [#-- @ftlvariable name="fileTree" type="java.lang.String" --]
+[#-- @ftlvariable name="needFilePassword" type="java.lang.Boolean" --]
+[#-- @ftlvariable name="filePasswordError" type="java.lang.Boolean" --]
 [#-- @ftlvariable name="baseUrl" type="java.lang.String" --]
 [#-- @ftlvariable name="imgUrls" type="String" --]
 [#-- @ftlvariable name="textData" type="java.lang.String" --]

server/src/main/java/cn/keking/ServerMain.java

@@ -1,6 +1,5 @@
 package cn.keking;
 
-import cn.keking.config.AppBanner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -23,7 +22,6 @@ public class ServerMain {
         stopWatch.start();
         ConfigurableApplicationContext context = new SpringApplicationBuilder(ServerMain.class)
                 .logStartupInfo(false)
-                .banner(new AppBanner())
                 .run(args);
         stopWatch.stop();
         Integer port = context.getBean(ServerProperties.class).getPort();

server/src/main/java/cn/keking/config/AppBanner.java

@@ -1,28 +0,0 @@
-package cn.keking.config;
-
-import org.springframework.boot.Banner;
-import org.springframework.core.env.Environment;
-
-import java.io.PrintStream;
-
-/**
- * @author kl (http://kailing.pub)
- * @since 2021/2/8
- */
-public class AppBanner implements Banner {
-    @Override
-    public void printBanner(Environment environment, Class<?> sourceClass, PrintStream out) {
-        out.println(
-                "  _      _      ______   _   _         __      __  _                   \n" +
-                " | |    | |    |  ____| (_) | |        \\ \\    / / (_)                  \n" +
-                " | | __ | | __ | |__     _  | |   ___   \\ \\  / /   _    ___  __      __\n" +
-                " | |/ / | |/ / |  __|   | | | |  / _ \\   \\ \\/ /   | |  / _ \\ \\ \\ /\\ / /\n" +
-                " |   <  |   <  | |      | | | | |  __/    \\  /    | | |  __/  \\ V  V / \n" +
-                " |_|\\_\\ |_|\\_\\ |_|      |_| |_|  \\___|     \\/     |_|  \\___|   \\_/\\_/  \n" +
-                "                                                                     \n" +
-                " => Spring Boot ::  (v2.4.2)             QQ1 :: 613025121\n" +
-                " => kkFileView  ::  (v4.0.0)             QQ2 :: 484680571\n" +
-                " => github      ::  https://github.com/kekingcn/kkFileView\n" +
-                " => gitee       ::  https://gitee.com/kekingcn/file-online-preview\n");
-    }
-}

server/src/main/java/cn/keking/config/ConfigConstants.java

@@ -6,8 +6,8 @@ import org.springframework.stereotype.Component;
 
 import java.io.File;
 import java.util.Arrays;
-import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * @author: chenjh
@@ -33,9 +33,15 @@ public class ConfigConstants {
     private static String ftpControlEncoding;
     private static String baseUrl;
     private static String fileDir = ConfigUtils.getHomePath() + File.separator + "file" + File.separator;
+    private static String localPreviewDir;
     private static CopyOnWriteArraySet<String> trustHostSet;
+    private static String pdfPresentationModeDisable;
+    private static String pdfOpenFileDisable;
+    private static String pdfPrintDisable;
     private static String pdfDownloadDisable;
+    private static String pdfBookmarkDisable;
     private static Boolean fileUploadDisable;
+    private static String tifPreviewType;
 
     public static final String DEFAULT_CACHE_ENABLED = "true";
     public static final String DEFAULT_TXT_TYPE = "txt,html,htm,asp,jsp,xml,json,properties,md,gitignore,log,java,py,c,cpp,sql,sh,bat,m,bas,prg,cmd";
@@ -47,10 +53,15 @@ public class ConfigConstants {
     public static final String DEFAULT_FTP_CONTROL_ENCODING = "UTF-8";
     public static final String DEFAULT_BASE_URL = "default";
     public static final String DEFAULT_FILE_DIR_VALUE = "default";
+    public static final String DEFAULT_LOCAL_PREVIEW_DIR_VALUE = "default";
     public static final String DEFAULT_TRUST_HOST = "default";
+    public static final String DEFAULT_PDF_PRESENTATION_MODE_DISABLE = "true";
+    public static final String DEFAULT_PDF_OPEN_FILE_DISABLE = "true";
+    public static final String DEFAULT_PDF_PRINT_DISABLE = "true";
     public static final String DEFAULT_PDF_DOWNLOAD_DISABLE = "true";
+    public static final String DEFAULT_PDF_BOOKMARK_DISABLE = "true";
     public static final String DEFAULT_FILE_UPLOAD_DISABLE = "false";
-
+    public static final String DEFAULT_TIF_PREVIEW_TYPE = "tif";
 
     public static Boolean isCacheEnabled() {
         return cacheEnabled;
@@ -203,6 +214,24 @@ public class ConfigConstants {
         }
     }
 
+    public static String getLocalPreviewDir() {
+        return localPreviewDir;
+    }
+
+    @Value("${local.preview.dir:default}")
+    public void setLocalPreviewDir(String localPreviewDir) {
+        setLocalPreviewDirValue(localPreviewDir);
+    }
+
+    public static void setLocalPreviewDirValue(String localPreviewDir) {
+        if (!DEFAULT_LOCAL_PREVIEW_DIR_VALUE.equals(localPreviewDir)) {
+            if (!localPreviewDir.endsWith(File.separator)) {
+                localPreviewDir = localPreviewDir + File.separator;
+            }
+        }
+        ConfigConstants.localPreviewDir = localPreviewDir;
+    }
+
     @Value("${trust.host:default}")
     public void setTrustHost(String trustHost) {
         setTrustHostValue(trustHost);
@@ -228,11 +257,46 @@ public class ConfigConstants {
         ConfigConstants.trustHostSet = trustHostSet;
     }
 
+    public static String getPdfPresentationModeDisable() {
+        return pdfPresentationModeDisable;
+    }
+
+    @Value("${pdf.presentationMode.disable:true}")
+    public void setPdfPresentationModeDisable(String pdfPresentationModeDisable) {
+        setPdfPresentationModeDisableValue(pdfPresentationModeDisable);
+    }
+
+    public static void setPdfPresentationModeDisableValue(String pdfPresentationModeDisable) {
+        ConfigConstants.pdfPresentationModeDisable = pdfPresentationModeDisable;
+    }
+
+    public static String getPdfOpenFileDisable() {
+        return pdfOpenFileDisable;
+    }
+
+    @Value("${pdf.openFile.disable:true}")
+    public void setPdfOpenFileDisable(String pdfOpenFileDisable) {
+        setPdfOpenFileDisableValue(pdfOpenFileDisable);
+    }
+    public static void setPdfOpenFileDisableValue(String pdfOpenFileDisable) {
+        ConfigConstants.pdfOpenFileDisable = pdfOpenFileDisable;
+    }
+
+    public static String getPdfPrintDisable() {
+        return pdfPrintDisable;
+    }
+    @Value("${pdf.print.disable:true}")
+    public void setPdfPrintDisable(String pdfPrintDisable) {
+        setPdfPrintDisableValue(pdfPrintDisable);
+    }
+    public static void setPdfPrintDisableValue(String pdfPrintDisable) {
+        ConfigConstants.pdfPrintDisable = pdfPrintDisable;
+    }
+
     public static String getPdfDownloadDisable() {
         return pdfDownloadDisable;
     }
 
-
     @Value("${pdf.download.disable:true}")
     public void setPdfDownloadDisable(String pdfDownloadDisable) {
         setPdfDownloadDisableValue(pdfDownloadDisable);
@@ -241,6 +305,17 @@ public class ConfigConstants {
         ConfigConstants.pdfDownloadDisable = pdfDownloadDisable;
     }
 
+    public static String getPdfBookmarkDisable() {
+        return pdfBookmarkDisable;
+    }
+    @Value("${pdf.bookmark.disable:true}")
+    public void setPdfBookmarkDisable(String pdfBookmarkDisable) {
+        setPdfBookmarkDisableValue(pdfBookmarkDisable);
+    }
+    public static void setPdfBookmarkDisableValue(String pdfBookmarkDisable) {
+        ConfigConstants.pdfBookmarkDisable = pdfBookmarkDisable;
+    }
+
     public static String getOfficePreviewSwitchDisabled() {
         return officePreviewSwitchDisabled;
     }
@@ -257,11 +332,25 @@ public class ConfigConstants {
     }
 
     @Value("${file.upload.disable:false}")
-    public static void setFileUploadDisable(Boolean fileUploadDisable) {
+    public void setFileUploadDisable(Boolean fileUploadDisable) {
         setFileUploadDisableValue(fileUploadDisable);
     }
 
     public static void setFileUploadDisableValue(Boolean fileUploadDisable) {
         ConfigConstants.fileUploadDisable = fileUploadDisable;
     }
+
+
+    public static String getTifPreviewType() {
+        return tifPreviewType;
+    }
+
+    @Value("${tif.preview.type:tif}")
+    public void setTifPreviewType(String tifPreviewType) {
+        setTifPreviewTypeValue(tifPreviewType);
+    }
+
+    public static void setTifPreviewTypeValue(String tifPreviewType) {
+        ConfigConstants.tifPreviewType = tifPreviewType;
+    }
 }

server/src/main/java/cn/keking/config/ConfigRefreshComponent.java

@@ -47,8 +47,14 @@ public class ConfigRefreshComponent {
                 String configFilePath = ConfigUtils.getCustomizedConfigPath();
                 String baseUrl;
                 String trustHost;
+                String pdfPresentationModeDisable;
+                String pdfOpenFileDisable;
+                String pdfPrintDisable;
                 String pdfDownloadDisable;
+                String pdfBookmarkDisable;
                 boolean fileUploadDisable;
+                String tifPreviewType;
+
                 while (true) {
                     FileReader fileReader = new FileReader(configFilePath);
                     BufferedReader bufferedReader = new BufferedReader(fileReader);
@@ -66,8 +72,14 @@ public class ConfigRefreshComponent {
                     mediaArray = media.split(",");
                     baseUrl = properties.getProperty("base.url", ConfigConstants.DEFAULT_BASE_URL);
                     trustHost = properties.getProperty("trust.host", ConfigConstants.DEFAULT_TRUST_HOST);
+                    pdfPresentationModeDisable = properties.getProperty("pdf.presentationMode.disable", ConfigConstants.DEFAULT_PDF_PRESENTATION_MODE_DISABLE);
+                    pdfOpenFileDisable = properties.getProperty("pdf.openFile.disable", ConfigConstants.DEFAULT_PDF_OPEN_FILE_DISABLE);
+                    pdfPrintDisable = properties.getProperty("pdf.print.disable", ConfigConstants.DEFAULT_PDF_PRINT_DISABLE);
                     pdfDownloadDisable = properties.getProperty("pdf.download.disable", ConfigConstants.DEFAULT_PDF_DOWNLOAD_DISABLE);
+                    pdfBookmarkDisable = properties.getProperty("pdf.bookmark.disable", ConfigConstants.DEFAULT_PDF_BOOKMARK_DISABLE);
                     fileUploadDisable = Boolean.parseBoolean(properties.getProperty("file.upload.disable", ConfigConstants.DEFAULT_FILE_UPLOAD_DISABLE));
+                    tifPreviewType = properties.getProperty("tif.preview.type", ConfigConstants.DEFAULT_TIF_PREVIEW_TYPE);
+
                     ConfigConstants.setCacheEnabledValueValue(cacheEnabled);
                     ConfigConstants.setSimTextValue(textArray);
                     ConfigConstants.setMediaValue(mediaArray);
@@ -78,8 +90,13 @@ public class ConfigRefreshComponent {
                     ConfigConstants.setBaseUrlValue(baseUrl);
                     ConfigConstants.setTrustHostValue(trustHost);
                     ConfigConstants.setOfficePreviewSwitchDisabledValue(officePreviewSwitchDisabled);
+                    ConfigConstants.setPdfPresentationModeDisableValue(pdfPresentationModeDisable);
+                    ConfigConstants.setPdfOpenFileDisableValue(pdfOpenFileDisable);
+                    ConfigConstants.setPdfPrintDisableValue(pdfPrintDisable);
                     ConfigConstants.setPdfDownloadDisableValue(pdfDownloadDisable);
+                    ConfigConstants.setPdfBookmarkDisableValue(pdfBookmarkDisable);
                     ConfigConstants.setFileUploadDisableValue(fileUploadDisable);
+                    ConfigConstants.setTifPreviewTypeValue(tifPreviewType);
                     setWatermarkConfig(properties);
                     bufferedReader.close();
                     fileReader.close();

server/src/main/java/cn/keking/config/WebConfig.java

@@ -1,11 +1,17 @@
 package cn.keking.config;
 
+import cn.keking.web.filter.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * @author: chenjh
  * @since: 2019/4/16 20:04
@@ -23,4 +29,63 @@ public class WebConfig implements WebMvcConfigurer {
         LOGGER.info("Add resource locations: {}", filePath);
         registry.addResourceHandler("/**").addResourceLocations("classpath:/META-INF/resources/","classpath:/resources/","classpath:/static/","classpath:/public/","file:" + filePath);
     }
+
+    @Bean
+    public FilterRegistrationBean<ChinesePathFilter> getChinesePathFilter() {
+        ChinesePathFilter filter = new ChinesePathFilter();
+        FilterRegistrationBean<ChinesePathFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(filter);
+        return registrationBean;
+    }
+
+    @Bean
+    public FilterRegistrationBean<TrustHostFilter> getTrustHostFilter() {
+        Set<String> filterUri = new HashSet<>();
+        filterUri.add("/onlinePreview");
+        filterUri.add("/picturesPreview");
+        TrustHostFilter filter = new TrustHostFilter();
+        FilterRegistrationBean<TrustHostFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(filter);
+        registrationBean.setUrlPatterns(filterUri);
+        return registrationBean;
+    }
+
+    @Bean
+    public FilterRegistrationBean<TrustDirFilter> getTrustDirFilter() {
+        Set<String> filterUri = new HashSet<>();
+        filterUri.add("/onlinePreview");
+        filterUri.add("/picturesPreview");
+        filterUri.add("/getCorsFile");
+        TrustDirFilter filter = new TrustDirFilter();
+        FilterRegistrationBean<TrustDirFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(filter);
+        registrationBean.setUrlPatterns(filterUri);
+        return registrationBean;
+    }
+
+    @Bean
+    public FilterRegistrationBean<BaseUrlFilter> getBaseUrlFilter() {
+        Set<String> filterUri = new HashSet<>();
+        filterUri.add("/index");
+        filterUri.add("/onlinePreview");
+        filterUri.add("/picturesPreview");
+        BaseUrlFilter filter = new BaseUrlFilter();
+        FilterRegistrationBean<BaseUrlFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(filter);
+        registrationBean.setUrlPatterns(filterUri);
+        return registrationBean;
+    }
+
+    @Bean
+    public FilterRegistrationBean<AttributeSetFilter> getWatermarkConfigFilter() {
+        Set<String> filterUri = new HashSet<>();
+        filterUri.add("/index");
+        filterUri.add("/onlinePreview");
+        filterUri.add("/picturesPreview");
+        AttributeSetFilter filter = new AttributeSetFilter();
+        FilterRegistrationBean<AttributeSetFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(filter);
+        registrationBean.setUrlPatterns(filterUri);
+        return registrationBean;
+    }
 }

server/src/main/java/cn/keking/model/FileAttribute.java

@@ -1,6 +1,7 @@
 package cn.keking.model;
 
 import cn.keking.config.ConfigConstants;
+import org.artofsolving.jodconverter.model.FileProperties;
 
 /**
  * Created by kl on 2018/1/17.
@@ -13,7 +14,11 @@ public class FileAttribute {
     private String name;
     private String url;
     private String fileKey;
+    private String filePassword;
+    private String userToken;
     private String officePreviewType = ConfigConstants.getOfficePreviewType();
+    private String tifPreviewType;
+    private Boolean skipDownLoad = false;
 
     public FileAttribute() {
     }
@@ -33,6 +38,12 @@ public class FileAttribute {
         this.officePreviewType = officePreviewType;
     }
 
+    public FileProperties toFileProperties() {
+        FileProperties fileProperties = new FileProperties();
+        fileProperties.setFilePassword(filePassword);
+        return fileProperties;
+    }
+
     public String getFileKey() {
         return fileKey;
     }
@@ -41,6 +52,22 @@ public class FileAttribute {
         this.fileKey = fileKey;
     }
 
+    public String getFilePassword() {
+        return filePassword;
+    }
+
+    public void setFilePassword(String filePassword) {
+        this.filePassword = filePassword;
+    }
+
+    public String getUserToken() {
+        return userToken;
+    }
+
+    public void setUserToken(String userToken) {
+        this.userToken = userToken;
+    }
+
     public String getOfficePreviewType() {
         return officePreviewType;
     }
@@ -80,4 +107,21 @@ public class FileAttribute {
     public void setUrl(String url) {
         this.url = url;
     }
+
+    public Boolean getSkipDownLoad() {
+        return skipDownLoad;
+    }
+
+    public void setSkipDownLoad(Boolean skipDownLoad) {
+        this.skipDownLoad = skipDownLoad;
+    }
+
+    public String getTifPreviewType() {
+        return tifPreviewType;
+    }
+
+    public void setTifPreviewType(String previewType) {
+        this.tifPreviewType = previewType;
+    }
+
 }

server/src/main/java/cn/keking/model/FileType.java

@@ -27,8 +27,8 @@ public enum FileType {
     OFD("ofdFilePreviewImpl");
 
 
-    private static final String[] OFFICE_TYPES = {"docx", "wps", "doc", "xls", "xlsx", "ppt", "pptx"};
-    private static final String[] PICTURE_TYPES = {"jpg", "jpeg", "png", "gif", "bmp", "ico", "raw"};
+    private static final String[] OFFICE_TYPES = {"docx", "wps", "doc", "docm", "xls", "xlsx", "csv" ,"xlsm", "ppt", "pptx", "vsd", "rtf", "odt", "wmf", "emf", "dps", "et", "ods", "ots", "tsv", "odp", "otp", "sxi", "ott", "vsdx", "fodt", "fods", "xltx","tga","psd"};
+    private static final String[] PICTURE_TYPES = {"jpg", "jpeg", "png", "gif", "bmp", "ico", "jfif", "webp"};
     private static final String[] ARCHIVE_TYPES = {"rar", "zip", "jar", "7-zip", "tar", "gzip", "7z"};
     private static final String[] TIFF_TYPES = {"tif", "tiff"};
     private static final String[] OFD_TYPES = {"ofd"};

server/src/main/java/cn/keking/service/FileHandlerService.java

@@ -149,7 +149,7 @@ public class FileHandlerService {
                 sb.append(line);
             }
             // 添加sheet控制头
-            sb.append("<script src=\"js/jquery-3.0.0.min.js\" type=\"text/javascript\"></script>");
+            sb.append("<script src=\"js/jquery-3.6.1.min.js\" type=\"text/javascript\"></script>");
             sb.append("<script src=\"js/excel.header.js\" type=\"text/javascript\"></script>");
             sb.append("<link rel=\"stylesheet\" href=\"bootstrap/css/bootstrap.min.css\">");
         } catch (IOException e) {
@@ -270,9 +270,13 @@ public class FileHandlerService {
             type = FileType.typeFromUrl(url);
             suffix = WebUtils.suffixFromUrl(url);
         }
+        if (url.contains("?fileKey=")) {
+            attribute.setSkipDownLoad(true);
+        }
         attribute.setType(type);
         attribute.setName(fileName);
         attribute.setSuffix(suffix);
+        url = WebUtils.encodeUrlFileName(url);
         attribute.setUrl(url);
         if (req != null) {
             String officePreviewType = req.getParameter("officePreviewType");
@@ -283,7 +287,23 @@ public class FileHandlerService {
             if (StringUtils.hasText(fileKey)) {
                 attribute.setFileKey(fileKey);
             }
+
+            String tifPreviewType = req.getParameter("tifPreviewType");
+            if (StringUtils.hasText(tifPreviewType)) {
+                attribute.setTifPreviewType(tifPreviewType);
             }
+
+            String filePassword = req.getParameter("filePassword");
+            if (StringUtils.hasText(filePassword)) {
+                attribute.setFilePassword(filePassword);
+            }
+
+            String userToken = req.getParameter("userToken");
+            if (StringUtils.hasText(userToken)) {
+                attribute.setUserToken(userToken);
+            }
+        }
+
         return attribute;
     }
 

server/src/main/java/cn/keking/service/OfficePluginManager.java

@@ -6,6 +6,7 @@ import org.artofsolving.jodconverter.OfficeDocumentConverter;
 import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration;
 import org.artofsolving.jodconverter.office.OfficeManager;
 import org.artofsolving.jodconverter.office.OfficeUtils;
+import org.artofsolving.jodconverter.util.PlatformUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -24,7 +25,6 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Properties;
 
 /**
  * 创建文件转换器
@@ -97,9 +97,8 @@ public class OfficePluginManager {
 
     private boolean killProcess() {
         boolean flag = false;
-        Properties props = System.getProperties();
         try {
-            if (props.getProperty("os.name").toLowerCase().contains("windows")) {
+            if (PlatformUtils.isWindows()) {
                 Process p = Runtime.getRuntime().exec("cmd /c tasklist ");
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();
                 InputStream os = p.getInputStream();
@@ -112,6 +111,20 @@ public class OfficePluginManager {
                     Runtime.getRuntime().exec("taskkill /im " + "soffice.bin" + " /f");
                     flag = true;
                 }
+            } else if (PlatformUtils.isLinux()) {
+                Process p = Runtime.getRuntime().exec(new String[]{"sh", "-c", "ps -ef | grep " + "soffice.bin" + " |grep -v grep | wc -l"});
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                InputStream os = p.getInputStream();
+                byte[] b = new byte[256];
+                while (os.read(b) > 0) {
+                    baos.write(b);
+                }
+                String s = baos.toString();
+                if (!s.startsWith("0")) {
+                    String[] cmd = {"sh", "-c", "ps -ef | grep soffice.bin | grep -v grep | awk '{print \"kill -9 \"$2}' | sh"};
+                    Runtime.getRuntime().exec(cmd);
+                    flag = true;
+                }
             } else {
                 Process p = Runtime.getRuntime().exec(new String[]{"sh", "-c", "ps -ef | grep " + "soffice.bin"});
                 ByteArrayOutputStream baos = new ByteArrayOutputStream();

server/src/main/java/cn/keking/service/OfficeToPdfService.java

@@ -1,5 +1,6 @@
 package cn.keking.service;
 
+import cn.keking.model.FileAttribute;
 import org.artofsolving.jodconverter.OfficeDocumentConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,22 +21,23 @@ public class OfficeToPdfService {
         this.officePluginManager = officePluginManager;
     }
 
-    public void openOfficeToPDF(String inputFilePath, String outputFilePath) {
-        office2pdf(inputFilePath, outputFilePath);
+    public void openOfficeToPDF(String inputFilePath, String outputFilePath, FileAttribute fileAttribute) {
+        office2pdf(inputFilePath, outputFilePath, fileAttribute);
     }
 
 
-    public static void converterFile(File inputFile, String outputFilePath_end, OfficeDocumentConverter converter) {
+    public static void converterFile(File inputFile, String outputFilePath_end, OfficeDocumentConverter converter, FileAttribute fileAttribute) {
         File outputFile = new File(outputFilePath_end);
         // 假如目标路径不存在,则新建该路径
         if (!outputFile.getParentFile().exists() && !outputFile.getParentFile().mkdirs()) {
             logger.error("创建目录【{}】失败，请检查目录权限！",outputFilePath_end);
         }
-        converter.convert(inputFile, outputFile);
+
+        converter.convert(inputFile, outputFile, fileAttribute.toFileProperties());
     }
 
 
-    public void office2pdf(String inputFilePath, String outputFilePath) {
+    public void office2pdf(String inputFilePath, String outputFilePath, FileAttribute fileAttribute) {
         OfficeDocumentConverter converter = officePluginManager.getDocumentConverter();
         if (null != inputFilePath) {
             File inputFile = new File(inputFilePath);
@@ -45,12 +47,12 @@ public class OfficeToPdfService {
                 String outputFilePath_end = getOutputFilePath(inputFilePath);
                 if (inputFile.exists()) {
                     // 找不到源文件, 则返回
-                    converterFile(inputFile, outputFilePath_end,converter);
+                    converterFile(inputFile, outputFilePath_end, converter, fileAttribute);
                 }
             } else {
                 if (inputFile.exists()) {
                     // 找不到源文件, 则返回
-                    converterFile(inputFile, outputFilePath, converter);
+                    converterFile(inputFile, outputFilePath, converter, fileAttribute);
                 }
             }
         }

server/src/main/java/cn/keking/service/cache/impl/CacheServiceJDKImpl.java

@@ -3,9 +3,9 @@ package cn.keking.service.cache.impl;
 import cn.keking.service.cache.CacheService;
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.googlecode.concurrentlinkedhashmap.Weighers;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import javax.annotation.PostConstruct;
 import java.util.ArrayList;

server/src/main/java/cn/keking/service/cache/impl/CacheServiceRocksDBImpl.java

@@ -177,6 +177,7 @@ public class CacheServiceRocksDBImpl implements CacheService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public Map<String, String> getMediaConvertCache() {
         Map<String, String> result = new HashMap<>();
         try{
@@ -199,6 +200,7 @@ public class CacheServiceRocksDBImpl implements CacheService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public String getMediaConvertCache(String key) {
         String result = "";
         try{

server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java

@@ -40,16 +40,7 @@ public class CompressFilePreviewImpl implements FilePreview {
                 return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg());
             }
             String filePath = response.getContent();
-            if ("zip".equalsIgnoreCase(suffix) || "jar".equalsIgnoreCase(suffix) || "gzip".equalsIgnoreCase(suffix)) {
-                fileTree = compressFileReader.readZipFile(filePath, fileName);
-            } else if ("rar".equalsIgnoreCase(suffix)) {
             fileTree = compressFileReader.unRar(filePath, fileName);
-            } else if ("7z".equalsIgnoreCase(suffix)) {
-                fileTree = compressFileReader.read7zFile(filePath, fileName);
-            }
-            if (fileTree != null && !"null".equals(fileTree) && ConfigConstants.isCacheEnabled()) {
-                fileHandlerService.addConvertedFile(fileName, fileTree);
-            }
         } else {
             fileTree = fileHandlerService.getConvertedFile(fileName);
         }
@@ -57,7 +48,7 @@ public class CompressFilePreviewImpl implements FilePreview {
             model.addAttribute("fileTree", fileTree);
             return COMPRESS_FILE_PREVIEW_PAGE;
         } else {
-            return otherFilePreview.notSupportedFile(model, fileAttribute, "压缩文件类型不受支持，尝试在压缩的时候选择RAR4格式");
+            return otherFilePreview.notSupportedFile(model, fileAttribute, "压缩文件类型不受支持");
         }
     }
 }

server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java

@@ -3,11 +3,13 @@ package cn.keking.service.impl;
 import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
-import cn.keking.service.FilePreview;
-import cn.keking.utils.DownloadUtils;
 import cn.keking.service.FileHandlerService;
+import cn.keking.service.FilePreview;
 import cn.keking.service.OfficeToPdfService;
+import cn.keking.utils.DownloadUtils;
+import cn.keking.utils.OfficeUtils;
 import cn.keking.web.filter.BaseUrlFilter;
+import org.artofsolving.jodconverter.office.OfficeException;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
@@ -42,33 +44,83 @@ public class OfficeFilePreviewImpl implements FilePreview {
         String baseUrl = BaseUrlFilter.getBaseUrl();
         String suffix = fileAttribute.getSuffix();
         String fileName = fileAttribute.getName();
-        boolean isHtml = suffix.equalsIgnoreCase("xls") || suffix.equalsIgnoreCase("xlsx");
+        String filePassword = fileAttribute.getFilePassword();
+        String userToken = fileAttribute.getUserToken();
+        boolean isHtml = suffix.equalsIgnoreCase("xls") || suffix.equalsIgnoreCase("xlsx") || suffix.equalsIgnoreCase("csv");
         String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + (isHtml ? "html" : "pdf");
-        String outFilePath = FILE_DIR + pdfName;
-        // 判断之前是否已转换过，如果转换过，直接返回，否则执行转换
-        if (!fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
-            String filePath;
-            ReturnResponse<String> response = DownloadUtils.downLoad(fileAttribute, null);
+        String cacheFileName = userToken == null ? pdfName : userToken + "_" + pdfName;
+        String outFilePath = FILE_DIR + cacheFileName;
+
+        // 下载远程文件到本地，如果文件在本地已存在不会重复下载
+        ReturnResponse<String> response = DownloadUtils.downLoad(fileAttribute, fileName);
         if (response.isFailure()) {
             return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg());
         }
-            filePath = response.getContent();
+        String filePath = response.getContent();
+
+        /*
+         * 1. 缓存判断-如果文件已经进行转换过，就直接返回，否则执行转换
+         * 2. 缓存判断-加密文件基于userToken进行缓存，如果没有就不缓存
+         */
+        boolean isCached = false;
+        boolean isUseCached = false;
+        boolean isPwdProtectedOffice = false;
+        if (ConfigConstants.isCacheEnabled()) {
+            // 全局开启缓存
+            isUseCached = true;
+            if (fileHandlerService.listConvertedFiles().containsKey(cacheFileName)) {
+                // 存在缓存
+                isCached = true;
+            }
+            if (OfficeUtils.isPwdProtected(filePath)) {
+                isPwdProtectedOffice = true;
+                if (!StringUtils.hasLength(userToken)) {
+                    // 不缓存没有userToken的加密文件
+                    isUseCached = false;
+                }
+            }
+        } else {
+            isPwdProtectedOffice = OfficeUtils.isPwdProtected(filePath);
+        }
+
+        if (isCached == false) {
+            // 没有缓存执行转换逻辑
+            if (isPwdProtectedOffice && !StringUtils.hasLength(filePassword)) {
+                // 加密文件需要密码
+                model.addAttribute("needFilePassword", true);
+                return EXEL_FILE_PREVIEW_PAGE;
+            } else {
                 if (StringUtils.hasText(outFilePath)) {
-                officeToPdfService.openOfficeToPDF(filePath, outFilePath);
+                    try {
+                        officeToPdfService.openOfficeToPDF(filePath, outFilePath, fileAttribute);
+                    } catch (OfficeException e) {
+                        if (isPwdProtectedOffice && OfficeUtils.isCompatible(filePath, filePassword) == false) {
+                            // 加密文件密码错误，提示重新输入
+                            model.addAttribute("needFilePassword", true);
+                            model.addAttribute("filePasswordError", true);
+                            return EXEL_FILE_PREVIEW_PAGE;
+                        }
+
+                        return otherFilePreview.notSupportedFile(model, fileAttribute, "抱歉，该文件版本不兼容，文件版本错误。");
+                    }
+
                     if (isHtml) {
                         // 对转换后的文件进行操作(改变编码方式)
                         fileHandlerService.doActionConvertedFile(outFilePath);
                     }
-                if (ConfigConstants.isCacheEnabled()) {
+                    if (isUseCached) {
                         // 加入缓存
-                    fileHandlerService.addConvertedFile(pdfName, fileHandlerService.getRelativePath(outFilePath));
+                        fileHandlerService.addConvertedFile(cacheFileName, fileHandlerService.getRelativePath(outFilePath));
                     }
                 }
             }
+        }
+
         if (!isHtml && baseUrl != null && (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OFFICE_PREVIEW_TYPE_ALL_IMAGES.equals(officePreviewType))) {
-            return getPreviewType(model, fileAttribute, officePreviewType, baseUrl, pdfName, outFilePath, fileHandlerService, OFFICE_PREVIEW_TYPE_IMAGE, otherFilePreview);
+            return getPreviewType(model, fileAttribute, officePreviewType, baseUrl, cacheFileName, outFilePath, fileHandlerService, OFFICE_PREVIEW_TYPE_IMAGE, otherFilePreview);
         }
-        model.addAttribute("pdfUrl", pdfName);
+
+        model.addAttribute("pdfUrl", cacheFileName);
         return isHtml ? EXEL_FILE_PREVIEW_PAGE : PDF_FILE_PREVIEW_PAGE;
     }
 
@@ -88,4 +140,5 @@ public class OfficeFilePreviewImpl implements FilePreview {
             return PICTURE_FILE_PREVIEW_PAGE;
         }
     }
+
 }

server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java

@@ -12,6 +12,9 @@ import org.springframework.ui.Model;
 import org.springframework.web.util.HtmlUtils;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 /**
  * Created by kl on 2018/1/17.
@@ -28,16 +31,14 @@ public class SimTextFilePreviewImpl implements FilePreview {
     private static final String FILE_DIR = ConfigConstants.getFileDir();
     @Override
     public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
-
         String fileName = fileAttribute.getName();
-        String baseUrll = FILE_DIR + fileName;
-        //  String suffix = fileAttribute.getSuffix();
+        String filePath = FILE_DIR + fileName;
         ReturnResponse<String> response = DownloadUtils.downLoad(fileAttribute, fileName);
         if (response.isFailure()) {
             return otherFilePreview.notSupportedFile(model, fileAttribute, response.getMsg());
         }
         try {
-            String   fileData = HtmlUtils.htmlEscape(textData(baseUrll));
+            String fileData = HtmlUtils.htmlEscape(textData(filePath));
             model.addAttribute("textData", Base64.encodeBase64String(fileData.getBytes()));
         } catch (IOException e) {
             return otherFilePreview.notSupportedFile(model, fileAttribute, e.getLocalizedMessage());
@@ -45,15 +46,16 @@ public class SimTextFilePreviewImpl implements FilePreview {
         return TXT_FILE_PREVIEW_PAGE;
     }
 
-    private String textData(String baseUrll) throws IOException {
-        File file = new File(baseUrll);
+    private String textData(String filePath) throws IOException {
+        File file = new File(filePath);
         if (!file.exists() || file.length() == 0) {
-            String line="";
-            return line;
+            return "";
         } else {
-            String charset = EncodingDetects.getJavaEncode(baseUrll);
-            System.out.println(charset);
-            BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(baseUrll), charset));
+            String charset = EncodingDetects.getJavaEncode(filePath);
+            if ("ASCII".equals(charset)) {
+                charset = StandardCharsets.US_ASCII.name();
+            }
+            BufferedReader br = new BufferedReader(new InputStreamReader(Files.newInputStream(Paths.get(filePath)), charset));
             StringBuilder result = new StringBuilder();
             String line;
             while ((line = br.readLine()) != null) {

server/src/main/java/cn/keking/service/impl/TiffFilePreviewImpl.java

@@ -1,31 +1,55 @@
 package cn.keking.service.impl;
 
+import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileAttribute;
+import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
+import cn.keking.utils.ConvertPicUtil;
+import cn.keking.utils.DownloadUtils;
 import cn.keking.utils.WebUtils;
+import cn.keking.web.filter.BaseUrlFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * tiff 图片文件处理
+ *
  * @author kl (http://kailing.pub)
  * @since 2021/2/8
  */
 @Service
 public class TiffFilePreviewImpl implements FilePreview {
 
+    private final static Logger logger = LoggerFactory.getLogger(TiffFilePreviewImpl.class);
+
     private final PictureFilePreviewImpl pictureFilePreview;
     private static final String INITIALIZE_MEMORY_SIZE = "initializeMemorySize";
     //默认初始化 50MB 内存
     private static final long INITIALIZE_MEMORY_SIZE_VALUE_DEFAULT = 1024L * 1024 * 50;
 
+    private final String fileDir = ConfigConstants.getFileDir();
+
     public TiffFilePreviewImpl(PictureFilePreviewImpl pictureFilePreview) {
         this.pictureFilePreview = pictureFilePreview;
     }
 
     @Override
     public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
+        String tifPreviewType = ConfigConstants.getTifPreviewType();
+        String tifOnLinePreviewType = fileAttribute.getTifPreviewType();
+        if (StringUtils.hasText(tifOnLinePreviewType)) {
+            tifPreviewType = tifOnLinePreviewType;
+        }
+
+        if ("tif".equalsIgnoreCase(tifPreviewType)) {
+
             pictureFilePreview.filePreviewHandle(url, model, fileAttribute);
             String fileSize = WebUtils.getUrlParameterReg(url, INITIALIZE_MEMORY_SIZE);
             if (StringUtils.hasText(fileSize)) {
@@ -34,5 +58,62 @@ public class TiffFilePreviewImpl implements FilePreview {
                 model.addAttribute(INITIALIZE_MEMORY_SIZE, Long.toString(INITIALIZE_MEMORY_SIZE_VALUE_DEFAULT));
             }
             return TIFF_FILE_PREVIEW_PAGE;
+
+        } else if ("jpg".equalsIgnoreCase(tifPreviewType) || "pdf".equalsIgnoreCase(tifPreviewType)) {
+            String inputFileName = url.substring(url.lastIndexOf("/") + 1);
+            String inputFileNamePrefix = inputFileName.substring(0, inputFileName.lastIndexOf("."));
+
+            String strLocalTif = fileDir + inputFileName;
+            File fileTiff = new File(strLocalTif);
+            // 如果本地不存在这个tif文件，则下载
+            if (!fileTiff.exists()) {
+                ReturnResponse<String> response = DownloadUtils.downLoad(fileAttribute, inputFileName);
+                if (response.isFailure()) {
+                    return NOT_SUPPORTED_FILE_PAGE;
+                }
+            }
+
+            String baseUrl = BaseUrlFilter.getBaseUrl();
+            if ("pdf".equalsIgnoreCase(tifPreviewType)) {
+                // 以PDF模式预览的过程
+                File filePdf = new File(fileDir + inputFileNamePrefix + ".pdf");
+                // 如果本地不存在对应的pdf，则调用转换过程。否则直接用现有的pdf文件
+                if (!filePdf.exists()) {
+                    filePdf = ConvertPicUtil.convertTif2Pdf(strLocalTif, fileDir + inputFileNamePrefix + ".pdf");
+                }
+
+                // 如果pdf已经存在，则将url路径加入到对象中，返回给页面
+                assert filePdf != null;
+                if (filePdf.exists()) {
+                    String pdfUrl = baseUrl + inputFileNamePrefix + ".pdf";
+                    model.addAttribute("pdfUrl", pdfUrl);
+
+                    return PDF_FILE_PREVIEW_PAGE;
+                }
+            } else {
+                // 以JPG模式预览的过程
+                String strJpgFilePathName = fileDir + inputFileNamePrefix + ".jpg";
+                // 将tif转换为jpg，返回转换后的文件路径、文件名的list
+                List<String> listPic2Jpg = ConvertPicUtil.convertTif2Jpg(strLocalTif, strJpgFilePathName);
+                // 将返回页面的图片url的list对象
+                List<String> listImageUrls = new ArrayList<>();
+                // 循环，拼装url的list对象
+                for (String strJpg : listPic2Jpg) {
+                    listImageUrls.add(baseUrl + strJpg);
+                }
+
+                model.addAttribute("imgUrls", listImageUrls);
+                model.addAttribute("currentUrl", listImageUrls.get(0));
+            }
+
+            // 转换后的tif没用了，可以删掉了
+            if (fileTiff.exists() && !fileTiff.delete()) {
+                logger.error("{} 清理失败", strLocalTif);
+            }
+
+            return PICTURE_FILE_PREVIEW_PAGE;
+        }
+
+        return NOT_SUPPORTED_FILE_PAGE;
     }
 }

server/src/main/java/cn/keking/utils/ConvertPicUtil.java

@@ -0,0 +1,231 @@
+package cn.keking.utils;
+
+
+import com.lowagie.text.Document;
+import com.lowagie.text.Image;
+import com.lowagie.text.Rectangle;
+import com.lowagie.text.pdf.PdfWriter;
+import com.lowagie.text.pdf.RandomAccessFileOrArray;
+import com.lowagie.text.pdf.codec.TiffImage;
+import com.sun.media.jai.codec.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.media.jai.JAI;
+import javax.media.jai.RenderedOp;
+import java.awt.image.RenderedImage;
+import java.awt.image.renderable.ParameterBlock;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class ConvertPicUtil {
+
+    private final static Logger logger = LoggerFactory.getLogger(ConvertPicUtil.class);
+
+    /**
+     * Tif 转  JPG。
+     *
+     * @param strInputFile  输入文件的路径和文件名
+     * @param strOutputFile 输出文件的路径和文件名
+     * @return boolean 是否转换成功
+     */
+    public static List<String> convertTif2Jpg(String strInputFile, String strOutputFile) {
+        List<String> listImageFiles = new ArrayList<>();
+
+        if (strInputFile == null || "".equals(strInputFile.trim())) {
+            return null;
+        }
+        if (!new File(strInputFile).exists()) {
+            logger.info("找不到文件【" + strInputFile + "】");
+            return null;
+        }
+
+        strInputFile = strInputFile.replaceAll("\\\\", "/");
+        strOutputFile = strOutputFile.replaceAll("\\\\", "/");
+
+        FileSeekableStream fileSeekStream = null;
+        try {
+            JPEGEncodeParam jpegEncodeParam = new JPEGEncodeParam();
+
+            TIFFEncodeParam tiffEncodeParam = new TIFFEncodeParam();
+            tiffEncodeParam.setCompression(TIFFEncodeParam.COMPRESSION_GROUP4);
+            tiffEncodeParam.setLittleEndian(false);
+
+            String strFilePrefix = strInputFile.substring(strInputFile.lastIndexOf("/") + 1, strInputFile.lastIndexOf("."));
+
+            fileSeekStream = new FileSeekableStream(strInputFile);
+            ImageDecoder imageDecoder = ImageCodec.createImageDecoder("TIFF", fileSeekStream, null);
+            int intTifCount = imageDecoder.getNumPages();
+            logger.info("该tif文件共有【" + intTifCount + "】页");
+
+            String strJpgPath;
+            String strJpgUrl;
+            if (intTifCount == 1) {
+                // 如果是单页tif文件，则转换的目标文件夹就在指定的位置
+                strJpgPath = strOutputFile.substring(0, strOutputFile.lastIndexOf("/"));
+            } else {
+                // 如果是多页tif文件，则在目标文件夹下，按照文件名再创建子目录，将转换后的文件放入此新建的子目录中
+                strJpgPath = strOutputFile.substring(0, strOutputFile.lastIndexOf("."));
+            }
+
+            // 处理目标文件夹，如果不存在则自动创建
+            File fileJpgPath = new File(strJpgPath);
+            if (!fileJpgPath.exists() && !fileJpgPath.mkdirs()) {
+                logger.error("{} 创建失败", strJpgPath);
+            }
+
+            // 循环，处理每页tif文件，转换为jpg
+            for (int i = 0; i < intTifCount; i++) {
+                String strJpg;
+                if (intTifCount == 1) {
+                    strJpg = strJpgPath + "/" + strFilePrefix + ".jpg";
+                    strJpgUrl = strFilePrefix + ".jpg";
+                } else {
+                    strJpg = strJpgPath + "/" + i + ".jpg";
+                    strJpgUrl = strFilePrefix + "/" + i + ".jpg";
+                }
+
+                File fileJpg = new File(strJpg);
+
+                // 如果文件不存在，则生成
+                if (!fileJpg.exists()) {
+                    RenderedImage renderedImage = imageDecoder.decodeAsRenderedImage(i);
+                    ParameterBlock pb = new ParameterBlock();
+                    pb.addSource(renderedImage);
+                    pb.add(fileJpg.toString());
+                    pb.add("JPEG");
+                    pb.add(jpegEncodeParam);
+
+                    RenderedOp renderedOp = JAI.create("filestore", pb);
+                    renderedOp.dispose();
+
+                    logger.info("每页分别保存至： " + fileJpg.getCanonicalPath());
+                } else {
+                    logger.info("JPG文件已存在： " + fileJpg.getCanonicalPath());
+                }
+
+                listImageFiles.add(strJpgUrl);
+            }
+
+            return listImageFiles;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            if (fileSeekStream != null) {
+                try {
+                    fileSeekStream.close();
+                } catch (IOException e) {
+                    logger.error(e.getMessage(), e);
+                }
+            }
+        }
+    }
+
+    /**
+     * 将Jpg图片转换为Pdf文件
+     *
+     * @param strJpgFile 输入的jpg的路径和文件名
+     * @param strPdfFile 输出的pdf的路径和文件名
+     */
+    public static void convertJpg2Pdf(String strJpgFile, String strPdfFile) {
+        Document document = new Document();
+        // 设置文档页边距
+        document.setMargins(0, 0, 0, 0);
+
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(strPdfFile);
+            PdfWriter.getInstance(document, fos);
+            // 打开文档
+            document.open();
+            // 获取图片的宽高
+            Image image = Image.getInstance(strJpgFile);
+            float floatImageHeight = image.getScaledHeight();
+            float floatImageWidth = image.getScaledWidth();
+            // 设置页面宽高与图片一致
+            Rectangle rectangle = new Rectangle(floatImageWidth, floatImageHeight);
+            document.setPageSize(rectangle);
+            // 图片居中
+            image.setAlignment(Image.ALIGN_CENTER);
+            //新建一页添加图片
+            document.newPage();
+            document.add(image);
+        } catch (Exception ioe) {
+            ioe.printStackTrace();
+        } finally {
+            //关闭文档
+            document.close();
+            try {
+                assert fos != null;
+                fos.flush();
+                fos.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+
+        }
+    }
+
+
+    /**
+     * 将Tif图片转换为Pdf文件（支持多页Tif）
+     *
+     * @param strTifFile 输入的tif的路径和文件名
+     * @param strPdfFile 输出的pdf的路径和文件名
+     * @return File
+     */
+    public static File convertTif2Pdf(String strTifFile, String strPdfFile) {
+        try {
+            RandomAccessFileOrArray rafa = new RandomAccessFileOrArray(strTifFile);
+
+            Document document = new Document();
+            // 设置文档页边距
+            document.setMargins(0, 0, 0, 0);
+
+            PdfWriter.getInstance(document, new FileOutputStream(strPdfFile));
+            document.open();
+            int intPages = TiffImage.getNumberOfPages(rafa);
+            Image image;
+            File filePDF;
+
+            if (intPages == 1) {
+                String strJpg = strTifFile.substring(0, strTifFile.lastIndexOf(".")) + ".jpg";
+                File fileJpg = new File(strJpg);
+                List<String> listPic2Jpg = convertTif2Jpg(strTifFile, strJpg);
+
+                if (listPic2Jpg != null && fileJpg.exists()) {
+                    convertJpg2Pdf(strJpg, strPdfFile);
+                }
+
+            } else {
+                for (int i = 1; i <= intPages; i++) {
+                    image = TiffImage.getTiffImage(rafa, i);
+                    // 设置页面宽高与图片一致
+                    Rectangle pageSize = new Rectangle(image.getScaledWidth(), image.getScaledHeight());
+                    document.setPageSize(pageSize);
+                    // 图片居中
+                    image.setAlignment(Image.ALIGN_CENTER);
+                    //新建一页添加图片
+                    document.newPage();
+                    document.add(image);
+                }
+
+                document.close();
+            }
+
+            rafa.close();
+
+            filePDF = new File(strPdfFile);
+
+            return filePDF;
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+        }
+        return null;
+    }
+
+}

server/src/main/java/cn/keking/utils/DownloadUtils.java

@@ -32,11 +32,12 @@ public class DownloadUtils {
      * @return 本地文件绝对路径
      */
     public static ReturnResponse<String> downLoad(FileAttribute fileAttribute, String fileName) {
-        String urlStr = fileAttribute.getUrl();
+        String urlStr = fileAttribute.getUrl().replaceAll("\\+", "%20");
         ReturnResponse<String> response = new ReturnResponse<>(0, "下载成功!!!", "");
         String realPath = DownloadUtils.getRelFilePath(fileName, fileAttribute);
         try {
             URL url = WebUtils.normalizedURL(urlStr);
+            if (!fileAttribute.getSkipDownLoad()) {
                 if (isHttpUrl(url)) {
                     File realFile = new File(realPath);
                     FileUtils.copyURLToFile(url, realFile);
@@ -49,6 +50,7 @@ public class DownloadUtils {
                     response.setCode(1);
                     response.setMsg("url不能识别url" + urlStr);
                 }
+            }
             response.setContent(realPath);
             response.setMsg(fileName);
             return response;
@@ -85,6 +87,13 @@ public class DownloadUtils {
         if (!dirFile.exists() && !dirFile.mkdirs()) {
             logger.error("创建目录【{}】失败,可能是权限不够，请检查", fileDir);
         }
+
+        // 文件已在本地存在，跳过文件下载
+        File realFile = new File(realPath);
+        if (realFile.exists()) {
+            fileAttribute.setSkipDownLoad(true);
+        }
+
         return realPath;
     }
 

server/src/main/java/cn/keking/utils/EncodingDetects.java

@@ -402,7 +402,7 @@ class BytesEncodingDetect extends Encoding {
         int row, column;
         rawtextlen = rawtext.length;
         for (i = 0; i < rawtextlen; i++) {
-            if (rawtext[i] == '~') {
+            if (rawtext[i] == '~' && i < rawtextlen - 1) {
                 if (rawtext[i + 1] == '{') {
                     hzstart++;
                     i += 2;

server/src/main/java/cn/keking/utils/FileHeaderRar.java

@@ -0,0 +1,28 @@
+package cn.keking.utils;
+
+public class FileHeaderRar {
+
+  private String fileNameW;
+  private Boolean isDirectory;
+
+  public FileHeaderRar(String fileNameW, Boolean isDirectory) {
+    this.fileNameW = fileNameW;
+    this.isDirectory = isDirectory;
+  }
+
+  public String getFileNameW() {
+    return fileNameW;
+  }
+
+  public void setFileNameW(String fileNameW) {
+    this.fileNameW = fileNameW;
+  }
+
+  public Boolean getDirectory() {
+    return isDirectory;
+  }
+
+  public void setDirectory(Boolean directory) {
+    isDirectory = directory;
+  }
+}