Merge pull request #39 from hduhelp/fix/content-type-marshaler

fix(grpc-gateway): support application/json and wildcard marshaler in ServeMux

Author: XinxinAkuma

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 .idea
+test_marshaler.go

api/grpc_gateway/mux.go

@@ -22,6 +22,17 @@ var DefaultServeMuxOption = []runtime.ServeMuxOption{
 	runtime.WithErrorHandler(DefaultErrorHandler),
 	runtime.WithRoutingErrorHandler(DefaultRoutingErrorHandler),
 	runtime.WithIncomingHeaderMatcher(DefaultHeaderWarp),
+	// 标准 JSON 格式
+	runtime.WithMarshalerOption("application/json", &runtime.JSONPb{
+		MarshalOptions: protojson.MarshalOptions{
+			EmitUnpopulated: true,
+			UseProtoNames:   true,
+		},
+		UnmarshalOptions: protojson.UnmarshalOptions{
+			DiscardUnknown: false,
+		},
+	}),
+	// Protobuf JSON 格式
 	runtime.WithMarshalerOption("application/jsonpb", &runtime.JSONPb{
 		MarshalOptions: protojson.MarshalOptions{
 			EmitUnpopulated: true,
@@ -31,6 +42,16 @@ var DefaultServeMuxOption = []runtime.ServeMuxOption{
 			DiscardUnknown: false,
 		},
 	}),
+	// 兜底方案：客户端没明确指定 Content-Type 时用这个
+	runtime.WithMarshalerOption(runtime.MIMEWildcard, &runtime.JSONPb{
+		MarshalOptions: protojson.MarshalOptions{
+			EmitUnpopulated: true,
+			UseProtoNames:   true,
+		},
+		UnmarshalOptions: protojson.UnmarshalOptions{
+			DiscardUnknown: false,
+		},
+	}),
 }
 
 func NewMixedPortServeMux(ctx context.Context, endpoint string, registers ...Register) (*runtime.ServeMux, error) {