引入cpdetector解决文件编码识别问题

2025-10-26 18:59:13 +08:00 · 2020-12-26 19:13:50 +08:00
parent f2d929e6fa
commit 342c391a9b
23 changed files with 240 additions and 400 deletions
--- a/server/src/main/java/cn/keking/service/impl/CadFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/CadFilePreviewImpl.java
@@ -6,7 +6,7 @@ import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.CadUtils;
 import cn.keking.utils.DownloadUtils;
-import cn.keking.service.FilePreviewCommonService;
+import cn.keking.service.FileHandlerService;
 import cn.keking.utils.PdfUtils;
 import cn.keking.web.filter.BaseUrlFilter;
 import org.springframework.stereotype.Service;
@@ -22,7 +22,7 @@ import static cn.keking.service.impl.OfficeFilePreviewImpl.getPreviewType;
@Service
 public class CadFilePreviewImpl implements FilePreview {

-    private final FilePreviewCommonService filePreviewCommonService;
+    private final FileHandlerService fileHandlerService;

    private final DownloadUtils downloadUtils;

@@ -30,11 +30,11 @@ public class CadFilePreviewImpl implements FilePreview {

    private final PdfUtils pdfUtils;

-    public CadFilePreviewImpl(FilePreviewCommonService filePreviewCommonService,
+    public CadFilePreviewImpl(FileHandlerService fileHandlerService,
                              DownloadUtils downloadUtils,
                              CadUtils cadUtils,
                              PdfUtils pdfUtils) {
-        this.filePreviewCommonService = filePreviewCommonService;
+        this.fileHandlerService = fileHandlerService;
        this.downloadUtils = downloadUtils;
        this.cadUtils = cadUtils;
        this.pdfUtils = pdfUtils;
@@ -56,7 +56,7 @@ public class CadFilePreviewImpl implements FilePreview {
        String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf";
        String outFilePath = FILE_DIR + pdfName;
        // 判断之前是否已转换过，如果转换过，直接返回，否则执行转换
-        if (!filePreviewCommonService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
+        if (!fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
            String filePath;
            ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, null);
            if (0 != response.getCode()) {
@@ -74,7 +74,7 @@ public class CadFilePreviewImpl implements FilePreview {
                }
                if (ConfigConstants.isCacheEnabled()) {
                    // 加入缓存
-                    filePreviewCommonService.addConvertedFile(pdfName, filePreviewCommonService.getRelativePath(outFilePath));
+                    fileHandlerService.addConvertedFile(pdfName, fileHandlerService.getRelativePath(outFilePath));
                }
            }
        }
--- a/server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java
@@ -5,8 +5,8 @@ import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
-import cn.keking.service.FilePreviewCommonService;
-import cn.keking.utils.ZipReader;
+import cn.keking.service.FileHandlerService;
+import cn.keking.service.CompressFileReader;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
@@ -18,18 +18,14 @@ import org.springframework.util.StringUtils;
@Service
 public class CompressFilePreviewImpl implements FilePreview {

-    private final FilePreviewCommonService filePreviewCommonService;
-
+    private final FileHandlerService fileHandlerService;
    private final DownloadUtils downloadUtils;
+    private final CompressFileReader compressFileReader;

-    private final ZipReader zipReader;
-
-    public CompressFilePreviewImpl(FilePreviewCommonService filePreviewCommonService,
-                                   DownloadUtils downloadUtils,
-                                   ZipReader zipReader) {
-        this.filePreviewCommonService = filePreviewCommonService;
+    public CompressFilePreviewImpl(FileHandlerService fileHandlerService, DownloadUtils downloadUtils, CompressFileReader compressFileReader) {
+        this.fileHandlerService = fileHandlerService;
        this.downloadUtils = downloadUtils;
-        this.zipReader = zipReader;
+        this.compressFileReader = compressFileReader;
    }

    @Override
@@ -38,7 +34,7 @@ public class CompressFilePreviewImpl implements FilePreview {
        String suffix=fileAttribute.getSuffix();
        String fileTree = null;
        // 判断文件名是否存在(redis缓存读取)
-        if (!StringUtils.hasText(filePreviewCommonService.getConvertedFile(fileName))  || !ConfigConstants.isCacheEnabled()) {
+        if (!StringUtils.hasText(fileHandlerService.getConvertedFile(fileName))  || !ConfigConstants.isCacheEnabled()) {
            ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, fileName);
            if (0 != response.getCode()) {
                model.addAttribute("fileType", suffix);
@@ -47,17 +43,17 @@ public class CompressFilePreviewImpl implements FilePreview {
            }
            String filePath = response.getContent();
            if ("zip".equalsIgnoreCase(suffix) || "jar".equalsIgnoreCase(suffix) || "gzip".equalsIgnoreCase(suffix)) {
-                fileTree = zipReader.readZipFile(filePath, fileName);
+                fileTree = compressFileReader.readZipFile(filePath, fileName);
            } else if ("rar".equalsIgnoreCase(suffix)) {
-                fileTree = zipReader.unRar(filePath, fileName);
+                fileTree = compressFileReader.unRar(filePath, fileName);
            } else if ("7z".equalsIgnoreCase(suffix)) {
-                fileTree = zipReader.read7zFile(filePath, fileName);
+                fileTree = compressFileReader.read7zFile(filePath, fileName);
            }
            if (fileTree != null && !"null".equals(fileTree) && ConfigConstants.isCacheEnabled()) {
-                filePreviewCommonService.addConvertedFile(fileName, fileTree);
+                fileHandlerService.addConvertedFile(fileName, fileTree);
            }
        } else {
-            fileTree = filePreviewCommonService.getConvertedFile(fileName);
+            fileTree = fileHandlerService.getConvertedFile(fileName);
        }
        if (fileTree != null && !"null".equals(fileTree)) {
            model.addAttribute("fileTree", fileTree);
--- 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 com.sun.glass.ui.Clipboard.TEXT_TYPE;
+
 /**
 * @author kl (http://kailing.pub)
 * @since 2020/12/25
--- a/server/src/main/java/cn/keking/service/impl/MediaFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/MediaFilePreviewImpl.java
@@ -4,7 +4,7 @@ import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
-import cn.keking.service.FilePreviewCommonService;
+import cn.keking.service.FileHandlerService;
 import cn.keking.web.filter.BaseUrlFilter;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
@@ -19,12 +19,12 @@ public class MediaFilePreviewImpl implements FilePreview {

    private final DownloadUtils downloadUtils;

-    private final FilePreviewCommonService filePreviewCommonService;
+    private final FileHandlerService fileHandlerService;

    public MediaFilePreviewImpl(DownloadUtils downloadUtils,
-                                FilePreviewCommonService filePreviewCommonService) {
+                                FileHandlerService fileHandlerService) {
        this.downloadUtils = downloadUtils;
-        this.filePreviewCommonService = filePreviewCommonService;
+        this.fileHandlerService = fileHandlerService;
    }

    @Override
@@ -37,7 +37,7 @@ public class MediaFilePreviewImpl implements FilePreview {
                model.addAttribute("msg", response.getMsg());
                return "fileNotSupported";
            } else {
-                model.addAttribute("mediaUrl", BaseUrlFilter.getBaseUrl() + filePreviewCommonService.getRelativePath(response.getContent()));
+                model.addAttribute("mediaUrl", BaseUrlFilter.getBaseUrl() + fileHandlerService.getRelativePath(response.getContent()));
            }
        } else {
            model.addAttribute("mediaUrl", url);
--- a/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java
@@ -5,7 +5,7 @@ import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
-import cn.keking.service.FilePreviewCommonService;
+import cn.keking.service.FileHandlerService;
 import cn.keking.service.OfficeToPdfService;
 import cn.keking.utils.PdfUtils;
 import cn.keking.web.filter.BaseUrlFilter;
@@ -22,13 +22,13 @@ import java.util.List;
@Service
 public class OfficeFilePreviewImpl implements FilePreview {

-    private final FilePreviewCommonService filePreviewCommonService;
+    private final FileHandlerService fileHandlerService;
    private final PdfUtils pdfUtils;
    private final DownloadUtils downloadUtils;
    private final OfficeToPdfService officeToPdfService;

-    public OfficeFilePreviewImpl(FilePreviewCommonService filePreviewCommonService, PdfUtils pdfUtils, DownloadUtils downloadUtils, OfficeToPdfService officeToPdfService) {
-        this.filePreviewCommonService = filePreviewCommonService;
+    public OfficeFilePreviewImpl(FileHandlerService fileHandlerService, PdfUtils pdfUtils, DownloadUtils downloadUtils, OfficeToPdfService officeToPdfService) {
+        this.fileHandlerService = fileHandlerService;
        this.pdfUtils = pdfUtils;
        this.downloadUtils = downloadUtils;
        this.officeToPdfService = officeToPdfService;
@@ -49,7 +49,7 @@ public class OfficeFilePreviewImpl implements FilePreview {
        String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + (isHtml ? "html" : "pdf");
        String outFilePath = FILE_DIR + pdfName;
        // 判断之前是否已转换过，如果转换过，直接返回，否则执行转换
-        if (!filePreviewCommonService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
+        if (!fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
            String filePath;
            ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, null);
            if (0 != response.getCode()) {
@@ -62,11 +62,11 @@ public class OfficeFilePreviewImpl implements FilePreview {
                officeToPdfService.openOfficeToPDF(filePath, outFilePath);
                if (isHtml) {
                    // 对转换后的文件进行操作(改变编码方式)
-                    filePreviewCommonService.doActionConvertedFile(outFilePath);
+                    fileHandlerService.doActionConvertedFile(outFilePath);
                }
                if (ConfigConstants.isCacheEnabled()) {
                    // 加入缓存
-                    filePreviewCommonService.addConvertedFile(pdfName, filePreviewCommonService.getRelativePath(outFilePath));
+                    fileHandlerService.addConvertedFile(pdfName, fileHandlerService.getRelativePath(outFilePath));
                }
            }
        }
--- a/server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java
@@ -5,7 +5,7 @@ import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
-import cn.keking.service.FilePreviewCommonService;
+import cn.keking.service.FileHandlerService;
 import cn.keking.utils.PdfUtils;
 import cn.keking.web.filter.BaseUrlFilter;
 import org.springframework.stereotype.Service;
@@ -20,7 +20,7 @@ import java.util.List;
@Service
 public class PdfFilePreviewImpl implements FilePreview {

-    private final FilePreviewCommonService filePreviewCommonService;
+    private final FileHandlerService fileHandlerService;

    private final PdfUtils pdfUtils;

@@ -28,10 +28,10 @@ public class PdfFilePreviewImpl implements FilePreview {

    private static final String FILE_DIR = ConfigConstants.getFileDir();

-    public PdfFilePreviewImpl(FilePreviewCommonService filePreviewCommonService,
+    public PdfFilePreviewImpl(FileHandlerService fileHandlerService,
                              PdfUtils pdfUtils,
                              DownloadUtils downloadUtils) {
-        this.filePreviewCommonService = filePreviewCommonService;
+        this.fileHandlerService = fileHandlerService;
        this.pdfUtils = pdfUtils;
        this.downloadUtils = downloadUtils;
    }
@@ -46,7 +46,7 @@ public class PdfFilePreviewImpl implements FilePreview {
        String outFilePath = FILE_DIR + pdfName;
        if (OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_ALL_IMAGES.equals(officePreviewType)) {
            //当文件不存在时，就去下载
-            if (!filePreviewCommonService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
+            if (!fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
                ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, fileName);
                if (0 != response.getCode()) {
                    model.addAttribute("fileType", suffix);
@@ -56,7 +56,7 @@ public class PdfFilePreviewImpl implements FilePreview {
                outFilePath = response.getContent();
                if (ConfigConstants.isCacheEnabled()) {
                    // 加入缓存
-                    filePreviewCommonService.addConvertedFile(pdfName, filePreviewCommonService.getRelativePath(outFilePath));
+                    fileHandlerService.addConvertedFile(pdfName, fileHandlerService.getRelativePath(outFilePath));
                }
            }
            List<String> imageUrls = pdfUtils.pdf2jpg(outFilePath, pdfName, baseUrl);
@@ -75,17 +75,17 @@ public class PdfFilePreviewImpl implements FilePreview {
        } else {
            // 不是http开头，浏览器不能直接访问，需下载到本地
            if (url != null && !url.toLowerCase().startsWith("http")) {
-                if (!filePreviewCommonService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
+                if (!fileHandlerService.listConvertedFiles().containsKey(pdfName) || !ConfigConstants.isCacheEnabled()) {
                    ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, pdfName);
                    if (0 != response.getCode()) {
                        model.addAttribute("fileType", suffix);
                        model.addAttribute("msg", response.getMsg());
                        return "fileNotSupported";
                    }
-                    model.addAttribute("pdfUrl", filePreviewCommonService.getRelativePath(response.getContent()));
+                    model.addAttribute("pdfUrl", fileHandlerService.getRelativePath(response.getContent()));
                    if (ConfigConstants.isCacheEnabled()) {
                        // 加入缓存
-                        filePreviewCommonService.addConvertedFile(pdfName, filePreviewCommonService.getRelativePath(outFilePath));
+                        fileHandlerService.addConvertedFile(pdfName, fileHandlerService.getRelativePath(outFilePath));
                    }
                } else {
                    model.addAttribute("pdfUrl", pdfName);
--- a/server/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/PictureFilePreviewImpl.java
@@ -4,7 +4,7 @@ import cn.keking.model.FileAttribute;
 import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
-import cn.keking.service.FilePreviewCommonService;
+import cn.keking.service.FileHandlerService;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 import org.springframework.util.CollectionUtils;
@@ -18,13 +18,13 @@ import java.util.List;
@Service
 public class PictureFilePreviewImpl implements FilePreview {

-    private final FilePreviewCommonService filePreviewCommonService;
+    private final FileHandlerService fileHandlerService;

    private final DownloadUtils downloadUtils;

-    public PictureFilePreviewImpl(FilePreviewCommonService filePreviewCommonService,
+    public PictureFilePreviewImpl(FileHandlerService fileHandlerService,
                                  DownloadUtils downloadUtils) {
-        this.filePreviewCommonService = filePreviewCommonService;
+        this.fileHandlerService = fileHandlerService;
        this.downloadUtils = downloadUtils;
    }

@@ -33,7 +33,7 @@ public class PictureFilePreviewImpl implements FilePreview {
        List<String> imgUrls = new ArrayList<>();
        imgUrls.add(url);
        String fileKey = fileAttribute.getFileKey();
-        List<String> zipImgUrls = filePreviewCommonService.getImgCache(fileKey);
+        List<String> zipImgUrls = fileHandlerService.getImgCache(fileKey);
        if (!CollectionUtils.isEmpty(zipImgUrls)) {
            imgUrls.addAll(zipImgUrls);
        }
@@ -45,7 +45,7 @@ public class PictureFilePreviewImpl implements FilePreview {
                model.addAttribute("msg", response.getMsg());
                return "fileNotSupported";
            } else {
-                String file = filePreviewCommonService.getRelativePath(response.getContent());
+                String file = fileHandlerService.getRelativePath(response.getContent());
                imgUrls.clear();
                imgUrls.add(file);
                model.addAttribute("imgurls", imgUrls);
--- a/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
+++ b/server/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java
@@ -1,7 +1,6 @@
 package cn.keking.service.impl;

 import cn.keking.model.FileAttribute;
-import cn.keking.model.FileType;
 import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
@@ -13,7 +12,6 @@ import org.springframework.util.Base64Utils;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;

 /**
 * Created by kl on 2018/1/17.
@@ -22,8 +20,10 @@ import java.nio.file.Files;
@Service
 public class SimTextFilePreviewImpl implements FilePreview {

-    private final DownloadUtils downloadUtils;
+    public static final String TEXT_TYPE = "textType";
+    public static final String DEFAULT_TEXT_TYPE = "simText";

+    private final DownloadUtils downloadUtils;

    public SimTextFilePreviewImpl(DownloadUtils downloadUtils) {
        this.downloadUtils = downloadUtils;
--- 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 com.sun.glass.ui.Clipboard.TEXT_TYPE;
+
 /**
 * @author kl (http://kailing.pub)
 * @since 2020/12/25