引入galimatias,解决不规范文件名导致文件下载异常

2020-12-28 11:42:08 +08:00
10 changed files with 199 additions and 350 deletions
--- a/server/src/main/config/freemarker_implicit.ftl
+++ b/server/src/main/config/freemarker_implicit.ftl
@ -1,7 +1,5 @@
 [#ftl]
 [#-- @implicitly included --]
-[#-- @ftlvariable name="file" type="cn.keking.model.FileAttribute" --]
-[#-- @ftlvariable name="fileName" type="java.lang.String" --]
 [#-- @ftlvariable name="fileTree" type="java.lang.String" --]
 [#-- @ftlvariable name="baseUrl" type="java.lang.String" --]
 [#-- @ftlvariable name="imgUrls" type="String" --]
--- a/server/src/main/java/cn/keking/service/FilePreview.java
+++ b/server/src/main/java/cn/keking/service/FilePreview.java
@ -17,8 +17,6 @@ public interface FilePreview {
    String OFFICE_PICTURE_FILE_PREVIEW_PAGE = "officePicture";
    String TXT_FILE_PREVIEW_PAGE = "txt";
    String EXEL_FILE_PREVIEW_PAGE = "html";
-    String XML_FILE_PREVIEW_PAGE = "xml";
-    String MARKDOWN_FILE_PREVIEW_PAGE = "markdown";
    String NOT_SUPPORTED_FILE_PAGE = "fileNotSupported";

    String filePreviewHandle(String url, Model model, FileAttribute fileAttribute);
--- a/server/src/main/java/cn/keking/service/impl/MarkdownFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/MarkdownFilePreviewImpl.java
@ -5,6 +5,8 @@ import cn.keking.service.FilePreview;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;

+import static cn.keking.service.impl.SimTextFilePreviewImpl.TEXT_TYPE;
+
 /**
 * @author kl (http://kailing.pub)
 * @since 2020/12/25
@ -21,7 +23,7 @@ public class MarkdownFilePreviewImpl implements FilePreview {

    @Override
    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
-         simTextFilePreview.filePreviewHandle(url, model, fileAttribute);
-         return MARKDOWN_FILE_PREVIEW_PAGE;
+        model.addAttribute(TEXT_TYPE,"markdown");
+        return simTextFilePreview.filePreviewHandle(url, model, fileAttribute);
    }
 }
--- a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
@ -20,6 +20,9 @@ import java.nio.charset.StandardCharsets;
@Service
 public class SimTextFilePreviewImpl implements FilePreview {

+    public static final String TEXT_TYPE = "textType";
+    public static final String DEFAULT_TEXT_TYPE = "simText";
+
    private final OtherFilePreviewImpl otherFilePreview;

    public SimTextFilePreviewImpl(OtherFilePreviewImpl otherFilePreview) {
@ -40,6 +43,9 @@ public class SimTextFilePreviewImpl implements FilePreview {
        } catch (IOException e) {
            return otherFilePreview.notSupportedFile(model, fileAttribute, e.getLocalizedMessage());
        }
+        if (!model.containsAttribute(TEXT_TYPE)) {
+            model.addAttribute(TEXT_TYPE, DEFAULT_TEXT_TYPE);
+        }
        return TXT_FILE_PREVIEW_PAGE;
    }

--- a/server/src/main/java/cn/keking/service/impl/XmlFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/XmlFilePreviewImpl.java
@ -5,6 +5,8 @@ import cn.keking.service.FilePreview;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;

+import static cn.keking.service.impl.SimTextFilePreviewImpl.TEXT_TYPE;
+
 /**
 * @author kl (http://kailing.pub)
 * @since 2020/12/25
@ -20,7 +22,7 @@ public class XmlFilePreviewImpl implements FilePreview {

    @Override
    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
-        simTextFilePreview.filePreviewHandle(url, model, fileAttribute);
-        return XML_FILE_PREVIEW_PAGE;
+        model.addAttribute(TEXT_TYPE,"xml");
+        return simTextFilePreview.filePreviewHandle(url, model, fileAttribute);
    }
 }
--- a/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
+++ b/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
@ -57,7 +57,6 @@ public class OnlinePreviewController {
            return otherFilePreview.notSupportedFile(model, errorMsg);
        }
        FileAttribute fileAttribute = fileHandlerService.getFileAttribute(fileUrl, req);
-        model.addAttribute("file", fileAttribute);
        FilePreview filePreview = previewFactory.get(fileAttribute);
        logger.info("预览文件url：{}，previewType：{}", fileUrl, fileAttribute.getType());
        return filePreview.filePreviewHandle(fileUrl, model, fileAttribute);
--- a/server/src/main/resources/web/index.ftl
+++ b/server/src/main/resources/web/index.ftl
@ -19,17 +19,18 @@
 </head>

 <body>
-<div class="panel-group container" id="accordion">
 <h1>文件预览项目接入和测试界面</h1>
-
+<div class="panel-group" id="accordion">
    <div class="panel panel-default">
        <div class="panel-heading">
            <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
+                <a data-toggle="collapse" data-parent="#accordion"
+                   href="#collapseOne">
                    接入说明
                </a>
            </h4>
        </div>
+        <div id="collapseOne" class="panel-collapse collapse">
            <div class="panel-body">
                <div>
                    如果你的项目需要接入文件预览项目，达到对docx、excel、ppt、jpg等文件的预览效果，那么通过在你的项目中加入下面的代码就可以
@ -48,6 +49,7 @@
                </div>
            </div>
        </div>
+    </div>
    <div class="panel panel-default">
        <div class="panel-heading">
            <h4 class="panel-title">
@ -57,11 +59,12 @@
                </a>
            </h4>
        </div>
+        <div id="collapseTwo" class="panel-collapse collapse">
            <div class="panel-body">
                <div style="padding: 10px">
                    <form enctype="multipart/form-data" id="fileUpload">
                        <input type="file" name="file" />
-                    <input type="button" id="btnSubmit" value=" 上 传 "/>
+                        <input type="button" id="btnsubmit" value=" 上 传 " />
                    </form>
                </div>
                <div>
@ -69,18 +72,21 @@
                </div>
            </div>
        </div>
+    </div>
    <div class="panel panel-default">
        <div class="panel-heading">
            <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
-                    发版记录
+                <a data-toggle="collapse" data-parent="#accordion"
+                   href="#collapseThree">
+                    更新记录
                </a>
            </h4>
        </div>
+        <div id="collapseThree" class="panel-collapse collapse in">
            <div class="panel-body">
                <div>
                     2020年12月27日 ：<br>
-                2020年年终大版本更新，架构全面设计，代码全面重构，代码质量全面提升，二次开发更便捷，欢迎拉源码品鉴，提issue、pr共同建设<br>
+                        2020年年终大版本更新，架构全面设计，代码全面重构，代码质量全面提升，二次开发更便捷，欢迎拉源码品鉴，提issue、pr共同建设
                        1. 架构模块调整,大量的代码重构，代码质量提升N个等级，欢迎品鉴<br>
                        2. 增强XML文件预览效果，新增XML文档数结构预览<br>
                        3. 新增markdown文件预览支持，预览支持md渲染和源文本切换支持<br>
@ -148,7 +154,7 @@
                        2.项目github开源:<a href="https://github.com/kekingcn/kkFileView" target="_blank">https://github.com/kekingcn/kkFileView</a>
                </div>
            </div>
-
+        </div>
        <div class="panel-body">
            <div id = "comments"></div>
        </div>
@ -184,7 +190,7 @@
            url: '${baseUrl}deleteFile?fileName=' + encodeURIComponent(fileName),
            success: function (data) {
                // 删除完成，刷新table
-                if (1 === data.code) {
+                if (1 == data.code) {
                    alert(data.msg);
                } else{
                    $('#table').bootstrapTable('refresh', {});
@ -195,7 +201,6 @@
            }
        })
    }
-
    $(function () {
        $('#table').bootstrapTable({
            url: 'listFiles',
@ -223,12 +228,12 @@
            $(".loading_container").css("height", height).show();
        }

-        $("#btnSubmit").click(function () {
+        $("#btnsubmit").click(function () {
            showLoadingDiv();
            $("#fileUpload").ajaxSubmit({
                success: function (data) {
                    // 上传完成，刷新table
-                    if (1 === data.code) {
+                    if (1 == data.code) {
                        alert(data.msg);
                    } else {
                        $('#table').bootstrapTable('refresh', {});
--- a/server/src/main/resources/web/markdown.ftl
+++ b/server/src/main/resources/web/markdown.ftl
@ -1,118 +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>
-</head>
-<body>
-<input hidden id="textData" value="${textData}"/>
-
-<div class="container">
-    <div class="panel panel-default">
-        <div id="markdown_btn" class="panel-heading">
-            <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
-                    ${file.name}
-                </a>
-            </h4>
-        </div>
-        <div id="text_btn" class="panel-heading">
-            <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
-                    ${file.name}
-                </a>
-            </h4>
-        </div>
-        <div class="panel-body">
-            <div id="markdown"></div>
-        </div>
-    </div>
-</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 src="js/base64.min.js" type="text/javascript"></script>
-
-<script>
-    /**
-     * 初始化
-     */
-    window.onload = function () {
-        $("#markdown_btn").hide()
-        initWaterMark();
-        loadMarkdown();
-    }
-
-    /**
-     * 初始化水印
-     */
-    function initWaterMark() {
-        let 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},
-            });
-        }
-    }
-
-
-    /**
-     * 加载markdown
-     */
-    function loadMarkdown() {
-        var textData = Base64.decode($("#textData").val())
-        window.textPreData = "<pre style='background-color: #FFFFFF;border:none'>" + textData + "</pre>";
-        window.textMarkdownData = marked(textData);
-        $("#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%;
-    }
-
-</style>
-</body>
-
-</html>
--- a/server/src/main/resources/web/txt.ftl
+++ b/server/src/main/resources/web/txt.ftl
@ -6,29 +6,32 @@
    <title>普通文本预览</title>
 </head>
 <body>
+<input hidden id="textType" value="${textType}"/>
 <input hidden id="textData" value="${textData}"/>

 <div class="container">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
-                    ${file.name}
-                </a>
-            </h4>
-        </div>
-        <div class="panel-body">
+    <#if textType?? && textType == "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>
+    <#elseif textType?? && textType == "xml" >
+        <div id="xml" style="padding: 18px;"></div>
+    <#else>
        <div id="text"></div>
-        </div>
-    </div>
+    </#if>
 </div>

+<link rel="stylesheet" href="css/xmlTreeViewer.css"/>
 <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 src="js/xmlTreeViewer.js" type="text/javascript"></script>
 <script src="js/base64.min.js" type="text/javascript"></script>

 <script>
@ -36,8 +39,12 @@
     * 初始化
     */
    window.onload = function () {
+        $("#markdown_btn").hide()
        initWaterMark();
+        fetchData();
        loadText();
+        loadXmlData()
+        loadMarkdown();
    }

    /**
@ -65,16 +72,56 @@
        }
    }

+    /**
+     * 获取文本数据
+     */
+    function fetchData() {
+        window.textData = Base64.decode($("#textData").val())
+        window.textPreData = "<pre>" + window.textData + "</pre>";
+    }
+
    /**
     *加载普通文本
     */
    function loadText() {
-        var textData = Base64.decode($("#textData").val())
-        var textPreData = "<pre style='background-color: #FFFFFF;border:none'>" + textData + "</pre>";
-
-        $("#text").html(textPreData);
+        $("#text").html(window.textPreData);
    }

+    /**
+     * 加载markdown
+     */
+    function loadMarkdown() {
+        if ($("#textType").val() === "markdown") {
+            window.textMarkdownData = marked(window.textData);
+            $("#markdown").html(window.textMarkdownData);
+        }
+    }
+
+    /**
+     * 加载xml数据
+     */
+    function loadXmlData() {
+        if ($("#textType").val() === "xml") {
+            var xmlNode = xmlTreeViewer.parseXML(window.textData);
+            var retNode = xmlTreeViewer.getXMLViewerNode(xmlNode.xml);
+            $("#xml").html(retNode);
+        }
+    }
+
+    $(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>
    * {
@ -87,6 +134,13 @@
        width: 100%;
    }

+    #markdown, #xml {
+        height: 97%;
+        max-height: 97%;
+        border: 1px solid #ece7e7;
+        overflow-y: scroll;
+        width: 100%;
+    }
 </style>
 </body>

--- a/server/src/main/resources/web/xml.ftl
+++ b/server/src/main/resources/web/xml.ftl
@ -1,97 +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>
-</head>
-<body>
-<input hidden id="textData" value="${textData}"/>
-<div class="container">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h4 class="panel-title">
-                <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
-                     ${file.name}
-                </a>
-            </h4>
-        </div>
-        <div class="panel-body">
-            <div id="xml"></div>
-        </div>
-    </div>
-</div>
-
-<link rel="stylesheet" href="css/xmlTreeViewer.css"/>
-<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 src="js/xmlTreeViewer.js" type="text/javascript"></script>
-<script src="js/base64.min.js" type="text/javascript"></script>
-
-<script>
-    /**
-     * 初始化
-     */
-    window.onload = function () {
-        initWaterMark();
-        loadXmlData()
-    }
-
-    /**
-     * 初始化水印
-     */
-    function initWaterMark() {
-        let 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},
-            });
-        }
-    }
-
-
-    /**
-     * 加载xml数据
-     */
-    function loadXmlData() {
-        var textData = Base64.decode($("#textData").val())
-        var xmlNode = xmlTreeViewer.parseXML(textData);
-        var retNode = xmlTreeViewer.getXMLViewerNode(xmlNode.xml);
-        $("#xml").html(retNode);
-
-    }
-
-</script>
-<style>
-    * {
-        margin: 0;
-        padding: 0;
-    }
-
-    html, body {
-        height: 100%;
-        width: 100%;
-    }
-
-</style>
-</body>
-
-</html>