Merge pull request #370 from go-admin-team/dev

gorm日志支持显示requestId

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()
 }

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()
 	}
 }

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