From aebd0482a49a1f90ec929d51322ca9b50ea2a49e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 11 May 2021 16:13:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AA=92=E4=BD=93=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=B7=BB=E5=8A=A0=E8=A7=86=E9=A2=91=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exception/file/InvalidExtensionException.java  | 10 ++++++++++
 .../ruoyi/common/utils/file/FileUploadUtils.java   | 14 +++++++++-----
 .../com/ruoyi/common/utils/file/MimeTypeUtils.java |  4 ++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
index 81cd78b..6819537 100644
--- a/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
+++ b/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
@@ -68,4 +68,14 @@ public class InvalidExtensionException extends FileUploadException
             super(allowedExtension, extension, filename);
         }
     }
+
+    public static class InvalidVideoExtensionException extends InvalidExtensionException
+    {
+        private static final long serialVersionUID = 1L;
+
+        public InvalidVideoExtensionException(String[] allowedExtension, String extension, String filename)
+        {
+            super(allowedExtension, extension, filename);
+        }
+    }
 }
diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index 5b356e2..cb1474f 100644
--- a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -131,13 +131,12 @@ public class FileUploadUtils
     {
         File desc = new File(uploadDir + File.separator + fileName);
 
-        if (!desc.getParentFile().exists())
-        {
-            desc.getParentFile().mkdirs();
-        }
         if (!desc.exists())
         {
-            desc.createNewFile();
+            if (!desc.getParentFile().exists())
+            {
+                desc.getParentFile().mkdirs();
+            }
         }
         return desc;
     }
@@ -186,6 +185,11 @@ public class FileUploadUtils
                 throw new InvalidExtensionException.InvalidMediaExtensionException(allowedExtension, extension,
                         fileName);
             }
+            else if (allowedExtension == MimeTypeUtils.VIDEO_EXTENSION)
+            {
+                throw new InvalidExtensionException.InvalidVideoExtensionException(allowedExtension, extension,
+                        fileName);
+            }
             else
             {
                 throw new InvalidExtensionException(allowedExtension, extension, fileName);
diff --git a/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
index d179a91..5935815 100644
--- a/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
@@ -24,6 +24,8 @@ public class MimeTypeUtils
     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 = {
             // 图片
             "bmp", "gif", "jpg", "jpeg", "png",
@@ -31,6 +33,8 @@ public class MimeTypeUtils
             "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件
             "rar", "zip", "gz", "bz2",
+            // 视频格式
+            "mp4", "avi", "rmvb",
             // pdf
             "pdf" };