采用apache-common-io包简化所有的文件下载io操作

2020-12-28 18:21:35 +08:00
24 changed files with 450 additions and 173 deletions
--- a/4
+++ b/4
@ -28,5 +28,5 @@ ENV CLASSPATH $JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
 ENV PATH $PATH:$JAVA_HOME/bin
 ENV LANG zh_CN.UTF-8
 ENV LC_ALL zh_CN.UTF-8
-ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-3.3.1/bin
-ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider","-Dspring.config.location=/opt/kkFileView-3.3.1/config/application.properties","-jar","/opt/kkFileView-3.3.1/bin/kkFileView-3.3.1.jar"]
+ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-3.3.0/bin
+ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider","-Dspring.config.location=/opt/kkFileView-3.3.0/config/application.properties","-jar","/opt/kkFileView-3.3.0/bin/kkFileView-3.3.0.jar"]
--- a/pom.xml
+++ b/pom.xml
@ -5,7 +5,7 @@

    <groupId>cn.keking</groupId>
    <artifactId>filepreview</artifactId>
-    <version>3.3.1</version>
+    <version>3.3.0</version>
    <modules>
        <module>office-plugin</module>
        <module>server</module>
--- a/server/pom.xml
+++ b/server/pom.xml
@ -12,7 +12,7 @@

    <groupId>cn.keking</groupId>
    <artifactId>kkFileView</artifactId>
-    <version>3.3.1</version>
+    <version>3.3.0</version>

    <properties>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@ -56,6 +56,12 @@
            <groupId>cn.keking</groupId>
            <artifactId>office-plugin</artifactId>
            <version>1.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>
@ -71,7 +77,7 @@
        <dependency>
            <groupId>org.apache.poi</groupId>
            <artifactId>poi</artifactId>
-            <version>3.17</version>
+            <version>3.12</version>
        </dependency>
        <dependency>
            <groupId>org.apache.poi</groupId>
@ -99,6 +105,11 @@
            <artifactId>fr.opensagres.xdocreport.document</artifactId>
            <version>1.0.5</version>
        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.4</version>
+        </dependency>
        <!-- 解压(apache) -->
        <dependency>
            <groupId>org.apache.commons</groupId>
--- a/server/src/main/bin/startup.bat
+++ b/server/src/main/bin/startup.bat
@ -6,4 +6,4 @@ echo Starting kkFileView...
 echo Please check log file in ../log/kkFileView.log for more information
 echo You can get help in our official homesite: https://kkFileView.keking.cn
 echo If this project is helpful to you, please star it on https://gitee.com/kekingcn/file-online-preview/stargazers
-java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=..\config\application.properties -jar kkFileView-3.3.1.jar -> ..\log\kkFileView.log
+java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=..\config\application.properties -jar kkFileView-3.3.0.jar -> ..\log\kkFileView.log
--- a/server/src/main/bin/startup.sh
+++ b/server/src/main/bin/startup.sh
@ -29,4 +29,4 @@ echo "Starting kkFileView..."
 echo "Please execute ./showlog.sh to check log for more information"
 echo "You can get help in our official homesite: https://kkFileView.keking.cn"
 echo "If this project is helpful to you, please star it on https://gitee.com/kekingcn/file-online-preview/stargazers"
