From 1c1a945959e544994e23e045db9aa0435c232cd6 Mon Sep 17 00:00:00 2001
From: kl <632104866@QQ.com>
Date: Mon, 26 Mar 2018 17:03:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=95=85=E8=A8=80=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E5=8F=8B=E8=A8=80=E7=A4=BE=E8=AF=84=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/application-dev.properties | 20 +++++++++----------
 .../src/main/resources/web/index.ftl          | 16 ++++++++++-----
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/jodconverter-web/src/main/resources/application-dev.properties b/jodconverter-web/src/main/resources/application-dev.properties
index c3a9545b0..af963da7b 100644
--- a/jodconverter-web/src/main/resources/application-dev.properties
+++ b/jodconverter-web/src/main/resources/application-dev.properties
@@ -1,15 +1,15 @@
-#=============================================#spring Redisson����#===================================#
-spring.redisson.address = 127.0.0.1:6379
-##��Դӳ��·��(��Ϊjar��ʽ���е�ԭ��)
-file.dir = /Users/chenkailing/test/
+#redis连接
+spring.redisson.address = 192.168.1.204:6379
+##资源映射路径
+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 = /Applications/LibreOffice.app/Contents
+## openoffice home路径
+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
-spring.http.multipart.max-request-size=100MB
-## ֧�ֵ����ı���ʽ���ļ�����
-simText = txt,html,xml,java,properties,sql
+##文本类型
+simText = txt,html,xml,java,properties,mp3,mp4,sql
+#多媒体类型
 media=mp3,mp4,flv,rmvb
\ No newline at end of file
diff --git a/jodconverter-web/src/main/resources/web/index.ftl b/jodconverter-web/src/main/resources/web/index.ftl
index e77a548d4..58e3432e1 100644
--- a/jodconverter-web/src/main/resources/web/index.ftl
+++ b/jodconverter-web/src/main/resources/web/index.ftl
@@ -106,11 +106,17 @@
             </div>
         </div>
         <div class="panel-body">
-            <div>
-                <!-- UY BEGIN -->
-                <div id="uyan_frame"></div>
-                <script type="text/javascript" src="http://v2.uyan.cc/code/uyan.js?uid=2155152"></script>
-                <!-- UY END -->
+            <div style="width: 80%">
+                <!-- 多说评论框 start -->
+                <div id="SOHUCS" sid="kkfileView"></div>
+                <script charset="utf-8" type="text/javascript" src="https://changyan.sohu.com/upload/changyan.js" ></script>
+                <script type="text/javascript">
+                    window.changyan.api.config({
+                        appid: 'cytx6wU4N',
+                        conf: 'prod_c53858654f21b8f813c14b7681f5405a'
+                    });
+                </script>
+                <!-- 多说评论框 end -->
             </div>
         </div>