From e23a1f615f7729c4ae5196b8faa3bd3dc8b226da Mon Sep 17 00:00:00 2001 From: linwenxiang <991154416@qq.com> Date: Wed, 19 May 2021 19:31:04 +0800 Subject: [PATCH] =?UTF-8?q?feat=20:sparkles:=20=E4=BC=98=E5=8C=96logger?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/sys_menu.go | 6 +++--- common/apis/api.go | 13 +++++++------ common/apis/request_logger.go | 10 ---------- common/middleware/logger.go | 2 +- common/middleware/request_id.go | 7 +++++++ common/service/service.go | 5 +++-- go.mod | 6 +++--- 7 files changed, 24 insertions(+), 25 deletions(-) delete mode 100644 common/apis/request_logger.go diff --git a/app/admin/service/sys_menu.go b/app/admin/service/sys_menu.go index e3007531..5889d116 100644 --- a/app/admin/service/sys_menu.go +++ b/app/admin/service/sys_menu.go @@ -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 -} \ No newline at end of file +} diff --git a/common/apis/api.go b/common/apis/api.go index 4708f1c7..f4350065 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -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) -} \ No newline at end of file +} diff --git a/common/apis/request_logger.go b/common/apis/request_logger.go deleted file mode 100644 index d3df51c4..00000000 --- a/common/apis/request_logger.go +++ /dev/null @@ -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} -//} \ No newline at end of file diff --git a/common/middleware/logger.go b/common/middleware/logger.go index 21acf890..229a93ec 100644 --- a/common/middleware/logger.go +++ b/common/middleware/logger.go @@ -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 { diff --git a/common/middleware/request_id.go b/common/middleware/request_id.go index 47161c34..8dedd834 100644 --- a/common/middleware/request_id.go +++ b/common/middleware/request_id.go @@ -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() } } diff --git a/common/service/service.go b/common/service/service.go index a748aab6..0deb4a92 100644 --- a/common/service/service.go +++ b/common/service/service.go @@ -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 } diff --git a/go.mod b/go.mod index 03d0b403..07aa1837 100644 --- a/go.mod +++ b/go.mod @@ -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 -) \ No newline at end of file +)