-nohup java -Dfile.encoding=UTF-8 -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=../config/application.properties -jar kkFileView-3.3.1.jar > ../log/kkFileView.log 2>&1 &
+nohup java -Dfile.encoding=UTF-8 -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=../config/application.properties -jar kkFileView-3.3.0.jar > ../log/kkFileView.log 2>&1 &
--- a/server/src/main/java/cn/keking/model/FileType.java
+++ b/server/src/main/java/cn/keking/model/FileType.java
@ -24,7 +24,7 @@ public enum FileType {
    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[] 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[] SSIM_TEXT_TYPES = ConfigConstants.getSimText();
    private static final String[] MEDIA_TYPES = ConfigConstants.getMedia();
@ -71,8 +71,7 @@ public enum FileType {

    public static FileType typeFromFileName(String fileName) {
        String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
-        String lowerCaseFileType = fileType.toLowerCase();
-        return FileType.to(lowerCaseFileType);
+        return FileType.to(fileType);
    }

    private final String instanceName;
--- a/server/src/main/java/cn/keking/service/FileHandlerService.java
+++ b/server/src/main/java/cn/keking/service/FileHandlerService.java
@ -178,15 +178,14 @@ public class FileHandlerService {
        String pdfFolder = pdfName.substring(0, pdfName.length() - 4);
        String urlPrefix;
        try {
-            urlPrefix = baseUrl + URLEncoder.encode(pdfFolder, uriEncoding).replaceAll("\\+", "%20");
+            urlPrefix = baseUrl + URLEncoder.encode(URLEncoder.encode(pdfFolder, uriEncoding).replaceAll("\\+", "%20"), uriEncoding);
        } catch (UnsupportedEncodingException e) {
            logger.error("UnsupportedEncodingException", e);
            urlPrefix = baseUrl + pdfFolder;
        }
        if (imageCount != null && imageCount > 0) {
-            for (int i = 0; i < imageCount; i++) {
+            for (int i = 0; i < imageCount; i++)
                imageUrls.add(urlPrefix + "/" + i + imageFileSuffix);
-            }
            return imageUrls;
        }
        try {
@ -276,7 +275,7 @@ public class FileHandlerService {
        attribute.setUrl(url);
        if (req != null) {
            String officePreviewType = req.getParameter("officePreviewType");
-            String fileKey = WebUtils.getUrlParameterReg(url,"fileKey");
+            String fileKey = req.getParameter("fileKey");
            if (StringUtils.hasText(officePreviewType)) {
                attribute.setOfficePreviewType(officePreviewType);
            }
--- a/server/src/main/java/cn/keking/service/impl/CadFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/CadFilePreviewImpl.java
@ -35,7 +35,7 @@ public class CadFilePreviewImpl implements FilePreview {
    @Override
    public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
        // 预览Type，参数传了就取参数的，没传取系统默认
-        String officePreviewType = fileAttribute.getOfficePreviewType() == null ? ConfigConstants.getOfficePreviewType() : fileAttribute.getOfficePreviewType();
+        String officePreviewType = model.asMap().get("officePreviewType") == null ? ConfigConstants.getOfficePreviewType() : model.asMap().get("officePreviewType").toString();
        String baseUrl = BaseUrlFilter.getBaseUrl();
        String fileName = fileAttribute.getName();
        String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf";
--- a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
@ -5,10 +5,10 @@ import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
 import cn.keking.utils.KkFileUtils;
-import jodd.io.FileUtil;
-import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.FileUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
+import org.springframework.util.Base64Utils;

 import java.io.File;
 import java.io.IOException;
@ -36,8 +36,8 @@ public class SimTextFilePreviewImpl implements FilePreview {
        try {
            File originFile = new File(response.getContent());
            String charset = KkFileUtils.getFileEncode(originFile);
-            String fileData = FileUtil.readString(originFile, charset);
-            model.addAttribute("textData", Base64.encodeBase64String(fileData.getBytes()));
+            String xmlString = FileUtils.readFileToString(originFile, charset);
+            model.addAttribute("textData", Base64Utils.encodeToString(xmlString.getBytes(charset)));
        } catch (IOException e) {
            return otherFilePreview.notSupportedFile(model, fileAttribute, e.getLocalizedMessage());
        }
--- a/server/src/main/java/cn/keking/utils/DownloadUtils.java
+++ b/server/src/main/java/cn/keking/utils/DownloadUtils.java
@ -4,7 +4,7 @@ import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
 import io.mola.galimatias.GalimatiasParseException;
-import jodd.io.NetUtil;
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@ -39,7 +39,7 @@ public class DownloadUtils {
            URL url = WebUtils.normalizedURL(urlStr);
            if (isHttpUrl(url)) {
                File realFile = new File(realPath);
-                NetUtil.downloadFile(url.toString(),realFile);
+                FileUtils.copyURLToFile(url, realFile);
            } else if (isFtpUrl(url)) {
                String ftpUsername = WebUtils.getUrlParameterReg(fileAttribute.getUrl(), URL_PARAM_FTP_USERNAME);
                String ftpPassword = WebUtils.getUrlParameterReg(fileAttribute.getUrl(), URL_PARAM_FTP_PASSWORD);
--- a/server/src/main/java/cn/keking/web/controller/FileController.java
+++ b/server/src/main/java/cn/keking/web/controller/FileController.java
@ -15,9 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;

 import java.io.*;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
-import org.springframework.web.util.HtmlUtils;

 /**
 *
@ -38,10 +36,6 @@ public class FileController {
        // 获取文件名
        String fileName = file.getOriginalFilename();
        //判断是否为IE浏览器的文件名，IE浏览器下文件名会带有盘符信息
-        
-        // escaping dangerous characters to prevent XSS
-        fileName = HtmlUtils.htmlEscape(fileName, StandardCharsets.UTF_8.name());
-
        // Check for Unix-style path
        int unixSep = fileName.lastIndexOf('/');
        // Check for Windows-style path
--- a/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
+++ b/server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java
@ -8,14 +8,13 @@ import cn.keking.service.cache.CacheService;
 import cn.keking.service.impl.OtherFilePreviewImpl;
 import cn.keking.service.FileHandlerService;
 import cn.keking.utils.WebUtils;
-import fr.opensagres.xdocreport.core.io.IOUtils;
 import io.mola.galimatias.GalimatiasParseException;
-import jodd.io.NetUtil;
-import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.util.Base64Utils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@ -25,7 +24,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;

@ -56,7 +54,7 @@ public class OnlinePreviewController {
    public String onlinePreview(String url, Model model, HttpServletRequest req) {
        String fileUrl;
        try {
-            fileUrl = new String(Base64.decodeBase64(url), StandardCharsets.UTF_8);
+            fileUrl = new String(Base64Utils.decodeFromString(url));
        } catch (Exception ex) {
            String errorMsg = String.format(BASE64_DECODE_ERROR_MSG, "url");
            return otherFilePreview.notSupportedFile(model, errorMsg);
@ -72,7 +70,7 @@ public class OnlinePreviewController {
    public String picturesPreview(String urls, Model model, HttpServletRequest req) throws UnsupportedEncodingException {
        String fileUrls;
        try {
-            fileUrls = new String(Base64.decodeBase64(urls));
+            fileUrls = new String(Base64Utils.decodeFromString(urls));
        } catch (Exception ex) {
            String errorMsg = String.format(BASE64_DECODE_ERROR_MSG, "urls");
            return otherFilePreview.notSupportedFile(model, errorMsg);
@ -85,7 +83,7 @@ public class OnlinePreviewController {

        String currentUrl = req.getParameter("currentUrl");
        if (StringUtils.hasText(currentUrl)) {
-            String decodedCurrentUrl = new String(Base64.decodeBase64(currentUrl));
+            String decodedCurrentUrl = new String(Base64Utils.decodeFromString(currentUrl));
            model.addAttribute("currentUrl", decodedCurrentUrl);
        } else {
            model.addAttribute("currentUrl", imgUrls.get(0));
@ -105,7 +103,7 @@ public class OnlinePreviewController {
        logger.info("下载跨域pdf文件url：{}", urlPath);
        try {
            URL url = WebUtils.normalizedURL(urlPath);
-            byte[] bytes = NetUtil.downloadBytes(url.toString());
+            byte[] bytes = IOUtils.toByteArray(url);
            IOUtils.write(bytes, response.getOutputStream());
        } catch (IOException | GalimatiasParseException e) {
            logger.error("下载跨域pdf文件异常，url：{}", urlPath, e);
--- a/server/src/main/resources/web/commonHeader.ftl
+++ b/server/src/main/resources/web/commonHeader.ftl
@ -1,49 +0,0 @@
-
-
-<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/base64.min.js" type="text/javascript"></script>
-
-<script>
-    /**
-     * 初始化水印
-     */
-    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},
-            });
-        }
-    }
-
-</script>
-<style>
-    * {
-        margin: 0;
-        padding: 0;
-    }
-
-    html, body {
-        height: 100%;
-        width: 100%;
-    }
-
-</style>
-
--- a/server/src/main/resources/web/compress.ftl
+++ b/server/src/main/resources/web/compress.ftl
@ -5,8 +5,15 @@
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
    <link href="css/zTreeStyle.css" rel="stylesheet" type="text/css">
-    <#include "*/commonHeader.ftl">
    <style type="text/css">
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        html, body {
+            height: 100%;
+            width: 100%;
+        }
        body {
            background-color: #404040;
        }
@ -25,7 +32,10 @@
 <div class="zTreeDemoBackground left">
    <ul id="treeDemo" class="ztree"></ul>
 </div>
+<script src="js/watermark.js" type="text/javascript"></script>
+<script type="text/javascript" src="js/jquery-3.0.0.min.js"></script>
 <script type="text/javascript" src="js/jquery.ztree.core.js"></script>
+<script type="text/javascript" src="js/base64.min.js" ></script>

 <script type="text/javascript">
    const data = JSON.parse('${fileTree}');
@ -77,7 +87,25 @@

    /*初始化水印*/
    window.onload = function() {
-      initWaterMark();
+        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},
+            });
+        }
    }

    /**
--- a/server/src/main/resources/web/fileNotSupported.ftl
+++ b/server/src/main/resources/web/fileNotSupported.ftl
@ -32,8 +32,7 @@
 <div class="container">
    <img src="images/sorry.jpg" />
    <span>
-    该文件类型(${file.suffix?html})系统暂时不支持在线预览，<b>说明</b>：      
-    
+        该文件类型(${fileType})系统暂时不支持在线预览，<b>说明</b>：
        <p style="color: red;">${msg}</p>
        有任何疑问，请加&nbsp;<a href="https://jq.qq.com/?_wv=1027&k=5c0UAtu">官方QQ群：613025121</a>&nbsp;咨询
    </span>
--- a/server/src/main/resources/web/flv.ftl
+++ b/server/src/main/resources/web/flv.ftl
@ -3,10 +3,18 @@
 <head>
    <meta charset="utf-8" />
    <title>多媒体文件预览</title>
-    <script src="js/flv.min.js" type="text/javascript"></script>
-    <#include "*/commonHeader.ftl">
+    <script src="js/flv.min.js"type="text/javascript"></script>
+    <script src="js/watermark.js" type="text/javascript"></script>
 </head>
 <style>
+    * {
+        margin: 0;
+        padding: 0;
+    }
+    html, body {
+        height: 100%;
+        width: 100%;
+    }
    body {
        background-color: #404040;
    }
@ -32,7 +40,25 @@
    }
    /*初始化水印*/
    window.onload = function() {
-      initWaterMark();
+        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},
+            });
+        }
    }
 </script>
 </body>
