From b79747e551fb083dc0d910452c7d0a7c17c97da1 Mon Sep 17 00:00:00 2001
From: linwenxiang <991154416@qq.com>
Date: Thu, 11 Mar 2021 13:39:43 +0800
Subject: [PATCH] =?UTF-8?q?gorm=E6=97=A5=E5=BF=97=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BArequestId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/middleware/db.go         | 2 +-
 common/middleware/request_id.go | 1 +
 go.mod                          | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/middleware/db.go b/common/middleware/db.go
index 308e9dfb..0e73a2d1 100644
--- a/common/middleware/db.go
+++ b/common/middleware/db.go
@@ -6,6 +6,6 @@ import (
 )
 
 func WithContextDb(c *gin.Context) {
-	c.Set("db", sdk.Runtime.GetDbByKey(c.Request.Host))
+	c.Set("db", sdk.Runtime.GetDbByKey(c.Request.Host).WithContext(c))
 	c.Next()
 }
diff --git a/common/middleware/request_id.go b/common/middleware/request_id.go
index fab02ca0..236bf44c 100644
--- a/common/middleware/request_id.go
+++ b/common/middleware/request_id.go
@@ -18,6 +18,7 @@ func RequestId(trafficKey string) gin.HandlerFunc {
 			requestId = uuid.New().String()
 		}
 		c.Header(trafficKey, requestId)
+		c.Set(trafficKey, requestId)
 		c.Next()
 	}
 }
diff --git a/go.mod b/go.mod
index 3889a296..486c0937 100644
--- a/go.mod
+++ b/go.mod
@@ -8,9 +8,8 @@ require (
 	github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5
 	github.com/casbin/casbin/v2 v2.25.1
 	github.com/gin-gonic/gin v1.6.3
-	github.com/go-admin-team/go-admin-core v1.3.0-rc.0.0.20210309094332-92435b42cec0
-	github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210309094332-92435b42cec0 // indirect
-	github.com/go-admin-team/go-admin-core/sdk v0.0.0-20210310135550-9ca1efa47cbf
+	github.com/go-admin-team/go-admin-core v1.3.0
+	github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.2
 	github.com/google/uuid v1.2.0
 	github.com/mojocn/base64Captcha v1.3.1
 	github.com/mssola/user_agent v0.5.2