From bb569d88ba67484d8135ad69de158c70e724624d Mon Sep 17 00:00:00 2001
From: kl <632104866@QQ.com>
Date: Wed, 13 Dec 2017 11:44:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E6=95=88=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/yudianbank/utils/OfficeToPdf.java | 7 -------
 src/main/resources/application.properties           | 7 -------
 2 files changed, 14 deletions(-)

diff --git a/src/main/java/com/yudianbank/utils/OfficeToPdf.java b/src/main/java/com/yudianbank/utils/OfficeToPdf.java
index 7f833446..884f7729 100644
--- a/src/main/java/com/yudianbank/utils/OfficeToPdf.java
+++ b/src/main/java/com/yudianbank/utils/OfficeToPdf.java
@@ -7,13 +7,6 @@ import org.springframework.stereotype.Component;
 import java.io.File;
 @Component
 public class OfficeToPdf {
-    /**
-     * 获取OpenOffice.org 3的安装目录
-     *
-     * @return OpenOffice.org 3的安装目录
-     */
-    @Value("${openOfficePath}")
-    private String openOfficePath;
     @Autowired
     ConverterUtils converterUtils;
     /**
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 830769bd..63fed3bb 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,8 +1,6 @@
 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
@@ -12,17 +10,12 @@ spring.freemarker.expose-request-attributes = true
 spring.freemarker.expose-session-attributes = true
 spring.freemarker.request-context-attribute = request
 spring.freemarker.suffix = .ftl
-
 #=============================================#spring Redisson配置#===================================#
 spring.redisson.address = 192.168.1.204:6379
-#Redisson配置end
-
 ##资源映射路径(因为jar方式运行的原因)
 file.dir = C:\\Users\\yudian\\Desktop\\dev\\
 spring.resources.static-locations = classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${file.dir}
-
 ## openoffice相关配置
-openOfficePath = /Applications/OpenOffice.app/Contents
 office.home = C:\\Program Files (x86)\\OpenOffice 4
 server.tomcat.uri-encoding = UTF-8
 converted.file.charset = GBK