diff --git a/.example/net/ghttp/client/upload-batch/server.go b/.example/net/ghttp/client/upload-batch/server.go index d7e7a2839..0ec144baf 100644 --- a/.example/net/ghttp/client/upload-batch/server.go +++ b/.example/net/ghttp/client/upload-batch/server.go @@ -70,10 +70,10 @@ func UploadShowBatch(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/upload", func(g *ghttp.RouterGroup) { - g.ALL("/", Upload) - g.ALL("/show", UploadShow) - g.ALL("/batch", UploadShowBatch) + s.Group("/upload", func(group *ghttp.RouterGroup) { + group.ALL("/", Upload) + group.ALL("/show", UploadShow) + group.ALL("/batch", UploadShowBatch) }) s.SetPort(8199) s.Run() diff --git a/.example/net/ghttp/client/upload/server.go b/.example/net/ghttp/client/upload/server.go index d7e7a2839..0ec144baf 100644 --- a/.example/net/ghttp/client/upload/server.go +++ b/.example/net/ghttp/client/upload/server.go @@ -70,10 +70,10 @@ func UploadShowBatch(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/upload", func(g *ghttp.RouterGroup) { - g.ALL("/", Upload) - g.ALL("/show", UploadShow) - g.ALL("/batch", UploadShowBatch) + s.Group("/upload", func(group *ghttp.RouterGroup) { + group.ALL("/", Upload) + group.ALL("/show", UploadShow) + group.ALL("/batch", UploadShowBatch) }) s.SetPort(8199) s.Run() diff --git a/.example/net/ghttp/server/cors/cors1.go b/.example/net/ghttp/server/cors/cors1.go index e9451ccde..a084208dc 100644 --- a/.example/net/ghttp/server/cors/cors1.go +++ b/.example/net/ghttp/server/cors/cors1.go @@ -16,8 +16,8 @@ func Order(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/api.v1", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareCORS) + s.Group("/api.v1", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareCORS) g.GET("/order", Order) }) s.SetPort(8199) diff --git a/.example/net/ghttp/server/cors/cors2.go b/.example/net/ghttp/server/cors/cors2.go index 89d480314..4dbd12162 100644 --- a/.example/net/ghttp/server/cors/cors2.go +++ b/.example/net/ghttp/server/cors/cors2.go @@ -18,8 +18,8 @@ func Order(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/api.v1", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareCORS) + s.Group("/api.v1", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareCORS) g.GET("/order", Order) }) s.SetPort(8199) diff --git a/.example/net/ghttp/server/cors/cors3.go b/.example/net/ghttp/server/cors/cors3.go index a95e1250c..961d9b242 100644 --- a/.example/net/ghttp/server/cors/cors3.go +++ b/.example/net/ghttp/server/cors/cors3.go @@ -24,8 +24,8 @@ func Order(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/api.v1", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareCORS) + s.Group("/api.v1", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareCORS) g.GET("/order", Order) }) s.SetPort(8199) diff --git a/.example/net/ghttp/server/hooks/cors1.go b/.example/net/ghttp/server/hooks/cors1.go index 6759a98f6..b4b1be33c 100644 --- a/.example/net/ghttp/server/hooks/cors1.go +++ b/.example/net/ghttp/server/hooks/cors1.go @@ -11,7 +11,7 @@ func Order(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/api.v1", func(g *ghttp.RouterGroup) { + s.Group("/api.v1", func(group *ghttp.RouterGroup) { g.GET("/order", Order) }) s.SetPort(8199) diff --git a/.example/net/ghttp/server/hooks/cors2.go b/.example/net/ghttp/server/hooks/cors2.go index 0f97e9a66..9992b5f15 100644 --- a/.example/net/ghttp/server/hooks/cors2.go +++ b/.example/net/ghttp/server/hooks/cors2.go @@ -11,8 +11,8 @@ func Order(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/api.v1", func(g *ghttp.RouterGroup) { - g.Hook("/*any", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { + s.Group("/api.v1", func(group *ghttp.RouterGroup) { + group.Hook("/*any", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { r.Response.CORSDefault() }) g.GET("/order", Order) diff --git a/.example/net/ghttp/server/log/log.go b/.example/net/ghttp/server/log/log.go index 75e95e43f..c4f1958d1 100644 --- a/.example/net/ghttp/server/log/log.go +++ b/.example/net/ghttp/server/log/log.go @@ -8,11 +8,11 @@ import ( func main() { s := g.Server() - s.Group("/", func(g *ghttp.RouterGroup) { - g.ALL("/", func(r *ghttp.Request) { + s.Group("/", func(group *ghttp.RouterGroup) { + group.ALL("/", func(r *ghttp.Request) { r.Response.Write("halo world!") }) - g.ALL("/log/handler", func(r *ghttp.Request) { + group.ALL("/log/handler", func(r *ghttp.Request) { r.Response.WriteStatus(http.StatusNotFound, "File Not Found!") }) }) diff --git a/.example/net/ghttp/server/middleware/auth.go b/.example/net/ghttp/server/middleware/auth.go index 79b325aa9..cda744673 100644 --- a/.example/net/ghttp/server/middleware/auth.go +++ b/.example/net/ghttp/server/middleware/auth.go @@ -23,9 +23,9 @@ func MiddlewareCORS(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/api.v2", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareAuth, MiddlewareCORS) - g.ALL("/user/list", func(r *ghttp.Request) { + s.Group("/api.v2", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareAuth, MiddlewareCORS) + group.ALL("/user/list", func(r *ghttp.Request) { r.Response.Write("list") }) }) diff --git a/.example/net/ghttp/server/middleware/auth_exception.go b/.example/net/ghttp/server/middleware/auth_exception.go index 5737e3a0e..106e241ba 100644 --- a/.example/net/ghttp/server/middleware/auth_exception.go +++ b/.example/net/ghttp/server/middleware/auth_exception.go @@ -18,7 +18,7 @@ func MiddlewareAuth(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/admin", func(g *ghttp.RouterGroup) { + s.Group("/admin", func(group *ghttp.RouterGroup) { g.MiddlewarePattern("/*action", func(r *ghttp.Request) { if action := r.GetRouterString("action"); action != "" { switch action { @@ -29,10 +29,10 @@ func main() { } MiddlewareAuth(r) }) - g.ALL("/login", func(r *ghttp.Request) { + group.ALL("/login", func(r *ghttp.Request) { r.Response.Write("login") }) - g.ALL("/dashboard", func(r *ghttp.Request) { + group.ALL("/dashboard", func(r *ghttp.Request) { r.Response.Write("dashboard") }) }) diff --git a/.example/net/ghttp/server/middleware/cors.go b/.example/net/ghttp/server/middleware/cors.go index 6ddcd3a0d..d7acaf51f 100644 --- a/.example/net/ghttp/server/middleware/cors.go +++ b/.example/net/ghttp/server/middleware/cors.go @@ -12,9 +12,9 @@ func MiddlewareCORS(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/api.v2", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareCORS) - g.ALL("/user/list", func(r *ghttp.Request) { + s.Group("/api.v2", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareCORS) + group.ALL("/user/list", func(r *ghttp.Request) { r.Response.Write("list") }) }) diff --git a/.example/net/ghttp/server/middleware/error_handling.go b/.example/net/ghttp/server/middleware/error_handling.go index c8c497feb..afe4e98a3 100644 --- a/.example/net/ghttp/server/middleware/error_handling.go +++ b/.example/net/ghttp/server/middleware/error_handling.go @@ -31,9 +31,9 @@ func MiddlewareError(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/api.v2", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareAuth, MiddlewareCORS, MiddlewareError) - g.ALL("/user/list", func(r *ghttp.Request) { + s.Group("/api.v2", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareAuth, MiddlewareCORS, MiddlewareError) + group.ALL("/user/list", func(r *ghttp.Request) { panic("db error: sql is xxxxxxx") }) }) diff --git a/.example/net/ghttp/server/middleware/log.go b/.example/net/ghttp/server/middleware/log.go index 607962a4f..c0cc2fc2c 100644 --- a/.example/net/ghttp/server/middleware/log.go +++ b/.example/net/ghttp/server/middleware/log.go @@ -30,12 +30,12 @@ func MiddlewareLog(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareLog) + s.Group("/", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareLog) }) - s.Group("/api.v2", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareAuth, MiddlewareCORS) - g.ALL("/user/list", func(r *ghttp.Request) { + s.Group("/api.v2", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareAuth, MiddlewareCORS) + group.ALL("/user/list", func(r *ghttp.Request) { panic("custom error") }) }) diff --git a/.example/net/ghttp/server/middleware/middleware.go b/.example/net/ghttp/server/middleware/middleware.go index 9eaafcaee..9f36efaa4 100644 --- a/.example/net/ghttp/server/middleware/middleware.go +++ b/.example/net/ghttp/server/middleware/middleware.go @@ -7,18 +7,18 @@ import ( func main() { s := g.Server() - s.Group("/api.v2", func(g *ghttp.RouterGroup) { - g.Middleware(func(r *ghttp.Request) { + s.Group("/api.v2", func(group *ghttp.RouterGroup) { + group.Middleware(func(r *ghttp.Request) { r.Response.Write("start") r.Middleware.Next() r.Response.Write("end") }) - g.Group("/order", func(g *ghttp.RouterGroup) { + g.Group("/order", func(group *ghttp.RouterGroup) { g.GET("/list", func(r *ghttp.Request) { r.Response.Write("list") }) }) - g.Group("/user", func(g *ghttp.RouterGroup) { + g.Group("/user", func(group *ghttp.RouterGroup) { g.GET("/info", func(r *ghttp.Request) { r.Response.Write("info") }) @@ -26,11 +26,11 @@ func main() { r.Response.Write("edit") }) }) - g.Group("/hook", func(g *ghttp.RouterGroup) { - g.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { + g.Group("/hook", func(group *ghttp.RouterGroup) { + group.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { r.Response.Write("hook any") }) - g.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { + group.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { r.Response.Write("hook name") }) }) diff --git a/.example/net/ghttp/server/request/request_validation.go b/.example/net/ghttp/server/request/request_validation.go index e1cb2b1a9..fa23190b2 100644 --- a/.example/net/ghttp/server/request/request_validation.go +++ b/.example/net/ghttp/server/request/request_validation.go @@ -15,8 +15,8 @@ type User struct { func main() { s := g.Server() - s.Group("/", func(rg *ghttp.RouterGroup) { - rg.ALL("/user", func(r *ghttp.Request) { + s.Group("/", func(rgroup *ghttp.RouterGroup) { + rgroup.ALL("/user", func(r *ghttp.Request) { user := new(User) if err := r.GetToStruct(user); err != nil { r.Response.WriteJsonExit(g.Map{ diff --git a/.example/net/ghttp/server/router/group/level.go b/.example/net/ghttp/server/router/group/level.go index ad5019bc8..9135799e9 100644 --- a/.example/net/ghttp/server/router/group/level.go +++ b/.example/net/ghttp/server/router/group/level.go @@ -29,15 +29,15 @@ func MiddlewareLog(r *ghttp.Request) { func main() { s := g.Server() - s.Group("/", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareLog) + s.Group("/", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareLog) }) - s.Group("/api.v2", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareAuth, MiddlewareCORS) + s.Group("/api.v2", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareAuth, MiddlewareCORS) g.GET("/test", func(r *ghttp.Request) { r.Response.Write("test") }) - g.Group("/order", func(g *ghttp.RouterGroup) { + g.Group("/order", func(group *ghttp.RouterGroup) { g.GET("/list", func(r *ghttp.Request) { r.Response.Write("list") }) @@ -45,7 +45,7 @@ func main() { r.Response.Write("update") }) }) - g.Group("/user", func(g *ghttp.RouterGroup) { + g.Group("/user", func(group *ghttp.RouterGroup) { g.GET("/info", func(r *ghttp.Request) { r.Response.Write("info") }) @@ -56,11 +56,11 @@ func main() { r.Response.Write("drop") }) }) - g.Group("/hook", func(g *ghttp.RouterGroup) { - g.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { + g.Group("/hook", func(group *ghttp.RouterGroup) { + group.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { r.Response.Write("hook any") }) - g.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { + group.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { r.Response.Write("hook name") }) }) diff --git a/.example/net/ghttp/server/session/session.go b/.example/net/ghttp/server/session/session.go index 241a99db2..203ecbace 100644 --- a/.example/net/ghttp/server/session/session.go +++ b/.example/net/ghttp/server/session/session.go @@ -8,7 +8,7 @@ import ( func main() { s := g.Server() - s.Group("/", func(g *ghttp.RouterGroup) { + s.Group("/", func(group *ghttp.RouterGroup) { g.GET("/set", func(r *ghttp.Request) { r.Session.Set("time", gtime.Second()) r.Response.Write("ok") diff --git a/.example/other/test.go b/.example/other/test.go index ab245dc5d..0bc9f57d6 100644 --- a/.example/other/test.go +++ b/.example/other/test.go @@ -1,22 +1,15 @@ package main import ( + "fmt" "github.com/gogf/gf/net/ghttp" ) func main() { s := ghttp.GetServer() - s.BindHandler("/admin", func(r *ghttp.Request) { - r.Response.Write("admin") - }) - s.BindHandler("/admin-{page}", func(r *ghttp.Request) { - r.Response.Write("admin-{page}", r.GetInt("page")) - }) - s.BindHandler("/admin-goods", func(r *ghttp.Request) { - r.Response.Write("admin-goods") - }) - s.BindHandler("/admin-goods-{page}", func(r *ghttp.Request) { - r.Response.Write("admin-goods-{page}", r.GetInt("page")) + s.BindHandler("/*", func(r *ghttp.Request) { + fmt.Println(r.URL.RawPath) + r.Response.Write(r.GetUrl()) }) s.SetPort(8199) s.Run() diff --git a/net/ghttp/ghttp_server_pprof.go b/net/ghttp/ghttp_server_pprof.go index 476aa50bc..b85d8a6cf 100644 --- a/net/ghttp/ghttp_server_pprof.go +++ b/net/ghttp/ghttp_server_pprof.go @@ -31,12 +31,12 @@ func (s *Server) EnablePProf(pattern ...string) { up := &utilPProf{} _, _, uri, _ := s.parsePattern(p) uri = strings.TrimRight(uri, "/") - s.Group(uri, func(g *RouterGroup) { - g.ALL("/*action", up.Index) - g.ALL("/cmdline", up.Cmdline) - g.ALL("/profile", up.Profile) - g.ALL("/symbol", up.Symbol) - g.ALL("/trace", up.Trace) + s.Group(uri, func(group *RouterGroup) { + group.ALL("/*action", up.Index) + group.ALL("/cmdline", up.Cmdline) + group.ALL("/profile", up.Profile) + group.ALL("/symbol", up.Symbol) + group.ALL("/trace", up.Trace) }) } diff --git a/net/ghttp/ghttp_unit_middleware_test.go b/net/ghttp/ghttp_unit_middleware_test.go index 0204231b7..110f3128d 100644 --- a/net/ghttp/ghttp_unit_middleware_test.go +++ b/net/ghttp/ghttp_unit_middleware_test.go @@ -134,16 +134,16 @@ func Test_BindMiddleware_Basic3(t *testing.T) { func Test_BindMiddleware_Must_Be_Called(t *testing.T) { p := ports.PopRand() s := g.Server(p) - s.Group("/", func(g *ghttp.RouterGroup) { - g.Middleware(func(r *ghttp.Request) { + s.Group("/", func(group *ghttp.RouterGroup) { + group.Middleware(func(r *ghttp.Request) { r.Response.Write("1") r.Middleware.Next() }) - g.Middleware(func(r *ghttp.Request) { + group.Middleware(func(r *ghttp.Request) { r.Middleware.Next() r.Response.Write("2") }) - g.ALL("/test", func(r *ghttp.Request) { + group.ALL("/test", func(r *ghttp.Request) { r.Response.Write("test") }) }) @@ -166,13 +166,13 @@ func Test_BindMiddleware_Must_Be_Called(t *testing.T) { func Test_Middleware_With_Static(t *testing.T) { p := ports.PopRand() s := g.Server(p) - s.Group("/", func(g *ghttp.RouterGroup) { - g.Middleware(func(r *ghttp.Request) { + s.Group("/", func(group *ghttp.RouterGroup) { + group.Middleware(func(r *ghttp.Request) { r.Response.Write("1") r.Middleware.Next() r.Response.Write("2") }) - g.ALL("/user/list", func(r *ghttp.Request) { + group.ALL("/user/list", func(r *ghttp.Request) { r.Response.Write("list") }) }) @@ -196,12 +196,12 @@ func Test_Middleware_With_Static(t *testing.T) { func Test_Middleware_Status(t *testing.T) { p := ports.PopRand() s := g.Server(p) - s.Group("/", func(g *ghttp.RouterGroup) { - g.Middleware(func(r *ghttp.Request) { + s.Group("/", func(group *ghttp.RouterGroup) { + group.Middleware(func(r *ghttp.Request) { r.Middleware.Next() r.Response.WriteOver(r.Response.Status) }) - g.ALL("/user/list", func(r *ghttp.Request) { + group.ALL("/user/list", func(r *ghttp.Request) { r.Response.Write("list") }) }) @@ -228,23 +228,23 @@ func Test_Middleware_Hook_With_Static(t *testing.T) { p := ports.PopRand() s := g.Server(p) a := garray.New(true) - s.Group("/", func(g *ghttp.RouterGroup) { - g.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { + s.Group("/", func(group *ghttp.RouterGroup) { + group.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { a.Append(1) fmt.Println("HOOK_BEFORE_SERVE") r.Response.Write("a") }) - g.Hook("/*", ghttp.HOOK_AFTER_SERVE, func(r *ghttp.Request) { + group.Hook("/*", ghttp.HOOK_AFTER_SERVE, func(r *ghttp.Request) { a.Append(1) fmt.Println("HOOK_AFTER_SERVE") r.Response.Write("b") }) - g.Middleware(func(r *ghttp.Request) { + group.Middleware(func(r *ghttp.Request) { r.Response.Write("1") r.Middleware.Next() r.Response.Write("2") }) - g.ALL("/user/list", func(r *ghttp.Request) { + group.ALL("/user/list", func(r *ghttp.Request) { r.Response.Write("list") }) }) @@ -594,9 +594,9 @@ func MiddlewareCORS(r *ghttp.Request) { func Test_Middleware_CORSAndAuth(t *testing.T) { p := ports.PopRand() s := g.Server(p) - s.Group("/api.v2", func(g *ghttp.RouterGroup) { - g.Middleware(MiddlewareAuth, MiddlewareCORS) - g.ALL("/user/list", func(r *ghttp.Request) { + s.Group("/api.v2", func(group *ghttp.RouterGroup) { + group.Middleware(MiddlewareAuth, MiddlewareCORS) + group.ALL("/user/list", func(r *ghttp.Request) { r.Response.Write("list") }) }) diff --git a/net/ghttp/ghttp_unit_router_domain_basic_test.go b/net/ghttp/ghttp_unit_router_domain_basic_test.go index 42f1ca9d1..e0f1b9236 100644 --- a/net/ghttp/ghttp_unit_router_domain_basic_test.go +++ b/net/ghttp/ghttp_unit_router_domain_basic_test.go @@ -332,8 +332,8 @@ func Test_Router_DomainGroup(t *testing.T) { p := ports.PopRand() s := g.Server(p) d := s.Domain("localhost, local") - d.Group("/", func(g *ghttp.RouterGroup) { - g.Group("/app", func(gApp *ghttp.RouterGroup) { + d.Group("/", func(group *ghttp.RouterGroup) { + group.Group("/app", func(gApp *ghttp.RouterGroup) { gApp.GET("/{table}/list/{page}.html", func(r *ghttp.Request) { intlog.Print("/{table}/list/{page}.html") r.Response.Write(r.Get("table"), "&", r.Get("page")) diff --git a/net/ghttp/ghttp_unit_router_group_group_test.go b/net/ghttp/ghttp_unit_router_group_group_test.go index b4765ddc9..c6cbd5d54 100644 --- a/net/ghttp/ghttp_unit_router_group_group_test.go +++ b/net/ghttp/ghttp_unit_router_group_group_test.go @@ -19,39 +19,39 @@ import ( func Test_Router_Group_Group(t *testing.T) { p := ports.PopRand() s := g.Server(p) - s.Group("/api.v2", func(g *ghttp.RouterGroup) { - g.Middleware(func(r *ghttp.Request) { + s.Group("/api.v2", func(group *ghttp.RouterGroup) { + group.Middleware(func(r *ghttp.Request) { r.Response.Write("1") r.Middleware.Next() r.Response.Write("2") }) - g.GET("/test", func(r *ghttp.Request) { + group.GET("/test", func(r *ghttp.Request) { r.Response.Write("test") }) - g.Group("/order", func(g *ghttp.RouterGroup) { - g.GET("/list", func(r *ghttp.Request) { + group.Group("/order", func(group *ghttp.RouterGroup) { + group.GET("/list", func(r *ghttp.Request) { r.Response.Write("list") }) - g.PUT("/update", func(r *ghttp.Request) { + group.PUT("/update", func(r *ghttp.Request) { r.Response.Write("update") }) }) - g.Group("/user", func(g *ghttp.RouterGroup) { - g.GET("/info", func(r *ghttp.Request) { + group.Group("/user", func(group *ghttp.RouterGroup) { + group.GET("/info", func(r *ghttp.Request) { r.Response.Write("info") }) - g.POST("/edit", func(r *ghttp.Request) { + group.POST("/edit", func(r *ghttp.Request) { r.Response.Write("edit") }) - g.DELETE("/drop", func(r *ghttp.Request) { + group.DELETE("/drop", func(r *ghttp.Request) { r.Response.Write("drop") }) }) - g.Group("/hook", func(g *ghttp.RouterGroup) { - g.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { + group.Group("/hook", func(group *ghttp.RouterGroup) { + group.Hook("/*", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { r.Response.Write("hook any") }) - g.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { + group.Hook("/:name", ghttp.HOOK_BEFORE_SERVE, func(r *ghttp.Request) { r.Response.Write("hook name") }) }) diff --git a/net/ghttp/ghttp_unit_router_group_hook_test.go b/net/ghttp/ghttp_unit_router_group_hook_test.go index b97c78df2..2462ed70c 100644 --- a/net/ghttp/ghttp_unit_router_group_hook_test.go +++ b/net/ghttp/ghttp_unit_router_group_hook_test.go @@ -19,14 +19,14 @@ import ( func Test_Router_Group_Hook1(t *testing.T) { p := ports.PopRand() s := g.Server(p) - g := s.Group("/api") - g.GET("/handler", func(r *ghttp.Request) { + group := s.Group("/api") + group.GET("/handler", func(r *ghttp.Request) { r.Response.Write("1") }) - g.ALL("/handler", func(r *ghttp.Request) { + group.ALL("/handler", func(r *ghttp.Request) { r.Response.Write("0") }, ghttp.HOOK_BEFORE_SERVE) - g.ALL("/handler", func(r *ghttp.Request) { + group.ALL("/handler", func(r *ghttp.Request) { r.Response.Write("2") }, ghttp.HOOK_AFTER_SERVE) diff --git a/net/ghttp/ghttp_unit_router_group_test.go b/net/ghttp/ghttp_unit_router_group_test.go index b19bbbd71..23bbe370c 100644 --- a/net/ghttp/ghttp_unit_router_group_test.go +++ b/net/ghttp/ghttp_unit_router_group_test.go @@ -77,14 +77,14 @@ func Test_Router_GroupBasic1(t *testing.T) { obj := new(GroupObject) ctl := new(GroupController) // 分组路由方法注册 - g := s.Group("/api") - g.ALL("/handler", Handler) - g.ALL("/ctl", ctl) - g.GET("/ctl/my-show", ctl, "Show") - g.REST("/ctl/rest", ctl) - g.ALL("/obj", obj) - g.GET("/obj/my-show", obj, "Show") - g.REST("/obj/rest", obj) + group := s.Group("/api") + group.ALL("/handler", Handler) + group.ALL("/ctl", ctl) + group.GET("/ctl/my-show", ctl, "Show") + group.REST("/ctl/rest", ctl) + group.ALL("/obj", obj) + group.GET("/obj/my-show", obj, "Show") + group.REST("/obj/rest", obj) s.SetPort(p) s.SetDumpRouteMap(false) s.Start() @@ -166,9 +166,9 @@ func Test_Router_GroupBuildInVar(t *testing.T) { obj := new(GroupObject) ctl := new(GroupController) // 分组路由方法注册 - g := s.Group("/api") - g.ALL("/{.struct}/{.method}", ctl) - g.ALL("/{.struct}/{.method}", obj) + group := s.Group("/api") + group.ALL("/{.struct}/{.method}", ctl) + group.ALL("/{.struct}/{.method}", obj) s.SetPort(p) s.SetDumpRouteMap(false) s.Start() diff --git a/os/gtimer/gtimer_z_unit_1_test.go b/os/gtimer/gtimer_z_unit_1_test.go index 9a2982397..e9a158032 100644 --- a/os/gtimer/gtimer_z_unit_1_test.go +++ b/os/gtimer/gtimer_z_unit_1_test.go @@ -229,7 +229,7 @@ func TestTimer_AddLeveledEntry1(t *testing.T) { timer := New() array := garray.New(true) //glog.Println("start") - timer.DelayAdd(1000*time.Millisecond, 1001*time.Millisecond, func() { + timer.DelayAdd(1000*time.Millisecond, 1000*time.Millisecond, func() { //glog.Println("add") array.Append(1) })