2.0版本

文本和多媒体类型添加默认值，变为可选配置

.gitignore

@@ -28,7 +28,6 @@ nbdist/
 .classpath
 .project
 **/.settings
-**/bin/
 **/build/
 **/.externalToolBuilders/
 *.iml

README.en.md

@@ -1,26 +1,33 @@
 # file-online-preview
-This kekingcn kkFileView software is intended to be a solution for previewing documents online. There are some similar paid products in the industry, at present.
-Such as 【[永中office](http://dcs.yozosoft.com/)】,【[office365](http://www.officeweb365.com/)】,【[idocv](https://www.idocv.com/)】, etc..
-The kekingcn kkFileView software is an open source implementation and released under the Apache License version 2. It's aimed to feedback the community after obtaining the consent of company executives, 
+
+[![GitHub license](https://img.shields.io/github/license/kekingcn/kkFileView.svg?style=flat-square)](https://github.com/kekingcn/kkFileView/blob/master/LICENSE)
+
+### Introduction
+
+This kekingcn kkFileView project is intended to be a solution for previewing documents online. At present,there are some similar paid products in the industry.
+Such as 【[永中office](http://dcs.yozosoft.com/)】,【[office365](http://www.officeweb365.com/)】,【[idocv](https://www.idocv.com/)】, etc...
+It is an open source implementation and released under the Apache License version 2.0. Finally,It is aimed to feedback the community after obtaining the consent of company executives, 
 special thanks to the supports of @唐老大 and the contributions of @端木详笑. 
 
-### Advantages
-* build with the popular frame spring boot, 
-* easy to deploy and deploy, 
-* basically support online preview of mainstream office documents, such as Doc, docx, Excel, PDF, TXT, zip, rar, pictures, etc.
+### Features
+- Build with the popular frame spring boot
+- Easy to build and deploy
+- Basically support online preview of mainstream office documents, such as Doc, docx, Excel, PDF, TXT, zip, rar, pictures, etc
+- REST API
+- Abstract file preview interface so that it is easy to extend more file extensions and develop this project on your own
 
-### The demo online
+### Live demo
 > Please treat public service kindly, or this would stop at any time.
 
 URL：http://file.keking.cn/
 
-### Project documentation
+### Documentation
 1. 中文文档：https://gitee.com/kekingcn/file-online-preview/blob/master/README.md
 1. English document：https://github.com/kekingcn/kkFileView/blob/master/README.en.md
 
 ### Contact us && Join us
-> We will answer everyone's questions which are found when using this project patiently.
-And please Google or Baidu first before asking a question, so that we can solve then efficiently. 
+> We will answer everyone's questions in use of this project.
+And please Google or Baidu first before asking a question, so that we can solve it efficiently. 
 Cherish life away from ineffective communication.
 
 ![输入图片说明](https://gitee.com/uploads/images/2017/1219/173717_934cb068_492218.png "屏幕截图.png")
@@ -41,24 +48,22 @@ QQ group：613025121
 > png,jpeg,jpg,etc., support for zooming with mouse scroll, rotation, inversion,etc.
 
 ![输入图片说明](https://gitee.com/uploads/images/2017/1213/094335_657a6f60_492218.png "屏幕截图.png")
-Considering space issues, the pictures of other types of documents will not be shown here.You can deploy it by yourself if you are interested in our project.The way to deploy is as below.
+Considering space issues, the pictures of other types of documents will not be shown here.You can deploy it by yourself if you are interested in our project.There is a way to deploy it as below.
 
 ### Quick Start
-> Technologies in this project
-- spring boot： [spring boot Development Reference Guide](http://www.kailing.pub/PdfReader/web/viewer.html?file=springboot)
-- freemarker
-- redisson 
-- jodconverter
-> Dependent External Environment
-- redis 
+> Technology stack
+- Spring boot： [spring boot Development Reference Guide](http://www.kailing.pub/PdfReader/web/viewer.html?file=springboot)
+- Freemarker
+- Redisson 
+- Jodconverter
+> Dependencies
+- Redis(Optional, Unnecessary by default)
 - OpenOffice or LibreOffice
 
-1. First step：pull https://github.com/kekingcn/file-online-preview.git
+1. First step：`git pull https://github.com/kekingcn/file-online-preview.git`
 
 2. Second step：configure redis address and OpenOffice directory，such as
 ```
-#=============================================#Spring Redisson Configuration#===================================#
-spring.redisson.address = 192.168.1.204:6379
 ##The folder for files which are uploaded to the server(Because of running as jar)
 file.dir = C:\\Users\\yudian\\Desktop\\dev\\
 ## openoffice configuration
@@ -67,23 +72,34 @@ office.home = C:\\Program Files (x86)\\OpenOffice 4
 ```
 'file.dir' is the real storage address of the converted files, please end with '/'.
 
-3. Third step：Run the main method of FilePreviewApplication.java.After starting,visit 'http://localhost:8012/'.
+3. Third step：Run the main method of FilePreviewApplication.java.After starting,visit `http://localhost:8012/`.
 If everything is ok,you will see the picture below.
 ![输入图片说明](https://gitee.com/uploads/images/2017/1213/100221_ea15202e_492218.png "屏幕截图.png")
 
-### System Update History
+### Changelog
 
-> January 12th 2018 ：
+> April 8th 2019
+1. Cache and queue implementations abstract, providing JDK and REDIS implementations (REDIS becomes optional dependencies)
+2. Provides zip and tar.gz packages, and provides a one-click startup script
+
+> January 17th 2018
+
+1. Refined the project directory, abstract file preview interface, Easy to extend more file extensions and depoly this project on your own
+1. Added English documentation (@幻幻Fate，@汝辉) contribution
+1. Support for more image file extensions
+1. Fixed the issue that image carousel in zip file will always start from the first
+
+> January 12th 2018
 
 1. Support for multiple images preview 
 1. Support for images rotation preview in rar/zip
 
-> January 2nd 2018 ： 
+> January 2nd 2018
 
-1. fixed gibberish issue when preview a txt document caused by the file encoding problem 
-1. fixed the issue that some module dependencies can not be found
-1. add a spring boot profile, and support for Multi-environment configuration 
-1. add 'pdf.js' to preview the documents such as doc,etc.,support for generating doc headlines as pdf menu，support for mobile preview
+1. Fixed gibberish issue when preview a txt document caused by the file encoding problem 
+1. Fixed the issue that some module dependencies can not be found
+1. Add a spring boot profile, and support for Multi-environment configuration 
+1. Add `pdf.js` to preview the documents such as doc,etc.,support for generating doc headlines as pdf menu，support for mobile preview
 
 ### Register Usage
 If this project is helpful for you, please register on 'https://gitee.com/kekingcn/file-online-preview/issues/IGSBV',

README.md

@@ -7,7 +7,7 @@
 1. 支持zip,rar,jar,tar,gzip等压缩包
 1. 支持jpg，jpeg，png，gif等图片预览（翻转，缩放，镜像）
 1. 使用spring boot开发，预览服务搭建部署非常简便
-1. rest接口提供服务，应用接入简单方便
+1. rest接口提供服务，跨平台特性(java,php,python,go,php，....)都支持，应用接入简单方便
 1. 抽象预览服务接口，方便二次开发，非常方便添加其他类型文件预览支持
 1. 最最重要Apache协议开源，代码pull下来想干嘛就干嘛
 
@@ -50,15 +50,13 @@ QQ群号：613025121
 - redisson 
 - jodconverter
 > 依赖外部环境
-- redis 
+- redis (可选，默认不用)
 - OpenOffice或者LibreOffice
 
 1. 第一步：pull项目https://github.com/kekingcn/file-online-preview.git
 
-2. 第二步：配置redis地址和OpenOffice目录，如
+2. 第二步：配置OpenOffice目录，如
 ```
-#=============================================#spring Redisson配置#===================================#
-spring.redisson.address = 192.168.1.204:6379
 ##资源映射路径(因为jar方式运行的原因)
 file.dir = C:\\Users\\yudian\\Desktop\\dev\\
 ## openoffice相关配置
@@ -73,6 +71,16 @@ file.dir为转换文件实际存储地址，注意要以/结尾
 
 ### 历史更新记录
 
+> 2019年04月08日 ：
+1. 缓存及队列实现抽象，提供JDK和REDIS两种实现(REDIS成为可选依赖)
+2. 打包方式提供zip和tar.gz包，并提供一键启动脚本
+
+> 2018年01月19日 ：
+
+1. 大文件入队提前处理
+1. 新增addTask文件转换入队接口 
+1. 采用redis队列，支持kkFIleView接口和异构系统入队两种方式
+
 > 2018年01月17日 ：
 
 1. 优化项目结构，抽象文件预览接口，更方便的加入更多的文件类型预览支持，方便二次开发

jodconverter-core/src/main/java/org/artofsolving/jodconverter/office/OfficeUtils.java

@@ -12,8 +12,11 @@
 //
 package org.artofsolving.jodconverter.office;
 
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
 import java.util.Map;
+import java.util.Properties;
 
 import org.artofsolving.jodconverter.util.PlatformUtils;
 
@@ -61,29 +64,40 @@ public class OfficeUtils {
     }
 
     public static File getDefaultOfficeHome() {
-        if (System.getProperty("office.home") != null) {
-            return new File(System.getProperty("office.home"));
+        Properties properties = new Properties();
+        String customizedConfigPath = getCustomizedConfigPath();
+        try {
+            BufferedReader bufferedReader = new BufferedReader(new FileReader(customizedConfigPath));
+            properties.load(bufferedReader);
+        } catch (Exception e) {}
+        if (properties.getProperty("office.home") != null) {
+            return new File(properties.getProperty("office.home"));
         }
         if (PlatformUtils.isWindows()) {
             // %ProgramFiles(x86)% on 64-bit machines; %ProgramFiles% on 32-bit ones
+            String homePath = OfficeUtils.getHomePath();
             String programFiles = System.getenv("ProgramFiles(x86)");
             if (programFiles == null) {
                 programFiles = System.getenv("ProgramFiles");
             }
             return findOfficeHome(
                 programFiles + File.separator + "OpenOffice 4",
-                programFiles + File.separator + "LibreOffice 4"
+                programFiles + File.separator + "LibreOffice 4",
+                homePath + File.separator + "office"
             );
         } else if (PlatformUtils.isMac()) {
             return findOfficeHome(
                 "/Applications/OpenOffice.org.app/Contents",
+                "/Applications/OpenOffice.app/Contents",
                 "/Applications/LibreOffice.app/Contents"
             );
         } else {
             // Linux or other *nix variants
             return findOfficeHome(
                 "/opt/openoffice.org3",
+                "/opt/openoffice",
                 "/opt/libreoffice",
+                "/opt/openoffice4",
                 "/usr/lib/openoffice",
                 "/usr/lib/libreoffice"
             );
@@ -108,4 +122,29 @@ public class OfficeUtils {
         }
     }
 
+    public static String getHomePath() {
+        String userDir = System.getenv("KKFILEVIEW_BIN_FOLDER");
+        if (userDir == null) {
+            userDir = System.getProperty("user.dir");
+        }
+        if (userDir.endsWith("bin")) {
+            userDir = userDir.substring(0, userDir.length() - 4);
+        } else {
+            String separator = File.separator;
+            if (userDir.contains("jodconverter-web")) {
+                userDir = userDir + separator + "src" + separator +  "main";
+            } else {
+                userDir = userDir + separator + "jodconverter-web" + separator + "src" + separator + "main";
+            }
+        }
+        return userDir;
+    }
+
+    public static String getCustomizedConfigPath() {
+        String homePath = OfficeUtils.getHomePath();
+        String separator = java.io.File.separator;
+        String configFilePath = homePath + separator + "conf" + separator + "application.properties";
+        return configFilePath;
+    }
+
 }

jodconverter-web/pom.xml

@@ -10,7 +10,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>jodconverter-web</artifactId>
+    <groupId>cn.keking</groupId>
+    <artifactId>kkFileView</artifactId>
+    <version>2.0</version>
 
 
     <properties>
@@ -104,13 +106,13 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
-            <version>1.9</version>
+            <version>1.18</version>
         </dependency>
         <!-- 解压(rar)-->
         <dependency>
             <groupId>com.github.junrar</groupId>
             <artifactId>junrar</artifactId>
-            <version>0.7</version>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>net.sourceforge.jchardet</groupId>
@@ -149,6 +151,26 @@
             <artifactId>guava</artifactId>
             <version>19.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.googlecode.concurrentlinkedhashmap</groupId>
+            <artifactId>concurrentlinkedhashmap-lru</artifactId>
+            <version>1.4.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.rocksdb</groupId>
+            <artifactId>rocksdbjni</artifactId>
+            <version>5.17.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox</artifactId>
+            <version>2.0.15</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pdfbox</groupId>
+            <artifactId>pdfbox-tools</artifactId>
+            <version>2.0.15</version>
+        </dependency>
     </dependencies>
     <build>
         <resources>
@@ -159,12 +181,36 @@
                 </includes>
                 <filtering>true</filtering>
             </resource>
+            <resource>
+                <directory>src/main/conf</directory>
+                <excludes>
+                    <exclude>${build.exclude.resource}</exclude>
+                </excludes>
+            </resource>
         </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/main/resources/assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

jodconverter-web/src/main/bin/shutdown.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+kill 15 `ps -ef|grep kkFileView|awk '{print $2}'`

jodconverter-web/src/main/bin/startup.bat

@@ -0,0 +1,7 @@
+@echo off
+set "KKFILEVIEW_BIN_FOLDER=%cd%"
+cd "%KKFILEVIEW_BIN_FOLDER%"
+echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER%
+echo Starting kkFileView...
+echo Please check log file for more information
+java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=..\conf\application.properties -jar kkFileView-2.0.jar -> ..\log\kkFileView.log

jodconverter-web/src/main/bin/startup.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+DIR_HOME=("/opt/openoffice.org3" "/opt/libreoffice" "/opt/openoffice4" "/usr/lib/openoffice" "/usr/lib/libreoffice")
+FLAG=
+OFFICE_HOME=
+KKFILEVIEW_BIN_FOLDER=$(cd "$(dirname "$0")";pwd)
+export KKFILEVIEW_BIN_FOLDER=$KKFILEVIEW_BIN_FOLDER
+cd $KKFILEVIEW_BIN_FOLDER
+echo "Using KKFILEVIEW_BIN_FOLDER $KKFILEVIEW_BIN_FOLDER"
+grep 'office\.home' ../conf/application.properties | grep '!^#'
+if [ $? -eq 0 ]; then
+  echo "Using customized office.home"
+else 
+ for i in ${DIR_HOME[@]}
+  do
+    if [ -f $i"/program/soffice.bin" ]; then
+      FLAG=true
+      OFFICE_HOME=${i}
+      break
+    fi
+  done
+  if [ ! -n "${FLAG}" ]; then
+    echo "Installing OpenOffice"
+    sh ../script/install.sh
+  else 
+    echo "Detected office component has been installed in $OFFICE_HOME"
+  fi
+fi
+echo "Starting kkFileView..."
+echo "Please check log file for more information"
+nohup java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=../conf/application.properties -jar kkFileView-2.0.jar > ../log/kkFileView.log 2>&1 &

jodconverter-web/src/main/conf/application.properties

@@ -0,0 +1,39 @@
+#######################################不可动态配置，需要重启生效#######################################
+server.port = 8012
+spring.http.encoding.charset = utf8
+## Freemarker 配置
+spring.freemarker.template-loader-path = classpath:/web/
+spring.freemarker.cache = false
+spring.freemarker.charset = UTF-8
+spring.freemarker.check-template-location = true
+spring.freemarker.content-type = text/html
+spring.freemarker.expose-request-attributes = true
+spring.freemarker.expose-session-attributes = true
+spring.freemarker.request-context-attribute = request
+spring.freemarker.suffix = .ftl
+
+server.tomcat.uri-encoding = UTF-8
+#文件上传限制
+spring.http.multipart.max-request-size=100MB
+spring.http.multipart.max-file-size=100MB
+
+#文件资源路径（默认为打包根路径下的file目录下）
+#file.dir = D:\\kkFileview\\
+#openoffice home路径
+#office.home = C:\\Program Files (x86)\\OpenOffice 4
+
+#缓存实现类型，不配默认为内嵌RocksDB实现，可配置为redis(type = redis)实现（需要配置spring.redisson.address等参数）和 JDK 内置对象实现（type = jdk）,
+#cache.type = redis
+#redis连接
+#spring.redisson.address = 192.168.1.204:6379
+#spring.redisson.password = xxx
+
+#######################################可在运行时动态配置#######################################
+#文本类型，默认如下，可自定义添加
+#simText = txt,html,xml,properties,md,java,py,c,cpp,sql
+#多媒体类型，默认如下，可自定义添加
+#media = mp3,wav,mp4,flv
+#文件转换编码，默认根据操作系统获取
+#converted.file.charset = GBK
+#office类型文档(word ppt)样式，默认为图片(image)，可配置为pdf（预览时也有按钮切换）
+#office.preview.type = pdf

jodconverter-web/src/main/java/cn/keking/config/ConfigConstants.java

@@ -0,0 +1,69 @@
+package cn.keking.config;
+
+import org.artofsolving.jodconverter.office.OfficeUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+
+/**
+ * @auther: chenjh
+ * @time: 2019/4/10 17:22
+ * @description
+ */
+@Component
+public class ConfigConstants {
+
+    private static String[] simText = {};
+    private static String[] media = {};
+    private static String convertedFileCharset;
+    private static String officePreviewType;
+    private static String fileDir = OfficeUtils.getHomePath() + File.separator + "file" + File.separator;
+
+    public static String[] getSimText() {
+        return simText;
+    }
+
+    public static void setSimText(String[] simText) {
+        ConfigConstants.simText = simText;
+    }
+
+    public static String[] getMedia() {
+        return media;
+    }
+
+    public static void setMedia(String[] media) {
+        ConfigConstants.media = media;
+    }
+
+    public static String getConvertedFileCharset() {
+        return convertedFileCharset;
+    }
+
+    public static void setConvertedFileCharset(String convertedFileCharset) {
+        ConfigConstants.convertedFileCharset = convertedFileCharset;
+    }
+
+    public static String getOfficePreviewType() {
+        return officePreviewType;
+    }
+
+    public static void setOfficePreviewType(String officePreviewType) {
+        ConfigConstants.officePreviewType = officePreviewType;
+    }
+
+    public static String getFileDir() {
+        return fileDir;
+    }
+
+    @Value("${file.dir:default}")
+    public void setFileDir(String fileDir) {
+        if (!"default".equals(fileDir)) {
+            if (!fileDir.endsWith(File.separator)) {
+                fileDir = fileDir + File.separator;
+            }
+            ConfigConstants.fileDir = fileDir;
+        }
+    }
+
+}

jodconverter-web/src/main/java/cn/keking/config/ConfigRefreshComponent.java

@@ -0,0 +1,68 @@
+package cn.keking.config;
+
+import cn.keking.service.impl.OfficeFilePreviewImpl;
+import org.artofsolving.jodconverter.office.OfficeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Properties;
+
+/**
+ * @auther: chenjh
+ * @time: 2019/4/10 16:16
+ * @description 每隔1s读取并更新一次配置文件
+ */
+@Component
+public class ConfigRefreshComponent {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ConfigRefreshComponent.class);
+
+    public static final String DEFAULT_TXT_TYPE = "txt,html,xml,properties,md,java,py,c,cpp,sql";
+    public static final String DEFAULT_MEDIA_TYPE = "mp3,wav,mp4,flv";
+
+
+    @PostConstruct
+    void refresh() {
+        Thread configRefreshThread = new Thread(new ConfigRefreshThread());
+        configRefreshThread.start();
+    }
+
+    class ConfigRefreshThread implements Runnable {
+        @Override
+        public void run() {
+            try {
+                Properties properties = new Properties();
+                Properties sysProperties = System.getProperties();
+                String text;
+                String media;
+                String convertedFileCharset = sysProperties.getProperty("sun.jnu.encoding");
+                String[] textArray;
+                String[] mediaArray;
+                String officePreviewType;
+                String configFilePath = OfficeUtils.getCustomizedConfigPath();
+                while (true) {
+                    BufferedReader bufferedReader = new BufferedReader(new FileReader(configFilePath));
+                    properties.load(bufferedReader);
+                    text = properties.getProperty("simText", DEFAULT_TXT_TYPE);
+                    media = properties.getProperty("media", DEFAULT_MEDIA_TYPE);
+                    convertedFileCharset = properties.getProperty("converted.file.charset", convertedFileCharset);
+                    officePreviewType = properties.getProperty("office.preview.type", OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_IMAGE);
+                    textArray = text.split(",");
+                    mediaArray = media.split(",");
+                    ConfigConstants.setSimText(textArray);
+                    ConfigConstants.setMedia(mediaArray);
+                    ConfigConstants.setConvertedFileCharset(convertedFileCharset);
+                    ConfigConstants.setOfficePreviewType(officePreviewType);
+                    Thread.sleep(1000L);
+                }
+            } catch (IOException | InterruptedException e) {
+                LOGGER.error("读取配置文件异常：{}", e);
+            }
+        }
+    }
+}

jodconverter-web/src/main/java/cn/keking/config/RedissonConfig.java

@@ -1,10 +1,9 @@
 package cn.keking.config;
 
 import io.netty.channel.nio.NioEventLoopGroup;
-import org.redisson.Redisson;
-import org.redisson.api.RedissonClient;
 import org.redisson.client.codec.Codec;
 import org.redisson.config.Config;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,6 +13,7 @@ import org.springframework.util.ClassUtils;
  * Created by kl on 2017/09/26.
  * redisson 客户端配置
  */
+@ConditionalOnExpression("'${cache.type:default}'.equals('redis')")
 @ConfigurationProperties(prefix = "spring.redisson")
 @Configuration
 public class RedissonConfig {
@@ -42,8 +42,8 @@ public class RedissonConfig {
 
     private String codec="org.redisson.codec.JsonJacksonCodec";
 
-    @Bean(destroyMethod = "shutdown")
-    RedissonClient redisson() throws Exception {
+    @Bean
+    Config config() throws Exception {
         Config config = new Config();
         config.useSingleServer().setAddress(address)
                 .setConnectionMinimumIdleSize(connectionMinimumIdleSize)
@@ -69,7 +69,7 @@ public class RedissonConfig {
         config.setThreads(thread);
         config.setEventLoopGroup(new NioEventLoopGroup());
         config.setUseLinuxNativeEpoll(false);
-        return Redisson.create(config);
+        return config;
     }
 
     public int getThread() {

jodconverter-web/src/main/java/cn/keking/config/WebConfig.java

@@ -0,0 +1,28 @@
+package cn.keking.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+/**
+ * @auther: chenjh
+ * @time: 2019/4/16 20:04
+ * @description
+ */
+@Configuration
+public class WebConfig extends WebMvcConfigurerAdapter {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(WebConfig.class);
+    /**
+     * 访问外部文件配置
+     */
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        String filePath = ConfigConstants.getFileDir();
+        LOGGER.info("Add resource locations: {}", filePath);
+        registry.addResourceHandler("/**").addResourceLocations("classpath:/META-INF/resources/","classpath:/resources/","classpath:/static/","classpath:/public/","file:" + filePath);
+        super.addResourceHandlers(registry);
+    }
+}

jodconverter-web/src/main/java/cn/keking/model/FileType.java

@@ -10,7 +10,8 @@ public enum FileType {
     office("officeFilePreviewImpl"),
     simText("simTextFilePreviewImpl"),
     pdf("pdfFilePreviewImpl"),
-    other("otherFilePreviewImpl");
+    other("otherFilePreviewImpl"),
+    media("mediaFilePreviewImpl");
 
     private String instanceName;
     FileType(String instanceName){

jodconverter-web/src/main/java/cn/keking/model/ReturnResponse.java

@@ -1,4 +1,4 @@
-package cn.keking.param;
+package cn.keking.model;
 
 import java.io.Serializable;
 

jodconverter-web/src/main/java/cn/keking/service/FileConverQueueTask.java

@@ -0,0 +1,82 @@
+package cn.keking.service;
+
+import cn.keking.model.FileAttribute;
+import cn.keking.model.FileType;
+import cn.keking.service.cache.CacheService;
+import cn.keking.utils.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.ExtendedModelMap;
+import javax.annotation.PostConstruct;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Created by kl on 2018/1/19.
+ * Content :消费队列中的转换文件
+ */
+@Service
+public class FileConverQueueTask {
+
+    Logger logger= LoggerFactory.getLogger(getClass());
+    public static final String queueTaskName="FileConverQueueTask";
+
+    @Autowired
+    FilePreviewFactory previewFactory;
+
+    @Autowired
+    CacheService cacheService;
+
+    @Autowired
+    FileUtils fileUtils;
+
+    @PostConstruct
+    public void startTask(){
+        ExecutorService executorService = Executors.newFixedThreadPool(3);
+        executorService.submit(new ConverTask(previewFactory,cacheService,fileUtils));
+        logger.info("队列处理文件转换任务启动完成 ");
+    }
+
+    class  ConverTask implements Runnable{
+
+        FilePreviewFactory previewFactory;
+
+        CacheService cacheService;
+
+        FileUtils fileUtils;
+
+        public ConverTask(FilePreviewFactory previewFactory, CacheService cacheService,FileUtils fileUtils) {
+            this.previewFactory = previewFactory;
+            this.cacheService = cacheService;
+            this.fileUtils=fileUtils;
+        }
+
+        @Override
+        public void run() {
+            while (true) {
+                try {
+                    String url = cacheService.takeQueueTask();
+                    if(url!=null){
+                        FileAttribute fileAttribute=fileUtils.getFileAttribute(url);
+                        logger.info("正在处理转换任务，文件名称【{}】",fileAttribute.getName());
+                        FileType fileType=fileAttribute.getType();
+                        if(fileType.equals(FileType.compress) || fileType.equals(FileType.office)){
+                            FilePreview filePreview=previewFactory.get(url);
+                            filePreview.filePreviewHandle(url,new ExtendedModelMap());
+                        }
+                    }
+                } catch (Exception e) {
+                    try {
+                        Thread.sleep(1000*10);
+                    }catch (Exception ex){
+                        ex.printStackTrace();
+                    }
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+}

jodconverter-web/src/main/java/cn/keking/service/cache/CacheService.java

@@ -0,0 +1,36 @@
+package cn.keking.service.cache;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @auther: chenjh
+ * @time: 2019/4/2 16:45
+ * @description
+ */
+public interface CacheService {
+    final String REDIS_FILE_PREVIEW_PDF_KEY = "converted-preview-pdf-file";
+    final String REDIS_FILE_PREVIEW_IMGS_KEY = "converted-preview-imgs-file";//压缩包内图片文件集合
+    final String REDIS_FILE_PREVIEW_PDF_IMGS_KEY = "converted-preview-pdfimgs-file";
+
+
+    final Integer DEFAULT_PDF_CAPACITY = 500000;
+    final Integer DEFAULT_IMG_CAPACITY = 500000;
+    final Integer DEFAULT_PDFIMG_CAPACITY = 500000;
+
+    void initPDFCachePool(Integer capacity);
+    void initIMGCachePool(Integer capacity);
+    public void initPdfImagesCachePool(Integer capacity);
+    void putPDFCache(String key, String value);
+    void putImgCache(String key, List<String> value);
+    Map<String, String> getPDFCache();
+    String getPDFCache(String key);
+    Map<String, List<String>> getImgCache();
+    List<String> getImgCache(String key);
+    Integer getPdfImageCache(String key);
+    void putPdfImageCache(String pdfFilePath, int num);
+
+    void addQueueTask(String url);
+    String takeQueueTask() throws InterruptedException;
+
+}

jodconverter-web/src/main/java/cn/keking/service/cache/impl/CacheServiceJDKImpl.java

@@ -0,0 +1,128 @@
+package cn.keking.service.cache.impl;
+
+import cn.keking.service.cache.CacheService;
+import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
+import com.googlecode.concurrentlinkedhashmap.Weighers;
+import org.rocksdb.RocksDB;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+
+/**
+ * @auther: chenjh
+ * @time: 2019/4/2 17:21
+ * @description
+ */
+@Service
+@ConditionalOnExpression("'${cache.type:default}'.equals('jdk')")
+public class CacheServiceJDKImpl implements CacheService {
+
+    private Map<String, String> pdfCache;
+
+    private Map<String, List<String>> imgCache;
+
+    private Map<String, Integer> pdfImagesCache;
+
+    private static final int QUEUE_SIZE = 500000;
+
+    private BlockingQueue blockingQueue = new ArrayBlockingQueue(QUEUE_SIZE);
+
+    @Override
+    public void initPDFCachePool(Integer capacity) {
+        pdfCache = new ConcurrentLinkedHashMap.Builder<String, String>()
+                .maximumWeightedCapacity(capacity).weigher(Weighers.singleton())
+                .build();
+    }
+
+    @Override
+    public void initIMGCachePool(Integer capacity) {
+        imgCache = new ConcurrentLinkedHashMap.Builder<String, List<String>>()
+                .maximumWeightedCapacity(capacity).weigher(Weighers.singleton())
+                .build();
+    }
+
+    @Override
+    public void initPdfImagesCachePool(Integer capacity) {
+        pdfImagesCache = new ConcurrentLinkedHashMap.Builder<String, Integer>()
+                .maximumWeightedCapacity(capacity).weigher(Weighers.singleton())
+                .build();
+    }
+
+    @Override
+    public void putPDFCache(String key, String value) {
+        if (pdfCache == null) {
+            initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
+        }
+        pdfCache.put(key, value);
+    }
+
+    @Override
+    public void putImgCache(String key, List<String> value) {
+        if (imgCache == null) {
+            initIMGCachePool(CacheService.DEFAULT_IMG_CAPACITY);
+        }
+        imgCache.put(key, value);
+    }
+
+    @Override
+    public Map<String, String> getPDFCache() {
+        if (pdfCache == null) {
+            initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
+        }
+        return pdfCache;
+    }
+
+    @Override
+    public String getPDFCache(String key) {
+        if (pdfCache == null) {
+            initPDFCachePool(CacheService.DEFAULT_PDF_CAPACITY);
+        }
+        return pdfCache.get(key);
+    }
+
+    @Override
+    public Map<String, List<String>> getImgCache() {
+        if (imgCache == null) {
+            initPDFCachePool(CacheService.DEFAULT_IMG_CAPACITY);
+        }
+        return imgCache;
+    }
+
+    @Override
+    public List<String> getImgCache(String key) {
+        if (imgCache == null) {
+            initPDFCachePool(CacheService.DEFAULT_IMG_CAPACITY);
+        }
+        return imgCache.get(key);
+    }
+
+    @Override
+    public Integer getPdfImageCache(String key) {
+        if (pdfImagesCache == null) {
+            initPdfImagesCachePool(CacheService.DEFAULT_PDFIMG_CAPACITY);
+        }
+        return pdfImagesCache.get(key);
+    }
+
+    @Override
+    public void putPdfImageCache(String pdfFilePath, int num) {
+        if (pdfImagesCache == null) {
+            initPdfImagesCachePool(CacheService.DEFAULT_PDFIMG_CAPACITY);
+        }
+        pdfImagesCache.put(pdfFilePath, num);
+    }
+
+    @Override
+    public void addQueueTask(String url) {
+        blockingQueue.add(url);
+    }
+
+    @Override
+    public String takeQueueTask() throws InterruptedException {
+        return String.valueOf(blockingQueue.take());
+    }
+}

jodconverter-web/src/main/java/cn/keking/service/cache/impl/CacheServiceRedisImpl.java

@@ -0,0 +1,108 @@
+package cn.keking.service.cache.impl;
+
+import cn.keking.service.FileConverQueueTask;
+import cn.keking.service.cache.CacheService;
+import org.redisson.Redisson;
+import org.redisson.api.RBlockingQueue;
+import org.redisson.api.RMapCache;
+import org.redisson.api.RedissonClient;
+import org.redisson.config.Config;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @auther: chenjh
+ * @time: 2019/4/2 18:02
+ * @description
+ */
+@ConditionalOnExpression("'${cache.type:default}'.equals('redis')")
+@Service
+public class CacheServiceRedisImpl implements CacheService {
+
+    private Config config;
+
+    @Autowired
+    public CacheServiceRedisImpl(Config config) {
+        this.config = config;
+        this.redissonClient = Redisson.create(config);
+    }
+
+    private RedissonClient redissonClient;
+
+    @Override
+    public void initPDFCachePool(Integer capacity) {
+
+    }
+
+    @Override
+    public void initIMGCachePool(Integer capacity) {
+
+    }
+
+    @Override
+    public void initPdfImagesCachePool(Integer capacity) {
+
+    }
+
+    @Override
+    public void putPDFCache(String key, String value) {
+        RMapCache<String, String> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_PDF_KEY);
+        convertedList.fastPut(key, value);
+    }
+
+    @Override
+    public void putImgCache(String key, List<String> value) {
+        RMapCache<String, List<String>> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_IMGS_KEY);
+        convertedList.fastPut(key, value);
+    }
+
+    @Override
+    public Map<String, String> getPDFCache() {
+        return redissonClient.getMapCache(REDIS_FILE_PREVIEW_PDF_KEY);
+    }
+
+    @Override
+    public String getPDFCache(String key) {
+        RMapCache<String, String> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_PDF_KEY);
+        return convertedList.get(key);
+    }
+
+    @Override
+    public Map<String, List<String>> getImgCache() {
+        return redissonClient.getMapCache(REDIS_FILE_PREVIEW_IMGS_KEY);
+    }
+
+    @Override
+    public List<String> getImgCache(String key) {
+        RMapCache<String, List<String>> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_IMGS_KEY);
+        return convertedList.get(key);
+    }
+
+    @Override
+    public Integer getPdfImageCache(String key) {
+        RMapCache<String, Integer> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_PDF_IMGS_KEY);
+        return convertedList.get(key);
+    }
+
+    @Override
+    public void putPdfImageCache(String pdfFilePath, int num) {
+        RMapCache<String, Integer> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_PDF_IMGS_KEY);
+        convertedList.fastPut(pdfFilePath, num);
+    }
+
+    @Override
+    public void addQueueTask(String url) {
+        RBlockingQueue<String> queue = redissonClient.getBlockingQueue(FileConverQueueTask.queueTaskName);
+        queue.addAsync(url);
+    }
+
+    @Override
+    public String takeQueueTask() throws InterruptedException {
+        RBlockingQueue<String> queue = redissonClient.getBlockingQueue(FileConverQueueTask.queueTaskName);
+        return queue.take();
+    }
+}

jodconverter-web/src/main/java/cn/keking/service/cache/impl/CacheServiceRocksDBImpl.java

@@ -0,0 +1,203 @@
+package cn.keking.service.cache.impl;
+
+import cn.keking.service.cache.CacheService;
+import org.artofsolving.jodconverter.office.OfficeUtils;
+import org.rocksdb.RocksDB;
+import org.rocksdb.RocksDBException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.stereotype.Service;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+
+/**
+ * @auther: chenjh
+ * @time: 2019/4/22 11:02
+ * @description
+ */
+@ConditionalOnExpression("'${cache.type:default}'.equals('default')")
+@Service
+public class CacheServiceRocksDBImpl implements CacheService {
+
+    static {
+        RocksDB.loadLibrary();
+    }
+
+    private static final String DB_PATH = OfficeUtils.getHomePath() + File.separator + "cache";
+
+    private static final int QUEUE_SIZE = 500000;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CacheServiceRocksDBImpl.class);
+
+    private BlockingQueue blockingQueue = new ArrayBlockingQueue(QUEUE_SIZE);
+
+    private RocksDB db;
+
+    {
+        try {
+            db = RocksDB.open(DB_PATH);
+            if (db.get(REDIS_FILE_PREVIEW_PDF_KEY.getBytes()) == null) {
+                Map<String, String> initPDFCache = new HashMap<>();
+                db.put(REDIS_FILE_PREVIEW_PDF_KEY.getBytes(), toByteArray(initPDFCache));
+            }
+            if (db.get(REDIS_FILE_PREVIEW_IMGS_KEY.getBytes()) == null) {
+                Map<String, List<String>> initIMGCache = new HashMap<>();
+                db.put(REDIS_FILE_PREVIEW_IMGS_KEY.getBytes(), toByteArray(initIMGCache));
+            }
+            if (db.get(REDIS_FILE_PREVIEW_PDF_IMGS_KEY.getBytes()) == null) {
+                Map<String, Integer> initPDFIMGCache = new HashMap<>();
+                db.put(REDIS_FILE_PREVIEW_PDF_IMGS_KEY.getBytes(), toByteArray(initPDFIMGCache));
+            }
+        } catch (RocksDBException | IOException e) {
+            LOGGER.error("Uable to init RocksDB" + e);
+        }
+    }
+
+
+    @Override
+    public void initPDFCachePool(Integer capacity) {
+
+    }
+
+    @Override
+    public void initIMGCachePool(Integer capacity) {
+
+    }
+
+    @Override
+    public void initPdfImagesCachePool(Integer capacity) {
+
+    }
+
+    @Override
+    public void putPDFCache(String key, String value) {
+        try {
+            Map<String, String> pdfCacheItem = new HashMap<>();
+            pdfCacheItem.put(key, value);
+            db.put(REDIS_FILE_PREVIEW_PDF_KEY.getBytes(), toByteArray(pdfCacheItem));
+        } catch (RocksDBException | IOException e) {
+            LOGGER.error("Put into RocksDB Exception" + e);
+        }
+    }
+
+    @Override
+    public void putImgCache(String key, List<String> value) {
+        try {
+            Map<String, List<String>> imgCacheItem = new HashMap<>();
+            imgCacheItem.put(key, value);
+            db.put(REDIS_FILE_PREVIEW_PDF_KEY.getBytes(), toByteArray(imgCacheItem));
+        } catch (RocksDBException | IOException e) {
+            LOGGER.error("Put into RocksDB Exception" + e);
+        }
+    }
+
+    @Override
+    public Map<String, String> getPDFCache() {
+        Map<String, String> result = new HashMap<>();
+        try{
+            result = (Map<String, String>) toObject(db.get(REDIS_FILE_PREVIEW_PDF_KEY.getBytes()));
+        } catch (RocksDBException | IOException | ClassNotFoundException e) {
+            LOGGER.error("Get from RocksDB Exception" + e);
+        }
+        return result;
+    }
+
+    @Override
+    public String getPDFCache(String key) {
+        String result = "";
+        try{
+            Map<String, String> map = (Map<String, String>) toObject(db.get(REDIS_FILE_PREVIEW_PDF_KEY.getBytes()));
+            result = map.get(key);
+        } catch (RocksDBException | IOException | ClassNotFoundException e) {
+            LOGGER.error("Get from RocksDB Exception" + e);
+        }
+        return result;
+    }
+
+    @Override
+    public Map<String, List<String>> getImgCache() {
+        Map<String, List<String>> result = new HashMap<>();
+        try{
+            result = (Map<String, List<String>>) toObject(db.get(REDIS_FILE_PREVIEW_IMGS_KEY.getBytes()));
+        } catch (RocksDBException | IOException | ClassNotFoundException e) {
+            LOGGER.error("Get from RocksDB Exception" + e);
+        }
+        return result;
+    }
+
+    @Override
+    public List<String> getImgCache(String key) {
+        List<String> result = new ArrayList<>();
+        Map<String, List<String>> map;
+        try{
+            map = (Map<String, List<String>>) toObject(db.get(REDIS_FILE_PREVIEW_IMGS_KEY.getBytes()));
+            result = map.get(key);
+        } catch (RocksDBException | IOException | ClassNotFoundException e) {
+            LOGGER.error("Get from RocksDB Exception" + e);
+        }
+        return result;
+    }
+
+    @Override
+    public Integer getPdfImageCache(String key) {
+        Integer result = 0;
+        Map<String, Integer> map;
+        try{
+            map = (Map<String, Integer>) toObject(db.get(REDIS_FILE_PREVIEW_PDF_IMGS_KEY.getBytes()));
+            result = map.get(key);
+        } catch (RocksDBException | IOException | ClassNotFoundException e) {
+            LOGGER.error("Get from RocksDB Exception" + e);
+        }
+        return result;
+    }
+
+    @Override
+    public void putPdfImageCache(String pdfFilePath, int num) {
+        try {
+            Map<String, Integer> pdfImageCacheItem = new HashMap<>();
+            pdfImageCacheItem.put(pdfFilePath, num);
+            db.put(REDIS_FILE_PREVIEW_PDF_IMGS_KEY.getBytes(), toByteArray(pdfImageCacheItem));
+        } catch (RocksDBException | IOException e) {
+            LOGGER.error("Put into RocksDB Exception" + e);
+        }
+    }
+
+    @Override
+    public void addQueueTask(String url) {
+        blockingQueue.add(url);
+    }
+
+    @Override
+    public String takeQueueTask() throws InterruptedException {
+        return String.valueOf(blockingQueue.take());
+    }
+
+    private byte[] toByteArray (Object obj) throws IOException {
+        byte[] bytes = null;
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ObjectOutputStream oos = new ObjectOutputStream(bos);
+        oos.writeObject(obj);
+        oos.flush();
+        bytes = bos.toByteArray ();
+        oos.close();
+        bos.close();
+        return bytes;
+    }
+
+    private Object toObject (byte[] bytes) throws IOException, ClassNotFoundException {
+        Object obj = null;
+        ByteArrayInputStream bis = new ByteArrayInputStream (bytes);
+        ObjectInputStream ois = new ObjectInputStream (bis);
+        obj = ois.readObject();
+        ois.close();
+        bis.close();
+        return obj;
+    }
+}

jodconverter-web/src/main/java/cn/keking/service/impl/CompressFilePreviewImpl.java

@@ -1,7 +1,7 @@
 package cn.keking.service.impl;
 
 import cn.keking.model.FileAttribute;
-import cn.keking.param.ReturnResponse;
+import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
 import cn.keking.utils.FileUtils;
@@ -38,6 +38,7 @@ public class CompressFilePreviewImpl implements FilePreview{
         if (!StringUtils.hasText(fileUtils.getConvertedFile(fileName))) {
             ReturnResponse<String> response = downloadUtils.downLoad(decodedUrl, suffix, fileName);
             if (0 != response.getCode()) {
+                model.addAttribute("fileType", suffix);
                 model.addAttribute("msg", response.getMsg());
                 return "fileNotSupported";
             }
@@ -47,14 +48,17 @@ public class CompressFilePreviewImpl implements FilePreview{
             } else if ("rar".equalsIgnoreCase(suffix)) {
                 fileTree = zipReader.unRar(filePath, fileName);
             }
-            fileUtils.addConvertedFile(fileName, fileTree);
+            if (fileTree != null && !"null".equals(fileTree)) {
+                fileUtils.addConvertedFile(fileName, fileTree);
+            }
         } else {
             fileTree = fileUtils.getConvertedFile(fileName);
         }
-        if (null != fileTree) {
+        if (fileTree != null && !"null".equals(fileTree)) {
             model.addAttribute("fileTree", fileTree);
             return "compress";
         } else {
+            model.addAttribute("fileType", suffix);
             model.addAttribute("msg", "压缩文件类型不受支持，尝试在压缩的时候选择RAR4格式");
             return "fileNotSupported";
         }

jodconverter-web/src/main/java/cn/keking/service/impl/MediaFilePreviewImpl.java

@@ -0,0 +1,27 @@
+package cn.keking.service.impl;
+
+import cn.keking.service.FilePreview;
+import cn.keking.utils.FileUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.Model;
+/**
+ * @author : kl
+ * @authorboke : kailing.pub
+ * @create : 2018-03-25 上午11:58
+ * @description:
+ **/
+@Service
+public class MediaFilePreviewImpl implements FilePreview {
+
+    @Autowired
+    FileUtils fileUtils;
+
+    @Override
+    public String filePreviewHandle(String url, Model model) {
+        model.addAttribute("mediaUrl", url);
+        return "media";
+    }
+
+
+}

jodconverter-web/src/main/java/cn/keking/service/impl/OfficeFilePreviewImpl.java

@@ -1,18 +1,22 @@
 package cn.keking.service.impl;
 
+import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileAttribute;
-import cn.keking.param.ReturnResponse;
+import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.DownloadUtils;
 import cn.keking.utils.FileUtils;
 import cn.keking.utils.OfficeToPdf;
+import cn.keking.utils.PdfUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.ExtendedModelMap;
 import org.springframework.ui.Model;
 import org.springframework.util.StringUtils;
 
 import java.io.File;
+import java.util.List;
 
 /**
  * Created by kl on 2018/1/17.
@@ -24,8 +28,8 @@ public class OfficeFilePreviewImpl implements FilePreview {
     @Autowired
     FileUtils fileUtils;
 
-    @Value("${file.dir}")
-    String fileDir;
+    @Autowired
+    PdfUtils pdfUtils;
 
     @Autowired
     DownloadUtils downloadUtils;
@@ -33,26 +37,36 @@ public class OfficeFilePreviewImpl implements FilePreview {
     @Autowired
     private OfficeToPdf officeToPdf;
 
+    String fileDir = ConfigConstants.getFileDir();
+
+    public static final String OFFICE_PREVIEW_TYPE_PDF = "pdf";
+    public static final String OFFICE_PREVIEW_TYPE_IMAGE = "image";
+    public static final String OFFICE_PREVIEW_TYPE_ALLIMAGES = "allImages";
+
     @Override
     public String filePreviewHandle(String url, Model model) {
+        // 预览Type，参数传了就取参数的，没传取系统默认
+        String officePreviewType = model.asMap().get("officePreviewType") == null ? ConfigConstants.getOfficePreviewType() : model.asMap().get("officePreviewType").toString();
+        String originUrl = model.asMap().get("originUrl").toString();
         FileAttribute fileAttribute=fileUtils.getFileAttribute(url);
         String suffix=fileAttribute.getSuffix();
         String fileName=fileAttribute.getName();
         String decodedUrl=fileAttribute.getDecodedUrl();
         boolean isHtml = suffix.equalsIgnoreCase("xls") || suffix.equalsIgnoreCase("xlsx");
         String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + (isHtml ? "html" : "pdf");
+        String outFilePath = fileDir + pdfName;
         // 判断之前是否已转换过，如果转换过，直接返回，否则执行转换
         if (!fileUtils.listConvertedFiles().containsKey(pdfName)) {
             String filePath = fileDir + fileName;
             if (!new File(filePath).exists()) {
                 ReturnResponse<String> response = downloadUtils.downLoad(decodedUrl, suffix, null);
                 if (0 != response.getCode()) {
+                    model.addAttribute("fileType", suffix);
                     model.addAttribute("msg", response.getMsg());
                     return "fileNotSupported";
                 }
                 filePath = response.getContent();
             }
-            String outFilePath = fileDir + pdfName;
             if (StringUtils.hasText(outFilePath)) {
                 officeToPdf.openOfficeToPDF(filePath, outFilePath);
                 File f = new File(filePath);
@@ -67,6 +81,21 @@ public class OfficeFilePreviewImpl implements FilePreview {
                 fileUtils.addConvertedFile(pdfName, fileUtils.getRelativePath(outFilePath));
             }
         }
+        if (!isHtml && (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OFFICE_PREVIEW_TYPE_ALLIMAGES.equals(officePreviewType))) {
+            List<String> imageUrls = pdfUtils.pdf2jpg(outFilePath, pdfName, originUrl);
+            if (imageUrls == null || imageUrls.size() < 1) {
+                model.addAttribute("msg", "office转图片异常，请联系管理员");
+                model.addAttribute("fileType",fileAttribute.getSuffix());
+                return "fileNotSupported";
+            }
+            model.addAttribute("imgurls", imageUrls);
+            model.addAttribute("currentUrl", imageUrls.get(0));
+            if (OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType)) {
+                return "officePicture";
+            } else {
+                return "picture";
+            }
+        }
         model.addAttribute("pdfUrl", pdfName);
         return isHtml ? "html" : "pdf";
     }

jodconverter-web/src/main/java/cn/keking/service/impl/OtherFilePreviewImpl.java

@@ -1,6 +1,9 @@
 package cn.keking.service.impl;
 
+import cn.keking.model.FileAttribute;
 import cn.keking.service.FilePreview;
+import cn.keking.utils.FileUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 
@@ -10,8 +13,14 @@ import org.springframework.ui.Model;
  */
 @Service
 public class OtherFilePreviewImpl implements FilePreview {
+    @Autowired
+    FileUtils fileUtils;
+
     @Override
     public String filePreviewHandle(String url, Model model) {
+        FileAttribute fileAttribute=fileUtils.getFileAttribute(url);
+
+        model.addAttribute("fileType",fileAttribute.getSuffix());
         model.addAttribute("msg", "系统还不支持该格式文件的在线预览，" +
                 "如有需要请按下方显示的邮箱地址联系系统维护人员");
         return "fileNotSupported";

jodconverter-web/src/main/java/cn/keking/service/impl/PdfFilePreviewImpl.java

@@ -1,9 +1,19 @@
 package cn.keking.service.impl;
 
+import cn.keking.config.ConfigConstants;
+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.utils.PdfUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 
+import java.io.File;
+import java.util.List;
+
 /**
  * Created by kl on 2018/1/17.
  * Content :处理pdf文件
@@ -11,9 +21,54 @@ import org.springframework.ui.Model;
 @Service
 public class PdfFilePreviewImpl implements FilePreview{
 
+
+    @Autowired
+    FileUtils fileUtils;
+
+    @Autowired
+    PdfUtils pdfUtils;
+
+    @Autowired
+    DownloadUtils downloadUtils;
+
+    String fileDir = ConfigConstants.getFileDir();
+
     @Override
     public String filePreviewHandle(String url, Model model) {
+        FileAttribute fileAttribute=fileUtils.getFileAttribute(url);
+        String decodedUrl=fileAttribute.getDecodedUrl();
+        String suffix=fileAttribute.getSuffix();
+        String fileName=fileAttribute.getName();
+        String officePreviewType = model.asMap().get("officePreviewType") == null ? "" : model.asMap().get("officePreviewType").toString();
+        String originUrl = model.asMap().get("originUrl").toString();
         model.addAttribute("pdfUrl", url);
+        String pdfName = fileName.substring(0, fileName.lastIndexOf(".") + 1) + "pdf";
+        String outFilePath = fileDir + pdfName;
+        if (OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType) || OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_ALLIMAGES.equals(officePreviewType)) {
+            //当文件不存在时，就去下载
+            if (!new File(outFilePath).exists()) {
+                ReturnResponse<String> response = downloadUtils.downLoad(decodedUrl, suffix, fileName);
+                if (0 != response.getCode()) {
+                    model.addAttribute("fileType", suffix);
+                    model.addAttribute("msg", response.getMsg());
+                    return "fileNotSupported";
+                }
+                outFilePath = response.getContent();
+            }
+            List<String> imageUrls = pdfUtils.pdf2jpg(outFilePath, pdfName, originUrl);
+            if (imageUrls == null || imageUrls.size() < 1) {
+                model.addAttribute("msg", "pdf转图片异常，请联系管理员");
+                model.addAttribute("fileType",fileAttribute.getSuffix());
+                return "fileNotSupported";
+            }
+            model.addAttribute("imgurls", imageUrls);
+            model.addAttribute("currentUrl", imageUrls.get(0));
+            if (OfficeFilePreviewImpl.OFFICE_PREVIEW_TYPE_IMAGE.equals(officePreviewType)) {
+                return "officePicture";
+            } else {
+                return "picture";
+            }
+        }
         return "pdf";
     }
 }

jodconverter-web/src/main/java/cn/keking/service/impl/SimTextFilePreviewImpl.java

@@ -1,8 +1,7 @@
 package cn.keking.service.impl;
 
 import cn.keking.model.FileAttribute;
-import cn.keking.model.FileType;
-import cn.keking.param.ReturnResponse;
+import cn.keking.model.ReturnResponse;
 import cn.keking.service.FilePreview;
 import cn.keking.utils.FileUtils;
 import cn.keking.utils.SimTextUtil;
@@ -10,8 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.ui.Model;
 
-import java.net.URLDecoder;
-
 /**
  * Created by kl on 2018/1/17.
  * Content :处理文本文件
@@ -33,6 +30,7 @@ public class SimTextFilePreviewImpl implements FilePreview{
         ReturnResponse<String> response = simTextUtil.readSimText(decodedUrl, fileName);
         if (0 != response.getCode()) {
             model.addAttribute("msg", response.getMsg());
+            model.addAttribute("fileType",fileAttribute.getSuffix());
             return "fileNotSupported";
         }
         model.addAttribute("ordinaryUrl", response.getMsg());

jodconverter-web/src/main/java/cn/keking/utils/ConverterUtils.java

@@ -5,6 +5,7 @@ import cn.keking.extend.ControlDocumentFormatRegistry;
 import org.artofsolving.jodconverter.OfficeDocumentConverter;
 import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration;
 import org.artofsolving.jodconverter.office.OfficeManager;
+import org.artofsolving.jodconverter.office.OfficeUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -23,8 +24,8 @@ import java.util.Map;
 @Component
 public class ConverterUtils {
 
-    @Value("${office.home}")
-    String officeHome;
+//    @Value("${office.home}")
+//    String officeHome;
 //    OpenOfficeConnection connection;
     OfficeManager officeManager;
 
@@ -32,6 +33,7 @@ public class ConverterUtils {
     public void initOfficeManager() {
         ////            connection = new SocketOpenOfficeConnection(host,8100);
 ////            connection.connect();
+        String officeHome = OfficeUtils.getDefaultOfficeHome().getAbsolutePath();
         DefaultOfficeManagerConfiguration configuration = new DefaultOfficeManagerConfiguration();
         configuration.setOfficeHome(officeHome);
         configuration.setPortNumber(8100);

jodconverter-web/src/main/java/cn/keking/utils/DownloadUtils.java

@@ -1,11 +1,10 @@
 package cn.keking.utils;
 
-import cn.keking.param.ReturnResponse;
-import org.springframework.beans.factory.annotation.Value;
+import cn.keking.config.ConfigConstants;
+import cn.keking.model.ReturnResponse;
 import org.springframework.stereotype.Component;
 import java.io.*;
 import java.net.*;
-import java.nio.charset.Charset;
 import java.util.UUID;
 
 /**
@@ -14,8 +13,7 @@ import java.util.UUID;
 @Component
 public class DownloadUtils {
 
-    @Value("${file.dir}")
-    String fileDir;
+    String fileDir = ConfigConstants.getFileDir();
 
     /**
      * 一开始测试的时候发现有些文件没有下载下来，而有些可以；当时也是郁闷了好一阵，但是最终还是不得解

jodconverter-web/src/main/java/cn/keking/utils/FileUtils.java

@@ -1,14 +1,13 @@
 package cn.keking.utils;
 
+import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileAttribute;
 import cn.keking.model.FileType;
+import cn.keking.service.cache.CacheService;
 import com.google.common.collect.Lists;
-import org.redisson.api.RMapCache;
-import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.io.*;
@@ -27,26 +26,17 @@ import java.util.Map;
 public class FileUtils {
     Logger log= LoggerFactory.getLogger(getClass());
 
-
-    final String REDIS_FILE_PREVIEW_PDF_KEY = "converted-preview-pdf-file";
-    final String REDIS_FILE_PREVIEW_IMGS_KEY = "converted-preview-imgs-file";//压缩包内图片文件集合
     @Autowired
-    RedissonClient redissonClient;
-    @Value("${file.dir}")
-    String fileDir;
+    CacheService cacheService;
 
-    @Value("${converted.file.charset}")
-    String charset;
+    String fileDir = ConfigConstants.getFileDir();
 
-    @Value("${simText}")
-    String[] simText;
     /**
      * 已转换过的文件集合(redis缓存)
      * @return
      */
     public Map<String, String> listConvertedFiles() {
-        RMapCache<String, String> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_PDF_KEY);
-        return convertedList;
+        return cacheService.getPDFCache();
     }
 
     /**
@@ -54,8 +44,16 @@ public class FileUtils {
      * @return
      */
     public String getConvertedFile(String key) {
-        RMapCache<String, String> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_PDF_KEY);
-        return convertedList.get(key);
+        return cacheService.getPDFCache(key);
+    }
+
+    /**
+     * 已将pdf转换成图片的图片本地路径
+     * @param key pdf本地路径
+     * @return
+     */
+    public Integer getConvertedPdfImage(String key) {
+        return cacheService.getPdfImageCache(key);
     }
 
     /**
@@ -65,6 +63,8 @@ public class FileUtils {
      * @return
      */
     public FileType typeFromUrl(String url) {
+        String[] simText = ConfigConstants.getSimText();
+        String[] media = ConfigConstants.getMedia();
         String nonPramStr = url.substring(0, url.indexOf("?") != -1 ? url.indexOf("?") : url.length());
         String fileName = nonPramStr.substring(nonPramStr.lastIndexOf("/") + 1);
         String fileType = fileName.substring(fileName.lastIndexOf(".") + 1);
@@ -80,6 +80,9 @@ public class FileUtils {
         if (Arrays.asList(simText).contains(fileType.toLowerCase())) {
             return FileType.simText;
         }
+        if (Arrays.asList(media).contains(fileType.toLowerCase())) {
+            return FileType.media;
+        }
         if("pdf".equalsIgnoreCase(fileType)){
             return FileType.pdf;
         }
@@ -164,8 +167,16 @@ public class FileUtils {
     }
 
     public void addConvertedFile(String fileName, String value){
-        RMapCache<String, String> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_PDF_KEY);
-        convertedList.fastPut(fileName, value);
+        cacheService.putPDFCache(fileName, value);
+    }
+
+    /**
+     *
+     * @param pdfFilePath
+     * @param num
+     */
+    public void addConvertedPdfImage(String pdfFilePath, int num){
+        cacheService.putPdfImageCache(pdfFilePath, num);
     }
 
     /**
@@ -174,8 +185,7 @@ public class FileUtils {
      * @return
      */
     public List getRedisImgUrls(String fileKey){
-        RMapCache<String, List> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_IMGS_KEY);
-        return convertedList.get(fileKey);
+        return cacheService.getImgCache(fileKey);
     }
 
     /**
@@ -184,8 +194,7 @@ public class FileUtils {
      * @param imgs
      */
     public void setRedisImgUrls(String fileKey,List imgs){
-        RMapCache<String, List> convertedList = redissonClient.getMapCache(REDIS_FILE_PREVIEW_IMGS_KEY);
-         convertedList.fastPut(fileKey,imgs);
+        cacheService.putImgCache(fileKey, imgs);
     }
     /**
      * 判断文件编码格式
@@ -219,6 +228,7 @@ public class FileUtils {
      */
     public void doActionConvertedFile(String outFilePath) {
         StringBuffer sb = new StringBuffer();
+        String charset = ConfigConstants.getConvertedFileCharset();
         try (InputStream inputStream = new FileInputStream(outFilePath);
             BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, charset))){
             String line;

jodconverter-web/src/main/java/cn/keking/utils/PdfUtils.java

@@ -0,0 +1,66 @@
+package cn.keking.utils;
+
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.rendering.ImageType;
+import org.apache.pdfbox.rendering.PDFRenderer;
+import org.apache.pdfbox.tools.imageio.ImageIOUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class PdfUtils {
+
+    private final Logger LOGGER = LoggerFactory.getLogger(PdfUtils.class);
+
+    @Autowired
+    FileUtils fileUtils;
+
+    public List<String> pdf2jpg(String pdfFilePath, String pdfName, String url) {
+        List<String> imageUrls = new ArrayList<>();
+        Integer imageCount = fileUtils.getConvertedPdfImage(pdfFilePath);
+        String imageFileSuffix = ".jpg";
+        // https://8个字符  http://7个字符 从这后面开始出现的第一个/就是当前file.Dir下的根目录
+        int index1 = url.indexOf("/", 8);
+        String pdfFolder = pdfName.substring(0, pdfName.length() - 4);
+        String urlPrefix = url.substring(0, index1 + 1) + pdfFolder;
+        if (imageCount != null && imageCount.intValue() > 0) {
+            for (int i = 0; i < imageCount ; i++)
+            imageUrls.add(urlPrefix + "/" + i + imageFileSuffix);
+            return imageUrls;
+        }
+        try {
+            File pdfFile = new File(pdfFilePath);
+            PDDocument doc = PDDocument.load(pdfFile);
+            int pageCount = doc.getNumberOfPages();
+            PDFRenderer pdfRenderer = new PDFRenderer(doc);
+
+            int index = pdfFilePath.lastIndexOf(".");
+            String folder = pdfFilePath.substring(0, index);
+
+            File path = new File(folder);
+            if (!path.exists()) {
+                path.mkdirs();
+            }
+            String imageFilePath;
+            for (int pageIndex = 0; pageIndex < pageCount; pageIndex++) {
+                imageFilePath = folder + File.separator + pageIndex + imageFileSuffix;
+                BufferedImage image = pdfRenderer.renderImageWithDPI(pageIndex, 105, ImageType.RGB);
+                ImageIOUtil.writeImage(image, imageFilePath, 105);
+                imageUrls.add(urlPrefix + "/" + pageIndex + imageFileSuffix);
+            }
+            doc.close();
+            fileUtils.addConvertedPdfImage(pdfFilePath, pageCount);
+        } catch (IOException e) {
+            LOGGER.error("Convert pdf to jpg exception", e);
+        }
+        return imageUrls;
+    }
+}

jodconverter-web/src/main/java/cn/keking/utils/ShedulerClean.java

@@ -1,12 +1,11 @@
 package cn.keking.utils;
 
-import org.springframework.beans.factory.annotation.Value;
+import cn.keking.config.ConfigConstants;
 import org.springframework.stereotype.Component;
 
 @Component
 public class ShedulerClean {
-    @Value("${file.dir}")
-    String fileDir;
+    String fileDir = ConfigConstants.getFileDir();
 
 //    @Scheduled(cron = "0 0 23 * * ?")   //每晚23点执行一次
     public void clean(){

jodconverter-web/src/main/java/cn/keking/utils/SimTextUtil.java

@@ -1,8 +1,8 @@
 package cn.keking.utils;
 
-import cn.keking.param.ReturnResponse;
+import cn.keking.config.ConfigConstants;
+import cn.keking.model.ReturnResponse;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 /**
@@ -12,8 +12,7 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class SimTextUtil {
-    @Value("${file.dir}")
-    String fileDir;
+    String fileDir = ConfigConstants.getFileDir();
     @Autowired
     DownloadUtils downloadUtils;
 

jodconverter-web/src/main/java/cn/keking/utils/ZipReader.java

@@ -1,5 +1,6 @@
 package cn.keking.utils;
 
+import cn.keking.config.ConfigConstants;
 import cn.keking.model.FileType;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -11,7 +12,6 @@ import com.google.common.collect.Maps;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestContextHolder;
 
@@ -36,8 +36,7 @@ public class ZipReader {
 
     @Autowired
     FileUtils fileUtils;
-    @Value("${file.dir}")
-    String fileDir;
+    String fileDir = ConfigConstants.getFileDir();
 
     ExecutorService executors = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
 
@@ -121,7 +120,7 @@ public class ZipReader {
         List imgUrls=Lists.newArrayList();
         String baseUrl= (String) RequestContextHolder.currentRequestAttributes().getAttribute("baseUrl",0);
         try {
-            Archive archive = new Archive(new File(filePath));
+            Archive archive = new Archive(new FileInputStream(new File(filePath)));
             List<FileHeader> headers = archive.getFileHeaders();
             headers = sortedHeaders(headers);
             String archiveFileName = fileUtils.getFileNameFromPath(filePath);
@@ -177,10 +176,10 @@ public class ZipReader {
     private List<FileHeader> sortedHeaders(List<FileHeader> headers) {
         List<FileHeader> sortedHeaders = new ArrayList<>();
         Map<Integer, FileHeader> mapHeaders = new TreeMap<>();
-        headers.forEach(header -> mapHeaders.put(header.getFileNameW().length(), header));
+        headers.forEach(header -> mapHeaders.put(new Integer(0).equals(header.getFileNameW().length()) ? header.getFileNameString().length() : header.getFileNameW().length(), header));
         for (Map.Entry<Integer, FileHeader> entry : mapHeaders.entrySet()){
             for (FileHeader header : headers) {
-                if (entry.getKey().intValue() == header.getFileNameW().length()) {
+                if (entry.getKey().equals(new Integer(0).equals(header.getFileNameW().length()) ? header.getFileNameString().length() : header.getFileNameW().length())) {
                     sortedHeaders.add(header);
                 }
             }

jodconverter-web/src/main/java/cn/keking/web/controller/FileController.java

@@ -1,13 +1,13 @@
 package cn.keking.web.controller;
 
+import cn.keking.config.ConfigConstants;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
-import cn.keking.param.ReturnResponse;
+import cn.keking.model.ReturnResponse;
 import cn.keking.utils.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -28,8 +28,7 @@ import java.util.UUID;
  */
 @RestController
 public class FileController {
-    @Value("${file.dir}")
-    String fileDir;
+    String fileDir = ConfigConstants.getFileDir();
     @Autowired
     FileUtils fileUtils;
     String demoDir = "demo";

jodconverter-web/src/main/java/cn/keking/web/controller/OnlinePreviewController.java

@@ -3,12 +3,16 @@ package cn.keking.web.controller;
 import cn.keking.service.FilePreview;
 import cn.keking.service.FilePreviewFactory;
 
+import cn.keking.service.cache.CacheService;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
 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.IOException;
@@ -20,7 +24,6 @@ import java.net.URLConnection;
 import java.net.URLDecoder;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author yudian-it
@@ -31,6 +34,9 @@ public class OnlinePreviewController {
     @Autowired
     FilePreviewFactory previewFactory;
 
+    @Autowired
+    CacheService cacheService;
+
     /**
      * @param url
      * @param model
@@ -38,9 +44,11 @@ public class OnlinePreviewController {
      */
     @RequestMapping(value = "onlinePreview", method = RequestMethod.GET)
     public String onlinePreview(String url, Model model, HttpServletRequest req) {
-          req.setAttribute("fileKey",req.getParameter("fileKey"));
-          FilePreview filePreview=previewFactory.get(url);
-          return filePreview.filePreviewHandle(url,model);
+        req.setAttribute("fileKey", req.getParameter("fileKey"));
+        model.addAttribute("officePreviewType", req.getParameter("officePreviewType"));
+        model.addAttribute("originUrl",req.getRequestURL().toString());
+        FilePreview filePreview = previewFactory.get(url);
+        return filePreview.filePreviewHandle(url, model);
     }
 
     /**
@@ -52,17 +60,32 @@ public class OnlinePreviewController {
      * @throws UnsupportedEncodingException
      */
     @RequestMapping(value = "picturesPreview", method = RequestMethod.GET)
-    public String picturesPreview(String urls, Model model, HttpServletRequest req) throws UnsupportedEncodingException {
+    public String picturesPreview(String urls, String currentUrl, Model model, HttpServletRequest req) throws UnsupportedEncodingException {
         // 路径转码
         String decodedUrl = URLDecoder.decode(urls, "utf-8");
+        String decodedCurrentUrl = URLDecoder.decode(currentUrl, "utf-8");
         // 抽取文件并返回文件列表
-        String[] imgs = decodedUrl.split("|");
+        String[] imgs = decodedUrl.split("\\|");
         List imgurls = Arrays.asList(imgs);
         model.addAttribute("imgurls", imgurls);
+        model.addAttribute("currentUrl",decodedCurrentUrl);
         return "picture";
     }
 
-
+    @RequestMapping(value = "picturesPreview", method = RequestMethod.POST)
+    public String picturesPreview(Model model, HttpServletRequest req) throws UnsupportedEncodingException {
+        String urls = req.getParameter("urls");
+        String currentUrl = req.getParameter("currentUrl");
+        // 路径转码
+        String decodedUrl = URLDecoder.decode(urls, "utf-8");
+        String decodedCurrentUrl = URLDecoder.decode(currentUrl, "utf-8");
+        // 抽取文件并返回文件列表
+        String[] imgs = decodedUrl.split("\\|");
+        List imgurls = Arrays.asList(imgs);
+        model.addAttribute("imgurls", imgurls);
+        model.addAttribute("currentUrl",decodedCurrentUrl);
+        return "picture";
+    }
     /**
      * 根据url获取文件内容
      * 当pdfjs读取存在跨域问题的文件时将通过此接口读取
@@ -95,4 +118,15 @@ public class OnlinePreviewController {
         }
     }
 
+    /**
+     * 通过api接口入队
+     * @param url 请编码后在入队
+     */
+    @GetMapping("/addTask")
+    @ResponseBody
+    public String addQueueTask(String url) {
+        cacheService.addQueueTask(url);
+        return "success";
+    }
+
 }

jodconverter-web/src/main/office/help/idxcaption.xsl

@@ -0,0 +1,54 @@
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
+<xsl:stylesheet version="1.0" encoding="UTF-8"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:office="http://openoffice.org/2000/office"
+	xmlns:style="http://openoffice.org/2000/style"
+	xmlns:table="http://openoffice.org/2000/table"
+	xmlns:draw="http://openoffice.org/2000/drawing"
+	xmlns:fo="http://www.w3.org/1999/XSL/Format"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:meta="http://openoffice.org/2000/meta"
+	xmlns:number="http://openoffice.org/2000/datastyle"
+	xmlns:svg="http://www.w3.org/2000/svg"
+	xmlns:chart="http://openoffice.org/2000/chart"
+	xmlns:help="http://openoffice.org/2000/help"
+	xmlns:index="http://sun.com/2000/XMLSearch"	
+	xmlns:text="http://openoffice.org/2000/text">
+
+<xsl:param name="Language" select="'en-US'"/>
+<xsl:output method="text" encoding="UTF-8"/>
+
+<xsl:template match="/">
+	<xsl:apply-templates select="//title" mode="include"/>
+	<xsl:apply-templates select="//paragraph[@role='heading']" mode="include"/>
+</xsl:template>
+
+<xsl:template match="*" mode="include">
+	<xsl:value-of select="."/>
+	<xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="*"/>
+
+</xsl:stylesheet>
+

jodconverter-web/src/main/office/help/idxcontent.xsl

@@ -0,0 +1,124 @@
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
+<xsl:stylesheet version="1.0" encoding="UTF-8"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:office="http://openoffice.org/2000/office"
+	xmlns:style="http://openoffice.org/2000/style"
+	xmlns:table="http://openoffice.org/2000/table"
+	xmlns:draw="http://openoffice.org/2000/drawing"
+	xmlns:fo="http://www.w3.org/1999/XSL/Format"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:meta="http://openoffice.org/2000/meta"
+	xmlns:number="http://openoffice.org/2000/datastyle"
+	xmlns:svg="http://www.w3.org/2000/svg"
+	xmlns:chart="http://openoffice.org/2000/chart"
+	xmlns:help="http://openoffice.org/2000/help"
+	xmlns:index="http://sun.com/2000/XMLSearch"	
+	xmlns:text="http://openoffice.org/2000/text">
+
+<xsl:param name="Language" select="'en-US'"/>
+<xsl:output method="text" encoding="UTF-8"/>
+
+<xsl:template match="helpdocument|body">
+  <xsl:choose>
+    <xsl:when test="meta/topic[@indexer='exclude']"/>
+    <xsl:otherwise>
+      <xsl:apply-templates/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="title">
+  <xsl:value-of select="."/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="table">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="tablecell">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="tablerow">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="list">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="listitem">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="item">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="emph">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="paragraph">
+  <xsl:value-of select="."/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="section">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="bookmark">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="bookmark_value">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="link">
+  <xsl:apply-templates/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="ahelp[@visibility='visible']">
+  <xsl:value-of select="."/>
+  <xsl:text>&#xA;</xsl:text>
+</xsl:template>
+
+<xsl:template match="*"/>
+
+</xsl:stylesheet>
+
+

jodconverter-web/src/main/office/help/zh-CN/default.css

@@ -0,0 +1,94 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                          DEFAULT STYLESHEET                       +
++                           CHINESE SIMPL                           +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 24-MAR-2005                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable  
+	{ font-family:  方正宋体,"MSung Light SC",SimSun,FZSongYi,FZShuSong,NSimSun,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Song; }
+	
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: 方正宋体,"MSung Light SC",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; border: 1px solid #999999; background: #FFFFFF; padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.howtoget
+	{ background:#EEEEEE;}
+
+.howtogetbody
+	{ background:#EEEEEE;}
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}

jodconverter-web/src/main/office/help/zh-CN/err.html

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<!--***********************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ ***********************************************************-->
+
+
+	
+<helpdocument version="1.0">
+<meta>
+<topic id="textshared05err_htmlxml" indexer="exclude" status="PUBLISH">
+<title id="tit" xml-lang="zh-CN">未找到帮助页面</title>
+<filename>/text/shared/05/err_html.xhp</filename>
+</topic>
+<history>
+<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
+<lastedited date="2005-01-11T11:07:13">converted from old format - fpe
+FPE: Updated</lastedited>
+</history>
+</meta>
+<body>
+<paragraph role="heading" id="hd_id3146957" xml-lang="zh-CN" level="1" l10n="U" oldref="1">帮助页面未能找到。</paragraph>
+<paragraph role="paragraph" id="par_id3147088" xml-lang="zh-CN" l10n="U" oldref="2">很遗憾，您所选择的帮助页面未能找到。以下数据可能对界定错误有所帮助：</paragraph>
+<paragraph role="paragraph" id="par_id3143268" xml-lang="zh-CN" l10n="U" oldref="3">帮助 ID：<emph><help-id-missing/></emph></paragraph>
+<paragraph role="paragraph" id="par_idN10681" xml-lang="zh-CN" l10n="NEW">可以使用安装应用程序来安装缺少的帮助模块。</paragraph>
+<paragraph role="paragraph" id="par_id3150541" xml-lang="zh-CN" l10n="U" oldref="16">单击<image id="img_id3148946" src="res/sc06301.png" width="0.222inch" height="0.222inch"><alt id="alt_id3148946">图标</alt></image><emph>上一步</emph>可返回上一页面。</paragraph>
+</body>
+</helpdocument>

jodconverter-web/src/main/office/help/zh-CN/highcontrast1.css

@@ -0,0 +1,114 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                        HIGH CONTRAST #1 STYLESHEET                +
++                           CHINESE SIMPL                           +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 24-MAR-2005                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable  
+	{ font-family:  方正宋体,"MSung Light SC",SimSun,FZSongYi,FZShuSong,NSimSun,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Song; }
+	
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: 方正宋体,"MSung Light SC",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFF00;}
+
+.related 
+	{ border-top: 1px solid #FFFF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFF00; }

jodconverter-web/src/main/office/help/zh-CN/highcontrast2.css

@@ -0,0 +1,114 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                        HIGH CONTRAST #2 STYLESHEET                +
++                           CHINESE SIMPL                           +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 24-MAR-2005                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable  
+	{ font-family:  方正宋体,"MSung Light SC",SimSun,FZSongYi,FZShuSong,NSimSun,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Song; }
+	
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: 方正宋体,"MSung Light SC",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #00FF00;}
+
+.related 
+	{ border-top: 1px solid #00FF00; }
+
+.howtogetheader
+	{border: 1px solid #EFEFEF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #00FF00; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #00FF00; }

jodconverter-web/src/main/office/help/zh-CN/highcontrastblack.css

@@ -0,0 +1,114 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST BLACK STYLESHEET               +
++                           CHINESE SIMPL                           +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 24-MAR-2005                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable  
+	{ font-family:  方正宋体,"MSung Light SC",SimSun,FZSongYi,FZShuSong,NSimSun,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Song; }
+	
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: 方正宋体,"MSung Light SC",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #000000; color: #FFFFFF;}
+
+.related 
+	{ border-top: 1px solid #FFFFFF; }
+
+.howtogetheader
+	{border: 1px solid #FFFFFF; background: #000000;}
+
+h1 
+	{ border-bottom: 1px solid #FFFFFF; ]
+
+.howtoget
+	{ background:#000000;}
+
+.howtogetbody
+	{ background:#000000;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #FFFFFF; }

jodconverter-web/src/main/office/help/zh-CN/highcontrastwhite.css

@@ -0,0 +1,114 @@
+/**************************************************************
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * 
+ *************************************************************/
+
+/*
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                          OPENOFFICE.ORG 2.0 HELP                  +
++                      HIGH CONTRAST WHITE STYLESHEET               +
++                           CHINESE SIMPL                           +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++ LAST CHANGES: 24-MAR-2005                                         +
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable  
+	{ font-family:  方正宋体,"MSung Light SC",SimSun,FZSongYi,FZShuSong,NSimSun,"Andale Sans UI","Arial Unicode MS","Lucida Sans Unicode",Song; }
+	
+.code, .codeintable, .example, .exampleintable, .literal, .literalintable, .path, .pathintable
+	{ font-family: 方正宋体,"MSung Light SC",Cumberland,Courier New,Courier,"Lucida Sans Typewriter","Lucida Typewriter",Monaco,Monospaced; margin-top: 1pt; margin-bottom: 1pt;}
+
+.acronym 
+	{ font-weight: bold; }
+
+.related
+	{ font-weight: bold; margin-top:20pt; border-top: 1px solid black;}
+
+.emph, .menuitem, .keycode
+	{ font-weight: bold; }
+
+.tablehead, .tableheadintable
+	{ font-weight: bold; margin-top: 0px;}
+
+.howtogetheader
+	{ font-weight: bold; padding: 3px;}
+
+h1, h2, h3, h4, h5, h6
+	{ margin-bottom: 5pt; }
+
+p, td
+	{ font-size: 10pt; }
+
+h1
+	{ font-size: 18pt; border-bottom: 1px solid black; padding-bottom: 6px; margin-bottom: 6px;}
+
+h2
+	{ font-size: 14pt; }
+
+h3
+	{ font-size: 12pt; }
+
+h4, h5, h6
+	{ font-size: 10pt; }
+
+.relatedtopics
+	{ font-weight: normal; }
+
+.relatedbody  
+	{ margin-top: 2px; margin-bottom: 2px; margin-left: 5px; }
+
+.wide 
+	{ width: 100%; }
+
+.topalign
+	 { vertical-align: top; border: 1px;}
+
+.bug 
+	{ color: red; border: 1px solid red;}
+
+.debug
+	{ border: 1px solid black; padding: 3px; display: none;}
+
+/* HIGH CONTRAST SPECIFIC SETTINGS */
+
+body, p, h1, h2, h3, h4, h5, h6, .listitem, .listitemintable, .tablecontent, .tablecontentintable
+	{ background: #FFFFFF; color: #000000;}
+
+.related 
+	{ border-top: 1px solid #000000; }
+
+.howtogetheader
+	{border: 1px solid #000000; background: #FFFFFF;}
+
+h1 
+	{ border-bottom: 1px solid #000000; ]
+
+.howtoget
+	{ background:#FFFFFF;}
+
+.howtogetbody
+	{ background:#FFFFFF;}
+
+.debug
+	{ border: 1px solid red; padding: 3px; display: none;}
+
+a
+ { color: #000000; }

jodconverter-web/src/main/office/help/zh-CN/sbasic.cfg

@@ -0,0 +1,30 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+Title=%PRODUCTNAME Basic
+
+Language=zh-CN
+Order=7
+Start=text%2Fsbasic%2Fshared%2Fmain0601.xhp
+Heading=headingheading
+Program=BASIC 
+07.07.04 00:00:00