更新版本到 3.3.1

URLEncoder.encode(URLEncoder.encode(pdfFolder, uriEncoding).replaceAll("\+", "%20"), uriEncoding);
这里encode了两次，导致图片预览失败。

Dockerfile

@@ -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.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"]
+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"]

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>cn.keking</groupId>
     <artifactId>filepreview</artifactId>
-    <version>3.3.0</version>
+    <version>3.3.1</version>
     <modules>
         <module>office-plugin</module>
         <module>server</module>

server/pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>cn.keking</groupId>
     <artifactId>kkFileView</artifactId>
-    <version>3.3.0</version>
+    <version>3.3.1</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -56,12 +56,6 @@
             <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>
@@ -77,7 +71,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.12</version>
+            <version>3.17</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
@@ -105,11 +99,6 @@
             <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>

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.0.jar -> ..\log\kkFileView.log
+java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=..\config\application.properties -jar kkFileView-3.3.1.jar -> ..\log\kkFileView.log

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.0.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.1.jar > ../log/kkFileView.log 2>&1 &

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

@@ -1,7 +1,7 @@
 package cn.keking.config;
 
 import cn.keking.service.cache.CacheService;
-import cn.keking.utils.FileUtils;
+import cn.keking.utils.KkFileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
@@ -31,7 +31,7 @@ public class SchedulerCleanConfig {
     public void clean() {
         logger.info("Cache clean start");
         cacheService.cleanCache();
-        FileUtils.deleteDirectory(fileDir);
+        KkFileUtils.deleteDirectory(fileDir);
         logger.info("Cache clean end");
     }
 }

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,7 +71,8 @@ public enum FileType {
 
     public static FileType typeFromFileName(String fileName) {
         String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
-        return FileType.to(fileType);
+        String lowerCaseFileType = fileType.toLowerCase();
+        return FileType.to(lowerCaseFileType);
     }
 
     private final String instanceName;

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

@@ -2,7 +2,7 @@ package cn.keking.service;
 
 import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileType;
-import cn.keking.utils.FileUtils;
+import cn.keking.utils.KkFileUtils;
 import cn.keking.web.filter.BaseUrlFilter;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -48,7 +48,7 @@ public class CompressFileReader {
         String baseUrl = BaseUrlFilter.getBaseUrl();
         String archiveFileName = fileHandlerService.getFileNameFromPath(filePath);
         try {
-            ZipFile zipFile = new ZipFile(filePath, FileUtils.getFileEncode(filePath));
+            ZipFile zipFile = new ZipFile(filePath, KkFileUtils.getFileEncode(filePath));
             Enumeration<ZipArchiveEntry> entries = zipFile.getEntries();
             // 排序
             entries = sortZipEntries(entries);
@@ -382,7 +382,7 @@ public class CompressFileReader {
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            FileUtils.deleteFileByPath(filePath);
+            KkFileUtils.deleteFileByPath(filePath);
         }
 
         private void extractZipFile(String childName, InputStream zipFile) {
@@ -439,7 +439,7 @@ public class CompressFileReader {
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            FileUtils.deleteFileByPath(filePath);
+            KkFileUtils.deleteFileByPath(filePath);
         }
     }
 
@@ -468,7 +468,7 @@ public class CompressFileReader {
             } catch (IOException e) {
                 e.printStackTrace();
             }
-            FileUtils.deleteFileByPath(filePath);
+            KkFileUtils.deleteFileByPath(filePath);
         }
 
         private void extractRarFile(String childName, FileHeader header, Archive archive) {

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

@@ -4,7 +4,7 @@ import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileAttribute;
 import cn.keking.model.FileType;
 import cn.keking.service.cache.CacheService;
-import cn.keking.utils.FileUtils;
+import cn.keking.utils.KkFileUtils;
 import cn.keking.utils.WebUtils;
 import com.aspose.cad.Color;
 import com.aspose.cad.fileformats.cad.CadDrawTypeMode;
@@ -178,14 +178,15 @@ public class FileHandlerService {
         String pdfFolder = pdfName.substring(0, pdfName.length() - 4);
         String urlPrefix;
         try {
-            urlPrefix = baseUrl + URLEncoder.encode(URLEncoder.encode(pdfFolder, uriEncoding).replaceAll("\\+", "%20"), uriEncoding);
+            urlPrefix = baseUrl + URLEncoder.encode(pdfFolder, uriEncoding).replaceAll("\\+", "%20");
         } 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 {
@@ -263,7 +264,7 @@ public class FileHandlerService {
         if (StringUtils.hasText(fullFileName)) {
             fileName = fullFileName;
             type = FileType.typeFromFileName(fullFileName);
-            suffix = FileUtils.suffixFromFileName(fullFileName);
+            suffix = KkFileUtils.suffixFromFileName(fullFileName);
         } else {
             fileName = WebUtils.getFileNameFromURL(url);
             type = FileType.typeFromUrl(url);

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 = model.asMap().get("officePreviewType") == null ? ConfigConstants.getOfficePreviewType() : model.asMap().get("officePreviewType").toString();
+        String officePreviewType = fileAttribute.getOfficePreviewType() == null ? ConfigConstants.getOfficePreviewType() : fileAttribute.getOfficePreviewType();
         String baseUrl = BaseUrlFilter.getBaseUrl();
         String fileName = fileAttribute.getName();
         String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf";

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

@@ -4,14 +4,14 @@ import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
-import org.apache.commons.io.FileUtils;
+import cn.keking.utils.KkFileUtils;
+import jodd.io.FileUtil;
+import org.apache.commons.codec.binary.Base64;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
-import org.springframework.util.Base64Utils;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 
 /**
  * Created by kl on 2018/1/17.
@@ -35,8 +35,9 @@ public class SimTextFilePreviewImpl implements FilePreview {
         }
         try {
             File originFile = new File(response.getContent());
-            String xmlString = FileUtils.readFileToString(originFile, StandardCharsets.UTF_8);
-            model.addAttribute("textData", Base64Utils.encodeToString(xmlString.getBytes(StandardCharsets.UTF_8)));
+            String charset = KkFileUtils.getFileEncode(originFile);
+            String fileData = FileUtil.readString(originFile, charset);
+            model.addAttribute("textData", Base64.encodeBase64String(fileData.getBytes()));
         } catch (IOException e) {
             return otherFilePreview.notSupportedFile(model, fileAttribute, e.getLocalizedMessage());
         }

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

@@ -2,17 +2,19 @@ package cn.keking.utils;
 
 import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileAttribute;
-import cn.keking.model.FileType;
 import cn.keking.model.ReturnResponse;
 import io.mola.galimatias.GalimatiasParseException;
+import jodd.io.NetUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.net.*;
-import java.nio.charset.StandardCharsets;
 import java.util.UUID;
 
+import static cn.keking.utils.KkFileUtils.isFtpUrl;
+import static cn.keking.utils.KkFileUtils.isHttpUrl;
+
 /**
  * @author yudian-it
  */
@@ -31,42 +33,26 @@ public class DownloadUtils {
      */
     public static ReturnResponse<String> downLoad(FileAttribute fileAttribute, String fileName) {
         String urlStr = fileAttribute.getUrl();
-        String type = fileAttribute.getSuffix();
         ReturnResponse<String> response = new ReturnResponse<>(0, "下载成功!!!", "");
-        UUID uuid = UUID.randomUUID();
-        if (null == fileName) {
-            fileName = uuid + "." + type;
-        } else { // 文件后缀不一致时，以type为准(针对simText【将类txt文件转为txt】)
-            fileName = fileName.replace(fileName.substring(fileName.lastIndexOf(".") + 1), type);
-        }
-        String realPath = fileDir + fileName;
-        File dirFile = new File(fileDir);
-        if (!dirFile.exists() && !dirFile.mkdirs()) {
-            logger.error("创建目录【{}】失败,可能是权限不够，请检查", fileDir);
-        }
+        String realPath = DownloadUtils.getRelFilePath(fileName, fileAttribute);
         try {
-            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(realPath);
-                saveBytesToOutStream(bytes, os);
-            } else if (url.getProtocol() != null && "ftp".equalsIgnoreCase(url.getProtocol())) {
+            URL url = WebUtils.normalizedURL(urlStr);
+            if (isHttpUrl(url)) {
+                File realFile = new File(realPath);
+                NetUtil.downloadFile(url.toString(),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);
                 String ftpControlEncoding = WebUtils.getUrlParameterReg(fileAttribute.getUrl(), URL_PARAM_FTP_CONTROL_ENCODING);
                 FtpUtils.download(fileAttribute.getUrl(), realPath, ftpUsername, ftpPassword, ftpControlEncoding);
             } else {
                 response.setCode(1);
-                response.setContent(null);
                 response.setMsg("url不能识别url" + urlStr);
             }
             response.setContent(realPath);
             response.setMsg(fileName);
-            if (FileType.simText.equals(fileAttribute.getType())) {
-                convertTextPlainFileCharsetToUtf8(realPath);
-            }
             return response;
-        } catch (IOException e) {
+        } catch (IOException | GalimatiasParseException e) {
             logger.error("文件下载失败，url：{}", urlStr, e);
             response.setCode(1);
             response.setContent(null);
@@ -79,82 +65,27 @@ public class DownloadUtils {
         }
     }
 
-    public static byte[] getBytesFromUrl(String urlStr) throws IOException {
-        InputStream is = getInputStreamFromUrl(urlStr);
-        if (is == null) {
-            is = getInputStreamFromUrl(urlStr);
-            if (is == null) {
-                logger.error("文件下载异常：url：{}", urlStr);
-                throw new IOException("文件下载异常：url：" + urlStr);
-            }
-        }
-        return getBytesFromStream(is);
-    }
-
-    public static void saveBytesToOutStream(byte[] b, OutputStream os) throws IOException {
-        os.write(b);
-        os.close();
-    }
-
-    private static InputStream getInputStreamFromUrl(String urlStr) {
-        try {
-
-            URL url = io.mola.galimatias.URL.parse(urlStr).toJavaURL();
-            URLConnection connection = url.openConnection();
-            if (connection instanceof HttpURLConnection) {
-                connection.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
-            }
-            return connection.getInputStream();
-        } catch (IOException | GalimatiasParseException e) {
-            logger.warn("连接url异常：url：{}", urlStr);
-            return null;
-        }
-    }
-
-    private static byte[] getBytesFromStream(InputStream is) throws IOException {
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        byte[] buffer = new byte[1024];
-        int len;
-        while ((len = is.read(buffer)) != -1) {
-            baos.write(buffer, 0, len);
-        }
-        byte[] b = baos.toByteArray();
-        is.close();
-        baos.close();
-        return b;
-    }
 
     /**
-     * 转换文本文件编码为utf8
-     * 探测源文件编码,探测到编码切不为utf8则进行转码
+     * 获取真实文件绝对路径
      *
-     * @param filePath 文件路径
+     * @param fileName 文件名
+     * @return 文件路径
      */
-    private static void convertTextPlainFileCharsetToUtf8(String filePath) throws IOException {
-        File sourceFile = new File(filePath);
-        if (sourceFile.exists() && sourceFile.isFile() && sourceFile.canRead()) {
-            String encoding = FileUtils.getFileEncode(filePath);
-            if (!FileUtils.DEFAULT_FILE_ENCODING.equals(encoding)) {
-                // 不为utf8,进行转码
-                File tmpUtf8File = new File(filePath + ".utf8");
-                Writer writer = new OutputStreamWriter(new FileOutputStream(tmpUtf8File), StandardCharsets.UTF_8);
-                Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(sourceFile), encoding));
-                char[] buf = new char[1024];
-                int read;
-                while ((read = reader.read(buf)) > 0) {
-                    writer.write(buf, 0, read);
-                }
-                reader.close();
-                writer.close();
-                // 删除源文件
-                if (!sourceFile.delete()) {
-                    logger.error("源文件【{}】删除失败,请检查文件目录权限！", filePath);
-                }
-                // 重命名
-                if (tmpUtf8File.renameTo(sourceFile)) {
-                    logger.error("临时文件【{}】重命名失败，请检查文件路径权限！", tmpUtf8File.getPath());
-                }
-            }
+    private static String getRelFilePath(String fileName, FileAttribute fileAttribute) {
+        String type = fileAttribute.getSuffix();
+        if (null == fileName) {
+            UUID uuid = UUID.randomUUID();
+            fileName = uuid + "." + type;
+        } else { // 文件后缀不一致时，以type为准(针对simText【将类txt文件转为txt】)
+            fileName = fileName.replace(fileName.substring(fileName.lastIndexOf(".") + 1), type);
         }
+        String realPath = fileDir + fileName;
+        File dirFile = new File(fileDir);
+        if (!dirFile.exists() && !dirFile.mkdirs()) {
+            logger.error("创建目录【{}】失败,可能是权限不够，请检查", fileDir);
+        }
+        return realPath;
     }
+
 }

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

@@ -6,19 +6,39 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 import java.util.Objects;
 
-public class FileUtils {
+public class KkFileUtils {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(FileUtils.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(KkFileUtils.class);
 
     public static final String DEFAULT_FILE_ENCODING = "UTF-8";
 
+    /**
+     * 判断url是否是http资源
+     *
+     * @param url url
+     * @return 是否http
+     */
+    public static boolean isHttpUrl(URL url) {
+        return url.getProtocol().toLowerCase().startsWith("file") || url.getProtocol().toLowerCase().startsWith("http");
+    }
+
+    /**
+     * 判断url是否是ftp资源
+     *
+     * @param url url
+     * @return 是否ftp
+     */
+    public static boolean isFtpUrl(URL url) {
+        return "ftp".equalsIgnoreCase(url.getProtocol());
+    }
+
     /**
      * 删除单个文件
      *
-     * @param fileName
-     *            要删除的文件的文件名
+     * @param fileName 要删除的文件的文件名
      * @return 单个文件删除成功返回true，否则返回false
      */
     public static boolean deleteFileByName(String fileName) {
@@ -39,17 +59,26 @@ public class FileUtils {
     }
 
     /**
-     * 判断文件编码格式
+     * 检测文件编码格式
      *
      * @param filePath 绝对路径
      * @return 编码格式
      */
     public static String getFileEncode(String filePath) {
-        File file = new File(filePath);
+        return getFileEncode(new File(filePath));
+    }
+
+    /**
+     * 检测文件编码格式
+     *
+     * @param file 检测的文件
+     * @return 编码格式
+     */
+    public static String getFileEncode(File file) {
         CharsetPrinter cp = new CharsetPrinter();
         try {
             String encoding = cp.guessEncoding(file);
-            LOGGER.info("检测到文件【{}】编码: {}", filePath, encoding);
+            LOGGER.info("检测到文件【{}】编码: {}", file.getAbsolutePath(), encoding);
             return encoding;
         } catch (IOException e) {
             LOGGER.warn("文件编码获取失败，采用默认的编码格式：UTF-8", e);
@@ -59,6 +88,7 @@ public class FileUtils {
 
     /**
      * 通过文件名获取文件后缀
+     *
      * @param fileName 文件名称
      * @return 文件后缀
      */
@@ -82,8 +112,7 @@ public class FileUtils {
     /**
      * 删除目录及目录下的文件
      *
-     * @param dir
-     *            要删除的目录的文件路径
+     * @param dir 要删除的目录的文件路径
      * @return 目录删除成功返回true，否则返回false
      */
     public static boolean deleteDirectory(String dir) {
@@ -103,13 +132,13 @@ public class FileUtils {
         for (int i = 0; i < Objects.requireNonNull(files).length; i++) {
             // 删除子文件
             if (files[i].isFile()) {
-                flag = FileUtils.deleteFileByName(files[i].getAbsolutePath());
+                flag = KkFileUtils.deleteFileByName(files[i].getAbsolutePath());
                 if (!flag) {
                     break;
                 }
-            }  else if (files[i].isDirectory()) {
+            } else if (files[i].isDirectory()) {
                 // 删除子目录
-                flag = FileUtils.deleteDirectory(files[i].getAbsolutePath());
+                flag = KkFileUtils.deleteDirectory(files[i].getAbsolutePath());
                 if (!flag) {
                     break;
                 }

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

@@ -1,5 +1,9 @@
 package cn.keking.utils;
 
+import io.mola.galimatias.GalimatiasParseException;
+
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -8,6 +12,16 @@ import java.util.Map;
  * create : 2020-12-27 1:30 上午
  **/
 public class WebUtils {
+
+    /**
+     * 获取标准的URL
+     * @param urlStr url
+     * @return 标准的URL
+     */
+    public static URL normalizedURL(String urlStr) throws GalimatiasParseException, MalformedURLException {
+        return io.mola.galimatias.URL.parse(urlStr).toJavaURL();
+    }
+
     /**
      * 获取url中的参数
      *
@@ -81,6 +95,6 @@ public class WebUtils {
     public static String suffixFromUrl(String url) {
         String nonPramStr = url.substring(0, url.contains("?") ? url.indexOf("?") : url.length());
         String fileName = nonPramStr.substring(nonPramStr.lastIndexOf("/") + 1);
-        return FileUtils.suffixFromFileName(fileName);
+        return KkFileUtils.suffixFromFileName(fileName);
     }
 }

server/src/main/java/cn/keking/web/controller/FileController.java

@@ -15,7 +15,9 @@ 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;
 
 /**
  *
@@ -36,6 +38,10 @@ 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

server/src/main/java/cn/keking/web/controller/OnlinePreviewController.java

@@ -6,13 +6,16 @@ import cn.keking.service.FilePreviewFactory;
 
 import cn.keking.service.cache.CacheService;
 import cn.keking.service.impl.OtherFilePreviewImpl;
-import cn.keking.utils.DownloadUtils;
 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.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;
@@ -21,6 +24,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 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;
 
@@ -51,7 +56,7 @@ public class OnlinePreviewController {
     public String onlinePreview(String url, Model model, HttpServletRequest req) {
         String fileUrl;
         try {
-            fileUrl = new String(Base64Utils.decodeFromString(url));
+            fileUrl = new String(Base64.decodeBase64(url), StandardCharsets.UTF_8);
         } catch (Exception ex) {
             String errorMsg = String.format(BASE64_DECODE_ERROR_MSG, "url");
             return otherFilePreview.notSupportedFile(model, errorMsg);
@@ -67,7 +72,7 @@ public class OnlinePreviewController {
     public String picturesPreview(String urls, Model model, HttpServletRequest req) throws UnsupportedEncodingException {
         String fileUrls;
         try {
-            fileUrls = new String(Base64Utils.decodeFromString(urls));
+            fileUrls = new String(Base64.decodeBase64(urls));
         } catch (Exception ex) {
             String errorMsg = String.format(BASE64_DECODE_ERROR_MSG, "urls");
             return otherFilePreview.notSupportedFile(model, errorMsg);
@@ -80,7 +85,7 @@ public class OnlinePreviewController {
 
         String currentUrl = req.getParameter("currentUrl");
         if (StringUtils.hasText(currentUrl)) {
-            String decodedCurrentUrl = new String(Base64Utils.decodeFromString(currentUrl));
+            String decodedCurrentUrl = new String(Base64.decodeBase64(currentUrl));
             model.addAttribute("currentUrl", decodedCurrentUrl);
         } else {
             model.addAttribute("currentUrl", imgUrls.get(0));
@@ -99,9 +104,10 @@ public class OnlinePreviewController {
     public void getCorsFile(String urlPath, HttpServletResponse response) {
         logger.info("下载跨域pdf文件url：{}", urlPath);
         try {
-            byte[] bytes = DownloadUtils.getBytesFromUrl(urlPath);
-            DownloadUtils.saveBytesToOutStream(bytes, response.getOutputStream());
-        } catch (IOException e) {
+            URL url = WebUtils.normalizedURL(urlPath);
+            byte[] bytes = NetUtil.downloadBytes(url.toString());
+            IOUtils.write(bytes, response.getOutputStream());
+        } catch (IOException | GalimatiasParseException e) {
             logger.error("下载跨域pdf文件异常，url：{}", urlPath, e);
         }
     }

server/src/main/resources/web/fileNotSupported.ftl

@@ -32,7 +32,8 @@
 <div class="container">
     <img src="images/sorry.jpg" />
     <span>
-        该文件类型(${file.suffix})系统暂时不支持在线预览，<b>说明</b>：
+    该文件类型(${file.suffix?html})系统暂时不支持在线预览，<b>说明</b>：      
+    
         <p style="color: red;">${msg}</p>
         有任何疑问，请加&nbsp;<a href="https://jq.qq.com/?_wv=1027&k=5c0UAtu">官方QQ群：613025121</a>&nbsp;咨询
     </span>

server/src/main/resources/web/txt.ftl

@@ -39,10 +39,10 @@
      *加载普通文本
      */
     function loadText() {
-        var textData = Base64.decode($("#textData").val())
-        var textPreData = "<pre style='background-color: #FFFFFF;border:none'>" + textData + "</pre>";
-
-        $("#text").html(textPreData);
+        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);
     }
 
 </script>

server/src/main/resources/web/xml.ftl

@@ -13,10 +13,17 @@
 <input hidden id="textData" value="${textData}"/>
 <div class="container">
     <div class="panel panel-default">
-        <div class="panel-heading">
+        <div id="xml_btn" class="panel-heading">
             <h4 class="panel-title">
                 <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
-                     ${file.name}
+                    ${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>
@@ -31,6 +38,7 @@
      * 初始化
      */
     window.onload = function () {
+        $("#xml_btn").hide()
         initWaterMark();
         loadXmlData()
     }
@@ -40,11 +48,25 @@
      */
     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);
-        var retNode = xmlTreeViewer.getXMLViewerNode(xmlNode.xml);
-        $("#xml").html(retNode);
+        window.retNode = xmlTreeViewer.getXMLViewerNode(xmlNode.xml);
+        $("#xml").html(window.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>
 </body>