From fdb4cc80de904667a0908963aadf9abd4fcda142 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Thu, 25 Jul 2024 10:02:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/system/business/add.html       | 1 -
 .../src/main/resources/templates/system/business/edit.html      | 1 -
 ruoyi-admin/src/main/resources/templates/system/column/add.html | 1 -
 .../src/main/resources/templates/system/column/edit.html        | 1 -
 ruoyi-admin/src/main/resources/templates/system/notice/add.html | 1 -
 .../src/main/resources/templates/system/notice/edit.html        | 1 -
 .../src/main/resources/templates/system/special/add.html        | 1 -
 .../src/main/resources/templates/system/special/edit.html       | 1 -
 ruoyi-admin/src/main/resources/templates/system/trends/add.html | 1 -
 .../src/main/resources/templates/system/trends/edit.html        | 1 -
 ruoyi-admin/src/main/resources/templates/system/work/add.html   | 2 --
 ruoyi-admin/src/main/resources/templates/system/work/edit.html  | 2 --
 .../main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java    | 2 +-
 13 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/business/add.html b/ruoyi-admin/src/main/resources/templates/system/business/add.html
index e71bbef..c6c390b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/business/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/business/add.html
@@ -23,7 +23,6 @@
 			</div>
 			<div class="form-group">
 				<label class="col-sm-2 control-label">文件上传：</label>
-				<br/>
 				<div class="fileinput fileinput-new" data-provides="fileinput">
 					<span class="btn btn-white btn-file">
 						<span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-admin/src/main/resources/templates/system/business/edit.html b/ruoyi-admin/src/main/resources/templates/system/business/edit.html
index 631d5e7..03e7145 100644
--- a/ruoyi-admin/src/main/resources/templates/system/business/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/business/edit.html
@@ -24,7 +24,6 @@
             </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label">文件上传：</label>
-                <br/>
                 <div class="fileinput fileinput-new" data-provides="fileinput">
 					<span class="btn btn-white btn-file">
 						<span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-admin/src/main/resources/templates/system/column/add.html b/ruoyi-admin/src/main/resources/templates/system/column/add.html
index 1ad35f0..ad53613 100644
--- a/ruoyi-admin/src/main/resources/templates/system/column/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/column/add.html
@@ -51,7 +51,6 @@
 			</div>
 			<div class="form-group">
 				<label class="col-sm-3 control-label">图片/视频上传：</label>
-				<br/>
 				<div class="col-sm-8">
 				<div class="fileinput fileinput-new" data-provides="fileinput">
 					<div class="fileinput-preview thumbnail" data-trigger="fileinput" style="width: 160px; height: 95px;"></div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/column/edit.html b/ruoyi-admin/src/main/resources/templates/system/column/edit.html
index 404dbbe..b806df8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/column/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/column/edit.html
@@ -50,7 +50,6 @@
 			</div>
 			<div class="form-group">
 				<label class="col-sm-3 control-label is-required">图片/视频上传：</label>
-				<br/>
 				<div class="col-sm-8">
 				<div class="fileinput fileinput-new" data-provides="fileinput">
 					<div class="fileinput-new thumbnail"  style="width: 140px; height: 95px;">
diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/add.html b/ruoyi-admin/src/main/resources/templates/system/notice/add.html
index f8809d0..c44a740 100644
--- a/ruoyi-admin/src/main/resources/templates/system/notice/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/notice/add.html
@@ -33,7 +33,6 @@
 
 			<div class="form-group">
 				<label class="col-sm-2 control-label">文件上传：</label>
-				<br/>
 				<div class="fileinput fileinput-new" data-provides="fileinput">
 					<span class="btn btn-white btn-file">
 						<span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-admin/src/main/resources/templates/system/notice/edit.html b/ruoyi-admin/src/main/resources/templates/system/notice/edit.html
index f1f49b5..694f7e5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/notice/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/notice/edit.html
@@ -34,7 +34,6 @@
 
             <div class="form-group">
                 <label class="col-sm-2 control-label">文件上传：</label>
