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

server/config.yaml

@@ -73,7 +73,10 @@ zap:
   # console: 控制台, json: json格式输出
   format: 'console'
   prefix: '[GIN-VUE-ADMIN]'
-  director: 'logs'
-  link_name: 'ZapLatestLog'
+  director: 'log'
+  link_name: 'latest_log'
   show_line: true
+  # LowercaseLevelEncoder:小写, LowercaseColorLevelEncoder:小写带颜色,CapitalLevelEncoder: 大写, CapitalColorLevelEncoder: 大写带颜色,
+  encode_level: 'LowercaseColorLevelEncoder'
+  stacktrace_key: 'stacktrace'
   log_in_console: true

server/config/config.go

@@ -1,16 +1,15 @@
 package config
 
 type Server struct {
-	Mysql     Mysql     `mapstructure:"mysql" json:"mysql" yaml:"mysql"`
-	Sqlite    Sqlite    `mapstructure:"sqlite" json:"sqlite" yaml:"sqlite"`
-	Qiniu     Qiniu     `mapstructure:"qiniu" json:"qiniu" yaml:"qiniu"`
-	Casbin    Casbin    `mapstructure:"casbin" json:"casbin" yaml:"casbin"`
-	Redis     Redis     `mapstructure:"redis" json:"redis" yaml:"redis"`
-	System    System    `mapstructure:"system" json:"system" yaml:"system"`
-	JWT       JWT       `mapstructure:"jwt" json:"jwt" yaml:"jwt"`
-	Captcha   Captcha   `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
-	Log       Log       `mapstructure:"log" json:"log" yaml:"log"`
-	Zap    	  Zap       `mapstructure:"zap" json:"zap" yaml:"zap"`
+	Mysql       Mysql       `mapstructure:"mysql" json:"mysql" yaml:"mysql"`
+	Sqlite      Sqlite      `mapstructure:"sqlite" json:"sqlite" yaml:"sqlite"`
+	Qiniu       Qiniu       `mapstructure:"qiniu" json:"qiniu" yaml:"qiniu"`
+	Casbin      Casbin      `mapstructure:"casbin" json:"casbin" yaml:"casbin"`
+	Redis       Redis       `mapstructure:"redis" json:"redis" yaml:"redis"`
+	System      System      `mapstructure:"system" json:"system" yaml:"system"`
+	JWT         JWT         `mapstructure:"jwt" json:"jwt" yaml:"jwt"`
+	Captcha     Captcha     `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
+	Zap         Zap         `mapstructure:"zap" json:"zap" yaml:"zap"`
 	LocalUpload LocalUpload `mapstructure:"localUpload" json:"localUpload" yaml:"localUpload"`
 }
 
