fix:#1987 Http and grpc generate route alignment (#1988)

* fix:#1987

* fix:explicit naming

* Update template.go

* Update template.go
status-code-override
songzhibin97 3 years ago committed by chenzhihui
parent a2765e27b4
commit bcf98570fe
  1. 1
      cmd/protoc-gen-go-http/http.go
  2. 5
      cmd/protoc-gen-go-http/template.go

@ -193,6 +193,7 @@ func buildMethodDesc(g *protogen.GeneratedFile, m *protogen.Method, method, path
} }
return &methodDesc{ return &methodDesc{
Name: m.GoName, Name: m.GoName,
OriginalName: string(m.Desc.Name()),
Num: methodSets[m.GoName], Num: methodSets[m.GoName],
Request: g.QualifiedGoIdent(m.Input.GoIdent), Request: g.QualifiedGoIdent(m.Input.GoIdent),
Reply: g.QualifiedGoIdent(m.Output.GoIdent), Reply: g.QualifiedGoIdent(m.Output.GoIdent),

@ -46,7 +46,7 @@ func _{{$svrType}}_{{.Name}}{{.Num}}_HTTP_Handler(srv {{$svrType}}HTTPServer) fu
return err return err
} }
{{- end}} {{- end}}
http.SetOperation(ctx,"/{{$svrName}}/{{.Name}}") http.SetOperation(ctx,"/{{$svrName}}/{{.OriginalName}}")
h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.{{.Name}}(ctx, req.(*{{.Request}})) return srv.{{.Name}}(ctx, req.(*{{.Request}}))
}) })
@ -79,7 +79,7 @@ func (c *{{$svrType}}HTTPClientImpl) {{.Name}}(ctx context.Context, in *{{.Reque
var out {{.Reply}} var out {{.Reply}}
pattern := "{{.Path}}" pattern := "{{.Path}}"
path := binding.EncodeURL(pattern, in, {{not .HasBody}}) path := binding.EncodeURL(pattern, in, {{not .HasBody}})
opts = append(opts, http.Operation("/{{$svrName}}/{{.Name}}")) opts = append(opts, http.Operation("/{{$svrName}}/{{.OriginalName}}"))
opts = append(opts, http.PathTemplate(pattern)) opts = append(opts, http.PathTemplate(pattern))
{{if .HasBody -}} {{if .HasBody -}}
err := c.cc.Invoke(ctx, "{{.Method}}", path, in{{.Body}}, &out{{.ResponseBody}}, opts...) err := c.cc.Invoke(ctx, "{{.Method}}", path, in{{.Body}}, &out{{.ResponseBody}}, opts...)
@ -105,6 +105,7 @@ type serviceDesc struct {
type methodDesc struct { type methodDesc struct {
// method // method
Name string Name string
OriginalName string // The parsed original name
Num int Num int
Request string Request string
Reply string Reply string

Loading…
Cancel
Save