From 98d30f64f6a1fb7f9096e542faf87a36be5af111 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Mon, 11 Jan 2021 16:27:36 +0800 Subject: [PATCH] =?UTF-8?q?perf=F0=9F=91=8C=20:=20logger=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BC=A0=E5=85=A5=E4=BC=A0=E5=87=BA=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/middleware/logger.go | 51 ++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/app/admin/middleware/logger.go b/app/admin/middleware/logger.go index 6dc46db..5e93e6e 100644 --- a/app/admin/middleware/logger.go +++ b/app/admin/middleware/logger.go @@ -1,6 +1,7 @@ package middleware import ( + "fmt" "strings" "time" @@ -9,7 +10,6 @@ import ( "go-admin/app/admin/models" "go-admin/app/admin/models/system" "go-admin/app/admin/service" - "go-admin/common/global" "go-admin/common/log" "go-admin/tools" "go-admin/tools/config" @@ -17,32 +17,42 @@ import ( // LoggerToFile 日志记录到文件 func LoggerToFile() gin.HandlerFunc { - return func(c *gin.Context) { // 开始时间 startTime := time.Now() - // 处理请求 c.Next() - // 结束时间 - endTime := time.Now() + bd, bl := c.Get("body") + var body = "" + if bl { + body = bd.(string) + } - // 执行时间 - latencyTime := endTime.Sub(startTime) + rt, bl := c.Get("result") + var result = "" + if bl { + result = rt.(string) + } + + st, bl := c.Get("status") + var statusBus = 0 + if bl { + statusBus = st.(int) + } // 请求方式 reqMethod := c.Request.Method - // 请求路由 reqUri := c.Request.RequestURI - // 状态码 statusCode := c.Writer.Status() - // 请求IP clientIP := c.ClientIP() - + // 结束时间 + endTime := time.Now() + // 执行时间 + latencyTime := endTime.Sub(startTime) // 日志格式 logData := map[string]interface{}{ "statusCode": statusCode, @@ -52,16 +62,14 @@ func LoggerToFile() gin.HandlerFunc { "uri": reqUri, } log.Info(logData) - global.RequestLogger.Info(logData) - if c.Request.Method != "GET" && c.Request.Method != "OPTIONS" && config.LoggerConfig.EnabledDB { - SetDBOperLog(c, clientIP, statusCode, reqUri, reqMethod, latencyTime) + SetDBOperLog(c, clientIP, statusCode, reqUri, reqMethod, latencyTime, body, result, statusBus) } } } // SetDBOperLog 写入操作日志表 fixme 该方法后续即将弃用 -func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string, reqMethod string, latencyTime time.Duration) { +func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string, reqMethod string, latencyTime time.Duration, body string, result string, status int) { menu := models.Menu{} menu.Path = reqUri menu.Action = reqMethod @@ -73,6 +81,7 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string sysOperaLog.OperName = tools.GetUserName(c) sysOperaLog.RequestMethod = c.Request.Method sysOperaLog.OperUrl = reqUri + sysOperaLog.OperParam = body if reqUri == "/login" { sysOperaLog.BusinessType = "10" sysOperaLog.Title = "用户登录" @@ -95,14 +104,14 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string if len(menuList) > 0 { sysOperaLog.Title = menuList[0].Title } - b, _ := c.Get("body") - sysOperaLog.OperParam, _ = tools.StructToJsonStr(b) sysOperaLog.CreateBy = tools.GetUserId(c) sysOperaLog.OperTime = tools.GetCurrentTime() - sysOperaLog.LatencyTime = (latencyTime).String() + sysOperaLog.LatencyTime = fmt.Sprintf("%v", latencyTime) + + sysOperaLog.JsonResult = result sysOperaLog.UserAgent = c.Request.UserAgent() - if c.Err() == nil { - sysOperaLog.Status = "0" + if status == 200 { + sysOperaLog.Status = "2" } else { sysOperaLog.Status = "1" } @@ -113,5 +122,5 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string } serviceOperaLog := service.SysOperaLog{} serviceOperaLog.Orm = db - _ = serviceOperaLog.InsertSysOperaLog(sysOperaLog.Generate()) + _ = serviceOperaLog.InsertSysOperaLog(&sysOperaLog) }