忽略log目录

2、合理设置预览消费队列的线程数

.gitignore

@@ -27,5 +27,6 @@ nbdist/
 ### VS Code ###
 .vscode/
 
-jodconverter-web/src/main/cache/
-jodconverter-web/src/main/file/
+server/src/main/cache/
+server/src/main/file/
+server/src/main/log

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 MAINTAINER chenjh "842761733@qq.com"
-ADD jodconverter-web/target/kkFileView-*.tar.gz /opt/
+ADD server/target/kkFileView-*.tar.gz /opt/
 COPY fonts/* /usr/share/fonts/chienes/
 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 &&\
@@ -9,7 +9,10 @@ RUN echo "deb http://mirrors.aliyun.com/ubuntu/ focal main restricted universe m
 	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 &&\
-	cd /tmp &&\
+	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 &&\
 	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/server-jre-8u251-linux-x64.tar.gz && mv /tmp/jdk1.8.0_251 /usr/local/ &&\

README.md

@@ -28,8 +28,9 @@
 ### 联系我们，加入组织
 > 我们会用心回答解决大家在项目使用中的问题，也请大家在提问前至少Google或baidu过，珍爱生命远离无效的交流沟通
 
-![输入图片说明](https://gitee.com/uploads/images/2017/1219/173717_934cb068_492218.png "屏幕截图.png")
-QQ群号：613025121
+![](./doc/KK开源技术交流2群群聊二维码.png) 
+
+QQ群号：~~613025121(已满)~~  2群：484680571
 
 ### 文档预览效果
 #### 1. 文本预览

jodconverter-web/src/main/java/cn/keking/model/FileType.java

@@ -1,27 +0,0 @@
-package cn.keking.model;
-
-/**
- * Created by kl on 2018/1/17.
- * Content :文件类型，文本，office，压缩包等等
- */
-public enum FileType {
-    picture("pictureFilePreviewImpl"),
-    compress("compressFilePreviewImpl"),
-    office("officeFilePreviewImpl"),
-    simText("simTextFilePreviewImpl"),
-    pdf("pdfFilePreviewImpl"),
-    other("otherFilePreviewImpl"),
-    media("mediaFilePreviewImpl"),
-    cad("cadFilePreviewImpl");
-
-    private final String instanceName;
-
-    FileType(String instanceName){
-        this.instanceName=instanceName;
-    }
-
-    public String getInstanceName() {
-        return instanceName;
-    }
-
-}

jodconverter-web/src/main/java/cn/keking/utils/FileCharsetDetector.java

@@ -1,157 +0,0 @@
-package cn.keking.utils;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.mozilla.intl.chardet.nsDetector;
-import org.mozilla.intl.chardet.nsICharsetDetectionObserver;
-
-/**
- * 文本文件编码探测工具类
- *
- * @author HWliao
- * @date 2017-12-24
- */
-public class FileCharsetDetector {
-
-  /**
-   * 传入一个文件(File)对象，检查文件编码
-   *
-   * @param file File对象实例
-   * @return 文件编码，若无，则返回null
-   * @throws FileNotFoundException
-   * @throws IOException
-   */
-  public static Observer guessFileEncoding(File file)
-      throws FileNotFoundException, IOException {
-    return guessFileEncoding(file, new nsDetector());
-  }
-
-  /**
-   * <pre>
-   * 获取文件的编码
-   * @param file
-   *            File对象实例
-   * @param languageHint
-   *            语言提示区域代码 @see #nsPSMDetector ,取值如下：
-   *             1 : Japanese
-   *             2 : Chinese
-   *             3 : Simplified Chinese
-   *             4 : Traditional Chinese
-   *             5 : Korean
-   *             6 : Dont know(default)
-   * </pre>
-   *
-   * @return 文件编码，eg：UTF-8,GBK,GB2312形式(不确定的时候，返回可能的字符编码序列)；若无，则返回null
-   * @throws FileNotFoundException
-   * @throws IOException
-   */
-  public static Observer guessFileEncoding(File file, int languageHint)
-      throws FileNotFoundException, IOException {
-    return guessFileEncoding(file, new nsDetector(languageHint));
-  }
-
-  /**
-   * 获取文件的编码
-   *
-   * @param file
-   * @param det
-   * @return
-   * @throws FileNotFoundException
-   * @throws IOException
-   */
-  private static Observer guessFileEncoding(File file, nsDetector det)
-      throws FileNotFoundException, IOException {
-    // new Observer
-    Observer observer = new Observer();
-    // set Observer
-    // The Notify() will be called when a matching charset is found.
-    det.Init(observer);
-
-    BufferedInputStream imp = new BufferedInputStream(new FileInputStream(
-        file));
-    byte[] buf = new byte[1024];
-    int len;
-    boolean done = false;
-    boolean isAscii = false;
-
-    while ((len = imp.read(buf, 0, buf.length)) != -1) {
-      // Check if the stream is only ascii.
-      isAscii = det.isAscii(buf, len);
-      if (isAscii) {
-        break;
-      }
-      // DoIt if non-ascii and not done yet.
-      done = det.DoIt(buf, len, false);
-      if (done) {
-        break;
-      }
-    }
-    imp.close();
-    det.DataEnd();
-
-    if (isAscii) {
-      observer.encoding = "ASCII";
-      observer.found = true;
-    }
-
-    if (!observer.isFound()) {
-      String[] prob = det.getProbableCharsets();
-      // // 这里将可能的字符集组合起来返回
-      // for (int i = 0; i < prob.length; i++) {
-      // if (i == 0) {
-      // encoding = prob[i];
-      // } else {
-      // encoding += "," + prob[i];
-      // }
-      // }
-      if (prob.length > 0) {
-        // 在没有发现情况下,去第一个可能的编码
-        observer.encoding = prob[0];
-      } else {
-        observer.encoding = null;
-      }
-    }
-    return observer;
-  }
-
-  /**
-   * @author liaohongwei
-   * @Description: 文件字符编码观察者, 但判断出字符编码时候调用
-   * @date 2016年6月20日 下午2:27:06
-   */
-  public static class Observer implements nsICharsetDetectionObserver {
-
-    /**
-     * @Fields encoding : 字符编码
-     */
-    private String encoding = null;
-    /**
-     * @Fields found : 是否找到字符集
-     */
-    private boolean found = false;
-
-    @Override
-    public void Notify(String charset) {
-      this.encoding = charset;
-      this.found = true;
-    }
-
-    public String getEncoding() {
-      return encoding;
-    }
-
-    public boolean isFound() {
-      return found;
-    }
-
-    @Override
-    public String toString() {
-      return "Observer [encoding=" + encoding + ", found=" + found + "]";
-    }
-  }
-
-}

jodconverter-web/src/main/resources/web/txt.ftl

@@ -1,56 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
-    <title>普通文本预览</title>
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-        }
-        html, body {
-            height: 100%;
-            width: 100%;
-        }
-    </style>
-</head>
-<body>
-<div id = "text"></div>
-<script src="js/jquery-3.0.0.min.js" type="text/javascript"></script>
-<script src="js/watermark.js" type="text/javascript"></script>
-<script>
-    /*初始化水印*/
-    window.onload = function() {
-        var watermarkTxt = '${watermarkTxt}';
-        if (watermarkTxt !== '') {
-            watermark.init({
-                watermark_txt: '${watermarkTxt}',
-                watermark_x: 0,
-                watermark_y: 0,
-                watermark_rows: 0,
-                watermark_cols: 0,
-                watermark_x_space: ${watermarkXSpace},
-                watermark_y_space: ${watermarkYSpace},
-                watermark_font: '${watermarkFont}',
-                watermark_fontsize: '${watermarkFontsize}',
-                watermark_color:'${watermarkColor}',
-                watermark_alpha: ${watermarkAlpha},
-                watermark_width: ${watermarkWidth},
-                watermark_height: ${watermarkHeight},
-                watermark_angle: ${watermarkAngle},
-            });
-        }
-        $.ajax({
-            type: 'GET',
-            url: '${ordinaryUrl}',
-            success: function (data) {
-                $("#text").html("<pre>" + data + "</pre>");
-            }
-        });
-    }
-
-</script>
-</body>
-
-</html>

office-plugin/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.keking</groupId>
-    <artifactId>jodconverter-core</artifactId>
+    <artifactId>office-plugin</artifactId>
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>

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

@@ -19,6 +19,7 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
 
+import org.artofsolving.jodconverter.util.ConfigUtils;
 import org.artofsolving.jodconverter.util.PlatformUtils;
 
 import com.sun.star.beans.PropertyValue;
@@ -55,7 +56,7 @@ public class OfficeUtils {
                 Map<String,Object> subProperties = (Map<String,Object>) value;
                 value = toUnoProperties(subProperties);
             }
