From 69818f10e7f5720e6e381b6c56e11fd327ae4381 Mon Sep 17 00:00:00 2001
From: "Mr. Lan" <fdevops@163.com>
Date: Sun, 27 Sep 2020 02:51:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/public/file.go | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/apis/public/file.go b/apis/public/file.go
index 773868d..b3b9e3c 100644
--- a/apis/public/file.go
+++ b/apis/public/file.go
@@ -3,7 +3,6 @@ package public
 import (
 	"encoding/base64"
 	"errors"
-	"ferry/pkg/utils"
 	"ferry/tools/app"
 	"fmt"
 	"io/ioutil"
@@ -71,6 +70,8 @@ func UploadFile(c *gin.Context) {
 		}
 	}
 
+	guid := strings.ReplaceAll(uuid.New().String(), "-", "")
+
 	switch tag {
 	case "1": // 单图
 		files, err := c.FormFile("file")
@@ -79,9 +80,7 @@ func UploadFile(c *gin.Context) {
 			return
 		}
 		// 上传文件至指定目录
-		guid := uuid.New().String()
-
-		singleFile := saveFilePath + guid + utils.GetExt(files.Filename)
+		singleFile := saveFilePath + guid + "-" + files.Filename
 		_ = c.SaveUploadedFile(files, singleFile)
 		app.OK(c, urlPrefix+singleFile, "上传成功")
 		return
@@ -89,8 +88,8 @@ func UploadFile(c *gin.Context) {
 		files := c.Request.MultipartForm.File["file"]
 		multipartFile := make([]string, len(files))
 		for _, f := range files {
-			guid := uuid.New().String()
-			multipartFileName := saveFilePath + guid + utils.GetExt(f.Filename)
+			guid = strings.ReplaceAll(uuid.New().String(), "-", "")
+			multipartFileName := saveFilePath + guid + "-" + f.Filename
 			_ = c.SaveUploadedFile(f, multipartFileName)
 			multipartFile = append(multipartFile, urlPrefix+multipartFileName)
 		}
@@ -99,7 +98,6 @@ func UploadFile(c *gin.Context) {
 	case "3": // base64
 		files, _ := c.GetPostForm("file")
 		ddd, _ := base64.StdEncoding.DecodeString(files)
-		guid := uuid.New().String()
 		_ = ioutil.WriteFile(saveFilePath+guid+".jpg", ddd, 0666)
 		app.OK(c, urlPrefix+saveFilePath+guid+".jpg", "上传成功")
 	default: