Merge remote-tracking branch 'origin/dev' into dev

Author: Vanessa219

kernel/model/upload.go

@@ -52,13 +52,13 @@ func InsertLocalAssets(id string, assetPaths []string, isUpload bool) (succMap m
 	}
 
 	for _, p := range assetPaths {
-		fName := filepath.Base(p)
+		baseName := filepath.Base(p)
+		fName := baseName
 		fName = util.FilterUploadFileName(fName)
 		ext := filepath.Ext(fName)
 		fName = strings.TrimSuffix(fName, ext)
 		ext = strings.ToLower(ext)
 		fName += ext
-		baseName := fName
 		if gulu.File.IsDir(p) || !isUpload {
 			if !strings.HasPrefix(p, "\\\\") {
 				p = "file://" + p
@@ -148,13 +148,14 @@ func Upload(c *gin.Context) {
 	succMap := map[string]interface{}{}
 	files := form.File["file[]"]
 	for _, file := range files {
-		fName := file.Filename
+		baseName := file.Filename
+
+		fName := baseName
 		fName = util.FilterUploadFileName(fName)
 		ext := filepath.Ext(fName)
 		fName = strings.TrimSuffix(fName, ext)
 		ext = strings.ToLower(ext)
 		fName += ext
-		baseName := fName
 		f, openErr := file.Open()
 		if nil != openErr {
 			errFiles = append(errFiles, fName)