7 gadi atpakaļ · 6d621dc05f
--- 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<String, FileNode> 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);
			
--- 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
			
--- 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
			
 
				+
			
--- a/jodconverter-web/src/main/resources/web/picture.ftl
+++ b/jodconverter-web/src/main/resources/web/picture.ftl
@@ -14,13 +14,14 @@
 
				 <body>
			
 
				 <ul id="dowebok">
			
 
				         <#list imgurls as img>
			
 
				-            <li><img id="${img}"  url="${img}" src="${img}" width="50px" height="50px"></li>
			
 
				+            <li><img id="${img}"  url="${img}" src="${img}" width="1px" height="1px"></li>
			
 
				         </#list>
			
 
				 </ul>
			
 
				 <script src="js/viewer.min.js"></script>
			
 
				 <script>
			
 
				     var viewer = new Viewer(document.getElementById('dowebok'), {
			
 
				-        url: 'src'
			
 
				+        url: 'src',
			
 
				+       navbar:false
			
 
				     });
			
 
				     document.getElementById("${currentUrl}").click();
			
 
				 </script>