新增spring boot profile多文件支持

klboke · klboke · commit 8cbb1c3bb715 · 2018-01-02T10:54:10.000+08:00
diff --git a/jodconverter-web/src/main/resources/application-dev.properties 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
diff --git a/jodconverter-web/src/main/resources/application-prod.properties b/jodconverter-web/src/main/resources/application-prod.properties
diff --git a/jodconverter-web/src/main/resources/application-uat.properties 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
diff --git 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
+
+#默认环境
+spring.profiles.active=dev