@@ -47,9 +46,9 @@ type Redis struct {
 }
 
 type LocalUpload struct {
-	Local bool `mapstructure:"local" json:"local" yaml:"local"`
+	Local      bool   `mapstructure:"local" json:"local" yaml:"local"`
 	AvatarPath string `mapstructure:"avatar-path" json:"avatarPath" yaml:"avatar-path"`
-	FilePath string `mapstructure:"file-path" json:"filePath" yaml:"file-path"`
+	FilePath   string `mapstructure:"file-path" json:"filePath" yaml:"file-path"`
 }
 
 type Qiniu struct {
@@ -65,13 +64,6 @@ type Captcha struct {
 	ImgHeight int `mapstructure:"img-height" json:"imgHeight" yaml:"img-height"`
 }
 
-type Log struct {
-	Prefix  string `mapstructure:"prefix" json:"prefix" yaml:"prefix"`
-	LogFile bool   `mapstructure:"log-file" json:"logFile" yaml:"log-file"`
-	Stdout  string `mapstructure:"stdout" json:"stdout" yaml:"stdout"`
-	File    string `mapstructure:"file" json:"file" yaml:"file"`
-}
-
 type Sqlite struct {
 	Username string `mapstructure:"username" json:"username" yaml:"username"`
 	Password string `mapstructure:"password" json:"password" yaml:"password"`
@@ -81,11 +73,13 @@ type Sqlite struct {
 }
 
 type Zap struct {
-	Level        string `mapstructure:"level" json:"level" yaml:"level"`
-	Format       string `mapstructure:"format" json:"format" yaml:"format"`
-	Prefix       string `mapstructure:"prefix" json:"prefix" yaml:"prefix"`
-	Director     string `mapstructure:"director" json:"director"  yaml:"director"`
-	LinkName     string `mapstructure:"link_name" json:"linkName" yaml:"link_name"`
-	ShowLine     bool   `mapstructure:"show_line" json:"show_line" yaml:"show_line"`
-	LogInConsole bool   `mapstructure:"log_in_console" json:"logInConsole" yaml:"log_in_console"`
+	Level         string `mapstructure:"level" json:"level" yaml:"level"`
+	Format        string `mapstructure:"format" json:"format" yaml:"format"`
+	Prefix        string `mapstructure:"prefix" json:"prefix" yaml:"prefix"`
+	Director      string `mapstructure:"director" json:"director"  yaml:"director"`
+	LinkName      string `mapstructure:"link_name" json:"linkName" yaml:"link_name"`
+	ShowLine      bool   `mapstructure:"show_line" json:"showLine" yaml:"showLine"`
+	EncodeLevel   string `mapstructure:"encode_level" json:"encodeLevel" yaml:"encode_level"`
+	StacktraceKey string `mapstructure:"stacktrace_key" json:"stacktraceKey" yaml:"stacktrace_key"`
+	LogInConsole  bool   `mapstructure:"log_in_console" json:"logInConsole" yaml:"log_in_console"`
 }

server/core/server.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"gin-vue-admin/global"
 	"gin-vue-admin/initialize"
+	"go.uber.org/zap"
 	"time"
 )
 
@@ -24,11 +25,11 @@ func RunWindowsServer() {
 	// 保证文本顺序输出
 	// In order to ensure that the text order output can be deleted
 	time.Sleep(10 * time.Microsecond)
-	global.GVA_LOG.Debug("server run success on ", address)
+	global.GVA_LOG.Debug("server run success on ", zap.String("address", address))
 
 	fmt.Printf(`欢迎使用 Gin-Vue-Admin
 	默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
 	默认前端文件运行地址:http://127.0.0.1:8080
 `, address)
-	global.GVA_LOG.Error(s.ListenAndServe())
+	global.GVA_LOG.Error(s.ListenAndServe().Error())
 }

server/core/zap.go

@@ -13,17 +13,17 @@ import (
 
 var (
 	err    error
-	level zapcore.Level
+	level  zapcore.Level
 	writer zapcore.WriteSyncer
 )
 
 func init() {
-	if ok, _ := utils.PathExists(global.GVA_CONFIG.Zap.Director); !ok { // 判断是否有logs文件夹
-		fmt.Println("create logs directory") // directory not exist
+	if ok, _ := utils.PathExists(global.GVA_CONFIG.Zap.Director); !ok { // 判断是否有Director文件夹
+		fmt.Printf("create %v directory\n", global.GVA_CONFIG.Zap.Director)
 		_ = os.Mkdir(global.GVA_CONFIG.Zap.Director, os.ModePerm)
 	}
 
-	switch global.GVA_CONFIG.Zap.Level {// 初始化配置文件的Level
+	switch global.GVA_CONFIG.Zap.Level { // 初始化配置文件的Level
 	case "debug":
 		level = zap.DebugLevel
 	case "info":
@@ -32,6 +32,12 @@ func init() {
 		level = zap.WarnLevel
 	case "error":
 		level = zap.ErrorLevel
+	case "dpanic":
+		level = zap.DPanicLevel
+	case "panic":
+		level = zap.PanicLevel
+	case "fatal":
+		level = zap.FatalLevel
 	default:
 		level = zap.InfoLevel
 	}
@@ -43,23 +49,19 @@ func init() {
 	}
 
 	if level == zap.DebugLevel || level == zap.ErrorLevel {
-		global.GVA_ZAP = zap.New(getEncoderCore(), zap.AddStacktrace(level))
-		if global.GVA_CONFIG.Zap.ShowLine {
-			global.GVA_ZAP.WithOptions(zap.AddCaller())
-		}
-		return
+		global.GVA_LOG = zap.New(getEncoderCore(), zap.AddStacktrace(level))
+	} else {
+		global.GVA_LOG = zap.New(getEncoderCore())
 	}
-	global.GVA_ZAP = zap.New(getEncoderCore())
 	if global.GVA_CONFIG.Zap.ShowLine {
-		global.GVA_ZAP.WithOptions(zap.AddCaller())
+		global.GVA_LOG.WithOptions(zap.AddCaller())
 	}
-
 }
 
 // getWriteSyncer zap logger中加入file-rotatelogs
 func getWriteSyncer() (zapcore.WriteSyncer, error) {
 	fileWriter, err := zaprotatelogs.New(
-		global.GVA_CONFIG.Zap.Director+string(os.PathSeparator)+"%Y-%m-%d-%H-%M.log",
+		global.GVA_CONFIG.Zap.Director+string(os.PathSeparator)+"%Y-%m-%d.log",
 		zaprotatelogs.WithLinkName(global.GVA_CONFIG.Zap.LinkName),
 		zaprotatelogs.WithMaxAge(7*24*time.Hour),
 		zaprotatelogs.WithRotationTime(24*time.Hour),
@@ -78,18 +80,41 @@ func getEncoderConfig() (config zapcore.EncoderConfig) {
 		TimeKey:        "time",
 		NameKey:        "logger",
 		CallerKey:      "caller",
-		StacktraceKey:  "stacktrace",
+		StacktraceKey:  global.GVA_CONFIG.Zap.StacktraceKey,
 		LineEnding:     zapcore.DefaultLineEnding,
-		EncodeLevel:    zapcore.CapitalColorLevelEncoder,
+		EncodeLevel:    zapcore.CapitalLevelEncoder,
 		EncodeTime:     CustomTimeEncoder,
 		EncodeDuration: zapcore.SecondsDurationEncoder,
 		EncodeCaller:   zapcore.FullCallerEncoder,
 	}
+	switch  {
+	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console" : // console小写编码器
+		config.EncodeLevel = zapcore.LowercaseLevelEncoder
+	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json" : // json小写编码器
+		config.EncodeLevel = zapcore.LowercaseLevelEncoder
+	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console": // console小写编码器带颜色
+		config.EncodeLevel = zapcore.LowercaseColorLevelEncoder
+	case global.GVA_CONFIG.Zap.EncodeLevel == "LowercaseColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json": // json小写编码器带颜色
+		config.EncodeLevel = zapcore.LowercaseColorLevelEncoder
+	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console": // console大写编码器
+		config.EncodeLevel = zapcore.CapitalLevelEncoder
+	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json": // json大写编码器
+		config.EncodeLevel = zapcore.CapitalLevelEncoder
+	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "console": // console 大写编码器带颜色
+		config.EncodeLevel = zapcore.CapitalColorLevelEncoder
+	case global.GVA_CONFIG.Zap.EncodeLevel == "CapitalColorLevelEncoder" && global.GVA_CONFIG.Zap.Format == "json": // json 大写编码器带颜色
+		config.EncodeLevel = zapcore.CapitalColorLevelEncoder
+	default:
+		config.EncodeLevel = zapcore.LowercaseLevelEncoder
+	}
 	return config
 }
 
 // getEncoder 获取zapcore.Encoder
 func getEncoder() zapcore.Encoder {
+	if global.GVA_CONFIG.Zap.Format == "json" {
+		return zapcore.NewJSONEncoder(getEncoderConfig())
+	}
 	return zapcore.NewConsoleEncoder(getEncoderConfig())
 }
 
@@ -100,5 +125,5 @@ func getEncoderCore() (core zapcore.Core) {
 
 // 自定义日志输出时间格式
 func CustomTimeEncoder(t time.Time, enc zapcore.PrimitiveArrayEncoder) {
-	enc.AppendString(t.Format(global.GVA_CONFIG.Zap.Prefix+"2006/01/02 - 15:04:05.000"))
+	enc.AppendString(t.Format(global.GVA_CONFIG.Zap.Prefix + "2006/01/02 - 15:04:05.000"))
 }

server/global/global.go

@@ -5,7 +5,6 @@ import (
 
 	"gin-vue-admin/config"
 	"github.com/go-redis/redis"
-	oplogging "github.com/op/go-logging"
 	"github.com/spf13/viper"
 	"gorm.io/gorm"
 )
@@ -15,6 +14,6 @@ var (
 	GVA_REDIS  *redis.Client
 	GVA_CONFIG config.Server
 	GVA_VP     *viper.Viper
-	GVA_LOG    *oplogging.Logger
-	GVA_ZAP    *zap.Logger
+	//GVA_LOG    *oplogging.Logger
+	GVA_LOG    *zap.Logger
 )

server/go.mod

@@ -23,14 +23,12 @@ require (
 	github.com/lestrrat-go/file-rotatelogs v2.3.0+incompatible
 	github.com/lestrrat-go/strftime v1.0.3 // indirect
 	github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 // indirect
-	github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f
 	github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect
 	github.com/mailru/easyjson v0.7.1 // indirect
 	github.com/mitchellh/mapstructure v1.2.2 // indirect
 	github.com/mojocn/base64Captcha v1.3.1
 	github.com/onsi/ginkgo v1.7.0 // indirect
 	github.com/onsi/gomega v1.4.3 // indirect
-	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pelletier/go-toml v1.6.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/qiniu/api.v7/v7 v7.4.1

server/initialize/data.go

@@ -3,6 +3,7 @@ package initialize
 import (
 	"gin-vue-admin/global"
 	"gin-vue-admin/service"
+	"go.uber.org/zap"
 )
 
 func Data() {
@@ -20,7 +21,7 @@ func Data() {
 	err = service.InitSysDictionaryDetail()
 	err = service.InitExaFileUploadAndDownload()
 	if err != nil {
-		global.GVA_LOG.Error("initialize data failed", err)
+		global.GVA_LOG.Error("initialize data failed", zap.Any("err", err))
 	}
 	global.GVA_LOG.Debug("initialize data success")
 }

server/initialize/db_table.go

@@ -3,6 +3,7 @@ package initialize
 import (
 	"gin-vue-admin/global"
 	"gin-vue-admin/model"
+	"go.uber.org/zap"
 	"os"
 )
 
@@ -28,7 +29,7 @@ func DBTables() {
 		model.SysOperationRecord{},
 	)
 	if err != nil {
-		global.GVA_LOG.Error("register table failed", err)
+		global.GVA_LOG.Error("register table failed", zap.Any("err", err))
 		os.Exit(0)
 	}
 	global.GVA_LOG.Debug("register table success")