优化：视频文件预览支持FTP

gitchenjh · klboke · commit c16116c7cdc1 · 2020-05-20T08:44:30.000+08:00
diff --git a/jodconverter-web/src/main/java/cn/keking/service/impl/MediaFilePreviewImpl.java b/jodconverter-web/src/main/java/cn/keking/service/impl/MediaFilePreviewImpl.java
@@ -1,7 +1,11 @@
 package cn.keking.service.impl;
 
 import cn.keking.model.FileAttribute;
+import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
+import cn.keking.utils.DownloadUtils;
+import cn.keking.utils.FileUtils;
+import cn.keking.web.filter.BaseUrlFilter;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 /**
@@ -13,8 +17,31 @@
 @Service
 public class MediaFilePreviewImpl implements FilePreview {
 
+    private final DownloadUtils downloadUtils;
+
+    private final FileUtils fileUtils;
+
+    public MediaFilePreviewImpl(DownloadUtils downloadUtils,
+                                FileUtils fileUtils) {
+        this.downloadUtils = downloadUtils;
+        this.fileUtils = fileUtils;
+    }
+
     @Override
     public String filePreviewHandle(String url, Model model, FileAttribute fileAttribute) {
+        // 不是http开头，浏览器不能直接访问，需下载到本地
+        if (url != null && !url.toLowerCase().startsWith("http")) {
+            ReturnResponse<String> response = downloadUtils.downLoad(fileAttribute, fileAttribute.getName());
+            if (0 != response.getCode()) {
+                model.addAttribute("fileType", fileAttribute.getSuffix());
+                model.addAttribute("msg", response.getMsg());
+                return "fileNotSupported";
+            } else {
+                model.addAttribute("mediaUrl", BaseUrlFilter.getBaseUrl() + fileUtils.getRelativePath(response.getContent()));
+            }
+        } else {
+            model.addAttribute("mediaUrl", url);
+        }
         model.addAttribute("mediaUrl", url);
         String suffix=fileAttribute.getSuffix();
         if ("flv".equalsIgnoreCase(suffix)) {
diff --git a/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java b/jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java
@@ -24,16 +24,16 @@
 @Component
 public class FileUtils {
 
-    public static final String DEFAULT_CONVERTER_CHARSET = System.getProperty("sun.jnu.encoding");
+    private static final String DEFAULT_CONVERTER_CHARSET = System.getProperty("sun.jnu.encoding");
+
+    private final String fileDir = ConfigConstants.getFileDir();
 
     private final CacheService cacheService;
 
     public FileUtils(CacheService cacheService) {
         this.cacheService = cacheService;
     }
 
-    String fileDir = ConfigConstants.getFileDir();
-
     /**
      * @return 已转换过的文件集合(缓存)
      */
