需要修复一下gateway
This commit is contained in:
@@ -16,7 +16,7 @@ func AutoRegisterHandler(ctx context.Context, mux *runtime.ServeMux, opts ...grp
|
||||
return err
|
||||
}
|
||||
|
||||
err = service.RegisterFsserviceHandlerClientNacos(ctx, mux, opts...)
|
||||
err = service.RegisterInfoHandlerClientNacos(ctx, mux, opts...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -25,15 +25,7 @@ func (m *EmptyMarshaler) Marshal(v interface{}) ([]byte, error) {
|
||||
var fsDefaultProtoJSON = &runtime.JSONPb{
|
||||
MarshalOptions: protojson.MarshalOptions{
|
||||
EmitUnpopulated: true,
|
||||
},
|
||||
UnmarshalOptions: protojson.UnmarshalOptions{
|
||||
DiscardUnknown: true,
|
||||
},
|
||||
}
|
||||
|
||||
var fsProtoDataJSON = &runtime.JSONPb{
|
||||
MarshalOptions: protojson.MarshalOptions{
|
||||
EmitUnpopulated: true,
|
||||
UseProtoNames: true,
|
||||
},
|
||||
UnmarshalOptions: protojson.UnmarshalOptions{
|
||||
DiscardUnknown: true,
|
||||
@@ -49,12 +41,16 @@ func WriteFusenResponse(fsHeader string, w http.ResponseWriter, resp proto.Messa
|
||||
var err error
|
||||
|
||||
if customResp, ok := resp.(*service.Response); ok {
|
||||
rdata, err = protojson.Marshal(customResp.GetData())
|
||||
if err != nil {
|
||||
return err
|
||||
if customResp.GetData() != nil {
|
||||
rdata, err = fsDefaultProtoJSON.Marshal(customResp.GetData())
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
rdata = []byte("null")
|
||||
}
|
||||
} else {
|
||||
rdata, err = protojson.Marshal(resp)
|
||||
rdata, err = fsDefaultProtoJSON.Marshal(resp)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user