From e4bccf96b4392f08cbc9d8e508d2accd877d7313 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E7=AC=91?= Date: Tue, 15 Jun 2021 15:05:04 +0800 Subject: [PATCH 1/2] exa_excel_parse.go: fix return err --- server/service/exa_excel_parse.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/service/exa_excel_parse.go b/server/service/exa_excel_parse.go index 19ec3e51..f8a5a356 100644 --- a/server/service/exa_excel_parse.go +++ b/server/service/exa_excel_parse.go @@ -24,8 +24,8 @@ func ParseInfoList2Excel(infoList []model.SysBaseMenu, filePath string) error { menu.Component, }) } - excel.SaveAs(filePath) - return nil + err := excel.SaveAs(filePath) + return err } func ParseExcel2InfoList() ([]model.SysBaseMenu, error) { From 4be5ae914900768ddfb478ce562d9f22d5005bfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E7=AC=91?= Date: Thu, 17 Jun 2021 14:51:35 +0800 Subject: [PATCH 2/2] aliyun_oss,qiniu,tencent_cos: fix file open close --- server/utils/upload/aliyun_oss.go | 2 +- server/utils/upload/qiniu.go | 1 + server/utils/upload/tencent_cos.go | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/utils/upload/aliyun_oss.go b/server/utils/upload/aliyun_oss.go index 4eeaaed6..fcba9700 100644 --- a/server/utils/upload/aliyun_oss.go +++ b/server/utils/upload/aliyun_oss.go @@ -25,7 +25,7 @@ func (*AliyunOSS) UploadFile(file *multipart.FileHeader) (string, string, error) global.GVA_LOG.Error("function file.Open() Failed", zap.Any("err", openError.Error())) return "", "", errors.New("function file.Open() Failed, err:" + openError.Error()) } - + defer f.Close() // 创建文件 defer 关闭 // 上传阿里云路径 文件名格式 自己可以改 建议保证唯一性 yunFileTmpPath := filepath.Join("uploads", time.Now().Format("2006-01-02")) + "/" + file.Filename diff --git a/server/utils/upload/qiniu.go b/server/utils/upload/qiniu.go index 614c912a..e70ba1fb 100644 --- a/server/utils/upload/qiniu.go +++ b/server/utils/upload/qiniu.go @@ -38,6 +38,7 @@ func (*Qiniu) UploadFile(file *multipart.FileHeader) (string, string, error) { return "", "", errors.New("function file.Open() Filed, err:" + openError.Error()) } + defer f.Close() // 创建文件 defer 关闭 fileKey := fmt.Sprintf("%d%s", time.Now().Unix(), file.Filename) // 文件名格式 自己可以改 建议保证唯一性 putErr := formUploader.Put(context.Background(), &ret, upToken, fileKey, f, file.Size, &putExtra) if putErr != nil { diff --git a/server/utils/upload/tencent_cos.go b/server/utils/upload/tencent_cos.go index 26b25843..b093d9c2 100644 --- a/server/utils/upload/tencent_cos.go +++ b/server/utils/upload/tencent_cos.go @@ -24,6 +24,7 @@ func (*TencentCOS) UploadFile(file *multipart.FileHeader) (string, string, error global.GVA_LOG.Error("function file.Open() Filed", zap.Any("err", openError.Error())) return "", "", errors.New("function file.Open() Filed, err:" + openError.Error()) } + defer f.Close() // 创建文件 defer 关闭 fileKey := fmt.Sprintf("%d%s", time.Now().Unix(), file.Filename) _, err := client.Object.Put(context.Background(), global.GVA_CONFIG.TencentCOS.PathPrefix+"/"+fileKey, f, nil)