-            propertyValues[i++] = property((String) entry.getKey(), value);
+            propertyValues[i++] = property(entry.getKey(), value);
         }
         return propertyValues;
     }
@@ -68,7 +69,7 @@ public class OfficeUtils {
 
     public static File getDefaultOfficeHome() {
         Properties properties = new Properties();
-        String customizedConfigPath = getCustomizedConfigPath();
+        String customizedConfigPath = ConfigUtils.getCustomizedConfigPath();
         try {
             BufferedReader bufferedReader = new BufferedReader(new FileReader(customizedConfigPath));
             properties.load(bufferedReader);
@@ -80,7 +81,7 @@ public class OfficeUtils {
         }
         if (PlatformUtils.isWindows()) {
             // %ProgramFiles(x86)% on 64-bit machines; %ProgramFiles% on 32-bit ones
-            String homePath = OfficeUtils.getHomePath();
+            String homePath = ConfigUtils.getHomePath();
             String programFiles = System.getenv("ProgramFiles(x86)");
             if (programFiles == null) {
                 programFiles = System.getenv("ProgramFiles");
@@ -127,30 +128,7 @@ public class OfficeUtils {
         }
     }
 
-    public static String getHomePath() {
-        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);
-        } else {
-            String separator = File.separator;
-            if (userDir.contains("jodconverter-web")) {
-                userDir = userDir + separator + "src" + separator +  "main";
-            } else {
-                userDir = userDir + separator + "jodconverter-web" + separator + "src" + separator + "main";
-            }
-        }
-        return userDir;
-    }
 
-    public static String getCustomizedConfigPath() {
-        String homePath = OfficeUtils.getHomePath();
-        String separator = java.io.File.separator;
-        String configFilePath = homePath + separator + "config" + separator + "application.properties";
-        return configFilePath;
-    }
 
     /**
      * SpringBoot application.properties 支持从环境变量获取值

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

@@ -0,0 +1,36 @@
+package org.artofsolving.jodconverter.util;
+
+
+import java.io.File;
+
+/**
+ * @author : kl
+ **/
+public class ConfigUtils {
+
+    private static final String MAIN_DIRECTORY_NAME = "server";
+
+    public static String getHomePath() {
+        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);
+        } else {
+            String separator = File.separator;
+            if (userDir.contains(MAIN_DIRECTORY_NAME)) {
+                userDir = userDir + separator + "src" + separator +  "main";
+            } else {
+                userDir = userDir + separator + MAIN_DIRECTORY_NAME + separator + "src" + separator + "main";
+            }
+        }
+        return userDir;
+    }
+
+    public static String getCustomizedConfigPath() {
+        String homePath = getHomePath();
+        String separator = java.io.File.separator;
+        return homePath + separator + "config" + separator + "application.properties";
+    }
+}

pom.xml

@@ -7,8 +7,8 @@
     <artifactId>filepreview</artifactId>
     <version>2.2.1</version>
     <modules>
-        <module>jodconverter-core</module>
-        <module>jodconverter-web</module>
+        <module>office-plugin</module>
+        <module>server</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -33,5 +33,5 @@
     </profiles>
 
     <name>file-online-preview</name>
-    <description>Demo project for Spring Boot</description>
+    <description>专注文件在线预览服务</description>
 </project>

server/pom.xml

@@ -14,12 +14,12 @@
     <artifactId>kkFileView</artifactId>
     <version>2.2.1</version>
 
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
     </properties>
+
     <repositories>
         <repository>
             <!-- required for org.hyperic:sigar -->
@@ -35,12 +35,18 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-            <version>4.11</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -48,7 +54,7 @@
         </dependency>
         <dependency>
             <groupId>cn.keking</groupId>
-            <artifactId>jodconverter-core</artifactId>
+            <artifactId>office-plugin</artifactId>
             <version>1.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
@@ -158,12 +164,7 @@
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.6</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>19.0</version>
+            <version>1.4.15</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
@@ -192,6 +193,14 @@
             <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>
     </dependencies>
     <build>
         <resources>

server/src/main/config/application.properties

