From 8cbb1c3bb715262354510014419145005bf40708 Mon Sep 17 00:00:00 2001
From: kl <632104866@QQ.com>
Date: Tue, 2 Jan 2018 10:54:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Espring=20boot=20profile?=
 =?UTF-8?q?=E5=A4=9A=E6=96=87=E4=BB=B6=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/application-dev.properties    | 13 +++++++++++++
 .../main/resources/application-prod.properties   |  0
 .../main/resources/application-uat.properties    | 14 ++++++++++++++
 .../src/main/resources/application.properties    | 16 +++-------------
 4 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 jodconverter-web/src/main/resources/application-dev.properties
 create mode 100644 jodconverter-web/src/main/resources/application-prod.properties
 create mode 100644 jodconverter-web/src/main/resources/application-uat.properties

diff --git a/jodconverter-web/src/main/resources/application-dev.properties b/jodconverter-web/src/main/resources/application-dev.properties
new file mode 100644
index 00000000..1f756b89
--- /dev/null
+++ b/jodconverter-web/src/main/resources/application-dev.properties
@@ -0,0 +1,13 @@
+#=============================================#spring Redisson配置#===================================#
+spring.redisson.address = 192.168.1.204:6379
+##资源映射路径(因为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相关配置
+office.home = C:\\Program Files (x86)\\OpenOffice 4
+server.tomcat.uri-encoding = UTF-8
+converted.file.charset = GBK
+#======================================#文件上传限制#======================================#
+spring.http.multipart.max-file-size=100MB
+## 支持的类文本格式的文件类型
+simText = txt,html,xml,java,properties,mp3,mp4,sql
\ No newline at end of file
diff --git a/jodconverter-web/src/main/resources/application-prod.properties b/jodconverter-web/src/main/resources/application-prod.properties
new file mode 100644
index 00000000..e69de29b
diff --git a/jodconverter-web/src/main/resources/application-uat.properties b/jodconverter-web/src/main/resources/application-uat.properties
new file mode 100644
index 00000000..04e4a5c0
--- /dev/null
+++ b/jodconverter-web/src/main/resources/application-uat.properties
@@ -0,0 +1,14 @@
+#=============================================#spring Redisson配置#===================================#
+spring.redisson.address = 192.168.1.204:6379
+spring.redisson.database = 3
+##资源映射路径(因为jar方式运行的原因)
+file.dir = /data/filepreview/
+spring.resources.static-locations = classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${file.dir}
+## openoffice相关配置
+openOfficePath = 123
+office.home = /opt/openoffice4
+server.tomcat.uri-encoding = utf-8
+converted.file.charset = utf-8
+spring.http.multipart.max-file-size = 100MB
+## 支持的类文本格式的文件类型
+simText = txt,html,xml,java,properties,sql,js,md,json,conf,ini,vue,php,py,bat,gitignore,log,htm,mp3,mp4,css,cnf
\ No newline at end of file
diff --git a/jodconverter-web/src/main/resources/application.properties b/jodconverter-web/src/main/resources/application.properties
index abd2a467..ed5c6706 100644
--- a/jodconverter-web/src/main/resources/application.properties
+++ b/jodconverter-web/src/main/resources/application.properties
@@ -10,16 +10,6 @@ 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
-##璧勬簮鏄犲皠璺緞(鍥犱负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鐩稿叧閰嶇疆
-office.home = C:\\Program Files (x86)\\OpenOffice 4
-server.tomcat.uri-encoding = UTF-8
-converted.file.charset = GBK
-#======================================#鏂囦欢涓婁紶闄愬埗#======================================#
-spring.http.multipart.max-file-size=100MB
-## 鏀寔鐨勭被鏂囨湰鏍煎紡鐨勬枃浠剁被鍨�
-simText = txt,html,xml,java,properties,mp3,mp4,sql
\ No newline at end of file
+
+#榛樿鐜
+spring.profiles.active=dev
\ No newline at end of file