Merge branch 'master' into master

2021-11-30 17:53:24 +08:00
parent b1aab27338 0a5fc1e4a8
commit 7b2adc3979
270 changed files with 90418 additions and 84704 deletions
--- a/server/src/main/resources/web/fileNotSupported.ftl
+++ b/server/src/main/resources/web/fileNotSupported.ftl
@ -32,8 +32,7 @@
 <div class="container">
    <img src="images/sorry.jpg" />
    <span>
-    该文件类型(${file.suffix?html})系统暂时不支持在线预览，<b>说明</b>：      
-    
+    该文件类型(${fileType})系统暂时不支持在线预览，<b>说明</b>：
        <p style="color: red;">${msg}</p>
        有任何疑问，请加&nbsp;<a href="https://jq.qq.com/?_wv=1027&k=5c0UAtu">官方QQ群：613025121</a>&nbsp;咨询
    </span>