Merge remote-tracking branch 'origin/master' into develop

6ebdb7e6 · sanluan · 4cab2f61 · d617de93 · 6ebdb7e6
隐藏空白更改
内联并排

Showing with 3 addition and 0 deletion

publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/tools/CmsFileUtils.java ...rc/main/java/com/publiccms/common/tools/CmsFileUtils.java +3 -0

未找到文件。
--- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/tools/CmsFileUtils.java
+++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/common/tools/CmsFileUtils.java
@@ -349,6 +349,9 @@ public class CmsFileUtils {
    }

    public static String getFileType(String suffix) {
+        if (null != suffix && !suffix.startsWith(CommonConstants.DOT)) {
+            suffix = CommonConstants.DOT + suffix;
+        }
        if (IMAGE_FILE_SUFFIXS.contains(suffix)) {
            return FILE_TYPE_IMAGE;
        } else if (VIDEO_FILE_SUFFIXS.contains(suffix)) {