Selaa lähdekoodia

添加pdfjs预览pdf文件

liou 7 vuotta sitten
vanhempi
commit
8e97395569
100 muutettua tiedostoa jossa 313 lisäystä ja 40 poistoa
  1. 5 0
      jodconverter-web/src/main/java/com/yudianbank/filters/ChinesePathFilter.java
  2. 27 1
      jodconverter-web/src/main/java/com/yudianbank/utils/OfficeToPdf.java
  3. 24 0
      jodconverter-web/src/main/java/com/yudianbank/web/controller/IndexController.java
  4. 66 35
      jodconverter-web/src/main/java/com/yudianbank/web/controller/OnlinePreviewController.java
  5. 4 4
      jodconverter-web/src/main/resources/static/css/zTreeStyle.css
  6. 177 0
      jodconverter-web/src/main/resources/static/pdfjs/LICENSE
  7. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-EUC-H.bcmap
  8. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-EUC-V.bcmap
  9. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-H.bcmap
  10. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-RKSJ-H.bcmap
  11. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-RKSJ-V.bcmap
  12. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-V.bcmap
  13. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78ms-RKSJ-H.bcmap
  14. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78ms-RKSJ-V.bcmap
  15. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/83pv-RKSJ-H.bcmap
  16. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90ms-RKSJ-H.bcmap
  17. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90ms-RKSJ-V.bcmap
  18. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90msp-RKSJ-H.bcmap
  19. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90msp-RKSJ-V.bcmap
  20. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90pv-RKSJ-H.bcmap
  21. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90pv-RKSJ-V.bcmap
  22. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Add-H.bcmap
  23. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Add-RKSJ-H.bcmap
  24. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Add-RKSJ-V.bcmap
  25. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Add-V.bcmap
  26. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-0.bcmap
  27. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-1.bcmap
  28. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-2.bcmap
  29. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-3.bcmap
  30. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-4.bcmap
  31. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-5.bcmap
  32. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-6.bcmap
  33. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-UCS2.bcmap
  34. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-0.bcmap
  35. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-1.bcmap
  36. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-2.bcmap
  37. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-3.bcmap
  38. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-4.bcmap
  39. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-5.bcmap
  40. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-UCS2.bcmap
  41. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-0.bcmap
  42. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-1.bcmap
  43. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-2.bcmap
  44. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-3.bcmap
  45. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-4.bcmap
  46. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-5.bcmap
  47. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-6.bcmap
  48. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-UCS2.bcmap
  49. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Korea1-0.bcmap
  50. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Korea1-1.bcmap
  51. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Korea1-2.bcmap
  52. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Korea1-UCS2.bcmap
  53. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/B5-H.bcmap
  54. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/B5-V.bcmap
  55. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/B5pc-H.bcmap
  56. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/B5pc-V.bcmap
  57. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS-EUC-H.bcmap
  58. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS-EUC-V.bcmap
  59. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS1-H.bcmap
  60. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS1-V.bcmap
  61. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS2-H.bcmap
  62. 3 0
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS2-V.bcmap
  63. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETHK-B5-H.bcmap
  64. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETHK-B5-V.bcmap
  65. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETen-B5-H.bcmap
  66. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETen-B5-V.bcmap
  67. 3 0
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETenms-B5-H.bcmap
  68. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETenms-B5-V.bcmap
  69. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/EUC-H.bcmap
  70. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/EUC-V.bcmap
  71. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Ext-H.bcmap
  72. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Ext-RKSJ-H.bcmap
  73. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Ext-RKSJ-V.bcmap
  74. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Ext-V.bcmap
  75. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GB-EUC-H.bcmap
  76. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GB-EUC-V.bcmap
  77. 4 0
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GB-H.bcmap
  78. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GB-V.bcmap
  79. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBK-EUC-H.bcmap
  80. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBK-EUC-V.bcmap
  81. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBK2K-H.bcmap
  82. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBK2K-V.bcmap
  83. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBKp-EUC-H.bcmap
  84. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBKp-EUC-V.bcmap
  85. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBT-EUC-H.bcmap
  86. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBT-EUC-V.bcmap
  87. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBT-H.bcmap
  88. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBT-V.bcmap
  89. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBTpc-EUC-H.bcmap
  90. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBTpc-EUC-V.bcmap
  91. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBpc-EUC-H.bcmap
  92. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBpc-EUC-V.bcmap
  93. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/H.bcmap
  94. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKdla-B5-H.bcmap
  95. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKdla-B5-V.bcmap
  96. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKdlb-B5-H.bcmap
  97. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKdlb-B5-V.bcmap
  98. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKgccs-B5-H.bcmap
  99. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKgccs-B5-V.bcmap
  100. BIN
      jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKm314-B5-H.bcmap

