From 6d621dc05fd4621e7df2bbb6ded576acb5582f7b Mon Sep 17 00:00:00 2001 From: kl <632104866@QQ.com> Date: Tue, 16 Jan 2018 20:08:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=88=8D=E5=BC=83=E7=BC=A9=E7=95=A5=E5=9B=BE?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=A4=9A=E5=9B=BE=E7=89=87=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E8=BD=AE=E6=92=AD=E6=95=88=E7=8E=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yudianbank/utils/ZipReader.java | 1 + .../main/resources/application-dev.properties | 1 + .../main/resources/application-prod.properties | 18 ++++++++++++++++++ .../src/main/resources/web/picture.ftl | 5 +++-- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/jodconverter-web/src/main/java/com/yudianbank/utils/ZipReader.java b/jodconverter-web/src/main/java/com/yudianbank/utils/ZipReader.java index b9ae1ab1..e165e1ea 100644 --- a/jodconverter-web/src/main/java/com/yudianbank/utils/ZipReader.java +++ b/jodconverter-web/src/main/java/com/yudianbank/utils/ZipReader.java @@ -157,6 +157,7 @@ public class ZipReader { private void addNodes(Map appender, String parentName, FileNode node) { if (appender.containsKey(parentName)) { appender.get(parentName).getChildList().add(node); + appender.get(parentName).getChildList().sort((final FileNode h1, final FileNode h2) -> h1.getOriginName().compareTo(h2.getOriginName()));//排序 }else { // 根节点 FileNode nodeRoot = new FileNode(parentName, parentName, "", new ArrayList<>(), true); nodeRoot.getChildList().add(node); diff --git a/jodconverter-web/src/main/resources/application-dev.properties b/jodconverter-web/src/main/resources/application-dev.properties index 1f756b89..46d4569d 100644 --- a/jodconverter-web/src/main/resources/application-dev.properties +++ b/jodconverter-web/src/main/resources/application-dev.properties @@ -9,5 +9,6 @@ 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,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 index e69de29b..c372398f 100644 --- a/jodconverter-web/src/main/resources/application-prod.properties +++ b/jodconverter-web/src/main/resources/application-prod.properties @@ -0,0 +1,18 @@ +#=============================================#spring Redisson#===================================# +spring.redisson.address = 10.19.140.7:6379 +spring.redisson.database = 0 +##Դӳ·(Ϊjarʽеԭ) +file.dir = /data/file-preview/convertedFile/ +spring.resources.static-locations = classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${file.dir} +## openoffice +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/web/picture.ftl b/jodconverter-web/src/main/resources/web/picture.ftl index 5ffcbeda..47da16ca 100644 --- a/jodconverter-web/src/main/resources/web/picture.ftl +++ b/jodconverter-web/src/main/resources/web/picture.ftl @@ -14,13 +14,14 @@