chore: 更新了 logger middleware

middlewares/logger/logger.go

@@ -2,17 +2,21 @@ package logger
 
 import (
 	"fmt"
-	"gitea.loveuer.com/yizhisec/packages/logger"
-	"gitea.loveuer.com/yizhisec/packages/opt"
-	"gitea.loveuer.com/yizhisec/packages/tool"
-	"github.com/gin-gonic/gin"
 	"strings"
 	"sync"
 	"time"
+
+	"gitea.loveuer.com/yizhisec/packages/opt"
+	"gitea.loveuer.com/yizhisec/packages/tool"
+	"github.com/fatih/color"
+	"github.com/gin-gonic/gin"
+)
+
+const (
+	defaultTrace = "                   middleware-logger"
 )
 
 var (
-	defaultTrace      = "middleware-logger"
 	stringBuilderPool = sync.Pool{
 		New: func() interface{} {
 			return &strings.Builder{}
@@ -36,26 +40,31 @@ func New() gin.HandlerFunc {
 
 		c.Next()
 
-		status := c.Writer.Status()
+		var (
+			status string
+		)
+
+		_status := c.Writer.Status()
 		duration := time.Since(start)
 
-		var logFn func(msg string, data ...any)
 		switch {
-		case status >= 500:
+		case _status >= 500:
-			logFn = logger.Error
+			status = color.RedString("%3d", _status)
-		case status >= 400:
+		case _status >= 400:
-			logFn = logger.Warn
+			status = color.YellowString("%3d", _status)
 		default:
-			logFn = logger.Info
+			status = color.GreenString("%3d", _status)
 		}
 
-		if logFn != nil {
 		b := stringBuilderPool.Get().(*strings.Builder)
 		b.Reset()
 
-			b.WriteString(fmt.Sprintf("%36s", trace))
+		b.WriteString("GIN   | ")
+		b.WriteString(start.Format("2006-01-02T15:04:05"))
 		b.WriteString(" | ")
-			b.WriteString(fmt.Sprintf("%3d", status))
+		b.WriteString(trace)
+		b.WriteString(" | ")
+		b.WriteString(status)
 		b.WriteString(" | ")
 		b.WriteString(fmt.Sprintf("%15s", ip))
 		b.WriteString(" | ")
@@ -65,9 +74,8 @@ func New() gin.HandlerFunc {
 		b.WriteString(" | ")
 		b.WriteString(c.Request.RequestURI)
 
-			logFn(b.String())
+		fmt.Println(b.String())
 
 		stringBuilderPool.Put(b)
 	}
-	}
 }

middlewares/logger/logger_test.go

@@ -2,10 +2,12 @@ package logger
 
 import (
 	"errors"
-	"github.com/gin-gonic/gin"
 	"net/http"
 	"testing"
 	"time"
+
+	"gitea.loveuer.com/yizhisec/packages/logger"
+	"github.com/gin-gonic/gin"
 )
 
 func TestLogger(t *testing.T) {
@@ -20,6 +22,7 @@ func TestLogger(t *testing.T) {
 		c.JSON(400, gin.H{"hello": "world"})
 	})
 	app.GET("/500", func(c *gin.Context) {
+		logger.ErrorCtx(c.Request.Context(), "oops")
 		c.JSON(500, gin.H{"hello": "world"})
 	})