+ 5 - 0
jodconverter-web/src/main/java/com/yudianbank/filters/ChinesePathFilter.java

@@ -1,6 +1,7 @@
 package com.yudianbank.filters;
 
 import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 
 /**
@@ -18,6 +19,10 @@ public class ChinesePathFilter implements Filter {
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
         request.setCharacterEncoding("UTF-8");
         response.setCharacterEncoding("UTF-8");
+        StringBuilder pathBuilder = new StringBuilder();
+        pathBuilder.append(request.getScheme()).append("://").append(request.getServerName()).append(":")
+                .append(request.getServerPort()).append(((HttpServletRequest)request).getContextPath()).append("/");
+        request.setAttribute("baseUrl", pathBuilder.toString());
         chain.doFilter(request, response);
     }
 

+ 27 - 1
jodconverter-web/src/main/java/com/yudianbank/utils/OfficeToPdf.java

@@ -2,10 +2,18 @@ package com.yudianbank.utils;
 import org.artofsolving.jodconverter.OfficeDocumentConverter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-
 import java.io.File;
+
+/**
+ * @author yudian-it
+ */
 @Component
 public class OfficeToPdf {
+    /**
+     * 获取OpenOffice.org 3的安装目录
+     *
+     * @return OpenOffice.org 3的安装目录
+     */
     @Autowired
     ConverterUtils converterUtils;
     /**
@@ -21,6 +29,24 @@ public class OfficeToPdf {
         return office2pdf(inputFilePath, outputFilePath);
     }
 
+
+
+    /**
+     * 连接OpenOffice.org 并且启动OpenOffice.org
+     *
+     * @return
+     */
+    /*public  OfficeManager getOfficeManager() {
+        DefaultOfficeManagerConfiguration config = new DefaultOfficeManagerConfiguration();
+        // 获取OpenOffice.org 3的安装目录
+        String officeHome = openOfficePath;
+        config.setOfficeHome(officeHome);
+        // 启动OpenOffice的服务
+        OfficeManager officeManager = config.buildOfficeManager();
+        officeManager.start();
+        return officeManager;
+    }*/
+
     /**
      * 转换文件
      *

+ 24 - 0
jodconverter-web/src/main/java/com/yudianbank/web/controller/IndexController.java

@@ -0,0 +1,24 @@
+package com.yudianbank.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";
+    }
+}

+ 66 - 35
jodconverter-web/src/main/java/com/yudianbank/web/controller/OnlinePreviewController.java

@@ -1,19 +1,33 @@
 package com.yudianbank.web.controller;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yudianbank.param.ReturnResponse;
-import com.yudianbank.utils.*;
+import com.yudianbank.utils.DownloadUtils;
+import com.yudianbank.utils.FileUtils;
+import com.yudianbank.utils.OfficeToPdf;
+import com.yudianbank.utils.ZipReader;
+import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLConnection;
 import java.net.URLDecoder;
-import java.util.Arrays;
 
 /**
  * @author yudian-it
@@ -28,54 +42,43 @@ public class OnlinePreviewController {
     DownloadUtils downloadUtils;
     @Autowired
     ZipReader zipReader;
-    @Autowired
-    SimTextUtil simTextUtil;
-    @Value("${simText}")
-    String[] simText;
-//    @ApolloConfig
-//    Config config;
 
     @Value("${file.dir}")
     String fileDir;
 
     /**
-     * xls:http://keking.ufile.ucloud.com.cn/20171113164107_月度绩效表模板(新).xls?UCloudPublicKey=ucloudtangshd@weifenf.com14355492830001993909323&Expires=&Signature=I+D1NOFtAJSPT16E6imv6JWuq0k=
-     * img:http://keking.ufile.ucloud.com.cn/ufile-a703a5a2-788f-488c-a9bf-f36878d5e308.JPG?UCloudPublicKey=ucloudtangshd@weifenf.com14355492830001993909323&Expires=&Signature=W9TKj5Kp9oxg85fn5/0zgwF2PL4=
-     * doc:http://keking.ufile.ucloud.com.cn/20171113173342_凯京新员工试用期评估与转正确认表.doc?UCloudPublicKey=ucloudtangshd@weifenf.com14355492830001993909323&Expires=&Signature=v1fC5ijYs8WnPzbSYa/bb0Z2Jf4=
-     * docx:http://keking.ufile.ucloud.com.cn/20171103180053_财产线索类需求20170920(1).docx?UCloudPublicKey=ucloudtangshd@weifenf.com14355492830001993909323&Expires=&Signature=p7/L1W3iwktzRtkY5Ef2vK7kn3o=
      * @param url
      * @param model
      * @return
      */
     @RequestMapping(value = "onlinePreview",method = RequestMethod.GET)
-    public String onlinePreview(String url, String needEncode, Model model) throws UnsupportedEncodingException {
+    public String onlinePreview(String url, String needEncode, Model model, HttpServletRequest req) throws UnsupportedEncodingException {
         // 路径转码
-        String decodedUrl = URLDecoder.decode(url, "utf-8");
+        url = URLDecoder.decode(url, "utf-8");
         String type = typeFromUrl(url);
         String suffix = suffixFromUrl(url);
-        // 抽取文件并返回文件列表
-        String fileName = fileUtils.getFileNameFromURL(decodedUrl);
         model.addAttribute("fileType", suffix);
         if (type.equalsIgnoreCase("picture")) {
             model.addAttribute("imgurl", url);
             return "picture";
-        } else if (type.equalsIgnoreCase("simText")){
-            ReturnResponse<String> response = simTextUtil.readSimText(decodedUrl, fileName, needEncode);
-            if (0 != response.getCode()) {
-                model.addAttribute("msg", response.getMsg());
-                return "fileNotSupported";
-            }
-            model.addAttribute("ordinaryUrl", response.getMsg());
+        } else if (type.equalsIgnoreCase("txt")
+                || type.equalsIgnoreCase("html")
+                || type.equalsIgnoreCase("xml")
+                || type.equalsIgnoreCase("java")
+                || type.equalsIgnoreCase("properties")
+                || type.equalsIgnoreCase("mp3")){
+            model.addAttribute("ordinaryUrl",url);
             return "txt";
         } else if(type.equalsIgnoreCase("pdf")){
             model.addAttribute("pdfUrl",url);
             return "pdf";
         } else if(type.equalsIgnoreCase("compress")){
             // 抽取文件并返回文件列表
+            String fileName = fileUtils.getFileNameFromURL(url);
             String fileTree = null;
             // 判断文件名是否存在(redis缓存读取)
             if (!StringUtils.hasText(fileUtils.getConvertedFile(fileName))) {
-                ReturnResponse<String> response = downloadUtils.downLoad(decodedUrl, suffix, fileName, needEncode);
+                ReturnResponse<String> response = downloadUtils.downLoad(url, suffix, fileName, needEncode);
                 if (0 != response.getCode()) {
                     model.addAttribute("msg", response.getMsg());
                     return "fileNotSupported";
@@ -101,14 +104,15 @@ public class OnlinePreviewController {
                 return "fileNotSupported";
             }
         } else if ("office".equalsIgnoreCase(type)) {
-            String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1)
-                    + ((suffix.equalsIgnoreCase("xls") || suffix.equalsIgnoreCase("xlsx")) ?
-                    "html" : "pdf");
+            String fileName = fileUtils.getFileNameFromURL(url);
+            boolean isHtml = suffix.equalsIgnoreCase("xls")
+                                || suffix.equalsIgnoreCase("xlsx");
+            String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + (isHtml ? "html" : "pdf");
             // 判断之前是否已转换过,如果转换过,直接返回,否则执行转换
             if (!fileUtils.listConvertedFiles().containsKey(pdfName)) {
                 String filePath = fileDir + fileName;
                 if (!new File(filePath).exists()) {
-                    ReturnResponse<String> response = downloadUtils.downLoad(decodedUrl, suffix, null, needEncode);
+                    ReturnResponse<String> response = downloadUtils.downLoad(url, suffix, null, needEncode);
                     if (0 != response.getCode()) {
                         model.addAttribute("msg", response.getMsg());
                         return "fileNotSupported";
@@ -122,8 +126,7 @@ public class OnlinePreviewController {
                     if (f.exists()) {
                         f.delete();
                     }
-                    if (suffix.equalsIgnoreCase("xls")
-                            || suffix.equalsIgnoreCase("xlsx")) {
+                    if (isHtml) {
                         // 对转换后的文件进行操作(改变编码方式)
                         fileUtils.doActionConvertedFile(outFilePath);
                     }
@@ -132,9 +135,10 @@ public class OnlinePreviewController {
                 }
             }
             model.addAttribute("pdfUrl", pdfName);
-            return "pdf";
+            return isHtml ? "html" : "pdf";
         }else {
-            model.addAttribute("msg", "系统还不支持该格式文件的在线预览," + "如有需要请按下方显示的邮箱地址联系系统维护人员");
+            model.addAttribute("msg", "系统还不支持该格式文件的在线预览," +
+                    "如有需要请按下方显示的邮箱地址联系系统维护人员");
             return "fileNotSupported";
         }
     }
@@ -164,11 +168,38 @@ public class OnlinePreviewController {
         if (fileUtils.listOfficeTypes().contains(fileType.toLowerCase())) {
             fileType = "office";
         }
-        if (Arrays.asList(simText).contains(fileType.toLowerCase())) {
-            fileType = "simText";
-        }
         return fileType;
     }
 
+    /**
+     * 根据url获取文件内容
+     * 当pdfjs读取存在跨域问题的文件时将通过此接口读取
+     * @param urlPath
+     * @param resp
+     */
+    @RequestMapping(value = "/getCorsFile", method = RequestMethod.GET)
+    public void getCorsFile(String urlPath, HttpServletResponse resp) {
+        InputStream inputStream = null;
+        try {
+            String strUrl = urlPath.trim();
+            URL url=new URL(strUrl);
+            //打开请求连接
+            URLConnection connection = url.openConnection();
+            HttpURLConnection httpURLConnection=(HttpURLConnection) connection;
+            httpURLConnection.setRequestProperty("User-Agent", "Mozilla/4.0 (compatible; MSIE 5.0; Windows NT; DigExt)");
+            inputStream = httpURLConnection.getInputStream();
+            byte[] bs = new byte[1024];
+            int len;
+            while(-1 != (len = inputStream.read(bs))) {
+                resp.getOutputStream().write(bs, 0, len);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            if(inputStream != null) {
+                IOUtils.closeQuietly(inputStream);
+            }
+        }
+    }
 
 }

+ 4 - 4
jodconverter-web/src/main/resources/static/css/zTreeStyle.css

@@ -12,7 +12,7 @@ website:	http://code.google.com/p/jquerytree/
 .ztree {margin:0; padding:5px; color:#333}
 .ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0}
 .ztree li ul{ margin:0; padding:0 0 0 18px}
-.ztree li ul.line{ background:url(img/line_conn.gif) 0 0 repeat-y;}
+.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
 
 .ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
 	text-decoration:none; vertical-align:top; display: inline-block}
@@ -29,7 +29,7 @@ website:	http://code.google.com/p/jquerytree/
 .ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle;
 	border:0 none; cursor: pointer;outline:none;
 	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
-	background-image:url("img/zTreeStandard.png"); *background-image:url("img/zTreeStandard.gif")}
+	background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
 
 .ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto}
 .ztree li span.button.chk.checkbox_false_full {background-position:0 0}
@@ -76,13 +76,13 @@ website:	http://code.google.com/p/jquerytree/
 .ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; *vertical-align:middle}
 .ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle}
 
-.ztree li span.button.ico_loading{margin-right:2px; background:url(img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
 
 ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
 
 span.tmpzTreeMove_arrow {width:16px; height:16px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute;
 	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
-	background-position:-110px -80px; background-image:url("img/zTreeStandard.png"); *background-image:url("img/zTreeStandard.gif")}
+	background-position:-110px -80px; background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
 
 ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
 .zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}

+ 177 - 0
jodconverter-web/src/main/resources/static/pdfjs/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-EUC-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-EUC-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-RKSJ-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-RKSJ-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78ms-RKSJ-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/78ms-RKSJ-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/83pv-RKSJ-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90ms-RKSJ-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90ms-RKSJ-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90msp-RKSJ-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90msp-RKSJ-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90pv-RKSJ-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/90pv-RKSJ-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Add-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Add-RKSJ-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Add-RKSJ-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Add-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-0.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-1.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-2.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-3.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-4.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-5.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-6.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-CNS1-UCS2.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-0.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-1.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-2.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-3.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-4.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-5.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-GB1-UCS2.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-0.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-1.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-2.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-3.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-4.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-5.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-6.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Japan1-UCS2.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Korea1-0.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Korea1-1.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Korea1-2.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Adobe-Korea1-UCS2.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/B5-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/B5-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/B5pc-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/B5pc-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS-EUC-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS-EUC-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS1-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS1-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS2-H.bcmap


+ 3 - 0
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/CNS2-V.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEáCNS2-H

BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETHK-B5-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETHK-B5-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETen-B5-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETen-B5-V.bcmap


+ 3 - 0
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETenms-B5-H.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEá	ETen-B5-H` ^

BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/ETenms-B5-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/EUC-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/EUC-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Ext-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Ext-RKSJ-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Ext-RKSJ-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/Ext-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GB-EUC-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GB-EUC-V.bcmap


+ 4 - 0
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GB-H.bcmap

@@ -0,0 +1,4 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE!!�º]aX!!]`�21�>	�p�z�$]‚�"R‚d�-Uƒ7�*„
4„%�+ „Z „{�/…%…<�9K…b�1]†.�"‡‰`]‡,�"]ˆ
+�"]ˆh�"]‰F�"]Š$�"]‹�"]‹`�"]Œ>�"]��"]�z�"]ŽX�"]�6�"]��"]�r�"]‘P�"]’.�"]“�"]“j�"]”H�"]•&�"]–�"]–b�"]—@�"]˜�"]˜|�"]™Z�"]š8�"]›�"]›t�"]œR�"]�0�"]ž�"]žl�"]ŸJ�"] (�"]¡�"]¡d�"]¢B�"]£ �"X£~�']¤W�"]¥5�"]¦�"]¦q�"]§O�"]¨-�"]©�"]©i�"]ªG�"]«%�"]¬�"]¬a�"]­?�"]®�"]®{�"]¯Y�"]°7�"]±�"]±s�"]²Q�"]³/�"]´
�"]´k�"]µI�"]¶'�"]·�"]·c�"]¸A�"]¹�"]¹}�"]º[�"]»9

BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GB-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBK-EUC-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBK-EUC-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBK2K-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBK2K-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBKp-EUC-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBKp-EUC-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBT-EUC-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBT-EUC-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBT-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBT-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBTpc-EUC-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBTpc-EUC-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBpc-EUC-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/GBpc-EUC-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKdla-B5-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKdla-B5-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKdlb-B5-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKdlb-B5-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKgccs-B5-H.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKgccs-B5-V.bcmap


BIN
jodconverter-web/src/main/resources/static/pdfjs/web/cmaps/HKm314-B5-H.bcmap


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä