yvan/Study
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

go-logging(停止维护了)替换成zap, zap的配置完善优化,gva的日志更换zap后的处理

Browse Source
This commit is contained in:
SliverHorn
2020-09-05 11:55:51 +08:00
parent 14ea27749c
commit e810a08c0e
18 changed files with 104 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/utils/directory.go
+3 -2
View File
@@ -2,6 +2,7 @@ package utils
import (
"gin-vue-admin/global"
"go.uber.org/zap"
"os"
)
@@ -35,10 +36,10 @@ func CreateDir(dirs ...string) (err error) {
return err
}
if !exist {
global.GVA_LOG.Debug("create directory ", v)
global.GVA_LOG.Debug("create directory" + v)
err = os.MkdirAll(v, os.ModePerm)
if err != nil {
global.GVA_LOG.Error("create directory", v, " error:", err)
global.GVA_LOG.Error("create directory"+ v, zap.Any(" error:", err))
}
}
}
server/utils/upload_avatar_local.go
+5 -4
View File
@@ -2,6 +2,7 @@ package utils
import (
"gin-vue-admin/global"
"go.uber.org/zap"
"io"
"mime/multipart"
"os"
@@ -23,7 +24,7 @@ func UploadAvatarLocal(file *multipart.FileHeader) (err error, localPath string,
// 尝试创建此路径
err = os.MkdirAll(savePath, os.ModePerm)
if err != nil{
global.GVA_LOG.Error("upload local file fail:", err)
global.GVA_LOG.Error("upload local file fail:", zap.Any("err", err))
return err, "", ""
}
// 拼接路径和文件名
@@ -32,21 +33,21 @@ func UploadAvatarLocal(file *multipart.FileHeader) (err error, localPath string,
// 打开文件 defer 关闭
src, err := file.Open()
if err != nil {
global.GVA_LOG.Error("upload local file fail:", err)
global.GVA_LOG.Error("upload local file fail:", zap.Any("err", err))
return err, "", ""
}
defer src.Close()
// 创建文件 defer 关闭
out, err := os.Create(dst)
if err != nil {
global.GVA_LOG.Error("upload local file fail:", err)
global.GVA_LOG.Error("upload local file fail:", zap.Any("err", err))
return err, "", ""
}
defer out.Close()
// 传输（拷贝）文件
_, err = io.Copy(out, src)
if err != nil {
global.GVA_LOG.Error("upload local file fail:", err)
global.GVA_LOG.Error("upload local file fail:", zap.Any("err", err))
return err, "", ""
}
return nil, dst, lastName
server/utils/upload_file_local.go
+6 -5
View File
@@ -2,6 +2,7 @@ package utils
import (
"gin-vue-admin/global"
"go.uber.org/zap"
"io"
"mime/multipart"
"os"
@@ -22,8 +23,8 @@ func UploadFileLocal(file *multipart.FileHeader) (err error, localPath string, k
savePath := global.GVA_CONFIG.LocalUpload.FilePath
// 尝试创建此路径
err = os.MkdirAll(savePath, os.ModePerm)
if err != nil{
global.GVA_LOG.Error("upload local file fail:", err)
if err != nil {
global.GVA_LOG.Error("upload local file fail:", zap.Any("err", err))
return err, "", ""
}
// 拼接路径和文件名
@@ -32,21 +33,21 @@ func UploadFileLocal(file *multipart.FileHeader) (err error, localPath string, k
// 打开文件 defer 关闭
src, err := file.Open()
if err != nil {
global.GVA_LOG.Error("upload local file fail:", err)
global.GVA_LOG.Error("upload local file fail:", zap.Any("err", err))
return err, "", ""
}
defer src.Close()
// 创建文件 defer 关闭
out, err := os.Create(dst)
if err != nil {
global.GVA_LOG.Error("upload local file fail:", err)
global.GVA_LOG.Error("upload local file fail:", zap.Any("err", err))
return err, "", ""
}
defer out.Close()
// 传输（拷贝）文件
_, err = io.Copy(out, src)
if err != nil {
global.GVA_LOG.Error("upload local file fail:", err)
global.GVA_LOG.Error("upload local file fail:", zap.Any("err", err))
return err, "", ""
}
return nil, dst, lastName
server/utils/upload_remote.go
+2 -1
View File
@@ -6,6 +6,7 @@ import (
"gin-vue-admin/global"
"github.com/qiniu/api.v7/v7/auth/qbox"
"github.com/qiniu/api.v7/v7/storage"
"go.uber.org/zap"
"mime/multipart"
"time"
)
@@ -40,7 +41,7 @@ func UploadRemote(file *multipart.FileHeader) (err error, path string, key strin
fileKey := fmt.Sprintf("%d%s", time.Now().Unix(), file.Filename) // 文件名格式 自己可以改 建议保证唯一性
err = formUploader.Put(context.Background(), &ret, upToken, fileKey, f, dataLen, &putExtra)
if err != nil {
global.GVA_LOG.Error("upload file fail:", err)
global.GVA_LOG.Error("upload file fail:", zap.Any("err", err))
return err, "", ""
}
return err, global.GVA_CONFIG.Qiniu.ImgPath + "/" + ret.Key, ret.Key