@@ -53,6 +53,9 @@ simText = ${KK_SIMTEXT:txt,html,htm,asp,jsp,xml,json,properties,md,gitignore,log
 media = ${KK_MEDIA:mp3,wav,mp4,flv}
 #office类型文档(word ppt)样式，默认为图片(image)，可配置为pdf（预览时也有按钮切换）
 office.preview.type = ${KK_OFFICE_PREVIEW_TYPE:image}
+#是否关闭office预览切换开关，默认为false，可配置为true关闭
+office.preview.switch.disabled = ${KK_OFFICE_PREVIEW_SWITCH_DISABLED:false}
+
 #是否禁止下载转换生成的pdf文件
 pdf.download.disable = ${KK_PDF_DOWNLOAD_DISABLE:true}
 

server/src/main/config/freemarker_implicit.ftl

@@ -0,0 +1,22 @@
+[#ftl]
+[#-- @implicitly included --]
+[#-- @ftlvariable name="imgUrls" type="String" --]
+[#-- @ftlvariable name="textData" type="java.lang.String" --]
+[#-- @ftlvariable name="xmlContent" type="java.lang.String" --]
+[#-- @ftlvariable name="textContent" type="java.lang.String" --]
+[#-- @ftlvariable name="textType" type="java.lang.String" --]
+[#-- @ftlvariable name="markdown" type="String" --]
+[#-- @ftlvariable name="xml" type="String" --]
+[#-- @ftlvariable name="switchDisabled" type="String" --]
+[#-- @ftlvariable name="imgurls" type="String" --]
+[#-- @ftlvariable name="watermarkAngle" type="String" --]
+[#-- @ftlvariable name="watermarkHeight" type="String" --]
+[#-- @ftlvariable name="watermarkWidth" type="String" --]
+[#-- @ftlvariable name="watermarkAlpha" type="String" --]
+[#-- @ftlvariable name="watermarkColor" type="String" --]
+[#-- @ftlvariable name="watermarkFontsize" type="String" --]
+[#-- @ftlvariable name="watermarkFont" type="String" --]
+[#-- @ftlvariable name="watermarkYSpace" type="String" --]
+[#-- @ftlvariable name="watermarkXSpace" type="String" --]
+[#-- @ftlvariable name="watermarkTxt" type="String" --]
+[#-- @ftlvariable name="ordinaryUrl" type="String" --]

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

@@ -8,8 +8,15 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
 @EnableScheduling
 @ComponentScan(value = "cn.keking.*")
-public class FilePreviewApplication {
+public class ServerMain {
+
 	public static void main(String[] args) {
-        SpringApplication.run(FilePreviewApplication.class, args);
+		ServerMain.staticInitSystemProperty();
+        SpringApplication.run(ServerMain.class, args);
+	}
+
+	private static void staticInitSystemProperty(){
+		//pdfbox兼容低版本jdk
+		System.setProperty("sun.java2d.cmm", "sun.java2d.cmm.kcms.KcmsServiceProvider");
 	}
 }

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

@@ -1,6 +1,6 @@
 package cn.keking.config;
 
-import org.artofsolving.jodconverter.office.OfficeUtils;
+import org.artofsolving.jodconverter.util.ConfigUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -20,11 +20,12 @@ public class ConfigConstants {
     private static String[] SIM_TEXT = {};
     private static String[] MEDIA = {};
     private static String OFFICE_PREVIEW_TYPE;
+    private static String OFFICE_PREVIEW_SWITCH_DISABLED;
     private static String FTP_USERNAME;
     private static String FTP_PASSWORD;
     private static String FTP_CONTROL_ENCODING;
     private static String BASE_URL;
-    private static String FILE_DIR = OfficeUtils.getHomePath() + File.separator + "file" + File.separator;
+    private static String FILE_DIR = ConfigUtils.getHomePath() + File.separator + "file" + File.separator;
     private static CopyOnWriteArraySet<String> TRUST_HOST_SET;
     private static String PDF_DOWNLOAD_DISABLE;
 
@@ -32,6 +33,7 @@ public class ConfigConstants {
     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";
     public static final String DEFAULT_MEDIA_TYPE = "mp3,wav,mp4,flv";
     public static final String DEFAULT_OFFICE_PREVIEW_TYPE = "image";
+    public static final String DEFAULT_OFFICE_PREVIEW_SWITCH_DISABLED = "false";
     public static final String DEFAULT_FTP_USERNAME = null;
     public static final String DEFAULT_FTP_PASSWORD = null;
     public static final String DEFAULT_FTP_CONTROL_ENCODING = "UTF-8";
@@ -156,7 +158,7 @@ public class ConfigConstants {
     }
 
     public static void setFileDirValue(String fileDir) {
-        if (!DEFAULT_FILE_DIR_VALUE.equals(fileDir.toLowerCase())) {
+        if (!DEFAULT_FILE_DIR_VALUE.equalsIgnoreCase(fileDir)) {
             if (!fileDir.endsWith(File.separator)) {
                 fileDir = fileDir + File.separator;
             }
@@ -171,7 +173,7 @@ public class ConfigConstants {
 
     public static void setTrustHostValue(String trustHost) {
         CopyOnWriteArraySet<String> trustHostSet;
-        if (DEFAULT_TRUST_HOST.equals(trustHost.toLowerCase())) {
+        if (DEFAULT_TRUST_HOST.equalsIgnoreCase(trustHost)) {
             trustHostSet = new CopyOnWriteArraySet<>();
         } else {
             String[] trustHostArray = trustHost.toLowerCase().split(",");
@@ -202,4 +204,14 @@ public class ConfigConstants {
         PDF_DOWNLOAD_DISABLE = pdfDownloadDisable;
     }
 
+    public static String getOfficePreviewSwitchDisabled() {
+        return OFFICE_PREVIEW_SWITCH_DISABLED;
+    }
+    @Value("${office.preview.switch.disabled:true}")
+    public void setOfficePreviewSwitchDisabled(String officePreviewSwitchDisabled) {
+        OFFICE_PREVIEW_SWITCH_DISABLED = officePreviewSwitchDisabled;
+    }
+    public static void setOfficePreviewSwitchDisabledValue(String officePreviewSwitchDisabled) {
+        OFFICE_PREVIEW_SWITCH_DISABLED = officePreviewSwitchDisabled;
+    }
 }

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

@@ -1,5 +1,7 @@
 package cn.keking.model;
 
+import cn.keking.config.ConfigConstants;
+
 /**
  * Created by kl on 2018/1/17.
  * Content :
@@ -7,12 +9,11 @@ package cn.keking.model;
 public class FileAttribute {
 
     private FileType type;
-
     private String suffix;
-
     private String name;
-
     private String url;
+    private String fileKey;
+    private String officePreviewType = ConfigConstants.getOfficePreviewType();
 
     public FileAttribute() {
     }
@@ -24,6 +25,30 @@ public class FileAttribute {
         this.url = url;
     }
 
+    public FileAttribute(FileType type, String suffix, String name, String url, String officePreviewType) {
+        this.type = type;
+        this.suffix = suffix;
+        this.name = name;
+        this.url = url;
+        this.officePreviewType = officePreviewType;
+    }
+
+    public String getFileKey() {
+        return fileKey;
+    }
+
+    public void setFileKey(String fileKey) {
+        this.fileKey = fileKey;
+    }
+
+    public String getOfficePreviewType() {
+        return officePreviewType;
+    }
+
+    public void setOfficePreviewType(String officePreviewType) {
+        this.officePreviewType = officePreviewType;
+    }
+
     public FileType getType() {
         return type;
     }

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

@@ -0,0 +1,67 @@
+package cn.keking.model;
+
+import cn.keking.config.ConfigConstants;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by kl on 2018/1/17.
+ * Content :文件类型，文本，office，压缩包等等
+ */
+public enum FileType {
+    picture("pictureFilePreviewImpl"),
+    compress("compressFilePreviewImpl"),
+    office("officeFilePreviewImpl"),
+    simText("simTextFilePreviewImpl"),
+    pdf("pdfFilePreviewImpl"),
+    other("otherFilePreviewImpl"),
+    media("mediaFilePreviewImpl"),
+    markdown("markdownFilePreviewImpl"),
+    xml("xmlFilePreviewImpl"),
+    cad("cadFilePreviewImpl");
+
+    private static final String[] OFFICE_TYPES = {"docx", "doc", "xls", "xlsx", "ppt", "pptx"};
+    private static final String[] PICTURE_TYPES = {"jpg", "jpeg", "png", "gif", "bmp", "ico", "RAW"};
+    private static final String[] ARCHIVE_TYPES = {"rar", "zip", "jar", "7-zip", "tar", "gzip", "7z"};
+    private static final String[] SIMTEXT_TYPES = ConfigConstants.getSimText();
+    private static final String[] MEDIA_TYPES = ConfigConstants.getMedia();
+    private static final Map<String, FileType> FILE_TYPE_MAPPER = new HashMap<>();
+
+    static {
+        for (String office : OFFICE_TYPES) {
+            FILE_TYPE_MAPPER.put(office, FileType.office);
+        }
+        for (String picture : PICTURE_TYPES) {
+            FILE_TYPE_MAPPER.put(picture, FileType.picture);
+        }
+        for (String archive : ARCHIVE_TYPES) {
+            FILE_TYPE_MAPPER.put(archive, FileType.compress);
+        }
+        for (String text : SIMTEXT_TYPES) {
+            FILE_TYPE_MAPPER.put(text, FileType.simText);
+        }
+        for (String media : MEDIA_TYPES) {
+            FILE_TYPE_MAPPER.put(media, FileType.media);
+        }
+        FILE_TYPE_MAPPER.put("md", FileType.markdown);
+        FILE_TYPE_MAPPER.put("xml", FileType.xml);
+        FILE_TYPE_MAPPER.put("pdf", FileType.pdf);
+        FILE_TYPE_MAPPER.put("dwg", FileType.cad);
+    }
+
+    public static FileType to(String fileType){
+        return FILE_TYPE_MAPPER.getOrDefault(fileType,other);
+    }
+
+    private final String instanceName;
+
+    FileType(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+    public String getInstanceName() {
+        return instanceName;
+    }
+
+}

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

@@ -1,15 +1,14 @@
-package cn.keking.utils;
+package cn.keking.service;
 
 import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileType;
+import cn.keking.utils.FileUtils;
 import cn.keking.web.filter.BaseUrlFilter;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.junrar.Archive;
 import com.github.junrar.exception.RarException;
 import com.github.junrar.rarfile.FileHeader;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import org.apache.commons.compress.archivers.sevenz.SevenZArchiveEntry;
 import org.apache.commons.compress.archivers.sevenz.SevenZFile;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
@@ -27,37 +26,34 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- *
  * @author yudian-it
- * @date 2017/11/27
+ * create 2017/11/27
  */
 @Component
-public class ZipReader {
-    static Pattern pattern = Pattern.compile("^\\d+");
-
-    private final FileUtils fileUtils;
+public class CompressFileReader {
 
+    private static final Pattern pattern = Pattern.compile("^\\d+");
+    private final FileHandlerService fileHandlerService;
     private final String fileDir = ConfigConstants.getFileDir();
-
     private final ExecutorService executors = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 
-    public ZipReader(FileUtils fileUtils) {
-        this.fileUtils = fileUtils;
+    public CompressFileReader(FileHandlerService fileHandlerService) {
+        this.fileHandlerService = fileHandlerService;
     }
 
-    public String readZipFile(String filePath,String fileKey) {
+    public String readZipFile(String filePath, String fileKey) {
         String archiveSeparator = "/";
-        Map<String, FileNode> appender = Maps.newHashMap();
-        List<String> imgUrls = Lists.newArrayList();
+        Map<String, FileNode> appender = new HashMap<>();
+        List<String> imgUrls = new LinkedList<>();
         String baseUrl = BaseUrlFilter.getBaseUrl();
-        String archiveFileName = fileUtils.getFileNameFromPath(filePath);
+        String archiveFileName = fileHandlerService.getFileNameFromPath(filePath);
         try {
-            ZipFile zipFile = new ZipFile(filePath, fileUtils.getFileEncodeUTFGBK(filePath));
+            ZipFile zipFile = new ZipFile(filePath, FileUtils.getFileEncode(filePath));
             Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
             // 排序
             entries = sortZipEntries(entries);
-            List<Map<String, ZipArchiveEntry>> entriesToBeExtracted = Lists.newArrayList();
-            while (entries.hasMoreElements()){
+            List<Map<String, ZipArchiveEntry>> entriesToBeExtracted = new LinkedList<>();
+            while (entries.hasMoreElements()) {
                 ZipArchiveEntry entry = entries.nextElement();
                 String fullName = entry.getName();
                 int level = fullName.split(archiveSeparator).length;
@@ -70,10 +66,10 @@ public class ZipReader {
                     entriesToBeExtracted.add(Collections.singletonMap(childName, entry));
                 }
                 String parentName = getLast2FileName(fullName, archiveSeparator, archiveFileName);
-                parentName = (level-1) + "_" + parentName;
-                FileType type=fileUtils.typeFromUrl(childName);
-                if (type.equals(FileType.picture)){//添加图片文件到图片列表
-                    imgUrls.add(baseUrl+childName);
+                parentName = (level - 1) + "_" + parentName;
+                FileType type = fileHandlerService.typeFromUrl(childName);
+                if (type.equals(FileType.picture)) {//添加图片文件到图片列表
+                    imgUrls.add(baseUrl + childName);
                 }
                 FileNode node = new FileNode(originName, childName, parentName, new ArrayList<>(), directory, fileKey);
                 addNodes(appender, parentName, node);
@@ -81,7 +77,7 @@ public class ZipReader {
             }
             // 开启新的线程处理文件解压
             executors.submit(new ZipExtractorWorker(entriesToBeExtracted, zipFile, filePath));
-            fileUtils.putImgCache(fileKey,imgUrls);
+            fileHandlerService.putImgCache(fileKey, imgUrls);
             return new ObjectMapper().writeValueAsString(appender.get(""));
         } catch (IOException e) {
             e.printStackTrace();
@@ -90,29 +86,29 @@ public class ZipReader {
     }
 
     private Enumeration<ZipArchiveEntry> sortZipEntries(Enumeration<ZipArchiveEntry> entries) {
-        List<ZipArchiveEntry> sortedEntries = Lists.newArrayList();
-        while(entries.hasMoreElements()){
+        List<ZipArchiveEntry> sortedEntries = new LinkedList<>();
+        while (entries.hasMoreElements()) {
             sortedEntries.add(entries.nextElement());
         }
         sortedEntries.sort(Comparator.comparingInt(o -> o.getName().length()));
         return Collections.enumeration(sortedEntries);
     }
 
-    public String unRar(String filePath,String fileKey){
-        Map<String, FileNode> appender = Maps.newHashMap();
-        List<String> imgUrls = Lists.newArrayList();
+    public String unRar(String filePath, String fileKey) {
+        Map<String, FileNode> appender = new HashMap<>();
+        List<String> imgUrls = new ArrayList<>();
         String baseUrl = BaseUrlFilter.getBaseUrl();
         try {
-            Archive archive = new Archive(new FileInputStream(new File(filePath)));
+            Archive archive = new Archive(new FileInputStream(filePath));
             List<FileHeader> headers = archive.getFileHeaders();
             headers = sortedHeaders(headers);
-            String archiveFileName = fileUtils.getFileNameFromPath(filePath);
-            List<Map<String, FileHeader>> headersToBeExtracted = Lists.newArrayList();
+            String archiveFileName = fileHandlerService.getFileNameFromPath(filePath);
+            List<Map<String, FileHeader>> headersToBeExtracted = new ArrayList<>();
             for (FileHeader header : headers) {
                 String fullName;
                 if (header.isUnicode()) {
                     fullName = header.getFileNameW();
-                }else {
+                } else {
                     fullName = header.getFileNameString();
                 }
                 // 展示名
@@ -124,16 +120,16 @@ public class ZipReader {
                     headersToBeExtracted.add(Collections.singletonMap(childName, header));
                 }
                 String parentName = getLast2FileName(fullName, "\\", archiveFileName);
-                FileType type = fileUtils.typeFromUrl(childName);
-                if (type.equals(FileType.picture)){//添加图片文件到图片列表
-                    imgUrls.add(baseUrl+childName);
+                FileType type = fileHandlerService.typeFromUrl(childName);
+                if (type.equals(FileType.picture)) {//添加图片文件到图片列表
+                    imgUrls.add(baseUrl + childName);
                 }
                 FileNode node = new FileNode(originName, childName, parentName, new ArrayList<>(), directory, fileKey);
                 addNodes(appender, parentName, node);
                 appender.put(childName, node);
             }
             executors.submit(new RarExtractorWorker(headersToBeExtracted, archive, filePath));
-            fileUtils.putImgCache(fileKey,imgUrls);
+            fileHandlerService.putImgCache(fileKey, imgUrls);
             return new ObjectMapper().writeValueAsString(appender.get(""));
         } catch (RarException | IOException e) {
             e.printStackTrace();
@@ -141,19 +137,19 @@ public class ZipReader {
         return null;
     }
 
-    public String read7zFile(String filePath,String fileKey) {
+    public String read7zFile(String filePath, String fileKey) {
         String archiveSeparator = "/";
-        Map<String, FileNode> appender = Maps.newHashMap();
-        List<String> imgUrls = Lists.newArrayList();
-        String baseUrl= BaseUrlFilter.getBaseUrl();
-        String archiveFileName = fileUtils.getFileNameFromPath(filePath);
+        Map<String, FileNode> appender = new HashMap<>();
+        List<String> imgUrls = new ArrayList<>();
+        String baseUrl = BaseUrlFilter.getBaseUrl();
+        String archiveFileName = fileHandlerService.getFileNameFromPath(filePath);
         try {
             SevenZFile zipFile = new SevenZFile(new File(filePath));
             Iterable<SevenZArchiveEntry> entries = zipFile.getEntries();
             // 排序
             Enumeration<SevenZArchiveEntry> newEntries = sortSevenZEntries(entries);
-            List<Map<String, SevenZArchiveEntry>> entriesToBeExtracted = Lists.newArrayList();
-            while (newEntries.hasMoreElements()){
+            List<Map<String, SevenZArchiveEntry>> entriesToBeExtracted = new ArrayList<>();
+            while (newEntries.hasMoreElements()) {
                 SevenZArchiveEntry entry = newEntries.nextElement();
                 String fullName = entry.getName();
                 int level = fullName.split(archiveSeparator).length;
@@ -166,10 +162,10 @@ public class ZipReader {
                     entriesToBeExtracted.add(Collections.singletonMap(childName, entry));
                 }
                 String parentName = getLast2FileName(fullName, archiveSeparator, archiveFileName);
-                parentName = (level-1) + "_" + parentName;
-                FileType type=fileUtils.typeFromUrl(childName);
-                if (type.equals(FileType.picture)){//添加图片文件到图片列表
-                    imgUrls.add(baseUrl+childName);
+                parentName = (level - 1) + "_" + parentName;
+                FileType type = fileHandlerService.typeFromUrl(childName);
+                if (type.equals(FileType.picture)) {//添加图片文件到图片列表
+                    imgUrls.add(baseUrl + childName);
                 }
                 FileNode node = new FileNode(originName, childName, parentName, new ArrayList<>(), directory, fileKey);
                 addNodes(appender, parentName, node);
@@ -177,7 +173,7 @@ public class ZipReader {
             }
             // 开启新的线程处理文件解压
             executors.submit(new SevenZExtractorWorker(entriesToBeExtracted, filePath));
-            fileUtils.putImgCache(fileKey,imgUrls);
+            fileHandlerService.putImgCache(fileKey, imgUrls);
             return new ObjectMapper().writeValueAsString(appender.get(""));
         } catch (IOException e) {
             e.printStackTrace();
@@ -187,7 +183,7 @@ public class ZipReader {
 
 
     private Enumeration<SevenZArchiveEntry> sortSevenZEntries(Iterable<SevenZArchiveEntry> entries) {
-        List<SevenZArchiveEntry> sortedEntries = Lists.newArrayList();
+        List<SevenZArchiveEntry> sortedEntries = new ArrayList<>();
         for (SevenZArchiveEntry entry : entries) {
             sortedEntries.add(entry);
         }
@@ -211,7 +207,7 @@ public class ZipReader {
         List<FileHeader> sortedHeaders = new ArrayList<>();
         Map<Integer, FileHeader> mapHeaders = new TreeMap<>();
         headers.forEach(header -> mapHeaders.put(new Integer(0).equals(header.getFileNameW().length()) ? header.getFileNameString().length() : header.getFileNameW().length(), header));
-        for (Map.Entry<Integer, FileHeader> entry : mapHeaders.entrySet()){
+        for (Map.Entry<Integer, FileHeader> entry : mapHeaders.entrySet()) {
             for (FileHeader header : headers) {
                 if (entry.getKey().equals(new Integer(0).equals(header.getFileNameW().length()) ? header.getFileNameString().length() : header.getFileNameW().length())) {
                     sortedHeaders.add(header);
@@ -223,7 +219,7 @@ public class ZipReader {
 
     private static String getLast2FileName(String fullName, String seperator, String rootName) {
         if (fullName.endsWith(seperator)) {
-            fullName = fullName.substring(0, fullName.length()-1);
+            fullName = fullName.substring(0, fullName.length() - 1);
         }
         // 1.获取剩余部分
         int endIndex = fullName.lastIndexOf(seperator);
@@ -238,7 +234,7 @@ public class ZipReader {
 
     private static String getLastFileName(String fullName, String seperator) {
         if (fullName.endsWith(seperator)) {
-            fullName = fullName.substring(0, fullName.length()-1);
+            fullName = fullName.substring(0, fullName.length() - 1);
         }
         String newName = fullName;
         if (fullName.contains(seperator)) {
@@ -249,10 +245,11 @@ public class ZipReader {
 
     public static Comparator<FileNode> sortComparator = new Comparator<FileNode>() {
         final Collator cmp = Collator.getInstance(Locale.US);
+
         @Override
         public int compare(FileNode o1, FileNode o2) {
             // 判断两个对比对象是否是开头包含数字，如果包含数字则获取数字并按数字真正大小进行排序
-            BigDecimal num1,num2;
+            BigDecimal num1, num2;
             if (null != (num1 = isStartNumber(o1))
                     && null != (num2 = isStartNumber(o2))) {
                 return num1.subtract(num2).intValue();
@@ -288,14 +285,16 @@ public class ZipReader {
             this.childList = childList;
             this.directory = directory;
         }
-        public FileNode(String originName, String fileName, String parentFileName, List<FileNode> childList, boolean directory,String fileKey) {
+
+        public FileNode(String originName, String fileName, String parentFileName, List<FileNode> childList, boolean directory, String fileKey) {
             this.originName = originName;
             this.fileName = fileName;
             this.parentFileName = parentFileName;
             this.childList = childList;
             this.directory = directory;
-            this.fileKey=fileKey;
+            this.fileKey = fileKey;
         }
+
         public String getFileKey() {
             return fileKey;
         }
@@ -383,17 +382,15 @@ public class ZipReader {
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            if (new File(filePath).exists()) {
-                new File(filePath).delete();
-            }
+            FileUtils.deleteFileByPath(filePath);
         }
 
         private void extractZipFile(String childName, InputStream zipFile) {
             String outPath = fileDir + childName;
-            try (OutputStream ot = new FileOutputStream(outPath)){
+            try (OutputStream ot = new FileOutputStream(outPath)) {
                 byte[] inByte = new byte[1024];
                 int len;
-                while ((-1 != (len = zipFile.read(inByte)))){
+                while ((-1 != (len = zipFile.read(inByte)))) {
                     ot.write(inByte, 0, len);
                 }
             } catch (IOException e) {
@@ -442,10 +439,7 @@ public class ZipReader {
             } catch (IOException e) {
                 e.printStackTrace();
             }
-
-            if (new File(filePath).exists()) {
-                new File(filePath).delete();
-            }
+            FileUtils.deleteFileByPath(filePath);
         }
     }
 
@@ -474,14 +468,12 @@ public class ZipReader {
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            if (new File(filePath).exists()) {
-                new File(filePath).delete();
-            }
+            FileUtils.deleteFileByPath(filePath);
         }
 
         private void extractRarFile(String childName, FileHeader header, Archive archive) {
             String outPath = fileDir + childName;
-            try(OutputStream ot = new FileOutputStream(outPath)) {
+            try (OutputStream ot = new FileOutputStream(outPath)) {
                 archive.extractFile(header, ot);
             } catch (IOException | RarException e) {
                 e.printStackTrace();

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

@@ -1,6 +1,9 @@
-package cn.keking.config;
+package cn.keking.service;
 
+import cn.keking.config.ConfigConstants;
+import cn.keking.config.WatermarkConfigConstants;
 import org.artofsolving.jodconverter.office.OfficeUtils;
+import org.artofsolving.jodconverter.util.ConfigUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -38,10 +41,11 @@ public class ConfigRefreshComponent {
                 String[] textArray;
                 String[] mediaArray;
                 String officePreviewType;
+                String officePreviewSwitchDisabled;
                 String ftpUsername;
                 String ftpPassword;
                 String ftpControlEncoding;
-                String configFilePath = OfficeUtils.getCustomizedConfigPath();
+                String configFilePath = ConfigUtils.getCustomizedConfigPath();
                 String baseUrl;
                 String trustHost;
                 String pdfDownloadDisable;
@@ -54,6 +58,7 @@ public class ConfigRefreshComponent {
                     text = properties.getProperty("simText", ConfigConstants.DEFAULT_TXT_TYPE);
                     media = properties.getProperty("media", ConfigConstants.DEFAULT_MEDIA_TYPE);
                     officePreviewType = properties.getProperty("office.preview.type", ConfigConstants.DEFAULT_OFFICE_PREVIEW_TYPE);
+                    officePreviewSwitchDisabled = properties.getProperty("office.preview.switch.disabled", ConfigConstants.DEFAULT_OFFICE_PREVIEW_TYPE);
                     ftpUsername = properties.getProperty("ftp.username", ConfigConstants.DEFAULT_FTP_USERNAME);
                     ftpPassword = properties.getProperty("ftp.password", ConfigConstants.DEFAULT_FTP_PASSWORD);
                     ftpControlEncoding = properties.getProperty("ftp.control.encoding", ConfigConstants.DEFAULT_FTP_CONTROL_ENCODING);
@@ -71,6 +76,7 @@ public class ConfigRefreshComponent {
                     ConfigConstants.setFtpControlEncodingValue(ftpControlEncoding);
                     ConfigConstants.setBaseUrlValue(baseUrl);
                     ConfigConstants.setTrustHostValue(trustHost);
+                    ConfigConstants.setOfficePreviewSwitchDisabledValue(officePreviewSwitchDisabled);
                     ConfigConstants.setPdfDownloadDisableValue(pdfDownloadDisable);
                     setWatermarkConfig(properties);
                     bufferedReader.close();

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

@@ -3,7 +3,6 @@ package cn.keking.service;
 import cn.keking.model.FileAttribute;
 import cn.keking.model.FileType;
 import cn.keking.service.cache.CacheService;
-import cn.keking.utils.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -20,44 +19,36 @@ import java.util.concurrent.Executors;
 public class FileConvertQueueTask {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
-
     private final FilePreviewFactory previewFactory;
-
     private final CacheService cacheService;
+    private final FileHandlerService fileHandlerService;
 
-    private final FileUtils fileUtils;
-
-    public FileConvertQueueTask(FilePreviewFactory previewFactory,
-                                CacheService cacheService,
-                                FileUtils fileUtils) {
+    public FileConvertQueueTask(FilePreviewFactory previewFactory, CacheService cacheService, FileHandlerService fileHandlerService) {
         this.previewFactory = previewFactory;
         this.cacheService = cacheService;
-        this.fileUtils=fileUtils;
+        this.fileHandlerService = fileHandlerService;
     }
 
     @PostConstruct
     public void startTask(){
-        ExecutorService executorService = Executors.newFixedThreadPool(3);
-        executorService.submit(new ConvertTask(previewFactory, cacheService, fileUtils));
+        ExecutorService executorService = Executors.newFixedThreadPool(1);
+        executorService.submit(new ConvertTask(previewFactory, cacheService, fileHandlerService));
         logger.info("队列处理文件转换任务启动完成 ");
     }
 
     static class ConvertTask implements Runnable {
 
         private final Logger logger = LoggerFactory.getLogger(ConvertTask.class);
-
         private final FilePreviewFactory previewFactory;
-
         private final CacheService cacheService;
-
-        private final FileUtils fileUtils;
+        private final FileHandlerService fileHandlerService;
 
         public ConvertTask(FilePreviewFactory previewFactory,
                            CacheService cacheService,
-                           FileUtils fileUtils) {
+                           FileHandlerService fileHandlerService) {
             this.previewFactory = previewFactory;
             this.cacheService = cacheService;
-            this.fileUtils=fileUtils;
+            this.fileHandlerService = fileHandlerService;
         }
 
         @Override
@@ -67,7 +58,7 @@ public class FileConvertQueueTask {
                 try {
                     url = cacheService.takeQueueTask();
                     if(url != null){
-                        FileAttribute fileAttribute = fileUtils.getFileAttribute(url);
+                        FileAttribute fileAttribute = fileHandlerService.getFileAttribute(url,null);
                         FileType fileType = fileAttribute.getType();
                         logger.info("正在处理预览转换任务，url：{}，预览类型：{}", url, fileType);
                         if(fileType.equals(FileType.compress) || fileType.equals(FileType.office) || fileType.equals(FileType.cad)) {

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

@@ -1,36 +1,31 @@
-package cn.keking.utils;
+package cn.keking.service;
 
 import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileAttribute;
 import cn.keking.model.FileType;
 import cn.keking.service.cache.CacheService;
-import com.google.common.collect.Lists;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.*;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
- *
  * @author yudian-it
  * @date 2017/11/13
  */
 @Component
-public class FileUtils {
+public class FileHandlerService {
 
     private static final String DEFAULT_CONVERTER_CHARSET = System.getProperty("sun.jnu.encoding");
-
     private final String fileDir = ConfigConstants.getFileDir();
-
     private final CacheService cacheService;
 
-    public FileUtils(CacheService cacheService) {
+    public FileHandlerService(CacheService cacheService) {
         this.cacheService = cacheService;
     }
 
@@ -65,96 +60,40 @@ public class FileUtils {
     public FileType typeFromUrl(String url) {
         String nonPramStr = url.substring(0, url.contains("?") ? url.indexOf("?") : url.length());
         String fileName = nonPramStr.substring(nonPramStr.lastIndexOf("/") + 1);
-        return typeFromFileName(fileName);
+        return this.typeFromFileName(fileName);
     }
 
     private FileType typeFromFileName(String fileName) {
-        String[] simText = ConfigConstants.getSimText();
-        String[] media = ConfigConstants.getMedia();
         String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
-        if (listPictureTypes().contains(fileType.toLowerCase())) {
-            return FileType.picture;
-        }
-        if (listArchiveTypes().contains(fileType.toLowerCase())) {
-            return FileType.compress;
-        }
-        if (listOfficeTypes().contains(fileType.toLowerCase())) {
-            return FileType.office;
-        }
-        if (Arrays.asList(simText).contains(fileType.toLowerCase())) {
-            return FileType.simText;
-        }
-        if (Arrays.asList(media).contains(fileType.toLowerCase())) {
-            return FileType.media;
-        }
-        if ("pdf".equalsIgnoreCase(fileType)) {
-            return FileType.pdf;
-        }
-        if ("dwg".equalsIgnoreCase(fileType)) {
-            return FileType.cad;
-        }
-        return FileType.other;
+        return FileType.to(fileType);
     }
+
     /**
      * 从url中剥离出文件名
-     * @param url
-     *      格式如：http://keking.ufile.ucloud.com.cn/20171113164107_月度绩效表模板(新).xls?UCloudPublicKey=ucloudtangshd@weifenf.com14355492830001993909323&Expires=&Signature=I D1NOFtAJSPT16E6imv6JWuq0k=
+     *
+     * @param url 格式如：http://www.com.cn/20171113164107_月度绩效表模板(新).xls?UCloudPublicKey=ucloudtangshd@weifenf.com14355492830001993909323&Expires=&Signature=I D1NOFtAJSPT16E6imv6JWuq0k=
      * @return 文件名
      */
     public String getFileNameFromURL(String url) {
         // 因为url的参数中可能会存在/的情况，所以直接url.lastIndexOf("/")会有问题
         // 所以先从？处将url截断，然后运用url.lastIndexOf("/")获取文件名
-        String noQueryUrl = url.substring(0, url.contains("?") ? url.indexOf("?"): url.length());
+        String noQueryUrl = url.substring(0, url.contains("?") ? url.indexOf("?") : url.length());
         return noQueryUrl.substring(noQueryUrl.lastIndexOf("/") + 1);
     }
 
     /**
      * 从路径中获取文件负
-     * @param path
-     *      类似这种：C:\Users\yudian-it\Downloads
+     *
+     * @param path 类似这种：C:\Users\yudian-it\Downloads
      * @return 文件名
      */
     public String getFileNameFromPath(String path) {
         return path.substring(path.lastIndexOf(File.separator) + 1);
     }
 
-    public List<String> listPictureTypes(){
-        List<String> list = Lists.newArrayList();
-        list.add("jpg");
-        list.add("jpeg");
-        list.add("png");
-        list.add("gif");
-        list.add("bmp");
-        list.add("ico");
-        list.add("RAW");
-        return list;
-    }
-
-    public List<String> listArchiveTypes(){
-        List<String> list = Lists.newArrayList();
-        list.add("rar");
-        list.add("zip");
-        list.add("jar");
-        list.add("7-zip");
-        list.add("tar");
-        list.add("gzip");
-        list.add("7z");
-        return list;
-    }
-
-    public List<String> listOfficeTypes() {
-        List<String> list = Lists.newArrayList();
-        list.add("docx");
-        list.add("doc");
-        list.add("xls");
-        list.add("xlsx");
-        list.add("ppt");
-        list.add("pptx");
-        return list;
-    }
-
     /**
      * 获取相对路径
+     *
      * @param absolutePath 绝对路径
      * @return 相对路径
      */
@@ -164,73 +103,55 @@ public class FileUtils {
 
     /**
      * 添加转换后PDF缓存
+     *
      * @param fileName pdf文件名
-     * @param value 缓存相对路径
+     * @param value    缓存相对路径
      */
-    public void addConvertedFile(String fileName, String value){
+    public void addConvertedFile(String fileName, String value) {
         cacheService.putPDFCache(fileName, value);
     }
 
     /**
      * 添加转换后图片组缓存
+     *
      * @param pdfFilePath pdf文件绝对路径
-     * @param num 图片张数
+     * @param num         图片张数
      */
-    public void addConvertedPdfImage(String pdfFilePath, int num){
+    public void addConvertedPdfImage(String pdfFilePath, int num) {
         cacheService.putPdfImageCache(pdfFilePath, num);
     }
 
     /**
      * 获取redis中压缩包内图片文件
+     *
      * @param fileKey fileKey
      * @return 图片文件访问url列表
      */
-    public List<String> getImgCache(String fileKey){
+    public List<String> getImgCache(String fileKey) {
         return cacheService.getImgCache(fileKey);
     }
 
     /**
      * 设置redis中压缩包内图片文件
+     *
      * @param fileKey fileKey
-     * @param imgs 图片文件访问url列表
+     * @param imgs    图片文件访问url列表
      */
-    public void putImgCache(String fileKey,List<String> imgs){
+    public void putImgCache(String fileKey, List<String> imgs) {
         cacheService.putImgCache(fileKey, imgs);
     }
-    /**
-     * 判断文件编码格式
-     * @param path 绝对路径
-     * @return 编码格式
-     */
-    public String getFileEncodeUTFGBK(String path){
-        String enc = Charset.forName("GBK").name();
-        File file = new File(path);
-        InputStream in;
-        try {
-            in = new FileInputStream(file);
-            byte[] b = new byte[3];
-            in.read(b);
-            in.close();
-            if (b[0] == -17 && b[1] == -69 && b[2] == -65) {
-                enc = StandardCharsets.UTF_8.name();
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        System.out.println("文件编码格式为:" + enc);
-        return enc;
-    }
 
     /**
      * 对转换后的文件进行操作(改变编码方式)
+     *
      * @param outFilePath 文件绝对路径
      */
     public void doActionConvertedFile(String outFilePath) {
         StringBuilder sb = new StringBuilder();
         try (InputStream inputStream = new FileInputStream(outFilePath);
-            BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, DEFAULT_CONVERTER_CHARSET))){
+             BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, DEFAULT_CONVERTER_CHARSET))) {
             String line;
-            while(null != (line = reader.readLine())){
+            while (null != (line = reader.readLine())) {
                 if (line.contains("charset=gb2312")) {
                     line = line.replace("charset=gb2312", "charset=utf-8");
                 }
@@ -244,15 +165,17 @@ public class FileUtils {
             e.printStackTrace();
         }
         // 重新写入文件
-        try(FileOutputStream fos = new FileOutputStream(outFilePath);
-            BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8))) {
+        try (FileOutputStream fos = new FileOutputStream(outFilePath);
+             BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(fos, StandardCharsets.UTF_8))) {
             writer.write(sb.toString());
         } catch (IOException e) {
             e.printStackTrace();
         }
     }
+
     /**
      * 获取文件后缀
+     *
      * @param url url
      * @return 文件后缀
      */
@@ -268,7 +191,8 @@ public class FileUtils {
 
     /**
      * 获取url中的参数
-     * @param url url
+     *
+     * @param url  url
      * @param name 参数名
      * @return 参数值
      */
@@ -280,10 +204,10 @@ public class FileUtils {
         }
         //每个键值为一组
         String[] arrSplit = strUrlParam.split("[&]");
-        for(String strSplit : arrSplit) {
+        for (String strSplit : arrSplit) {
             String[] arrSplitEqual = strSplit.split("[=]");
             //解析出键值
-            if(arrSplitEqual.length > 1) {
+            if (arrSplitEqual.length > 1) {
                 //正确解析
                 mapRequest.put(arrSplitEqual[0], arrSplitEqual[1]);
             } else if (!arrSplitEqual[0].equals("")) {
@@ -296,6 +220,7 @@ public class FileUtils {
 
     /**
      * 去掉url中的路径，留下请求参数部分
+     *
      * @param strURL url地址
      * @return url请求参数部分
      */
@@ -303,10 +228,10 @@ public class FileUtils {
         String strAllParam = null;
         strURL = strURL.trim();
         String[] arrSplit = strURL.split("[?]");
-        if(strURL.length() > 1)  {
-            if(arrSplit.length > 1) {
-                if(arrSplit[1] != null) {
-                    strAllParam=arrSplit[1];
+        if (strURL.length() > 1) {
+            if (arrSplit.length > 1) {
+                if (arrSplit[1] != null) {
+                    strAllParam = arrSplit[1];
                 }
             }
         }
@@ -315,23 +240,39 @@ public class FileUtils {
 
     /**
      * 获取文件属性
+     *
      * @param url url
      * @return 文件属性
      */
-    public FileAttribute getFileAttribute(String url) {
-        String fileName;
-        FileType type;
+    public FileAttribute getFileAttribute(String url, HttpServletRequest req) {
+        FileAttribute attribute = new FileAttribute();
         String suffix;
-        String fullFileName = getUrlParameterReg(url, "fullfilename");
-        if (!StringUtils.isEmpty(fullFileName)) {
+        FileType type;
+        String fileName;
+        String fullFileName = this.getUrlParameterReg(url, "fullfilename");
+        if (StringUtils.hasText(fullFileName)) {
             fileName = fullFileName;
-            type = typeFromFileName(fileName);
-            suffix = suffixFromFileName(fileName);
+            type = this.typeFromFileName(fullFileName);
+            suffix = suffixFromFileName(fullFileName);
         } else {
             fileName = getFileNameFromURL(url);
             type = typeFromUrl(url);
             suffix = suffixFromUrl(url);
         }
-        return new FileAttribute(type,suffix,fileName,url);
+        attribute.setType(type);
+        attribute.setName(fileName);
+        attribute.setSuffix(suffix);
+        attribute.setUrl(url);
+        if (req != null) {
+            String officePreviewType = req.getParameter("officePreviewType");
+            String fileKey = req.getParameter("fileKey");
+            if (StringUtils.hasText(officePreviewType)) {
+                attribute.setOfficePreviewType(officePreviewType);
+            }
+            if (StringUtils.hasText(fileKey)) {
+                attribute.setFileKey(fileKey);
+            }
+        }
+        return attribute;
     }
 }

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

@@ -1,4 +1,4 @@
-package cn.keking.utils;
+package cn.keking.service;
 
 import com.sun.star.document.UpdateDocMode;
 import cn.keking.extend.ControlDocumentFormatRegistry;
@@ -9,6 +9,8 @@ import org.artofsolving.jodconverter.office.OfficeManager;
 import org.artofsolving.jodconverter.office.OfficeUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
@@ -29,16 +31,23 @@ import java.util.Properties;
  * @date 2017/11/13
  */
 @Component
-public class ConverterUtils {
+@Order(Ordered.HIGHEST_PRECEDENCE)
+public class OfficePluginManager {
 
-    private final Logger logger = LoggerFactory.getLogger(ConverterUtils.class);
+    private final Logger logger = LoggerFactory.getLogger(OfficePluginManager.class);
 
     private OfficeManager officeManager;
 
     @PostConstruct
     public void initOfficeManager() {
-        File officeHome;
-        officeHome = OfficeUtils.getDefaultOfficeHome();
+        new Thread(this::startOfficeManager).start();
+    }
+
+    /**
+     * 启动Office组件进程
+     */
+    private void startOfficeManager(){
+        File officeHome = OfficeUtils.getDefaultOfficeHome();
         if (officeHome == null) {
             throw new RuntimeException("找不到office组件，请确认'office.home'配置是否有误");
         }

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

@@ -1,4 +1,4 @@
-package cn.keking.utils;
+package cn.keking.service;
 
 import org.artofsolving.jodconverter.OfficeDocumentConverter;
 import org.springframework.stereotype.Component;
@@ -9,11 +9,11 @@ import java.io.File;
  * @author yudian-it
  */
 @Component
-public class OfficeToPdf {
-    private final ConverterUtils converterUtils;
+public class OfficeToPdfService {
+    private final OfficePluginManager officePluginManager;
 
-    public OfficeToPdf(ConverterUtils converterUtils) {
-        this.converterUtils = converterUtils;
+    public OfficeToPdfService(OfficePluginManager officePluginManager) {
+        this.officePluginManager = officePluginManager;
     }
 
     public void openOfficeToPDF(String inputFilePath, String outputFilePath) {
@@ -33,7 +33,7 @@ public class OfficeToPdf {
 
 
     public void office2pdf(String inputFilePath, String outputFilePath) {
-        OfficeDocumentConverter converter = converterUtils.getDocumentConverter();
+        OfficeDocumentConverter converter = officePluginManager.getDocumentConverter();
         if (null != inputFilePath) {
             File inputFile = new File(inputFilePath);
             // 判断目标文件路径是否为空

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

@@ -5,7 +5,10 @@ import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 import com.googlecode.concurrentlinkedhashmap.Weighers;
 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;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -21,15 +24,78 @@ import java.util.concurrent.BlockingQueue;
 public class CacheServiceJDKImpl implements CacheService {
 
     private Map<String, String> pdfCache;
-
     private Map<String, List<String>> imgCache;
-
     private Map<String, Integer> pdfImagesCache;
-
     private static final int QUEUE_SIZE = 500000;
-
     private final BlockingQueue<String> blockingQueue = new ArrayBlockingQueue<>(QUEUE_SIZE);
 
+    @PostConstruct
+    public void initCache(){
+        initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
+        initIMGCachePool(CacheService.DEFAULT_IMG_CAPACITY);
+        initPdfImagesCachePool(CacheService.DEFAULT_PDFIMG_CAPACITY);
+    }
+
+    @Override
+    public void putPDFCache(String key, String value) {
+        pdfCache.put(key, value);
+    }
+
+    @Override
+    public void putImgCache(String key, List<String> value) {
+        imgCache.put(key, value);
+    }
+
+    @Override
+    public Map<String, String> getPDFCache() {
+        return pdfCache;
+    }
+
+    @Override
+    public String getPDFCache(String key) {
+        return pdfCache.get(key);
+    }
+
+    @Override
+    public Map<String, List<String>> getImgCache() {
+        return imgCache;
+    }
+
+    @Override
+    public List<String> getImgCache(String key) {
+        if(StringUtils.isEmpty(key)){
+            return new ArrayList<>();
+        }
+        return imgCache.get(key);
+    }
+
+    @Override
+    public Integer getPdfImageCache(String key) {
+        return pdfImagesCache.get(key);
+    }
+
+    @Override
+    public void putPdfImageCache(String pdfFilePath, int num) {
+        pdfImagesCache.put(pdfFilePath, num);
+    }
+
+    @Override
+    public void cleanCache() {
+        initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
+        initIMGCachePool(CacheService.DEFAULT_IMG_CAPACITY);
+        initPdfImagesCachePool(CacheService.DEFAULT_PDFIMG_CAPACITY);
+    }
+
+    @Override
+    public void addQueueTask(String url) {
+        blockingQueue.add(url);
+    }
+
+    @Override
+    public String takeQueueTask() throws InterruptedException {
+        return blockingQueue.take();
+    }
+
     @Override
     public void initPDFCachePool(Integer capacity) {
         pdfCache = new ConcurrentLinkedHashMap.Builder<String, String>()
@@ -50,85 +116,4 @@ public class CacheServiceJDKImpl implements CacheService {
                 .maximumWeightedCapacity(capacity).weigher(Weighers.singleton())
                 .build();
     }
-
-    @Override
-    public void putPDFCache(String key, String value) {
-        if (pdfCache == null) {
-            initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
-        }
-        pdfCache.put(key, value);
-    }
-
-    @Override
-    public void putImgCache(String key, List<String> value) {
-        if (imgCache == null) {
-            initIMGCachePool(CacheService.DEFAULT_IMG_CAPACITY);
-        }
-        imgCache.put(key, value);
-    }
-
-    @Override
-    public Map<String, String> getPDFCache() {
-        if (pdfCache == null) {
-            initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
-        }
-        return pdfCache;
-    }
-
-    @Override
-    public String getPDFCache(String key) {
-        if (pdfCache == null) {
-            initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
-        }
-        return pdfCache.get(key);
-    }
-
-    @Override
-    public Map<String, List<String>> getImgCache() {
-        if (imgCache == null) {
-            initPDFCachePool(CacheService.DEFAULT_IMG_CAPACITY);
-        }
-        return imgCache;
-    }
-
-    @Override
-    public List<String> getImgCache(String key) {
-        if (imgCache == null) {
-            initPDFCachePool(CacheService.DEFAULT_IMG_CAPACITY);
-        }
-        return imgCache.get(key);
-    }
-
-    @Override
-    public Integer getPdfImageCache(String key) {
-        if (pdfImagesCache == null) {
-            initPdfImagesCachePool(CacheService.DEFAULT_PDFIMG_CAPACITY);
-        }
-        return pdfImagesCache.get(key);
-    }
-
-    @Override
-    public void putPdfImageCache(String pdfFilePath, int num) {
-        if (pdfImagesCache == null) {
-            initPdfImagesCachePool(CacheService.DEFAULT_PDFIMG_CAPACITY);
-        }
-        pdfImagesCache.put(pdfFilePath, num);
-    }
-
-    @Override
-    public void cleanCache() {
-        initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
-        initIMGCachePool(CacheService.DEFAULT_IMG_CAPACITY);
-        initPdfImagesCachePool(CacheService.DEFAULT_PDFIMG_CAPACITY);
-    }
-
-    @Override
-    public void addQueueTask(String url) {
-        blockingQueue.add(url);
-    }
-
-    @Override
-    public String takeQueueTask() throws InterruptedException {
-        return blockingQueue.take();
-    }
 }

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

@@ -1,7 +1,7 @@
 package cn.keking.service.cache.impl;
 
 import cn.keking.service.cache.CacheService;
-import org.artofsolving.jodconverter.office.OfficeUtils;
+import org.artofsolving.jodconverter.util.ConfigUtils;
 import org.rocksdb.RocksDB;
 import org.rocksdb.RocksDBException;
 import org.slf4j.Logger;
@@ -30,7 +30,7 @@ public class CacheServiceRocksDBImpl implements CacheService {
         RocksDB.loadLibrary();
     }
 
-    private static final String DB_PATH = OfficeUtils.getHomePath() + File.separator + "cache";
+    private static final String DB_PATH = ConfigUtils.getHomePath() + File.separator + "cache";
 
     private static final int QUEUE_SIZE = 500000;
 

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

@@ -6,7 +6,7 @@ import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.CadUtils;
 import cn.keking.utils.DownloadUtils;
-import cn.keking.utils.FileUtils;
+import cn.keking.service.FileHandlerService;
 import cn.keking.utils.PdfUtils;
 import cn.keking.web.filter.BaseUrlFilter;
 import org.springframework.stereotype.Service;
@@ -22,7 +22,7 @@ import static cn.keking.service.impl.OfficeFilePreviewImpl.getPreviewType;
 @Service
 public class CadFilePreviewImpl implements FilePreview {
 
-    private final FileUtils fileUtils;
+    private final FileHandlerService fileHandlerService;
 
     private final DownloadUtils downloadUtils;
 
@@ -30,11 +30,11 @@ public class CadFilePreviewImpl implements FilePreview {
 
     private final PdfUtils pdfUtils;
 
-    public CadFilePreviewImpl(FileUtils fileUtils,
+    public CadFilePreviewImpl(FileHandlerService fileHandlerService,
                               DownloadUtils downloadUtils,
                               CadUtils cadUtils,
                               PdfUtils pdfUtils) {
-        this.fileUtils = fileUtils;
+        this.fileHandlerService = fileHandlerService;
         this.downloadUtils = downloadUtils;
         this.cadUtils = cadUtils;
         this.pdfUtils = pdfUtils;
@@ -56,7 +56,7 @@ public class CadFilePreviewImpl implements FilePreview {
         String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf";
         String outFilePath = FILE_DIR + pdfName;
         // 判断之前是否已转换过，如果转换过，直接返回，否则执行转换
-        if (!fileUtils.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
+        if (!fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
             String filePath;
             ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, null);
             if (0 != response.getCode()) {
@@ -74,7 +74,7 @@ public class CadFilePreviewImpl implements FilePreview {
                 }
                 if (ConfigConstants.isCacheEnabled()) {
                     // 加入缓存
-                    fileUtils.addConvertedFile(pdfName, fileUtils.getRelativePath(outFilePath));
+                    fileHandlerService.addConvertedFile(pdfName, fileHandlerService.getRelativePath(outFilePath));
                 }
             }
         }

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

@@ -5,8 +5,8 @@ import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
-import cn.keking.utils.FileUtils;
-import cn.keking.utils.ZipReader;
+import cn.keking.service.FileHandlerService;
+import cn.keking.service.CompressFileReader;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
@@ -18,18 +18,14 @@ import org.springframework.util.StringUtils;
 @Service
 public class CompressFilePreviewImpl implements FilePreview {
 
-    private final FileUtils fileUtils;
-
+    private final FileHandlerService fileHandlerService;
     private final DownloadUtils downloadUtils;
+    private final CompressFileReader compressFileReader;
 
-    private final ZipReader zipReader;
-
-    public CompressFilePreviewImpl(FileUtils fileUtils,
-                                   DownloadUtils downloadUtils,
-                                   ZipReader zipReader) {
-        this.fileUtils = fileUtils;
+    public CompressFilePreviewImpl(FileHandlerService fileHandlerService, DownloadUtils downloadUtils, CompressFileReader compressFileReader) {
+        this.fileHandlerService = fileHandlerService;
         this.downloadUtils = downloadUtils;
-        this.zipReader = zipReader;
+        this.compressFileReader = compressFileReader;
     }
 
     @Override
@@ -38,7 +34,7 @@ public class CompressFilePreviewImpl implements FilePreview {
         String suffix=fileAttribute.getSuffix();
         String fileTree = null;
         // 判断文件名是否存在(redis缓存读取)
-        if (!StringUtils.hasText(fileUtils.getConvertedFile(fileName))  || !ConfigConstants.isCacheEnabled()) {
+        if (!StringUtils.hasText(fileHandlerService.getConvertedFile(fileName))  || !ConfigConstants.isCacheEnabled()) {
             ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, fileName);
             if (0 != response.getCode()) {
                 model.addAttribute("fileType", suffix);
@@ -47,17 +43,17 @@ public class CompressFilePreviewImpl implements FilePreview {
             }
             String filePath = response.getContent();
             if ("zip".equalsIgnoreCase(suffix) || "jar".equalsIgnoreCase(suffix) || "gzip".equalsIgnoreCase(suffix)) {
-                fileTree = zipReader.readZipFile(filePath, fileName);
+                fileTree = compressFileReader.readZipFile(filePath, fileName);
             } else if ("rar".equalsIgnoreCase(suffix)) {
-                fileTree = zipReader.unRar(filePath, fileName);
+                fileTree = compressFileReader.unRar(filePath, fileName);
             } else if ("7z".equalsIgnoreCase(suffix)) {
-                fileTree = zipReader.read7zFile(filePath, fileName);
+                fileTree = compressFileReader.read7zFile(filePath, fileName);
             }
             if (fileTree != null && !"null".equals(fileTree) && ConfigConstants.isCacheEnabled()) {
-                fileUtils.addConvertedFile(fileName, fileTree);
+                fileHandlerService.addConvertedFile(fileName, fileTree);
             }
         } else {
-            fileTree = fileUtils.getConvertedFile(fileName);
+            fileTree = fileHandlerService.getConvertedFile(fileName);
         }
         if (fileTree != null && !"null".equals(fileTree)) {
             model.addAttribute("fileTree", fileTree);

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

@@ -0,0 +1,29 @@
+package cn.keking.service.impl;
+
+import cn.keking.model.FileAttribute;
+import cn.keking.service.FilePreview;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.Model;
+
+import static com.sun.glass.ui.Clipboard.TEXT_TYPE;
+
+/**
+ * @author kl (http://kailing.pub)
+ * @since 2020/12/25
+ */
+@Service
+public class MarkdownFilePreviewImpl implements FilePreview {
+
+    private final SimTextFilePreviewImpl simTextFilePreview;
+
+    public MarkdownFilePreviewImpl(SimTextFilePreviewImpl simTextFilePreview) {
+        this.simTextFilePreview = simTextFilePreview;
+    }
+
+
+    @Override
+    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
+        model.addAttribute(TEXT_TYPE,"markdown");
+        return simTextFilePreview.filePreviewHandle(url, model, fileAttribute);
+    }
+}

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

@@ -4,7 +4,7 @@ import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
-import cn.keking.utils.FileUtils;
+import cn.keking.service.FileHandlerService;
 import cn.keking.web.filter.BaseUrlFilter;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
@@ -19,12 +19,12 @@ public class MediaFilePreviewImpl implements FilePreview {
 
     private final DownloadUtils downloadUtils;
 
-    private final FileUtils fileUtils;
+    private final FileHandlerService fileHandlerService;
 
     public MediaFilePreviewImpl(DownloadUtils downloadUtils,
-                                FileUtils fileUtils) {
+                                FileHandlerService fileHandlerService) {
         this.downloadUtils = downloadUtils;
-        this.fileUtils = fileUtils;
+        this.fileHandlerService = fileHandlerService;
     }
 
     @Override
@@ -37,7 +37,7 @@ public class MediaFilePreviewImpl implements FilePreview {
                 model.addAttribute("msg", response.getMsg());
                 return "fileNotSupported";
             } else {
-                model.addAttribute("mediaUrl", BaseUrlFilter.getBaseUrl() + fileUtils.getRelativePath(response.getContent()));
+                model.addAttribute("mediaUrl", BaseUrlFilter.getBaseUrl() + fileHandlerService.getRelativePath(response.getContent()));
             }
         } else {
             model.addAttribute("mediaUrl", url);