update: X-Trace-Id

internal/middleware/auth/auth.go

@@ -31,11 +31,11 @@ func NewAuth() nf.HandlerFunc {
 			return resp.Resp401(c, token)
 		}
 
-		log.Debug(c, "middleware.NewAuth: token=%s", token)
+		log.Debug(c.Context(), "middleware.NewAuth: token=%s", token)
 
 		target, err := controller.UserController.GetUserByToken(c, token)
 		if err != nil {
-			log.Error(c, "middleware.NewAuth: get user by token=%s err=%v", token, err)
+			log.Error(c.Context(), "middleware.NewAuth: get user by token=%s err=%v", token, err)
 			if errors.Is(err, redis.Nil) || errors.Is(err, gredis.ErrKeyNotFound) {
 				return resp.Resp401(c, err)
 			}

internal/middleware/front/front.go

@@ -33,7 +33,7 @@ func NewFront(ff *embed.FS, basePath string) nf.HandlerFunc {
 		)
 
 		if bs, err = ff.ReadFile(basePath + path); err != nil {
-			log.Debug(c, "embed read file [%s]%s err: %v", basePath, path, err)
+			log.Debug(c.Context(), "embed read file [%s]%s err: %v", basePath, path, err)
 			c.Set("Content-Type", "text/html")
 			_, err = c.Write(indexBytes)
 			return err

internal/middleware/logger/logger.go

@@ -2,38 +2,25 @@ package logger
 
 import (
 	"fmt"
-	"github.com/google/uuid"
 	"github.com/loveuer/esgo2dump/log"
 	"github.com/loveuer/nf"
 	"github.com/loveuer/nf/nft/resp"
-	"net/http"
 	"strconv"
 	"time"
-	"ultone/internal/opt"
 	"ultone/internal/tool"
 )
 
-var (
-	Header = http.CanonicalHeaderKey("X-Trace-Id")
-)
-
 func New() nf.HandlerFunc {
 
 	return func(c *nf.Ctx) error {
 		var (
-			now     = time.Now()
-			traceId = c.Get(Header)
-			logFn   func(msg string, data ...any)
-			ip      = c.IP()
+			now   = time.Now()
+			logFn func(msg string, data ...any)
+			ip    = c.IP()
 		)
 
-		if traceId == "" {
-			traceId = uuid.Must(uuid.NewV7()).String()
-		}
-
-		c.SetHeader(Header, traceId)
-
-		c.Locals(opt.LocalTraceKey, traceId)
+		traceId := c.Context().Value(nf.TraceKey)
+		c.Locals(nf.TraceKey, traceId)
 
 		err := c.Next()
 		status, _ := strconv.Atoi(c.Writer.Header().Get(resp.RealStatusHeader))