--- a/server/src/main/resources/web/html.ftl
+++ b/server/src/main/resources/web/html.ftl
@ -4,11 +4,21 @@
 <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
-    <#include "*/commonHeader.ftl">
+    <style type="text/css">
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        html, body {
+            height: 100%;
+            width: 100%;
+        }
+    </style>
 </head>
 <body>
    <iframe src="${pdfUrl}" width="100%" frameborder="0"></iframe>
 </body>
+<script src="js/watermark.js" type="text/javascript"></script>
 <script type="text/javascript">
    document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight-10;
    /**
@ -20,7 +30,25 @@
    }
    /*初始化水印*/
    window.onload = function() {
-      initWaterMark();
+        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},
+            });
+        }
    }
 </script>
 </html>
--- a/server/src/main/resources/web/markdown.ftl
+++ b/server/src/main/resources/web/markdown.ftl
@ -3,9 +3,7 @@
 <head>
    <meta charset="utf-8"/>
    <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
-    <title>markdown文本预览</title>
-    <script src="js/marked.min.js" type="text/javascript"></script>
-    <#include "*/commonHeader.ftl">
+    <title>普通文本预览</title>
 </head>
 <body>
 <input hidden id="textData" value="${textData}"/>
@ -32,6 +30,15 @@
    </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>
    /**
     * 初始化
@ -42,6 +49,32 @@
        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
     */
