Squashed commits:

[ad9ec39] Squashed commits: [0f14acb] #2870 rollback go mod
zeromicro · Nov 27, 2024 · 8dd4161 · 8dd4161
1 parent 636f508
commit 8dd4161
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/zeromicro/go-zero
 
-go 1.21
-
-toolchain go1.21.5
+go 1.20
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.2

diff --git a/rest/engine.go b/rest/engine.go
@@ -101,7 +101,7 @@ func (ng *engine) bindRoute(fr featuredRoutes, router httpx.Router, metrics *sta
 		chn = chain.New()
 	}
 	if ng.conf.AddNativeMiddlewares {
-		ng.buildChainWithNativeMiddlewares(chn, fr, route, metrics)
+		chn = ng.buildChainWithNativeMiddlewares(chn, fr, route, metrics)
 	}
 
 	chn = ng.appendAuthHandler(fr, chn, verifier)
@@ -127,7 +127,7 @@ func (ng *engine) bindRoutes(router httpx.Router) error {
 }
 
 func (ng *engine) buildChainWithNativeMiddlewares(chn chain.Chain, fr featuredRoutes, route Route,
-	metrics *stat.Metrics) {
+	metrics *stat.Metrics) chain.Chain {
 
 	if ng.conf.Middlewares.Trace {
 		chn = chn.Append(handler.TraceHandler(ng.conf.Name,
@@ -164,6 +164,7 @@ func (ng *engine) buildChainWithNativeMiddlewares(chn chain.Chain, fr featuredRo
 	if ng.conf.Middlewares.Gunzip {
 		chn = chn.Append(handler.GunzipHandler)
 	}
+	return chn
 
 }
 

diff --git a/rest/server_test.go b/rest/server_test.go
@@ -627,7 +627,7 @@ func TestServer_WithChain(t *testing.T) {
 		}
 	}
 
-	server := MustNewServer(RestConf{}, WithChain(chain.New(middleware1(), middleware2())))
+	server := MustNewServer(RestConf{AddNativeMiddlewares: true, Middlewares: MiddlewaresConf{Log: true}}, WithChain(chain.New(middleware1(), middleware2())))
 	server.AddRoutes(
 		[]Route{
 			{

diff --git a/tools/goctl/go.mod b/tools/goctl/go.mod
@@ -1,8 +1,6 @@
 module github.com/zeromicro/go-zero/tools/goctl
 
-go 1.21
-
-toolchain go1.21.5
+go 1.20
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.5.2