From 09323e7895ae85319cd8afc51409be43cde90e3d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 18 Nov 2025 15:18:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-common/src/main/java/com/ard/common/utils/file/MimeTypeUtils.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/ard-common/src/main/java/com/ard/common/utils/file/MimeTypeUtils.java b/ard-common/src/main/java/com/ard/common/utils/file/MimeTypeUtils.java
index 9d85813..11c9625 100644
--- a/ard-common/src/main/java/com/ard/common/utils/file/MimeTypeUtils.java
+++ b/ard-common/src/main/java/com/ard/common/utils/file/MimeTypeUtils.java
@@ -2,11 +2,12 @@
/**
* 媒体类型工具类
- *
+ *
* @author ard
*/
-public class MimeTypeUtils
-{
+public class MimeTypeUtils {
+ public static final String VIDEO_MP4 = "video/mp4";
+
public static final String IMAGE_PNG = "image/png";
public static final String IMAGE_JPG = "image/jpg";
@@ -16,15 +17,15 @@
public static final String IMAGE_BMP = "image/bmp";
public static final String IMAGE_GIF = "image/gif";
-
- public static final String[] IMAGE_EXTENSION = { "bmp", "gif", "jpg", "jpeg", "png" };
- public static final String[] FLASH_EXTENSION = { "swf", "flv" };
+ public static final String[] IMAGE_EXTENSION = {"bmp", "gif", "jpg", "jpeg", "png"};
- public static final String[] MEDIA_EXTENSION = { "swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
- "asf", "rm", "rmvb" };
+ public static final String[] FLASH_EXTENSION = {"swf", "flv"};
- public static final String[] VIDEO_EXTENSION = { "mp4", "avi", "rmvb" };
+ public static final String[] MEDIA_EXTENSION = {"swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
+ "asf", "rm", "rmvb"};
+
+ public static final String[] VIDEO_EXTENSION = {"mp4", "avi", "rmvb"};
public static final String[] DEFAULT_ALLOWED_EXTENSION = {
// 图片
@@ -43,10 +44,10 @@
"glb"
};
- public static String getExtension(String prefix)
- {
- switch (prefix)
- {
+ public static String getExtension(String prefix) {
+ switch (prefix) {
+ case VIDEO_MP4:
+ return "mp4";
case IMAGE_PNG:
return "png";
case IMAGE_JPG:
--
Gitblit v1.9.3