@ -68,6 +101,18 @@
    });

 </script>
+<style>
+    * {
+        margin: 0;
+        padding: 0;
+    }
+
+    html, body {
+        height: 100%;
+        width: 100%;
+    }
+
+</style>
 </body>

 </html>
--- a/server/src/main/resources/web/media.ftl
+++ b/server/src/main/resources/web/media.ftl
@ -1,16 +1,23 @@
 <!DOCTYPE html>
 <html lang="zh-cn">
 <head>
-    <meta charset="utf-8"/>
+    <meta charset="utf-8" />
    <title>多媒体文件预览</title>
-    <link rel="stylesheet" href="plyr/plyr.css"/>
+    <link rel="stylesheet" href="plyr/plyr.css" />
    <script type="text/javascript" src="plyr/plyr.js"></script>
-    <#include "*/commonHeader.ftl">
+    <script type="text/javascript" src="js/watermark.js"></script>
    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        html, body {
+            height: 100%;
+            width: 100%;
+        }
        body {
            background-color: #404040;
        }
-
        .m {
            width: 1024px;
            margin: 0 auto;
@ -20,13 +27,31 @@
 <body>
 <div class="m">
    <video>
-        <source src="${mediaUrl}"/>
+        <source src="${mediaUrl}" />
    </video>
 </div>
 <script>
    plyr.setup();
-    window.onload = function () {
-        initWaterMark();
+    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},
+            });
+        }
    }
 </script>
 </body>
