Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/pre' into pre

# Conflicts:
#	Makefile
#	src/main/java/com/xjrsoft/config/FileCheckRuleConfig.java
fanxp 2 mēneši atpakaļ
vecāks
revīzija
0fd9ee342e

+ 1 - 1
Makefile

@@ -5,7 +5,7 @@ merge-pre:
 	git checkout pre;git merge dev;git push;git checkout dev;
 
 create-tag:
-	git checkout master;git tag v5.3.1;git push origin --tags;git checkout dev;
+	git checkout master;git tag v5.3.0;git push origin --tags;git checkout dev;
 
 remove-tag:
 	git tag -d v1.2.0;git push origin :refs/tags/v1.1.8;

+ 1 - 6
src/main/java/com/xjrsoft/config/FileCheckRuleConfig.java

@@ -61,9 +61,7 @@ public final class FileCheckRuleConfig {
             .withExtensions(
                     "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt",
                     // WPS 文件扩展名
-                    "wps", "et", "dps", "wpt", "ett", "dpt", "vsd", "vsdx",
-                    // OFD 文件扩展名
-                    "ofd"
+                    "wps", "et", "dps", "wpt", "ett", "dpt", "vsd", "vsdx"
             )
             .withMimeTypes(
                     "application/pdf",
@@ -82,9 +80,6 @@ public final class FileCheckRuleConfig {
                     "application/wps-office.wpt",
                     "application/wps-office.ett",
                     "application/wps-office.dpt",
-                    // OFD MIME 类型
-                    "application/ofd",
-                    "application/x-ofd",
                     // 其他可能的 MIME 类型
                     "application/octet-stream", // 某些 WPS 文件可能被识别为此类型
                     "application/x-msdownload"