Merge branches 'develop' and 'gva_gormv2_dev' of https://github.com/flipped-aurora/gin-vue-admin into gva_gormv2_dev

server/service/exa_simple_uploader.go

@@ -51,7 +51,12 @@ func MergeFileMd5(md5 string, fileName string) (err error) {
 	rd, err := ioutil.ReadDir(dir)
 	_ = os.MkdirAll(finishDir, os.ModePerm)
 	//创建目标文件
-	fd, _ := os.OpenFile(finishDir+fileName, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
+	fd, err := os.OpenFile(finishDir+fileName, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
+	if err != nil {
+		return
+	}
+	//关闭文件
+	defer fd.Close()
 	//将切片文件按照顺序写入
 	for k := range rd {
 		content, _ := ioutil.ReadFile(dir + "/" + fileName + strconv.Itoa(k+1))
@@ -60,8 +65,6 @@ func MergeFileMd5(md5 string, fileName string) (err error) {
 			_ = os.Remove(finishDir + fileName)
 		}
 	}
-	//关闭文件
-	defer fd.Close()
 
 	if err != nil {
 		return err

server/utils/breakpoint_continue.go

@@ -55,7 +55,6 @@ func CheckMd5(content []byte, chunkMd5 string) (CanUpload bool) {
 func makeFileContent(content []byte, fileName string, FileDir string, contentNumber int) (error, string) {
 	path := FileDir + fileName + "_" + strconv.Itoa(contentNumber)
 	f, err := os.Create(path)
-	defer f.Close()
 	if err != nil {
 		return err, path
 	} else {
@@ -64,6 +63,7 @@ func makeFileContent(content []byte, fileName string, FileDir string, contentNum
 			return err, path
 		}
 	}
+	defer f.Close()
 	return nil, path
 }
 
@@ -79,7 +79,11 @@ func MakeFile(fileName string, FileMd5 string) (error, string) {
 		return err, finishDir + fileName
 	}
 	_ = os.MkdirAll(finishDir, os.ModePerm)
-	fd, _ := os.OpenFile(finishDir+fileName, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
+	fd, err := os.OpenFile(finishDir+fileName, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
+	if err != nil {
+		return err, finishDir + fileName
+	}
+	defer fd.Close()
 	for k := range rd {
 		content, _ := ioutil.ReadFile(breakpointDir + FileMd5 + "/" + fileName + "_" + strconv.Itoa(k))
 		_, err = fd.Write(content)
@@ -88,7 +92,7 @@ func MakeFile(fileName string, FileMd5 string) (error, string) {
 			return err, finishDir + fileName
 		}
 	}
-	defer fd.Close()
+
 	return nil, finishDir + fileName
 }
 

server/utils/zipfiles.go

@@ -13,51 +13,60 @@ import (
 //@param: filename string, files []string, oldform, newform string
 //@return: error
 
-func ZipFiles(filename string, files []string, oldform, newform string) error {
+func ZipFiles(filename string, files []string, oldForm, newForm string) error {
 
 	newZipFile, err := os.Create(filename)
 	if err != nil {
 		return err
 	}
-	defer newZipFile.Close()
+	defer func() {
+		_ = newZipFile.Close()
+	}()
 
 	zipWriter := zip.NewWriter(newZipFile)
-	defer zipWriter.Close()
+	defer func() {
+		_ = zipWriter.Close()
+	}()
 
 	// 把files添加到zip中
 	for _, file := range files {
 
-		zipfile, err := os.Open(file)
+		err = func(file string) error {
+			zipFile, err := os.Open(file)
+			if err != nil {
+				return err
+			}
+			defer zipFile.Close()
+			// 获取file的基础信息
+			info, err := zipFile.Stat()
+			if err != nil {
+				return err
+			}
+
+			header, err := zip.FileInfoHeader(info)
+			if err != nil {
+				return err
+			}
+
+			// 使用上面的FileInforHeader() 就可以把文件保存的路径替换成我们自己想要的了，如下面
+			header.Name = strings.Replace(file, oldForm, newForm, -1)
+
+			// 优化压缩
+			// 更多参考see http://golang.org/pkg/archive/zip/#pkg-constants
+			header.Method = zip.Deflate
+
+			writer, err := zipWriter.CreateHeader(header)
+			if err != nil {
+				return err
+			}
+			if _, err = io.Copy(writer, zipFile); err != nil {
+				return err
+			}
+			return nil
+		}(file)
 		if err != nil {
 			return err
 		}
-		defer zipfile.Close()
-
-		// 获取file的基础信息
-		info, err := zipfile.Stat()
-		if err != nil {
-			return err
-		}
-
-		header, err := zip.FileInfoHeader(info)
-		if err != nil {
-			return err
-		}
-
-		// 使用上面的FileInforHeader() 就可以把文件保存的路径替换成我们自己想要的了，如下面
-		header.Name = strings.Replace(file, oldform, newform, -1)
-
-		// 优化压缩
-		// 更多参考see http://golang.org/pkg/archive/zip/#pkg-constants
-		header.Method = zip.Deflate
-
-		writer, err := zipWriter.CreateHeader(header)
-		if err != nil {
-			return err
-		}
-		if _, err = io.Copy(writer, zipfile); err != nil {
-			return err
-		}
 	}
 	return nil
 }