fix: lint issues

utils/zip.go

@@ -4,15 +4,16 @@ import (
 	"archive/zip"
 	"fmt"
 	"io"
+	"io/fs"
 	"os"
 	"path/filepath"
 	"strings"
 )
 
-// 解压
-func Unzip(zipFile string, destDir string) ([]string, error) {
+// Unzip 解压
+func Unzip(zipFile, destDir string) ([]string, error) {
 	zipReader, err := zip.OpenReader(zipFile)
-	var paths []string
+	paths := []string{}
 	if err != nil {
 		return []string{}, err
 	}
@@ -22,30 +23,45 @@ func Unzip(zipFile string, destDir string) ([]string, error) {
 		if strings.Contains(f.Name, "..") {
 			return []string{}, fmt.Errorf("%s 文件名不合法", f.Name)
 		}
+		// nolint
 		fpath := filepath.Join(destDir, f.Name)
 		paths = append(paths, fpath)
 		if f.FileInfo().IsDir() {
-			if err := os.MkdirAll(fpath, os.ModePerm); err != nil {
+			err = os.MkdirAll(fpath, os.ModePerm)
+			if err != nil {
 				return nil, err
 			}
 		} else {
-			if err = os.MkdirAll(filepath.Dir(fpath), os.ModePerm); err != nil {
-				return []string{}, err
-			}
-
-			inFile, err := f.Open()
+			err = os.MkdirAll(filepath.Dir(fpath), os.ModePerm)
 			if err != nil {
 				return []string{}, err
 			}
-			defer inFile.Close()
 
-			outFile, err := os.OpenFile(fpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
-			if err != nil {
-				return []string{}, err
+			zipFunc := func(fpath string) error {
+				var inFile io.ReadCloser
+				var outFile *os.File
+
+				inFile, err = f.Open()
+				if err != nil {
+					return err
+				}
+				defer inFile.Close()
+
+				outFile, err = os.OpenFile(fpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, f.Mode())
+				if err != nil {
+					return err
+				}
+				defer outFile.Close()
+
+				// nolint
+				_, err = io.Copy(outFile, inFile)
+				if err != nil {
+					return err
+				}
+				return nil
 			}
-			defer outFile.Close()
 
-			_, err = io.Copy(outFile, inFile)
+			err = zipFunc(fpath)
 			if err != nil {
 				return []string{}, err
 			}
@@ -70,32 +86,35 @@ func ZipFiles(filename string, files []string, oldForm, newForm string) error {
 
 	// 把files添加到zip中
 	for _, file := range files {
-
 		err = func(file string) error {
-			zipFile, err := os.Open(file)
+			var zipFile *os.File
+			zipFile, err = os.Open(file)
 			if err != nil {
 				return err
 			}
 			defer zipFile.Close()
 			// 获取file的基础信息
-			info, err := zipFile.Stat()
+			var info fs.FileInfo
+			info, err = zipFile.Stat()
 			if err != nil {
 				return err
 			}
 
-			header, err := zip.FileInfoHeader(info)
+			var header *zip.FileHeader
+			header, err = zip.FileInfoHeader(info)
 			if err != nil {
 				return err
 			}
 
-			// 使用上面的FileInforHeader() 就可以把文件保存的路径替换成我们自己想要的了，如下面
+			// 使用上面的FileInfoHeader() 就可以把文件保存的路径替换成我们自己想要的了，如下面
 			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)
+			var writer io.Writer
+			writer, err = zipWriter.CreateHeader(header)
 			if err != nil {
 				return err
 			}