From 43c1f1ff303090667344445685ee078864781838 Mon Sep 17 00:00:00 2001
From: dtapps <li.gc@icloud.com>
Date: Wed, 27 Mar 2024 10:29:35 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=20`slog`=20=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md  | 2 +-
 context.go | 6 +++---
 version.go | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 076d5a4..2b1676d 100644
--- a/README.md
+++ b/README.md
@@ -13,5 +13,5 @@
 #### 安装
 
 ```shell
-go get -v -u go.dtapp.net/gotrace_id@v1.0.9
+go get -v -u go.dtapp.net/gotrace_id@v1.0.10
 ```
diff --git a/context.go b/context.go
index 7c1e27b..d3da8a7 100644
--- a/context.go
+++ b/context.go
@@ -26,7 +26,7 @@ func CustomTraceIdContext(ctx context.Context) context.Context {
 	var v []slog.Attr
 	v = append(v, slog.String(TraceIdKey, traceId))
 
-	return context.WithValue(ctx, TraceIdKey, traceId)
+	return context.WithValue(context.WithValue(ctx, SlogFields, v), TraceIdKey, traceId)
 }
 
 // SetCustomTraceId 自定义设置跟踪编号上下文
@@ -45,7 +45,7 @@ func SetCustomTraceId(ctx context.Context, traceId string) context.Context {
 	var v []slog.Attr
 	v = append(v, slog.String(TraceIdKey, traceId))
 
-	return context.WithValue(ctx, TraceIdKey, traceId)
+	return context.WithValue(context.WithValue(ctx, SlogFields, v), TraceIdKey, traceId)
 }
 
 // SetGinTraceIdContext 设置跟踪编号上下文
@@ -66,7 +66,7 @@ func SetGinTraceIdContext(ctx context.Context, c *gin.Context) context.Context {
 	var v []slog.Attr
 	v = append(v, slog.String(TraceIdKey, traceId))
 
-	return context.WithValue(ctx, TraceIdKey, v)
+	return context.WithValue(context.WithValue(ctx, SlogFields, v), TraceIdKey, traceId)
 }
 
 // GetTraceIdContext 通过上下文获取跟踪编号
diff --git a/version.go b/version.go
index 96359d1..3634803 100644
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
 package gotrace_id
 
-const Version = "1.0.9"
+const Version = "1.0.10"