--- a/server/src/main/resources/web/officePicture.ftl
+++ b/server/src/main/resources/web/officePicture.ftl
@ -4,8 +4,15 @@
    <meta charset="utf-8" />
    <title>PDF图片预览</title>
    <script src="js/lazyload.js"></script>
-    <#include "*/commonHeader.ftl">
    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        html, body {
+            height: 100%;
+            width: 100%;
+        }
        body {
            background-color: #404040;
        }
@ -30,10 +37,29 @@
 <#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 () {
        /*初始化水印*/
-        initWaterMark();
+        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},
+            });
+        }
        checkImgs();
    };
    window.onscroll = throttle(checkImgs);
--- a/server/src/main/resources/web/pdf.ftl
+++ b/server/src/main/resources/web/pdf.ftl
@ -2,33 +2,41 @@

 <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>PDF预览</title>
-    <#include "*/commonHeader.ftl">
+    <style type="text/css">
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        html, body {
+            height: 100%;
+            width: 100%;
+        }
+    </style>
 </head>
 <body>
-<#if pdfUrl?contains("http://") || pdfUrl?contains("https://")>
-    <#assign finalUrl="${pdfUrl}">
-<#else>
-    <#assign finalUrl="${baseUrl}${pdfUrl}">
-</#if>
-<iframe src="" width="100%" frameborder="0"></iframe>
-<#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>
+    <#if pdfUrl?contains("http://") || pdfUrl?contains("https://")>
+        <#assign finalUrl="${pdfUrl}">
+    <#else>
+        <#assign finalUrl="${baseUrl}${pdfUrl}">
+    </#if>
+    <iframe src="" width="100%" frameborder="0"></iframe>
+    <#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">
-    document.getElementsByTagName('iframe')[0].src = "${baseUrl}pdfjs/web/viewer.html?base=${baseUrl}&file=" + encodeURIComponent('${finalUrl}') + "&disabledownload=${pdfDownloadDisable}";
-    document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight - 10;
+    document.getElementsByTagName('iframe')[0].src = "${baseUrl}pdfjs/web/viewer.html?base=${baseUrl}&file="+encodeURIComponent('${finalUrl}')+"&disabledownload=${pdfDownloadDisable}";
+    document.getElementsByTagName('iframe')[0].height = document.documentElement.clientHeight-10;
    /**
     * 页面变化调整高度
     */
