feat: export gateway.Server to let users add middlewares (#2157)

This commit is contained in:
Kevin Wan
2022-07-16 22:59:25 +08:00
committed by GitHub
parent 4d7dae9cea
commit 453fa309b1
3 changed files with 17 additions and 17 deletions

View File

@@ -10,6 +10,15 @@ import (
"github.com/zeromicro/go-zero/rest/pathvar"
)
func buildJsonRequestParser(v interface{}, resolver jsonpb.AnyResolver) (grpcurl.RequestParser, error) {
var buf bytes.Buffer
if err := json.NewEncoder(&buf).Encode(v); err != nil {
return nil, err
}
return grpcurl.NewJSONRequestParser(&buf, resolver), nil
}
func newRequestParser(r *http.Request, resolver jsonpb.AnyResolver) (grpcurl.RequestParser, error) {
vars := pathvar.Vars(r)
if len(vars) == 0 {
@@ -17,12 +26,7 @@ func newRequestParser(r *http.Request, resolver jsonpb.AnyResolver) (grpcurl.Req
}
if r.ContentLength == 0 {
var buf bytes.Buffer
if err := json.NewEncoder(&buf).Encode(vars); err != nil {
return nil, err
}
return grpcurl.NewJSONRequestParser(&buf, resolver), nil
return buildJsonRequestParser(vars, resolver)
}
m := make(map[string]interface{})
@@ -34,10 +38,5 @@ func newRequestParser(r *http.Request, resolver jsonpb.AnyResolver) (grpcurl.Req
m[k] = v
}
var buf bytes.Buffer
if err := json.NewEncoder(&buf).Encode(m); err != nil {
return nil, err
}
return grpcurl.NewJSONRequestParser(&buf, resolver), nil
return buildJsonRequestParser(m, resolver)
}