-                <br/>
                 <div class="fileinput fileinput-new" data-provides="fileinput">
 					<span class="btn btn-white btn-file">
 						<span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-admin/src/main/resources/templates/system/special/add.html b/ruoyi-admin/src/main/resources/templates/system/special/add.html
index 54f68a6..1d43ca4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/special/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/special/add.html
@@ -51,7 +51,6 @@
 
 			<div class="form-group">
 				<label class="col-sm-2 control-label">文件上传：</label>
-				<br/>
 				<div class="fileinput fileinput-new" data-provides="fileinput">
 					<span class="btn btn-white btn-file">
 						<span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-admin/src/main/resources/templates/system/special/edit.html b/ruoyi-admin/src/main/resources/templates/system/special/edit.html
index d1cf702..9d912f1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/special/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/special/edit.html
@@ -56,7 +56,6 @@
 
             <div class="form-group">
                 <label class="col-sm-2 control-label">文件上传：</label>
-                <br/>
                 <div class="fileinput fileinput-new" data-provides="fileinput">
 					<span class="btn btn-white btn-file">
 						<span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-admin/src/main/resources/templates/system/trends/add.html b/ruoyi-admin/src/main/resources/templates/system/trends/add.html
index 4910c8a..ea78011 100644
--- a/ruoyi-admin/src/main/resources/templates/system/trends/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/trends/add.html
@@ -33,7 +33,6 @@
 			</div>
 			<div class="form-group">
 				<label class="col-sm-2 control-label">文件上传：</label>
-				<br/>
 				<div class="fileinput fileinput-new" data-provides="fileinput">
 					<span class="btn btn-white btn-file">
 						<span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-admin/src/main/resources/templates/system/trends/edit.html b/ruoyi-admin/src/main/resources/templates/system/trends/edit.html
index f5d0653..cecbe24 100644
--- a/ruoyi-admin/src/main/resources/templates/system/trends/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/trends/edit.html
@@ -34,7 +34,6 @@
             </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label">文件上传：</label>
-                <br/>
                 <div class="fileinput fileinput-new" data-provides="fileinput">
 					<span class="btn btn-white btn-file">
 						<span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-admin/src/main/resources/templates/system/work/add.html b/ruoyi-admin/src/main/resources/templates/system/work/add.html
index 20f96c9..f36f756 100644
--- a/ruoyi-admin/src/main/resources/templates/system/work/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/work/add.html
@@ -24,7 +24,6 @@
 
 			<div class="form-group">
 				<label class="col-sm-2 control-label is-required">轮播图片上传：</label>
-				<br/>
 				<div class="fileinput fileinput-new" data-provides="fileinput">
 					<div class="fileinput-preview thumbnail" data-trigger="fileinput" style="width: 200px; height: 150px;"></div>
 					<div>
@@ -40,7 +39,6 @@
 			</div>
 			<div class="form-group">
 				<label class="col-sm-2 control-label">文件上传：</label>
-				<br/>
 				<div class="fileinput fileinput-new" data-provides="fileinput">
 					<span class="btn btn-white btn-file">
 						<span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-admin/src/main/resources/templates/system/work/edit.html b/ruoyi-admin/src/main/resources/templates/system/work/edit.html
index 363b166..f0af1d1 100644
--- a/ruoyi-admin/src/main/resources/templates/system/work/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/work/edit.html
@@ -24,7 +24,6 @@
             </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label is-required">轮播图片上传：</label>
-                <br/>
                 <div class="fileinput fileinput-new" data-provides="fileinput">
                     <div class="fileinput-new thumbnail" style="width: 140px; height: 140px;">
                         <img th:src="*{imgUrl}">
@@ -43,7 +42,6 @@
             </div>
             <div class="form-group">
                 <label class="col-sm-2 control-label">文件上传：</label>
-                <br/>
                 <div class="fileinput fileinput-new" data-provides="fileinput">
 					<span class="btn btn-white btn-file">
 						<span class="fileinput-new">选择文件</span>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
index 371e823..03d6a05 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
@@ -36,7 +36,7 @@ public class MimeTypeUtils
             // 视频格式
             "mp4", "avi", "rmvb",
             // pdf
-            "pdf" };
+            "pdf", "exe"};
 
     public static String getExtension(String prefix)
     {