if unmarshal target is proto.Message, using jsonpb
This commit is contained in:
		
							
								
								
									
										5
									
								
								codec.go
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								codec.go
									
									
									
									
									
								
							| @@ -4,6 +4,7 @@ import ( | ||||
| 	"fmt" | ||||
| 	"strings" | ||||
|  | ||||
| 	"github.com/golang/protobuf/jsonpb" | ||||
| 	"github.com/golang/protobuf/proto" | ||||
| 	"github.com/json-iterator/go" | ||||
| 	"github.com/micro/go-micro/codec" | ||||
| @@ -114,6 +115,10 @@ func (jsonCodec) Marshal(v interface{}) ([]byte, error) { | ||||
| } | ||||
|  | ||||
| func (jsonCodec) Unmarshal(data []byte, v interface{}) error { | ||||
| 	if pb, ok := v.(proto.Message); ok { | ||||
| 		return jsonpb.UnmarshalString(string(data), pb) | ||||
| 	} | ||||
|  | ||||
| 	return json.Unmarshal(data, v) | ||||
| } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user