新增配置项office.preview.switch.disabled，控制offic文件预览切换开关

Bumps [xstream](https://github.com/x-stream/xstream) from 1.4.6 to 1.4.15.
- [Release notes](https://github.com/x-stream/xstream/releases)
- [Commits](https://github.com/x-stream/xstream/commits)

Signed-off-by: dependabot[bot] <support@github.com>

jodconverter-web/pom.xml

@@ -158,7 +158,7 @@
         <dependency>
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>xstream</artifactId>
-            <version>1.4.6</version>
+            <version>1.4.15</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

jodconverter-web/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}
 

jodconverter-web/src/main/config/freemarker_implicit.ftl

@@ -0,0 +1,15 @@
+[#ftl]
+[#-- @implicitly included --]
+[#-- @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" --]

jodconverter-web/src/main/java/cn/keking/config/ConfigConstants.java

@@ -20,6 +20,7 @@ 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;
@@ -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";
@@ -202,4 +204,12 @@ public class ConfigConstants {
         PDF_DOWNLOAD_DISABLE = pdfDownloadDisable;
     }
 
+    public static String getOfficePreviewSwitchDisabled() {
+        return OFFICE_PREVIEW_SWITCH_DISABLED;
+    }
+
+    @Value("${office.preview.switch.disabled:true}")
+    public static void setOfficePreviewSwitchDisabled(String officePreviewSwitchDisabled) {
+        OFFICE_PREVIEW_SWITCH_DISABLED = officePreviewSwitchDisabled;
+    }
 }

jodconverter-web/src/main/java/cn/keking/config/ConfigRefreshComponent.java

@@ -38,6 +38,7 @@ public class ConfigRefreshComponent {
                 String[] textArray;
                 String[] mediaArray;
                 String officePreviewType;
+                String officePreviewSwitchDisabled;
                 String ftpUsername;
                 String ftpPassword;
                 String ftpControlEncoding;
@@ -54,6 +55,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 +73,7 @@ public class ConfigRefreshComponent {
                     ConfigConstants.setFtpControlEncodingValue(ftpControlEncoding);
                     ConfigConstants.setBaseUrlValue(baseUrl);
                     ConfigConstants.setTrustHostValue(trustHost);
+                    ConfigConstants.setOfficePreviewSwitchDisabled(officePreviewSwitchDisabled);
                     ConfigConstants.setPdfDownloadDisableValue(pdfDownloadDisable);
                     setWatermarkConfig(properties);
                     bufferedReader.close();

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

@@ -5,15 +5,17 @@ package cn.keking.model;
  * Content :文件类型，文本，office，压缩包等等
  */
 public enum FileType {
-    picture("pictureFilePreviewImpl"),
+    picture("picturefilepreviewimpl"),
     compress("compressFilePreviewImpl"),
     office("officeFilePreviewImpl"),
     simText("simTextFilePreviewImpl"),
     pdf("pdfFilePreviewImpl"),
     other("otherFilePreviewImpl"),
     media("mediaFilePreviewImpl"),
+    markdown("markdownFilePreviewImpl"),
     cad("cadFilePreviewImpl");
 
+
     private final String instanceName;
 
     FileType(String instanceName){

jodconverter-web/src/main/java/cn/keking/service/impl/MarkdownFilePreviewImpl.java

@@ -0,0 +1,27 @@
+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;
+
+/**
+ * @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("markdown","true");
+        return simTextFilePreview.filePreviewHandle(url, model, fileAttribute);
+    }
+}

jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java

@@ -54,6 +54,7 @@ public class OfficeFilePreviewImpl implements FilePreview {
         boolean isHtml = suffix.equalsIgnoreCase("xls") || suffix.equalsIgnoreCase("xlsx");
         String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + (isHtml ? "html" : "pdf");
         String outFilePath = FILE_DIR + pdfName;
+        model.addAttribute("switchDisabled", ConfigConstants.getOfficePreviewSwitchDisabled());
         // 判断之前是否已转换过，如果转换过，直接返回，否则执行转换
         if (!fileUtils.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
             String filePath;

jodconverter-web/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java

@@ -44,6 +44,7 @@ public class PdfFilePreviewImpl implements FilePreview {
         String baseUrl = BaseUrlFilter.getBaseUrl();
         String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf";
         String outFilePath = FILE_DIR + pdfName;
+        model.addAttribute("switchDisabled", ConfigConstants.getOfficePreviewSwitchDisabled());
         if (OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_ALL_IMAGES.equals(officePreviewType)) {
             //当文件不存在时，就去下载
             if (!fileUtils.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {

jodconverter-web/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java

@@ -1,5 +1,6 @@
 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;
@@ -33,6 +34,7 @@ public class PictureFilePreviewImpl implements FilePreview {
     public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
         String fileKey = (String) RequestContextHolder.currentRequestAttributes().getAttribute("fileKey",0);
         List<String> imgUrls = Lists.newArrayList(url);
+        model.addAttribute("switchDisabled", ConfigConstants.getOfficePreviewSwitchDisabled());
         try {
             imgUrls.clear();
             imgUrls.addAll(fileUtils.getImgCache(fileKey));

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

@@ -58,9 +58,9 @@ public class DownloadUtils {
             URL url = new URL(urlStr);
             if (url.getProtocol() != null && (url.getProtocol().toLowerCase().startsWith("file")||url.getProtocol().toLowerCase().startsWith("http"))) {
                 byte[] bytes = getBytesFromUrl(urlStr);
-                OutputStream os = new FileOutputStream(new File(realPath));
+                OutputStream os = new FileOutputStream(realPath);
                 saveBytesToOutStream(bytes, os);
-            } else if (url.getProtocol() != null && "ftp".equals(url.getProtocol().toLowerCase())) {
+            } else if (url.getProtocol() != null && "ftp".equalsIgnoreCase(url.getProtocol())) {
                 String ftpUsername = fileUtils.getUrlParameterReg(fileAttribute.getUrl(), URL_PARAM_FTP_USERNAME);
                 String ftpPassword = fileUtils.getUrlParameterReg(fileAttribute.getUrl(), URL_PARAM_FTP_PASSWORD);
                 String ftpControlEncoding = fileUtils.getUrlParameterReg(fileAttribute.getUrl(), URL_PARAM_FTP_CONTROL_ENCODING);

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

@@ -27,7 +27,6 @@ public class FileUtils {
     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) {
@@ -81,6 +80,9 @@ public class FileUtils {
         if (listOfficeTypes().contains(fileType.toLowerCase())) {
             return FileType.office;
         }
+        if("md".equalsIgnoreCase(fileType)){
+            return FileType.markdown;
+        }
         if (Arrays.asList(simText).contains(fileType.toLowerCase())) {
             return FileType.simText;
         }
@@ -323,7 +325,7 @@ public class FileUtils {
         FileType type;
         String suffix;
         String fullFileName = getUrlParameterReg(url, "fullfilename");
-        if (!StringUtils.isEmpty(fullFileName)) {
+        if (StringUtils.hasText(fullFileName)) {
             fileName = fullFileName;
             type = typeFromFileName(fileName);
             suffix = suffixFromFileName(fileName);

jodconverter-web/src/main/java/cn/keking/web/controller/OnlinePreviewController.java

@@ -32,11 +32,8 @@ public class OnlinePreviewController {
     private final Logger logger = LoggerFactory.getLogger(OnlinePreviewController.class);
 
     private final FilePreviewFactory previewFactory;
-
     private final CacheService cacheService;
-
     private final FileUtils fileUtils;
-
     private final DownloadUtils downloadUtils;
 
     public OnlinePreviewController(FilePreviewFactory filePreviewFactory,

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

@@ -34,7 +34,9 @@
         </div>
     </#list>
 </div>
-<img src="images/pdf.svg" width="63" height="63" style="position: fixed; cursor: pointer; top: 40%; right: 48px; z-index: 999;" alt="使用PDF预览" title="使用PDF预览" onclick="changePreviewType('pdf')"/>
+<#if "false" == switchDisabled>
+    <img src="images/pdf.svg" width="63" height="63" style="position: fixed; cursor: pointer; top: 40%; right: 48px; z-index: 999;" alt="使用PDF预览" title="使用PDF预览" onclick="changePreviewType('pdf')"/>
+</#if>
 <script src="js/watermark.js" type="text/javascript"></script>
 <script>
     window.onload = function () {
@@ -63,12 +65,12 @@
     window.onscroll = throttle(checkImgs);
     function changePreviewType(previewType) {
         var url = window.location.href;
-        if (url.indexOf("officePreviewType=image") != -1) {
+        if (url.indexOf("officePreviewType=image") !== -1) {
             url = url.replace("officePreviewType=image", "officePreviewType="+previewType);
         } else {
             url = url + "&officePreviewType="+previewType;
         }
-        if ('allImages' == previewType) {
+        if ('allImages' === previewType) {
             window.open(url)
         } else {
             window.location.href = url;

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

@@ -23,9 +23,9 @@
         <#assign finalUrl="${baseUrl}${pdfUrl}">
     </#if>
     <iframe src="" width="100%" frameborder="0"></iframe>
-
-    <img src="images/jpg.svg" width="63" height="63" style="position: fixed; cursor: pointer; top: 40%; right: 48px; z-index: 999;" alt="使用图片预览" title="使用图片预览" onclick="goForImage()"/>
-
+    <#if "false" == switchDisabled>
+       <img src="images/jpg.svg" width="63" height="63" style="position: fixed; cursor: pointer; top: 40%; right: 48px; z-index: 999;" alt="使用图片预览" title="使用图片预览" onclick="goForImage()"/>
+    </#if>
 </body>
 <script src="js/watermark.js" type="text/javascript"></script>
 <script type="text/javascript">

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

@@ -1,28 +1,44 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="utf-8" />
+    <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>
+
+<div class="container" >
+    <#if markdown??>
+        <p>
+            <button id="markdown_btn" type="button" class="btn btn-primary">切换markdown</button>
+            <button id="text_btn" type="button" class="btn btn-primary">切换text</button>
+        </p>
+        <div id="markdown" style="padding: 18px;"></div>
+    <#else>
+        <div id="text"></div>
+    </#if>
+</div>
+
+<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css"/>
 <script src="js/jquery-3.0.0.min.js" type="text/javascript"></script>
+<script src="js/jquery.form.min.js" type="text/javascript"></script>
+<script src="bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
 <script src="js/watermark.js" type="text/javascript"></script>
+<script src="js/marked.min.js" type="text/javascript"></script>
+
 <script>
     /*初始化水印*/
-    window.onload = function() {
-        var watermarkTxt = '${watermarkTxt}';
+    window.onload = function () {
+        $("#markdown_btn").hide()
+        initWaterMark();
+        fetchData();
+    }
+
+    /**
+     * 初始化水印
+     */
+    function initWaterMark() {
+        let watermarkTxt = '${watermarkTxt}';
         if (watermarkTxt !== '') {
             watermark.init({
                 watermark_txt: '${watermarkTxt}',
@@ -34,23 +50,65 @@
                 watermark_y_space: ${watermarkYSpace},
                 watermark_font: '${watermarkFont}',
                 watermark_fontsize: '${watermarkFontsize}',
-                watermark_color:'${watermarkColor}',
+                watermark_color: '${watermarkColor}',
                 watermark_alpha: ${watermarkAlpha},
                 watermark_width: ${watermarkWidth},
                 watermark_height: ${watermarkHeight},
                 watermark_angle: ${watermarkAngle},
             });
         }
+    }
+
+    /**
+     * 获取文本数据
+     */
+    function fetchData() {
         $.ajax({
             type: 'GET',
             url: '${ordinaryUrl}',
             success: function (data) {
-                $("#text").html("<pre>" + data + "</pre>");
+                window.textData = data;
+                window.textPreData = "<pre>" + data + "</pre>";
+                window.textMarkdownData =  marked(window.textData);
+                $("#text").html(window.textPreData);
+                $("#markdown").html(window.textMarkdownData);
             }
         });
     }
 
+    $(function () {
+        $("#markdown_btn").click(function () {
+            $("#markdown").html(window.textMarkdownData);
+            $("#text_btn").show()
+            $("#markdown_btn").hide()
+        });
+
+        $("#text_btn").click(function () {
+            $("#markdown_btn").show()
+            $("#text_btn").hide();
+            $("#markdown").html(window.textPreData);
+        });
+    });
+
 </script>
+<style>
+    * {
+        margin: 0;
+        padding: 0;
+    }
+
+    html, body {
+        height: 100%;
+        width: 100%;
+    }
+    #markdown {
+        height: 97%;
+        max-height: 97%;
+        border: 1px solid #eee;
+        overflow-y: scroll;
+        width: 100%;
+    }
+</style>
 </body>
 
 </html>