From 3cc8dccc6329e6e43fa1988f5fa50e245771a4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= Date: Tue, 20 Feb 2024 09:19:06 +0100 Subject: [PATCH] v0.0.388 fix ginext.Use loosing absPath information --- ginext/routes.go | 13 +++---------- go.mod | 4 ++-- go.sum | 4 ++++ goextVersion.go | 4 ++-- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/ginext/routes.go b/ginext/routes.go index 72ec1fb..acc6365 100644 --- a/ginext/routes.go +++ b/ginext/routes.go @@ -53,15 +53,11 @@ func (w *GinRoutesWrapper) Group(relativePath string) *GinRoutesWrapper { func (w *GinRoutesWrapper) Use(middleware ...gin.HandlerFunc) *GinRoutesWrapper { defHandler := langext.ArrCopy(w.defaultHandler) defHandler = append(defHandler, middleware...) - return &GinRoutesWrapper{wrapper: w.wrapper, routes: w.routes, defaultHandler: defHandler} + return &GinRoutesWrapper{wrapper: w.wrapper, routes: w.routes, defaultHandler: defHandler, absPath: w.absPath} } func (w *GinRoutesWrapper) WithJSONFilter(filter string) *GinRoutesWrapper { - defHandler := langext.ArrCopy(w.defaultHandler) - defHandler = append(defHandler, func(g *gin.Context) { - g.Set("goext.jsonfilter", filter) - }) - return &GinRoutesWrapper{wrapper: w.wrapper, routes: w.routes, defaultHandler: defHandler} + return w.Use(func(g *gin.Context) { g.Set("goext.jsonfilter", filter) }) } func (w *GinRoutesWrapper) GET(relativePath string) *GinRouteBuilder { @@ -116,10 +112,7 @@ func (w *GinRouteBuilder) Use(middleware ...gin.HandlerFunc) *GinRouteBuilder { } func (w *GinRouteBuilder) WithJSONFilter(filter string) *GinRouteBuilder { - w.handlers = append(w.handlers, func(g *gin.Context) { - g.Set("goext.jsonfilter", filter) - }) - return w + return w.Use(func(g *gin.Context) { g.Set("goext.jsonfilter", filter) }) } func (w *GinRouteBuilder) Handle(handler WHandlerFunc) { diff --git a/go.mod b/go.mod index db981e4..4960a7e 100644 --- a/go.mod +++ b/go.mod @@ -8,14 +8,14 @@ require ( github.com/jmoiron/sqlx v1.3.5 github.com/rs/xid v1.5.0 github.com/rs/zerolog v1.32.0 - go.mongodb.org/mongo-driver v1.13.1 + go.mongodb.org/mongo-driver v1.14.0 golang.org/x/crypto v0.19.0 golang.org/x/sys v0.17.0 golang.org/x/term v0.17.0 ) require ( - github.com/bytedance/sonic v1.10.2 // indirect + github.com/bytedance/sonic v1.11.0 // indirect github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect github.com/chenzhuoyu/iasm v0.9.1 // indirect github.com/dustin/go-humanize v1.0.1 // indirect diff --git a/go.sum b/go.sum index dd3839a..2cc29c2 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM= github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE= github.com/bytedance/sonic v1.10.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= +github.com/bytedance/sonic v1.11.0 h1:FwNNv6Vu4z2Onf1++LNzxB/QhitD8wuTdpZzMTGITWo= +github.com/bytedance/sonic v1.11.0/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0= @@ -128,6 +130,8 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mongodb.org/mongo-driver v1.13.1 h1:YIc7HTYsKndGK4RFzJ3covLz1byri52x0IoMB0Pt/vk= go.mongodb.org/mongo-driver v1.13.1/go.mod h1:wcDf1JBCXy2mOW0bWHwO/IOYqdca1MPCwDtFu/Z9+eo= +go.mongodb.org/mongo-driver v1.14.0 h1:P98w8egYRjYe3XDjxhYJagTokP/H6HzlsnojRgZRd80= +go.mongodb.org/mongo-driver v1.14.0/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc= golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= diff --git a/goextVersion.go b/goextVersion.go index 93a0a2d..398452d 100644 --- a/goextVersion.go +++ b/goextVersion.go @@ -1,5 +1,5 @@ package goext -const GoextVersion = "0.0.387" +const GoextVersion = "0.0.388" -const GoextVersionTimestamp = "2024-02-12T18:17:49+0100" +const GoextVersionTimestamp = "2024-02-20T09:19:06+0100"