调整log代码,兼容zap扩展支持fields
This commit is contained in:
1 parent
39dd1ee6f8
commit
75711922b4
47 files changed
+267
-275
No files matched your search
@@ -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()
|
||||
}
|
||||
@@ -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()
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user