Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
56ae0cfc6c | |||
202afc9068
|
@@ -322,7 +322,9 @@ func (b *Builder) GinReq(ctx context.Context, g *gin.Context, req *http.Request)
|
|||||||
if ctxVal := g.GetString("reqid"); ctxVal != "" {
|
if ctxVal := g.GetString("reqid"); ctxVal != "" {
|
||||||
b.Str("gin.context.reqid", ctxVal)
|
b.Str("gin.context.reqid", ctxVal)
|
||||||
}
|
}
|
||||||
if req.Method != "GET" && req.Body != nil && req.Header.Get("Content-Type") == "application/json" {
|
if req.Method != "GET" && req.Body != nil {
|
||||||
|
|
||||||
|
if req.Header.Get("Content-Type") == "application/json" {
|
||||||
if brc, ok := req.Body.(dataext.BufferedReadCloser); ok {
|
if brc, ok := req.Body.(dataext.BufferedReadCloser); ok {
|
||||||
if bin, err := brc.BufferedAll(); err == nil {
|
if bin, err := brc.BufferedAll(); err == nil {
|
||||||
if len(bin) < 16*1024 {
|
if len(bin) < 16*1024 {
|
||||||
@@ -334,12 +336,26 @@ func (b *Builder) GinReq(ctx context.Context, g *gin.Context, req *http.Request)
|
|||||||
b.Bytes("gin.body", bin)
|
b.Bytes("gin.body", bin)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
b.Str("gin.body", fmt.Sprintf("[[%v bytes]]", len(bin)))
|
b.Str("gin.body", fmt.Sprintf("[[%v bytes | %s]]", len(bin), req.Header.Get("Content-Type")))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if req.Header.Get("Content-Type") == "multipart/form-data" || req.Header.Get("Content-Type") == "x-www-form-urlencoded" {
|
||||||
|
if brc, ok := req.Body.(dataext.BufferedReadCloser); ok {
|
||||||
|
if bin, err := brc.BufferedAll(); err == nil {
|
||||||
|
if len(bin) < 16*1024 {
|
||||||
|
b.Bytes("gin.body", bin)
|
||||||
|
} else {
|
||||||
|
b.Str("gin.body", fmt.Sprintf("[[%v bytes | %s]]", len(bin), req.Header.Get("Content-Type")))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
b.containsGinData = true
|
b.containsGinData = true
|
||||||
return b
|
return b
|
||||||
}
|
}
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
package goext
|
package goext
|
||||||
|
|
||||||
const GoextVersion = "0.0.239"
|
const GoextVersion = "0.0.241"
|
||||||
|
|
||||||
const GoextVersionTimestamp = "2023-08-11T16:32:34+0200"
|
const GoextVersionTimestamp = "2023-08-14T15:54:50+0200"
|
||||||
|
@@ -467,3 +467,13 @@ func ArrayToInterface[T any](t []T) []interface{} {
|
|||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func JoinString(arr []string, delimiter string) string {
|
||||||
|
str := ""
|
||||||
|
for i, v := range arr {
|
||||||
|
str += v
|
||||||
|
if i < len(arr)-1 {
|
||||||
|
str += delimiter
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user