-    window.onresize = function () {
+    window.onresize = function(){
        var fm = document.getElementsByTagName("iframe")[0];
-        fm.height = window.document.documentElement.clientHeight - 10;
+        fm.height = window.document.documentElement.clientHeight-10;
    }

    function goForImage() {
@ -38,12 +46,29 @@
        } else {
            url = url + "&officePreviewType=image";
        }
-        window.location.href = url;
+        window.location.href=url;
    }
-
    /*初始化水印*/
-    window.onload = function () {
-        initWaterMark();
+    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},
+            });
+        }
    }
 </script>
 </html>
--- a/server/src/main/resources/web/picture.ftl
+++ b/server/src/main/resources/web/picture.ftl
@ -4,20 +4,25 @@
    <meta charset="utf-8" />
    <title>图片预览</title>
    <link rel="stylesheet" href="css/viewer.min.css">
-    <script src="js/viewer.min.js"></script>
-    <#include "*/commonHeader.ftl">
    <style>
+        * {
+            margin: 0;
+            padding: 0;
+        }
+        html, body {
+            height: 100%;
+            width: 100%;
+        }
        body {
            background-color: #404040;
        }
-        #image { width: 800px; margin: 0 auto; font-size: 0;}
-        #image li {  display: inline-block;width: 50px;height: 50px; margin-left: 1%; padding-top: 1%;}
+        #dowebok { width: 800px; margin: 0 auto; font-size: 0;}
+        #dowebok li {  display: inline-block;width: 50px;height: 50px; margin-left: 1%; padding-top: 1%;}
        /*#dowebok li img { width: 200%;}*/
    </style>
 </head>
 <body>
-
-<ul id="image">
+<ul id="dowebok">
    <#list imgUrls as img>
        <#if img?contains("http://") || img?contains("https://")>
            <#assign img="${img}">
@ -27,9 +32,11 @@
        <li><img id="${img}"  url="${img}" src="${img}" width="1px" height="1px"></li>
    </#list>
 </ul>
-
+<script src="js/jquery-3.0.0.min.js"></script>
+<script src="js/viewer.min.js"></script>
+<script src="js/watermark.js" type="text/javascript"></script>
 <script>
-    var viewer = new Viewer(document.getElementById('image'), {
+    var viewer = new Viewer(document.getElementById('dowebok'), {
        url: 'src',
        navbar: false,
        button: false,
@ -37,10 +44,61 @@
        loop : true
    });
    document.getElementById("${currentUrl}").click();
-
+    // 修改下一页按钮的样式和位置
+    $(function () {
+        var outHandler = function(){
+            $(this).css('background-color','rgba(0, 0, 0, 0)');
+        };
+        var overHandler = function(){
+            $(this).css('background-color','rgba(0, 0, 0, .5)');
+        };
+        var next = $("li[data-action=next]");
+        var prev = $("li[data-action=prev]");
+        var viewerToolBar = $(".viewer-footer");
+        // 覆盖按钮父类原始样式
+        viewerToolBar.css("overflow", "visible");
+        // 获取文档高度、宽度
+        var clientHeight = window.innerHeight;
+        var clientWidth = window.innerWidth;
+        // 调整样式
+        var styleCss = {},nextCss={},prevCss={};
+        styleCss.position = "absolute";
+        styleCss.top = -clientHeight;
+        styleCss.width = clientWidth*0.1;
+        styleCss.height = clientHeight + 52;
+        // 覆盖原始样式
+        styleCss.backgroundColor='rgba(0, 0, 0, 0)';
+        styleCss.borderRadius='inherit';
+        nextCss.right = "0";
+        prevCss.left = "0";
+        next.css($.extend(nextCss, styleCss));
+        prev.css($.extend(prevCss, styleCss));
+        next.on('mouseout',outHandler);
+        next.on('mouseover',overHandler);
+        prev.on('mouseout',outHandler);
+        prev.on('mouseover',overHandler);
+    });
    /*初始化水印*/
    window.onload = function() {
-        initWaterMark();
+        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},
+            });
+        }
    }
 </script>
 </body>
