diff --git a/cmd/gf/internal/cmd/genctrl/genctrl.go b/cmd/gf/internal/cmd/genctrl/genctrl.go index 5f76a4fe2a0..a651a3d8c9d 100644 --- a/cmd/gf/internal/cmd/genctrl/genctrl.go +++ b/cmd/gf/internal/cmd/genctrl/genctrl.go @@ -38,7 +38,7 @@ gf gen ctrl ) const ( - PatternApiDefinition = `type\s+(\w+)Req\s+struct\s+{([\s\S]+?)}` + PatternApiDefinition = `type[\s\(]+(\w+)Req\s+struct\s+{([\s\S]+?)}` PatternCtrlDefinition = `func\s+\(.+?\)\s+\w+\(.+?\*(\w+)\.(\w+)Req\)\s+\(.+?\*(\w+)\.(\w+)Res,\s+\w+\s+error\)\s+{` ) diff --git a/cmd/gf/internal/cmd/testdata/genctrl/api/article/v1/edit.go b/cmd/gf/internal/cmd/testdata/genctrl/api/article/v1/edit.go index b873d580403..9e893d87cda 100644 --- a/cmd/gf/internal/cmd/testdata/genctrl/api/article/v1/edit.go +++ b/cmd/gf/internal/cmd/testdata/genctrl/api/article/v1/edit.go @@ -8,16 +8,20 @@ package v1 import "github.com/gogf/gf/v2/frame/g" -type CreateReq struct { - g.Meta `path:"/article/create" method:"post" tags:"ArticleService"` - Title string `v:"required"` -} +type ( + CreateReq struct { + g.Meta `path:"/article/create" method:"post" tags:"ArticleService"` + Title string `v:"required"` + } -type CreateRes struct{} + CreateRes struct{} +) -type UpdateReq struct { - g.Meta `path:"/article/update" method:"post" tags:"ArticleService"` - Title string `v:"required"` -} +type ( + UpdateReq struct { + g.Meta `path:"/article/update" method:"post" tags:"ArticleService"` + Title string `v:"required"` + } -type UpdateRes struct{} + UpdateRes struct{} +)