调整项目模块，jodconverter-core重命名为office-plugin。jdocnverter-web重命名为server

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

@@ -0,0 +1,99 @@
+package cn.keking.web.controller;
+
+import cn.keking.config.ConfigConstants;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import cn.keking.model.ReturnResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.*;
+import java.util.*;
+
+/**
+ *
+ * @author yudian-it
+ * @date 2017/12/1
+ */
+@RestController
+public class FileController {
+
+    private final Logger logger = LoggerFactory.getLogger(FileController.class);
+
+    private final String fileDir = ConfigConstants.getFileDir();
+
+    private final String demoDir = "demo";
+
+    private final String demoPath = demoDir + File.separator;
+
+    @RequestMapping(value = "fileUpload", method = RequestMethod.POST)
+    public String fileUpload(@RequestParam("file") MultipartFile file) throws JsonProcessingException {
+        // 获取文件名
+        String fileName = file.getOriginalFilename();
+        //判断是否为IE浏览器的文件名，IE浏览器下文件名会带有盘符信息
+        // Check for Unix-style path
+        int unixSep = fileName.lastIndexOf('/');
+        // Check for Windows-style path
+        int winSep = fileName.lastIndexOf('\\');
+        // Cut off at latest possible point
+        int pos = (Math.max(winSep, unixSep));
+        if (pos != -1)  {
+            fileName = fileName.substring(pos + 1);
+        }
+        // 判断是否存在同名文件
+        if (existsFile(fileName)) {
+            return new ObjectMapper().writeValueAsString(new ReturnResponse<String>(1, "存在同名文件，请先删除原有文件再次上传", null));
+        }
+        File outFile = new File(fileDir + demoPath);
+        if (!outFile.exists()) {
+            outFile.mkdirs();
+        }
+        logger.info("上传文件：{}", fileDir + demoPath + fileName);
+        try(InputStream in = file.getInputStream(); OutputStream out = new FileOutputStream(fileDir + demoPath + fileName)) {
+            StreamUtils.copy(in, out);
+            return new ObjectMapper().writeValueAsString(new ReturnResponse<String>(0, "SUCCESS", null));
+        } catch (IOException e) {
+            logger.error("文件上传失败", e);
+            return new ObjectMapper().writeValueAsString(new ReturnResponse<String>(1, "FAILURE", null));
+        }
+    }
+
+    @RequestMapping(value = "deleteFile", method = RequestMethod.GET)
+    public String deleteFile(String fileName) throws JsonProcessingException {
+        if (fileName.contains("/")) {
+            fileName = fileName.substring(fileName.lastIndexOf("/") + 1);
+        }
+        File file = new File(fileDir + demoPath + fileName);
+        logger.info("删除文件：{}", file.getAbsolutePath());
+        if (file.exists()) {
+            file.delete();
+        }
+        return new ObjectMapper().writeValueAsString(new ReturnResponse<String>(0, "SUCCESS", null));
+    }
+
+    @RequestMapping(value = "listFiles", method = RequestMethod.GET)
+    public String getFiles() throws JsonProcessingException {
+        List<Map<String, String>> list = new ArrayList<>();
+        File file = new File(fileDir + demoPath);
+        if (file.exists()) {
+            Arrays.stream(Objects.requireNonNull(file.listFiles())).forEach(file1 -> {
+                Map<String, String> fileName = new HashMap();
+                fileName.put("fileName", demoDir + "/" + file1.getName());
+                list.add(fileName);
+            });
+        }
+        return new ObjectMapper().writeValueAsString(list);
+    }
+
+    private boolean existsFile(String fileName) {
+        File file = new File(fileDir + demoPath + fileName);
+        return file.exists();
+    }
+}

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

@@ -0,0 +1,24 @@
+package cn.keking.web.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ *  页面跳转
+ * @author yudian-it
+ * @date 2017/12/27
+ */
+@Controller
+public class IndexController {
+
+    @RequestMapping(value = "/index", method = RequestMethod.GET)
+    public String go2Index(){
+        return "index";
+    }
+
+    @RequestMapping(value = "/", method = RequestMethod.GET)
+    public String root() {
+        return "redirect:/index";
+    }
+}

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

