From c91520a04d866d13a59014837f5c5c6875a7767e Mon Sep 17 00:00:00 2001
From: lifei6671 <longfei6671@163.com>
Date: Wed, 27 Feb 2019 17:32:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/DocumentController.go |  2 +-
 utils/filetil/filetil.go          | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/controllers/DocumentController.go b/controllers/DocumentController.go
index 3a8c327a..3c02c2aa 100644
--- a/controllers/DocumentController.go
+++ b/controllers/DocumentController.go
@@ -419,7 +419,7 @@ func (c *DocumentController) Upload() {
 	filePath := filepath.Join(conf.WorkingDirectory, "uploads", identify)
 
 	//将图片和文件分开存放
-	if strings.EqualFold(ext, ".jpg") || strings.EqualFold(ext, ".jpeg") || strings.EqualFold(ext, ".png") || strings.EqualFold(ext, ".gif") {
+	if filetil.IsImageExt(moreFile.Filename) {
 		filePath = filepath.Join(filePath, "images", fileName+ext)
 	} else {
 		filePath = filepath.Join(filePath, "files", fileName+ext)
diff --git a/utils/filetil/filetil.go b/utils/filetil/filetil.go
index db13671f..83c6f812 100644
--- a/utils/filetil/filetil.go
+++ b/utils/filetil/filetil.go
@@ -224,6 +224,18 @@ func HasFileOfExt(path string,exts []string) bool {
 
 	return err == os.ErrExist
 }
+// IsImageExt 判断是否是图片后缀
+func IsImageExt(filename string) bool {
+	ext := filepath.Ext(filename)
+
+	return strings.EqualFold(ext, ".jpg") ||
+		strings.EqualFold(ext, ".jpeg") ||
+		strings.EqualFold(ext, ".png") ||
+		strings.EqualFold(ext, ".gif") ||
+		strings.EqualFold(ext,".svg") ||
+		strings.EqualFold(ext,".bmp") ||
+		strings.EqualFold(ext,".webp")
+}
 //忽略字符串中的BOM头
 func ReadFileAndIgnoreUTF8BOM(filename string) ([]byte,error) {