Skip to content

Commit 924cac3

Browse files
committed
Squashed commits:
[ad9ec39] Squashed commits: [0f14acb] #2870 rollback go mod
1 parent c91f990 commit 924cac3

File tree

4 files changed

+6
-9
lines changed

4 files changed

+6
-9
lines changed

go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/zeromicro/go-zero
22

3-
go 1.21
4-
5-
toolchain go1.21.5
3+
go 1.20
64

75
require (
86
github.com/DATA-DOG/go-sqlmock v1.5.2

rest/engine.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func (ng *engine) bindRoute(fr featuredRoutes, router httpx.Router, metrics *sta
101101
chn = chain.New()
102102
}
103103
if ng.conf.AddNativeMiddlewares {
104-
ng.buildChainWithNativeMiddlewares(chn, fr, route, metrics)
104+
chn = ng.buildChainWithNativeMiddlewares(chn, fr, route, metrics)
105105
}
106106

107107
chn = ng.appendAuthHandler(fr, chn, verifier)
@@ -127,7 +127,7 @@ func (ng *engine) bindRoutes(router httpx.Router) error {
127127
}
128128

129129
func (ng *engine) buildChainWithNativeMiddlewares(chn chain.Chain, fr featuredRoutes, route Route,
130-
metrics *stat.Metrics) {
130+
metrics *stat.Metrics) chain.Chain {
131131

132132
if ng.conf.Middlewares.Trace {
133133
chn = chn.Append(handler.TraceHandler(ng.conf.Name,
@@ -164,6 +164,7 @@ func (ng *engine) buildChainWithNativeMiddlewares(chn chain.Chain, fr featuredRo
164164
if ng.conf.Middlewares.Gunzip {
165165
chn = chn.Append(handler.GunzipHandler)
166166
}
167+
return chn
167168

168169
}
169170

rest/server_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ func TestServer_WithChain(t *testing.T) {
627627
}
628628
}
629629

630-
server := MustNewServer(RestConf{}, WithChain(chain.New(middleware1(), middleware2())))
630+
server := MustNewServer(RestConf{AddNativeMiddlewares: true, Middlewares: MiddlewaresConf{Log: true}}, WithChain(chain.New(middleware1(), middleware2())))
631631
server.AddRoutes(
632632
[]Route{
633633
{

tools/goctl/go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/zeromicro/go-zero/tools/goctl
22

3-
go 1.21
4-
5-
toolchain go1.21.5
3+
go 1.20
64

75
require (
86
github.com/DATA-DOG/go-sqlmock v1.5.2

0 commit comments

Comments
 (0)