diff --git a/internal/utils/utils_reflect.go b/internal/utils/utils_reflect.go index f8c4df94e..928ee9d43 100644 --- a/internal/utils/utils_reflect.go +++ b/internal/utils/utils_reflect.go @@ -41,6 +41,9 @@ type OriginTypeAndKindOutput struct { // OriginTypeAndKind retrieves and returns the original reflect type and kind. func OriginTypeAndKind(value interface{}) (out OriginTypeAndKindOutput) { + if value == nil { + return + } if reflectType, ok := value.(reflect.Type); ok { out.InputType = reflectType } else { diff --git a/net/ghttp/ghttp_z_unit_feature_router_group_test.go b/net/ghttp/ghttp_z_unit_feature_router_group_test.go index c006d972e..3c64c0ae8 100644 --- a/net/ghttp/ghttp_z_unit_feature_router_group_test.go +++ b/net/ghttp/ghttp_z_unit_feature_router_group_test.go @@ -182,24 +182,3 @@ func Test_Router_Group_Map(t *testing.T) { t.Assert(c.PostContent(ctx, "/test"), "post") }) } - -// https://github.com/gogf/gf/issues/1609 -func Test_Issue1609(t *testing.T) { - s := g.Server(guid.S()) - group := s.Group("/api/get") - group.GET("/", func(r *ghttp.Request) { - r.Response.Write("get") - }) - s.SetDumpRouterMap(false) - gtest.Assert(s.Start(), nil) - defer s.Shutdown() - - time.Sleep(100 * time.Millisecond) - gtest.C(t, func(t *gtest.T) { - c := g.Client() - c.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort())) - - t.Assert(c.GetContent(ctx, "/api/get"), "get") - t.Assert(c.PostContent(ctx, "/test"), "Not Found") - }) -} diff --git a/net/ghttp/ghttp_z_unit_feature_router_handler_extended_test.go b/net/ghttp/ghttp_z_unit_feature_router_handler_extended_test.go index 2b9d52f6d..003227a52 100644 --- a/net/ghttp/ghttp_z_unit_feature_router_handler_extended_test.go +++ b/net/ghttp/ghttp_z_unit_feature_router_handler_extended_test.go @@ -16,7 +16,6 @@ import ( "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/net/ghttp" "github.com/gogf/gf/v2/test/gtest" - "github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/util/guid" ) @@ -191,42 +190,3 @@ func Test_Router_Handler_Extended_Handler_Group_Bind(t *testing.T) { t.Assert(client.GetContent(ctx, "/api/v2/custom-test4?age=18&name=john"), `{"code":0,"message":"","data":{"Id":1,"Name":"john"}}`) }) } - -// https://github.com/gogf/gf/issues/1626 -func Test_Issue1626(t *testing.T) { - type TestReq struct { - Name string `v:"required"` - } - type TestRes struct { - Name string - } - s := g.Server(guid.S()) - s.Use( - ghttp.MiddlewareHandlerResponse, - func(r *ghttp.Request) { - r.Middleware.Next() - if err := r.GetError(); err != nil { - r.Response.ClearBuffer() - r.Response.Write(err.Error()) - } - }, - ) - s.BindHandler("/test", func(ctx context.Context, req *TestReq) (res *TestRes, err error) { - return &TestRes{Name: req.Name}, nil - }) - s.SetDumpRouterMap(false) - s.Start() - defer s.Shutdown() - - time.Sleep(100 * time.Millisecond) - gtest.C(t, func(t *gtest.T) { - c := g.Client() - c.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort())) - - t.Assert(c.GetContent(ctx, "/test"), `The Name field is required`) - t.Assert( - gstr.Contains(c.GetContent(ctx, "/test?name=john"), `{"Name":"john"}`), - true, - ) - }) -} diff --git a/net/ghttp/ghttp_z_unit_issue_test.go b/net/ghttp/ghttp_z_unit_issue_test.go new file mode 100644 index 000000000..4e1bef297 --- /dev/null +++ b/net/ghttp/ghttp_z_unit_issue_test.go @@ -0,0 +1,168 @@ +// Copyright GoFrame Author(https://goframe.org). All Rights Reserved. +// +// This Source Code Form is subject to the terms of the MIT License. +// If a copy of the MIT was not distributed with this file, +// You can obtain one at https://github.com/gogf/gf. + +package ghttp_test + +import ( + "context" + "fmt" + "testing" + "time" + + "github.com/gogf/gf/v2/debug/gdebug" + "github.com/gogf/gf/v2/frame/g" + "github.com/gogf/gf/v2/net/ghttp" + "github.com/gogf/gf/v2/test/gtest" + "github.com/gogf/gf/v2/text/gstr" + "github.com/gogf/gf/v2/util/guid" +) + +// https://github.com/gogf/gf/issues/1609 +func Test_Issue1609(t *testing.T) { + s := g.Server(guid.S()) + group := s.Group("/api/get") + group.GET("/", func(r *ghttp.Request) { + r.Response.Write("get") + }) + s.SetDumpRouterMap(false) + gtest.Assert(s.Start(), nil) + defer s.Shutdown() + + time.Sleep(100 * time.Millisecond) + gtest.C(t, func(t *gtest.T) { + c := g.Client() + c.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort())) + + t.Assert(c.GetContent(ctx, "/api/get"), "get") + t.Assert(c.PostContent(ctx, "/test"), "Not Found") + }) +} + +func Test_Issue1611(t *testing.T) { + s := g.Server(guid.S()) + v := g.View(guid.S()) + content := "This is header" + gtest.AssertNil(v.SetPath(gdebug.TestDataPath("issue1611"))) + s.SetView(v) + s.BindHandler("/", func(r *ghttp.Request) { + gtest.AssertNil(r.Response.WriteTpl("index/layout.html", g.Map{ + "header": content, + })) + }) + s.SetDumpRouterMap(false) + s.Start() + defer s.Shutdown() + + time.Sleep(100 * time.Millisecond) + gtest.C(t, func(t *gtest.T) { + c := g.Client() + c.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort())) + + t.Assert(gstr.Contains(c.GetContent(ctx, "/"), content), true) + }) +} + +// https://github.com/gogf/gf/issues/1626 +func Test_Issue1626(t *testing.T) { + type TestReq struct { + Name string `v:"required"` + } + type TestRes struct { + Name string + } + s := g.Server(guid.S()) + s.Use( + ghttp.MiddlewareHandlerResponse, + func(r *ghttp.Request) { + r.Middleware.Next() + if err := r.GetError(); err != nil { + r.Response.ClearBuffer() + r.Response.Write(err.Error()) + } + }, + ) + s.BindHandler("/test", func(ctx context.Context, req *TestReq) (res *TestRes, err error) { + return &TestRes{Name: req.Name}, nil + }) + s.SetDumpRouterMap(false) + s.Start() + defer s.Shutdown() + + time.Sleep(100 * time.Millisecond) + gtest.C(t, func(t *gtest.T) { + c := g.Client() + c.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort())) + + t.Assert(c.GetContent(ctx, "/test"), `The Name field is required`) + t.Assert( + gstr.Contains(c.GetContent(ctx, "/test?name=john"), `{"Name":"john"}`), + true, + ) + }) +} + +type Issue1653TestReq struct { + g.Meta `path:"/test" method:"post" summary:"执行报表查询" tags:""` + UUID string `json:"uuid" v:"required#菜单唯一码不可为空" dc:""` + Limit int `json:"limit"` + Filter []g.Map `json:"filter"` + FilterMap g.Map `json:"filter_map"` +} + +type Issue1653TestRes struct { + UUID string `json:"uuid"` + FeedBack interface{} `json:"feed_back"` +} + +type cIssue1653Foo struct{} + +var Issue1653Foo = new(cIssue1653Foo) + +func (r cIssue1653Foo) PostTest(ctx context.Context, req *Issue1653TestReq) (*Issue1653TestRes, error) { + return &Issue1653TestRes{UUID: req.UUID, FeedBack: req.Filter[0]["code"]}, nil +} + +func Test_Issue1653(t *testing.T) { + s := g.Server(guid.S()) + s.Use(ghttp.MiddlewareHandlerResponse) + s.Group("/boot", func(grp *ghttp.RouterGroup) { + grp.Bind(Issue1653Foo) + }) + s.SetPort(9527) + s.SetDumpRouterMap(false) + s.Start() + defer s.Shutdown() + time.Sleep(1000 * time.Millisecond) + // g.Client()测试： + gtest.C(t, func(t *gtest.T) { + c := g.Client() + c.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort())) + dataReq := ` +{"uuid":"28ee701c-7daf-4cdc-9a62-6d6704e6112b","limit":0,"filter": +[ +{ +"code":"P00001","constraint":"", +"created_at":"2022-03-08 04:56:15","created_by":"3ed72aba-1622-4262-a61e-83581e020763","default_value":"MonthStart()", +"expression":"AND A.DLVDAT_0>='%v'","force":false,"frequent":true,"name":"发货日期起", +"parent":"13109602-0da3-49b9-827f-2f44183ab756","read_only":false,"reference":null,"type":"date", +"updated_at":"2022-03-08 04:56:15","updated_by":"3ed72aba-1622-4262-a61e-83581e020763","updated_tick":1, +"uuid":"e6cd3268-1d75-42e0-83f9-f1f7b29976e8" +}, +{ +"code":"P00002","constraint":"","created_at":"2022-03-08 04:56:15","created_by": +"3ed72aba-1622-4262-a61e-83581e020763","default_value":"MonthEnd()","expression":"AND A.DLVDAT_0<='%v'","force":false,"frequent":true, +"name":"发货日期止","parent":"13109602-0da3-49b9-827f-2f44183ab756","read_only":false,"reference":null,"type":"date","updated_at": +"2022-03-08 04:56:15","updated_by":"3ed72aba-1622-4262-a61e-83581e020763","updated_tick":1,"uuid":"dba005b5-655e-4ac4-8b22-898aa3ad2294" +} +], +"filter_map":{"P00001":1646064000000,"P00002":1648742399999}, +"selector_template":"" +} +` + resContent := c.PostContent(ctx, "/boot/test", dataReq) + t.Assert(resContent, `{"code":0,"message":"","data":{"uuid":"28ee701c-7daf-4cdc-9a62-6d6704e6112b","feed_back":"P00001"}}`) + }) +} diff --git a/net/ghttp/ghttp_z_unit_test.go b/net/ghttp/ghttp_z_unit_test.go index ed88da876..90f9c8d53 100644 --- a/net/ghttp/ghttp_z_unit_test.go +++ b/net/ghttp/ghttp_z_unit_test.go @@ -13,12 +13,10 @@ import ( "testing" "time" - "github.com/gogf/gf/v2/debug/gdebug" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/net/ghttp" "github.com/gogf/gf/v2/os/genv" "github.com/gogf/gf/v2/test/gtest" - "github.com/gogf/gf/v2/text/gstr" "github.com/gogf/gf/v2/util/guid" ) @@ -76,27 +74,3 @@ func Test_XUrlPath(t *testing.T) { t.Assert(c.GetContent(ctx, "/test1"), "test2") }) } - -func Test_Issue1611(t *testing.T) { - s := g.Server(guid.S()) - v := g.View(guid.S()) - content := "This is header" - gtest.AssertNil(v.SetPath(gdebug.TestDataPath("issue1611"))) - s.SetView(v) - s.BindHandler("/", func(r *ghttp.Request) { - gtest.AssertNil(r.Response.WriteTpl("index/layout.html", g.Map{ - "header": content, - })) - }) - s.SetDumpRouterMap(false) - s.Start() - defer s.Shutdown() - - time.Sleep(100 * time.Millisecond) - gtest.C(t, func(t *gtest.T) { - c := g.Client() - c.SetPrefix(fmt.Sprintf("http://127.0.0.1:%d", s.GetListenedPort())) - - t.Assert(gstr.Contains(c.GetContent(ctx, "/"), content), true) - }) -} diff --git a/util/gvalid/gvalid_validator_check_value.go b/util/gvalid/gvalid_validator_check_value.go index 6d0d46978..2a3838baa 100644 --- a/util/gvalid/gvalid_validator_check_value.go +++ b/util/gvalid/gvalid_validator_check_value.go @@ -563,9 +563,7 @@ func (v *Validator) doCheckValueRecursively(ctx context.Context, in doCheckValue } case reflect.Map: - var ( - dataMap = gconv.Map(in.Value) - ) + var dataMap = gconv.Map(in.Value) for _, item := range dataMap { originTypeAndKind := utils.OriginTypeAndKind(item) v.doCheckValueRecursively(ctx, doCheckValueRecursivelyInput{