调整log代码,兼容zap扩展支持fields

This commit is contained in:
linwenxiang committed 2021-03-05 15:13:36 +08:00
1 parent 39dd1ee6f8
commit 75711922b4
47 files changed
+267 -275

No files matched your search

+2 -2
View File
@@ -1,13 +1,13 @@
package actions
import (
"go-admin/common/apis"
"net/http"
"github.com/gin-gonic/gin"
"go-admin/common/dto"
"go-admin/common/models"
"go-admin/pkg/logger"
"go-admin/tools"
"go-admin/tools/app"
)
@@ -15,7 +15,7 @@ import (
// CreateAction 通用新增动作
func CreateAction(control dto.Control) gin.HandlerFunc {
return func(c *gin.Context) {
log := logger.GetRequestLogger(c)
log := apis.GetRequestLogger(c)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
+2 -2
View File
@@ -16,8 +16,8 @@ type Api struct {
}
// GetLogger 获取上下文提供的日志
func (e *Api) GetLogger(c *gin.Context) logger.Logger {
return logger.GetRequestLogger(c)
func (e *Api) GetLogger(c *gin.Context) *logger.Logger {
return GetRequestLogger(c)
}
// GetOrm 获取Orm DB
+18
View File
@@ -0,0 +1,18 @@
package apis
import (
"github.com/gin-gonic/gin"
"go-admin/pkg/logger"
"go-admin/tools"
"go-admin/tools/app"
"strings"
)
// GetRequestLogger 获取上下文提供的日志
func GetRequestLogger(c *gin.Context) *logger.Logger {
requestId := tools.GenerateMsgIDFromContext(c)
log := app.Runtime.GetLogger().Fields(map[string]interface{}{
strings.ToLower(tools.TrafficKey): requestId,
})
return &logger.Logger{Logger: log}
}
+5 -5
View File
@@ -1,6 +1,7 @@
package database
import (
"go-admin/tools/app"
. "log"
"time"
@@ -11,7 +12,6 @@ import (
"gorm.io/gorm/schema"
log "github.com/go-admin-team/go-admin-core/logger"
"go-admin/common/global"
mycasbin "go-admin/pkg/casbin"
"go-admin/tools"
toolsConfig "go-admin/tools/config"
@@ -25,8 +25,8 @@ func Setup() {
}
func setupSimpleDatabase(host string, c *toolsConfig.Database) {
if global.Driver == "" {
global.Driver = c.Driver
if app.Driver == "" {
app.Driver = c.Driver
}
log.Infof("%s => %s", host, tools.Green(c.Source))
registers := make([]toolsDB.ResolverConfigure, len(c.Registers))
@@ -65,6 +65,6 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
// global.Eloquent = db
//}
global.Runtime.SetDb(host, db)
global.Runtime.SetCasbin(host, e)
app.Runtime.SetDb(host, db)
app.Runtime.SetCasbin(host, e)
}
+2 -2
View File
@@ -2,7 +2,7 @@ package dto
import (
"github.com/go-admin-team/go-admin-core/tools/search"
"go-admin/common/global"
"go-admin/tools/app"
"gorm.io/gorm"
)
@@ -44,7 +44,7 @@ func MakeCondition(q interface{}) func(db *gorm.DB) *gorm.DB {
GormPublic: search.GormPublic{},
Join: make([]*search.GormJoin, 0),
}
search.ResolveSearchQuery(global.Driver, q, condition)
search.ResolveSearchQuery(app.Driver, q, condition)
for _, join := range condition.Join {
if join == nil {
continue
-18
View File
@@ -1,18 +0,0 @@
package global
import (
"github.com/go-admin-team/go-admin-core/tools/runtime"
)
const (
// go-admin Version Info
Version = "1.2.3"
)
var Runtime runtime.Runtime = runtime.NewConfig()
var (
Source string
Driver string
DBName string
)
+5 -4
View File
@@ -3,13 +3,14 @@ package global
import (
"github.com/casbin/casbin/v2"
"github.com/gin-gonic/gin"
"go-admin/pkg/logger"
"go-admin/common/apis"
"go-admin/tools/app"
)
func LoadPolicy(c *gin.Context) (*casbin.SyncedEnforcer, error) {
log := logger.GetRequestLogger(c)
if err := Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
return Runtime.GetCasbinKey(c.Request.Host), err
log := apis.GetRequestLogger(c)
if err := app.Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
return app.Runtime.GetCasbinKey(c.Request.Host), err
} else {
log.Errorf("casbin rbac_model or policy init error, %s ", err.Error())
return nil, err
+2 -3
View File
@@ -2,11 +2,10 @@ package middleware
import (
"github.com/gin-gonic/gin"
"go-admin/common/global"
"go-admin/tools/app"
)
func WithContextDb(c *gin.Context) {
c.Set("db", global.Runtime.GetDbByKey(c.Request.Host))
c.Set("db", app.Runtime.GetDbByKey(c.Request.Host))
c.Next()
}
+2 -6
View File
@@ -4,12 +4,11 @@ import (
"strings"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/logger"
"github.com/google/uuid"
)
// RequestIdLogger 自动增加requestId
func RequestIdLogger(trafficKey, loggerKey string) gin.HandlerFunc {
// RequestId 自动增加requestId
func RequestId(trafficKey string) gin.HandlerFunc {
return func(c *gin.Context) {
requestId := c.GetHeader(trafficKey)
if requestId == "" {
@@ -19,9 +18,6 @@ func RequestIdLogger(trafficKey, loggerKey string) gin.HandlerFunc {
requestId = uuid.New().String()
}
c.Header(trafficKey, requestId)
c.Set(loggerKey, logger.DefaultLogger.Fields(map[string]interface{}{
strings.ToLower(trafficKey): requestId,
}))
c.Next()
}
}
+1 -1
View File
@@ -9,5 +9,5 @@ type Service struct {
Orm *gorm.DB
Msg string
MsgID string
Log logger.Logger
Log *logger.Logger
}