feat ✨ 优化logger使用
This commit is contained in:
1 parent
d3fa3ecf6c
commit
e23a1f615f
7 files changed
+24
-25
No files matched your search
@@ -3,8 +3,8 @@ package service
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"github.com/go-admin-team/go-admin-core/logger"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/admin/models"
|
||||
@@ -24,7 +24,7 @@ func (e *SysMenu) MakeOrm(orm *gorm.DB) *SysMenu {
|
||||
}
|
||||
|
||||
// MakeLog 设置Log
|
||||
func (e *SysMenu) MakeLog(l *logger.Logger) *SysMenu {
|
||||
func (e *SysMenu) MakeLog(l *logger.Helper) *SysMenu {
|
||||
e.Log = l
|
||||
return e
|
||||
}
|
||||
@@ -322,4 +322,4 @@ func (e *SysMenu) getByRoleName(roleName string) (Menus []models.SysMenu, err er
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
}
|
||||
+7
-6
@@ -3,21 +3,22 @@ package apis
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"go-admin/common/service"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/gin-gonic/gin/binding"
|
||||
"github.com/go-admin-team/go-admin-core/logger"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/common/service"
|
||||
)
|
||||
|
||||
type Api struct {
|
||||
Context *gin.Context
|
||||
Logger *logger.Logger
|
||||
Logger *logger.Helper
|
||||
Orm *gorm.DB
|
||||
Errors error
|
||||
}
|
||||
@@ -41,7 +42,7 @@ func (e *Api) MakeContext(c *gin.Context) *Api {
|
||||
}
|
||||
|
||||
// GetLogger 获取上下文提供的日志
|
||||
func (e Api) GetLogger() *logger.Logger {
|
||||
func (e Api) GetLogger() *logger.Helper {
|
||||
return api.GetRequestLogger(e.Context)
|
||||
}
|
||||
|
||||
@@ -134,4 +135,4 @@ func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int,
|
||||
// Custom 兼容函数
|
||||
func (e Api) Custom(data gin.H) {
|
||||
response.Custum(e.Context, data)
|
||||
}
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package apis
|
||||
|
||||
// GetRequestLogger 获取上下文提供的日志
|
||||
//func GetRequestLogger(c *gin.Context) *logger.Logger {
|
||||
// requestId := pkg.GenerateMsgIDFromContext(c)
|
||||
// log := sdk.Runtime.GetLogger().Fields(map[string]interface{}{
|
||||
// strings.ToLower(pkg.TrafficKey): requestId,
|
||||
// })
|
||||
// return &logger.Logger{Logger: log}
|
||||
//}
|
||||
@@ -76,7 +76,7 @@ func LoggerToFile() gin.HandlerFunc {
|
||||
"method": reqMethod,
|
||||
"uri": reqUri,
|
||||
}
|
||||
log.Info(logData)
|
||||
log.WithFields(logData).Info()
|
||||
//l := logger.Logger{Logger: log.Fields(logData)}
|
||||
//l.Info(logData)
|
||||
if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB {
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
package middleware
|
||||
|
||||
import (
|
||||
"github.com/go-admin-team/go-admin-core/logger"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
@@ -24,6 +26,11 @@ func RequestId(trafficKey string) gin.HandlerFunc {
|
||||
}
|
||||
c.Request.Header.Set(trafficKey, requestId)
|
||||
c.Set(trafficKey, requestId)
|
||||
c.Set(pkg.LoggerKey,
|
||||
logger.NewHelper(logger.DefaultLogger).
|
||||
WithFields(map[string]interface{}{
|
||||
trafficKey: requestId,
|
||||
}))
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,8 @@ package service
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
|
||||
|
||||
"github.com/go-admin-team/go-admin-core/logger"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
@@ -10,7 +11,7 @@ type Service struct {
|
||||
Orm *gorm.DB
|
||||
Msg string
|
||||
MsgID string
|
||||
Log *logger.Logger
|
||||
Log *logger.Helper
|
||||
Error error
|
||||
}
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@ require (
|
||||
github.com/bytedance/go-tagexpr/v2 v2.7.10
|
||||
github.com/casbin/casbin/v2 v2.25.1
|
||||
github.com/gin-gonic/gin v1.7.1
|
||||
github.com/go-admin-team/go-admin-core v1.3.5-rc.0.0.20210423072631-e3580b68ee26
|
||||
github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210427015751-b42693c49c6c
|
||||
github.com/go-admin-team/go-admin-core v1.3.5-rc.0
|
||||
github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210519112810-242d8766f4b9
|
||||
github.com/google/uuid v1.2.0
|
||||
github.com/mssola/user_agent v0.5.2
|
||||
github.com/opentracing/opentracing-go v1.1.0
|
||||
@@ -28,4 +28,4 @@ require (
|
||||
gorm.io/driver/postgres v1.0.6-0.20201208020313-1ed927cfab53
|
||||
gorm.io/driver/sqlite v1.1.5-0.20201206014648-c84401fbe3ba
|
||||
gorm.io/gorm v1.21.6
|
||||
)
|
||||
)
|
||||
Reference in new issue
Block a user