--- a/server/src/main/resources/web/txt.ftl
+++ b/server/src/main/resources/web/txt.ftl
@ -4,10 +4,8 @@
    <meta charset="utf-8"/>
    <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
    <title>普通文本预览</title>
-    <#include  "*/commonHeader.ftl">
 </head>
 <body>
-
 <input hidden id="textData" value="${textData}"/>

 <div class="container">
@ -25,6 +23,13 @@
    </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/base64.min.js" type="text/javascript"></script>

 <script>
    /**
@ -35,18 +40,54 @@
        loadText();
    }

+    /**
+     * 初始化水印
+     */
+    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},
+            });
+        }
+    }
+
    /**
     *加载普通文本
     */
    function loadText() {
-        var base64data = $("#textData").val()
-        var textData = Base64.decode(base64data);
-        var textPreData = "<xmp style='background-color: #FFFFFF;overflow-y: scroll;border:none'>" + textData + "</xmp>";
-        $("#text").append(textPreData);
+        var textData = Base64.decode($("#textData").val())
+        var textPreData = "<pre style='background-color: #FFFFFF;border:none'>" + textData + "</pre>";
+
+        $("#text").html(textPreData);
    }

 </script>
+<style>
+    * {
+        margin: 0;
+        padding: 0;
+    }

+    html, body {
+        height: 100%;
+        width: 100%;
+    }
+
+</style>
 </body>

 </html>
--- a/server/src/main/resources/web/xml.ftl
+++ b/server/src/main/resources/web/xml.ftl
@ -3,27 +3,16 @@
 <head>
    <meta charset="utf-8"/>
    <meta name="viewport" content="width=device-width, user-scalable=yes, initial-scale=1.0">
-    <title>xml文本预览</title>
-    <#include  "*/commonHeader.ftl">
-    <link rel="stylesheet" href="css/xmlTreeViewer.css"/>
-    <script src="js/xmlTreeViewer.js" type="text/javascript"></script>
+    <title>普通文本预览</title>
 </head>
 <body>
-
 <input hidden id="textData" value="${textData}"/>
 <div class="container">
    <div class="panel panel-default">
-        <div id="xml_btn" class="panel-heading">
+        <div 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}
+                     ${file.name}
                </a>
            </h4>
        </div>
@ -33,41 +22,76 @@
    </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 () {
-        $("#xml_btn").hide()
        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())
-        window.textPreData = "<xmp style='background-color: #FFFFFF;overflow-y: scroll;border:none'>" + textData + "</xmp>";
        var xmlNode = xmlTreeViewer.parseXML(textData);
-        window.retNode = xmlTreeViewer.getXMLViewerNode(xmlNode.xml);
-        $("#xml").html(window.retNode);
+        var retNode = xmlTreeViewer.getXMLViewerNode(xmlNode.xml);
+        $("#xml").html(retNode);
+
    }

-    $(function () {
-        $("#xml_btn").click(function () {
-            $("#xml").html(window.retNode);
-            $("#text_btn").show()
-            $("#xml_btn").hide()
-        });
-
-        $("#text_btn").click(function () {
-            $("#xml_btn").show()
-            $("#text_btn").hide();
-            $("#xml").html(window.textPreData);
-        });
-    });
 </script>
+<style>
+    * {
+        margin: 0;
+        padding: 0;
+    }
+
+    html, body {
+        height: 100%;
+        width: 100%;
+    }
+
+</style>
 </body>

 </html>