@@ -0,0 +1,100 @@
+package cn.keking.web.controller;
+
+import cn.keking.model.FileAttribute;
+import cn.keking.service.FilePreview;
+import cn.keking.service.FilePreviewFactory;
+
+import cn.keking.service.cache.CacheService;
+import cn.keking.utils.DownloadUtils;
+import cn.keking.service.FilePreviewCommonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author yudian-it
+ */
+@Controller
+public class OnlinePreviewController {
+
+    private final Logger logger = LoggerFactory.getLogger(OnlinePreviewController.class);
+
+    private final FilePreviewFactory previewFactory;
+    private final CacheService cacheService;
+    private final FilePreviewCommonService filePreviewCommonService;
+    private final DownloadUtils downloadUtils;
+
+    public OnlinePreviewController(FilePreviewFactory filePreviewFactory, FilePreviewCommonService filePreviewCommonService, CacheService cacheService, DownloadUtils downloadUtils) {
+        this.previewFactory = filePreviewFactory;
+        this.filePreviewCommonService = filePreviewCommonService;
+        this.cacheService = cacheService;
+        this.downloadUtils = downloadUtils;
+    }
+
+
+    @RequestMapping(value = "/onlinePreview")
+    public String onlinePreview(String url, Model model, HttpServletRequest req) {
+        FileAttribute fileAttribute = filePreviewCommonService.getFileAttribute(url,req);
+        FilePreview filePreview = previewFactory.get(fileAttribute);
+        logger.info("预览文件url：{}，previewType：{}", url, fileAttribute.getType());
+        return filePreview.filePreviewHandle(url, model, fileAttribute);
+    }
+
+    @RequestMapping(value = "/picturesPreview")
+    public String picturesPreview(Model model, HttpServletRequest req) throws UnsupportedEncodingException {
+        String urls = req.getParameter("urls");
+        String currentUrl = req.getParameter("currentUrl");
+        logger.info("预览文件url：{}，urls：{}", currentUrl, urls);
+        // 路径转码
+        String decodedUrl = URLDecoder.decode(urls, "utf-8");
+        String decodedCurrentUrl = URLDecoder.decode(currentUrl, "utf-8");
+        // 抽取文件并返回文件列表
+        String[] imgs = decodedUrl.split("\\|");
+        List<String> imgUrls = Arrays.asList(imgs);
+        model.addAttribute("imgUrls", imgUrls);
+        model.addAttribute("currentUrl",decodedCurrentUrl);
+        return "picture";
+    }
+
+    /**
+     * 根据url获取文件内容
+     * 当pdfjs读取存在跨域问题的文件时将通过此接口读取
+     *
+     * @param urlPath url
+     * @param response response
+     */
+    @RequestMapping(value = "/getCorsFile", method = RequestMethod.GET)
+    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) {
+            logger.error("下载跨域pdf文件异常，url：{}", urlPath, e);
+        }
+    }
+
+    /**
+     * 通过api接口入队
+     * @param url 请编码后在入队
+     */
+    @RequestMapping("/addTask")
+    @ResponseBody
+    public String addQueueTask(String url) {
+        logger.info("添加转码队列url：{}", url);
+        cacheService.addQueueTask(url);
+        return "success";
+    }
+
+}

server/src/main/java/cn/keking/web/filter/AttributeSetFilter.java

@@ -0,0 +1,62 @@
+package cn.keking.web.filter;
+
+import cn.keking.config.ConfigConstants;
+import cn.keking.config.WatermarkConfigConstants;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * @author chenjh
+ * @since 2020/5/13 18:34
+ */
+public class AttributeSetFilter implements Filter {
+
+    @Override
+    public void init(FilterConfig filterConfig) {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
+        this.setWatermarkAttribute(request);
+        this.setFileAttribute(request);
+        filterChain.doFilter(request, response);
+    }
+
+    /**
+     * 设置办公文具预览逻辑需要的属性
+     * @param request request
+     */
+    private void setFileAttribute(ServletRequest request){
+        HttpServletRequest httpRequest = (HttpServletRequest)request;
+        request.setAttribute("pdfDownloadDisable", ConfigConstants.getPdfDownloadDisable());
+        request.setAttribute("fileKey", httpRequest.getParameter("fileKey"));
+        request.setAttribute("switchDisabled", ConfigConstants.getOfficePreviewSwitchDisabled());
+
+    }
+
+    /**
+     * 设置水印属性
+     * @param request request
+     */
+    private void setWatermarkAttribute(ServletRequest request) {
+        String watermarkTxt = request.getParameter("watermarkTxt");
+        request.setAttribute("watermarkTxt", watermarkTxt != null ? watermarkTxt : WatermarkConfigConstants.getWatermarkTxt());
+        request.setAttribute("watermarkXSpace", WatermarkConfigConstants.getWatermarkXSpace());
+        request.setAttribute("watermarkYSpace", WatermarkConfigConstants.getWatermarkYSpace());
+        request.setAttribute("watermarkFont", WatermarkConfigConstants.getWatermarkFont());
+        request.setAttribute("watermarkFontsize", WatermarkConfigConstants.getWatermarkFontsize());
+        request.setAttribute("watermarkColor", WatermarkConfigConstants.getWatermarkColor());
+        request.setAttribute("watermarkAlpha", WatermarkConfigConstants.getWatermarkAlpha());
+        request.setAttribute("watermarkWidth", WatermarkConfigConstants.getWatermarkWidth());
+        request.setAttribute("watermarkHeight", WatermarkConfigConstants.getWatermarkHeight());
+        request.setAttribute("watermarkAngle", WatermarkConfigConstants.getWatermarkAngle());
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}

server/src/main/java/cn/keking/web/filter/BaseUrlFilter.java

@@ -0,0 +1,58 @@
+package cn.keking.web.filter;
+
+import cn.keking.config.ConfigConstants;
+import org.springframework.web.context.request.RequestContextHolder;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * @author chenjh
+ * @since 2020/5/13 18:27
+ */
+public class BaseUrlFilter implements Filter {
+
+    private static String BASE_URL;
+
+    public static String getBaseUrl() {
+        String baseUrl;
+        try {
+            baseUrl = (String) RequestContextHolder.currentRequestAttributes().getAttribute("baseUrl",0);
+        } catch (Exception e) {
+            baseUrl = BASE_URL;
+        }
+        return baseUrl;
+    }
+
+
+    @Override
+    public void init(FilterConfig filterConfig) {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
+        String baseUrl;
+        StringBuilder pathBuilder = new StringBuilder();
+        pathBuilder.append(request.getScheme()).append("://").append(request.getServerName()).append(":")
+                .append(request.getServerPort()).append(((HttpServletRequest) request).getContextPath()).append("/");
+        String baseUrlTmp = ConfigConstants.getBaseUrl();
+        if (baseUrlTmp != null && !ConfigConstants.DEFAULT_BASE_URL.equals(baseUrlTmp.toLowerCase())) {
+            if (!baseUrlTmp.endsWith("/")) {
+                baseUrlTmp = baseUrlTmp.concat("/");
+            }
+            baseUrl = baseUrlTmp;
+        } else {
+            baseUrl = pathBuilder.toString();
+        }
+        BASE_URL = baseUrl;
+        request.setAttribute("baseUrl", baseUrl);
+        filterChain.doFilter(request, response);
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}

server/src/main/java/cn/keking/web/filter/ChinesePathFilter.java

@@ -0,0 +1,28 @@
+package cn.keking.web.filter;
+
+
+import javax.servlet.*;
+import java.io.IOException;
+
+/**
+ *
+ * @author yudian-it
+ * @date 2017/11/30
+ */
+public class ChinesePathFilter implements Filter {
+
+    @Override
+    public void init(FilterConfig filterConfig) {
+    }
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        request.setCharacterEncoding("UTF-8");
+        response.setCharacterEncoding("UTF-8");
+        chain.doFilter(request, response);
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}

server/src/main/java/cn/keking/web/filter/FilterConfiguration.java

@@ -0,0 +1,66 @@
+package cn.keking.web.filter;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashSet;
+import java.util.Set;
+
+
+/**
+ *
+ * @author yudian-it
+ * @date 2017/11/30
+ */
+@Configuration
+public class FilterConfiguration {
+
+
+    @Bean
+    public FilterRegistrationBean getChinesePathFilter() {
+        ChinesePathFilter filter = new ChinesePathFilter();
+        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+        registrationBean.setFilter(filter);
+        return registrationBean;
+    }
+
+    @Bean
+    public FilterRegistrationBean getTrustHostFilter() {
+        Set<String> filterUri = new HashSet<>();
+        filterUri.add("/onlinePreview");
+        filterUri.add("/picturesPreview");
+        filterUri.add("/getCorsFile");
+        filterUri.add("/addTask");
+        TrustHostFilter filter = new TrustHostFilter();
+        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+        registrationBean.setFilter(filter);
+        registrationBean.setUrlPatterns(filterUri);
+        return registrationBean;
+    }
+
+    @Bean
+    public FilterRegistrationBean getBaseUrlFilter() {
+        Set<String> filterUri = new HashSet<>();
+        filterUri.add("/index");
+        filterUri.add("/onlinePreview");
+        filterUri.add("/picturesPreview");
+        BaseUrlFilter filter = new BaseUrlFilter();
+        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+        registrationBean.setFilter(filter);
+        registrationBean.setUrlPatterns(filterUri);
+        return registrationBean;
+    }
+
+    @Bean
+    public FilterRegistrationBean getWatermarkConfigFilter() {
+        Set<String> filterUri = new HashSet<>();
+        filterUri.add("/onlinePreview");
+        filterUri.add("/picturesPreview");
+        AttributeSetFilter filter = new AttributeSetFilter();
+        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
+        registrationBean.setFilter(filter);
+        registrationBean.setUrlPatterns(filterUri);
+        return registrationBean;
+    }
+}

server/src/main/java/cn/keking/web/filter/TrustHostFilter.java

@@ -0,0 +1,75 @@
+package cn.keking.web.filter;
+
+import cn.keking.config.ConfigConstants;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.util.FileCopyUtils;
+
+import javax.servlet.*;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * @author chenjh
+ * @since 2020/2/18 19:13
+ */
+public class TrustHostFilter implements Filter {
+
+    private String notTrustHost;
+
+    @Override
+    public void init(FilterConfig filterConfig) {
+        ClassPathResource classPathResource = new ClassPathResource("web/notTrustHost.html");
+        try {
+            classPathResource.getInputStream();
+            byte[] bytes = FileCopyUtils.copyToByteArray(classPathResource.getInputStream());
+            this.notTrustHost = new String(bytes, StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        String url = getSourceUrl(request);
+        String host = getHost(url);
+        if (host != null &&!ConfigConstants.getTrustHostSet().isEmpty() && !ConfigConstants.getTrustHostSet().contains(host)) {
+            String html = this.notTrustHost.replace("${current_host}", host);
+            response.getWriter().write(html);
+            response.getWriter().close();
+        }
+        chain.doFilter(request, response);
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+
+    private String getSourceUrl(ServletRequest request) {
+        String url = request.getParameter("url");
+        String currentUrl = request.getParameter("currentUrl");
+        String urlPath = request.getParameter("urlPath");
+        if (StringUtils.isNotBlank(url)) {
+            return url;
+        }
+        if (StringUtils.isNotBlank(currentUrl)) {
+            return currentUrl;
+        }
+        if (StringUtils.isNotBlank(urlPath)) {
+            return urlPath;
+        }
+        return null;
+    }
+
+    private String getHost(String urlStr) {
+        try {
+            URL url = new URL(urlStr);
+            return url.getHost().toLowerCase();
+        } catch (MalformedURLException ignored) {
+        }
+        return null;
+    }
+}