coopgo-platform/gorush
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

chore(grpc): add image field (#485)

Browse Source
This commit is contained in:
Bo-Yi Wu
2020-03-14 00:00:03 +08:00
committed by GitHub
parent 38f11f0592
commit 44bf37941b
7 changed files with 128 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rpc/example/node/gorush_pb.js
View File

@@ -505,7 +505,8 @@ proto.proto.NotificationRequest.toObject = function(includeInstance, msg) {
contentavailable: jspb.Message.getFieldWithDefault(msg, 11, false),
threadid: jspb.Message.getFieldWithDefault(msg, 12, ""),
mutablecontent: jspb.Message.getFieldWithDefault(msg, 13, false),
data: (f = msg.getData()) && google_protobuf_struct_pb.Struct.toObject(includeInstance, f)
data: (f = msg.getData()) && google_protobuf_struct_pb.Struct.toObject(includeInstance, f),
image: jspb.Message.getFieldWithDefault(msg, 15, "")
};
if (includeInstance) {
@@ -600,6 +601,10 @@ proto.proto.NotificationRequest.deserializeBinaryFromReader = function(msg, read
reader.readMessage(value,google_protobuf_struct_pb.Struct.deserializeBinaryFromReader);
msg.setData(value);
break;
case 15:
var value = /** @type {string} */ (reader.readString());
msg.setImage(value);
break;
default:
reader.skipField();
break;
@@ -729,6 +734,13 @@ proto.proto.NotificationRequest.serializeBinaryToWriter = function(message, writ
google_protobuf_struct_pb.Struct.serializeBinaryToWriter
);
}
f = message.getImage();
if (f.length > 0) {
writer.writeString(
15,
f
);
}
};
@@ -990,6 +1002,21 @@ proto.proto.NotificationRequest.prototype.hasData = function() {
};
/**
* optional string image = 15;
* @return {string}
*/
proto.proto.NotificationRequest.prototype.getImage = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 15, ""));
};
/** @param {string} value */
proto.proto.NotificationRequest.prototype.setImage = function(value) {
jspb.Message.setProto3StringField(this, 15, value);
};
/**
* Generated by JsPbCodeGenerator.

123
rpc/proto/gorush.pb.go
View File

@@ -9,6 +9,8 @@ import (
proto "github.com/golang/protobuf/proto"
_struct "github.com/golang/protobuf/ptypes/struct"
grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes"
status "google.golang.org/grpc/status"
math "math"
)
@@ -21,7 +23,7 @@ var _ = math.Inf
// is compatible with the proto package it is being compiled against.
// A compilation error at this line likely means your copy of the
// proto package needs to be updated.
const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
type HealthCheckResponse_ServingStatus int32
@@ -177,6 +179,7 @@ type NotificationRequest struct {
ThreadID string `protobuf:"bytes,12,opt,name=threadID,proto3" json:"threadID,omitempty"`
MutableContent bool `protobuf:"varint,13,opt,name=mutableContent,proto3" json:"mutableContent,omitempty"`
Data *_struct.Struct `protobuf:"bytes,14,opt,name=data,proto3" json:"data,omitempty"`
Image string `protobuf:"bytes,15,opt,name=image,proto3" json:"image,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -305,6 +308,13 @@ func (m *NotificationRequest) GetData() *_struct.Struct {
return nil
}
func (m *NotificationRequest) GetImage() string {
if m != nil {
return m.Image
}
return ""
}
type NotificationReply struct {
Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
Counts int32 `protobuf:"varint,2,opt,name=counts,proto3" json:"counts,omitempty"`
@@ -439,57 +449,60 @@ func init() {
proto.RegisterType((*HealthCheckResponse)(nil), "proto.HealthCheckResponse")
}
func init() { proto.RegisterFile("gorush.proto", fileDescriptor_40935fa25e258221) }
func init() {
proto.RegisterFile("gorush.proto", fileDescriptor_40935fa25e258221)
}
var fileDescriptor_40935fa25e258221 = []byte{
// 607 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0x4f, 0x6f, 0xd3, 0x4e,
0x10, 0xad, 0x9b, 0x38, 0x4d, 0x26, 0x69, 0x7f, 0xf9, 0x6d, 0x11, 0x2c, 0x11, 0x87, 0xc8, 0x07,
0x14, 0x81, 0xe4, 0x4a, 0xe5, 0xc6, 0xa1, 0xa2, 0x2a, 0x55, 0x5b, 0x15, 0xb9, 0x92, 0xc3, 0x9f,
0x23, 0x5a, 0xaf, 0xb7, 0x8e, 0xd5, 0x8d, 0xd7, 0x78, 0xd7, 0x95, 0xf2, 0x39, 0xf8, 0x08, 0xdc,
0xf8, 0x94, 0x68, 0x67, 0xed, 0x90, 0x40, 0x38, 0x65, 0xdf, 0x9b, 0x99, 0xb7, 0x6f, 0x67, 0x26,
0x86, 0x51, 0xa6, 0xaa, 0x5a, 0x2f, 0xc2, 0xb2, 0x52, 0x46, 0x11, 0x1f, 0x7f, 0x26, 0x2f, 0x32,
0xa5, 0x32, 0x29, 0x4e, 0x10, 0x25, 0xf5, 0xfd, 0x89, 0x36, 0x55, 0xcd, 0x8d, 0x4b, 0x0a, 0x7e,
0xec, 0x83, 0x7f, 0x2e, 0x45, 0x65, 0xc8, 0x13, 0xf0, 0x4d, 0x6e, 0xa4, 0xa0, 0xde, 0xd4, 0x9b,
0x0d, 0x62, 0x07, 0x08, 0x81, 0x6e, 0xa2, 0xd2, 0x15, 0xdd, 0x47, 0x12, 0xcf, 0x64, 0x02, 0x7d,
0x5d, 0x27, 0x2e, 0xb9, 0x83, 0xfc, 0x1a, 0x93, 0xa7, 0xd0, 0x63, 0xdc, 0xe4, 0xaa, 0xa0, 0x5d,
0x8c, 0x34, 0x88, 0x04, 0x30, 0x72, 0xa7, 0x0f, 0x8a, 0xdf, 0x8a, 0x15, 0xf5, 0x31, 0xba, 0xc5,
0x91, 0x29, 0x0c, 0x25, 0xab, 0x0b, 0xbe, 0xb8, 0x59, 0xb2, 0x4c, 0xd0, 0x1e, 0xa6, 0x6c, 0x52,
0x56, 0x5d, 0xba, 0xfa, 0x03, 0xa7, 0x2e, 0xd7, 0x95, 0x78, 0x7d, 0x23, 0xde, 0x77, 0x95, 0x1b,
0x14, 0xa1, 0x70, 0x20, 0x15, 0x3f, 0xaf, 0x32, 0x4d, 0x07, 0xd3, 0xce, 0x6c, 0x10, 0xb7, 0xd0,
0x3a, 0x6b, 0x13, 0x31, 0x0c, 0x18, 0xde, 0xe2, 0x82, 0x9f, 0x1d, 0x38, 0x8e, 0x94, 0xc9, 0xef,
0x73, 0xce, 0xac, 0xe1, 0x58, 0x7c, 0xab, 0x85, 0x36, 0xd6, 0x8f, 0x51, 0x0f, 0xa2, 0xd0, 0xd4,
0xc3, 0xaa, 0x06, 0xd9, 0x0e, 0x95, 0x92, 0x99, 0x7b, 0x55, 0x2d, 0xb1, 0x73, 0x7e, 0xbc, 0xc6,
0xd6, 0xc9, 0x52, 0x68, 0x6d, 0x5f, 0xe8, 0x9a, 0xd7, 0xc2, 0xdf, 0x13, 0xe8, 0x6e, 0x4e, 0xc0,
0xb2, 0xaa, 0xcc, 0x79, 0xd3, 0x32, 0x07, 0xc8, 0x18, 0x3a, 0x0f, 0x62, 0xd5, 0xf4, 0xc8, 0x1e,
0x6d, 0x5e, 0xc2, 0xd2, 0x4c, 0x60, 0x6b, 0xfc, 0xd8, 0x01, 0xeb, 0x84, 0x33, 0x23, 0x32, 0x55,
0xb5, 0x6d, 0x59, 0x63, 0x12, 0x80, 0xcf, 0xec, 0xe8, 0xe9, 0x60, 0xea, 0xcd, 0x86, 0xa7, 0x23,
0xb7, 0x12, 0x21, 0xae, 0x43, 0xec, 0x42, 0x56, 0x55, 0xab, 0xba, 0x48, 0x29, 0xb8, 0xdb, 0x11,
0x90, 0x57, 0x30, 0xe6, 0xaa, 0x30, 0xa2, 0x30, 0xe7, 0x8f, 0x2c, 0x97, 0x2c, 0x91, 0x82, 0x0e,
0xa7, 0xde, 0xac, 0x1f, 0xff, 0xc5, 0x5b, 0x07, 0x66, 0x51, 0x09, 0x96, 0xde, 0xbc, 0xa7, 0x23,
0xe7, 0xa0, 0xc5, 0xe4, 0x25, 0x1c, 0x2d, 0x6b, 0x63, 0xd3, 0x2e, 0x5c, 0x19, 0x3d, 0x44, 0x95,
0x3f, 0x58, 0xf2, 0x1a, 0xba, 0x29, 0x33, 0x8c, 0x1e, 0xa1, 0xd1, 0x67, 0xa1, 0x5b, 0xe9, 0xb0,
0x5d, 0xe9, 0x70, 0x8e, 0x2b, 0x1d, 0x63, 0x52, 0x70, 0x09, 0xff, 0x6f, 0xcf, 0xaa, 0x94, 0x38,
0x7f, 0x5d, 0x73, 0x2e, 0xb4, 0xc6, 0xfd, 0xee, 0xc7, 0x2d, 0xb4, 0x33, 0xe4, 0xaa, 0x2e, 0x8c,
0x6e, 0x26, 0xd5, 0xa0, 0x20, 0x04, 0x72, 0x2d, 0x98, 0x34, 0x8b, 0x8b, 0x85, 0xe0, 0x0f, 0xed,
0xc4, 0xad, 0x8e, 0xa8, 0x1e, 0x73, 0xde, 0xfe, 0x4f, 0x5a, 0x18, 0x7c, 0xf7, 0xe0, 0x78, 0xab,
0x40, 0x97, 0xaa, 0xd0, 0x82, 0xbc, 0x83, 0x9e, 0x36, 0xcc, 0xd4, 0xee, 0xe2, 0xa3, 0xd3, 0x59,
0xd3, 0xe6, 0x1d, 0xb9, 0xe1, 0xdc, 0x6a, 0x15, 0xd9, 0x1c, 0xf3, 0xe3, 0xa6, 0x2e, 0x78, 0x0b,
0x87, 0x5b, 0x01, 0x32, 0x84, 0x83, 0x4f, 0xd1, 0x6d, 0x74, 0xf7, 0x25, 0x1a, 0xef, 0x59, 0x30,
0xbf, 0x8c, 0x3f, 0xdf, 0x44, 0x57, 0x63, 0x8f, 0xfc, 0x07, 0xc3, 0xe8, 0xee, 0xe3, 0xd7, 0x96,
0xd8, 0x3f, 0xbd, 0x86, 0xde, 0x15, 0x7e, 0x14, 0xc8, 0x19, 0x74, 0xe7, 0xa2, 0x48, 0xc9, 0xa4,
0xb9, 0x7f, 0xc7, 0x3e, 0x4f, 0xe8, 0xce, 0x58, 0x29, 0x57, 0xc1, 0x9e, 0x55, 0x72, 0x96, 0xc9,
0x19, 0xf8, 0x68, 0x9b, 0x3c, 0xdf, 0xf5, 0x14, 0xa7, 0x34, 0xf9, 0xf7, 0x2b, 0x93, 0x1e, 0x86,
0xde, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x46, 0xa4, 0x16, 0xe6, 0xaf, 0x04, 0x00, 0x00,
// 614 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0xdd, 0x6e, 0xd3, 0x30,
0x14, 0x5e, 0xd6, 0xa6, 0x6b, 0x4f, 0xbb, 0xad, 0x78, 0x08, 0x4c, 0xc5, 0x45, 0x95, 0x0b, 0x54,
0x81, 0x94, 0x49, 0xe3, 0x8e, 0x8b, 0x89, 0x69, 0x4c, 0xdb, 0x34, 0x94, 0x49, 0x29, 0x3f, 0x97,
0xc8, 0x71, 0xbc, 0x34, 0x9a, 0x1b, 0x87, 0xd8, 0x99, 0xd4, 0xe7, 0xe0, 0x11, 0x78, 0x11, 0x1e,
0x0d, 0xf9, 0x38, 0x29, 0x2b, 0x94, 0xab, 0xfa, 0xfb, 0xce, 0x8f, 0x3f, 0x9f, 0xf3, 0x35, 0x30,
0xca, 0x54, 0x55, 0xeb, 0x45, 0x58, 0x56, 0xca, 0x28, 0xe2, 0xe3, 0xcf, 0xe4, 0x65, 0xa6, 0x54,
0x26, 0xc5, 0x31, 0xa2, 0xa4, 0xbe, 0x3b, 0xd6, 0xa6, 0xaa, 0xb9, 0x71, 0x49, 0xc1, 0xcf, 0x5d,
0xf0, 0xcf, 0xa4, 0xa8, 0x0c, 0x79, 0x0a, 0xbe, 0xc9, 0x8d, 0x14, 0xd4, 0x9b, 0x7a, 0xb3, 0x41,
0xec, 0x00, 0x21, 0xd0, 0x4d, 0x54, 0xba, 0xa2, 0xbb, 0x48, 0xe2, 0x99, 0x4c, 0xa0, 0xaf, 0xeb,
0xc4, 0x25, 0x77, 0x90, 0x5f, 0x63, 0xf2, 0x0c, 0x7a, 0x8c, 0x9b, 0x5c, 0x15, 0xb4, 0x8b, 0x91,
0x06, 0x91, 0x00, 0x46, 0xee, 0xf4, 0x51, 0xf1, 0x1b, 0xb1, 0xa2, 0x3e, 0x46, 0x37, 0x38, 0x32,
0x85, 0xa1, 0x64, 0x75, 0xc1, 0x17, 0xd7, 0x4b, 0x96, 0x09, 0xda, 0xc3, 0x94, 0xc7, 0x94, 0xed,
0x2e, 0x5d, 0xfd, 0x9e, 0xeb, 0x2e, 0xd7, 0x95, 0x78, 0x7d, 0xd3, 0xbc, 0xef, 0x2a, 0x1f, 0x51,
0x84, 0xc2, 0x9e, 0x54, 0xfc, 0xac, 0xca, 0x34, 0x1d, 0x4c, 0x3b, 0xb3, 0x41, 0xdc, 0x42, 0xab,
0xac, 0x4d, 0xc4, 0x30, 0x60, 0x78, 0x83, 0x0b, 0x7e, 0x75, 0xe0, 0x28, 0x52, 0x26, 0xbf, 0xcb,
0x39, 0xb3, 0x82, 0x63, 0xf1, 0xbd, 0x16, 0xda, 0x58, 0x3d, 0x46, 0xdd, 0x8b, 0x42, 0x53, 0x0f,
0xab, 0x1a, 0x64, 0x27, 0x54, 0x4a, 0x66, 0xee, 0x54, 0xb5, 0xc4, 0xc9, 0xf9, 0xf1, 0x1a, 0x5b,
0x25, 0x4b, 0xa1, 0xb5, 0x7d, 0xa1, 0x1b, 0x5e, 0x0b, 0xff, 0x6c, 0xa0, 0xfb, 0x78, 0x03, 0x96,
0x55, 0x65, 0xce, 0x9b, 0x91, 0x39, 0x40, 0xc6, 0xd0, 0xb9, 0x17, 0xab, 0x66, 0x46, 0xf6, 0x68,
0xf3, 0x12, 0x96, 0x66, 0x02, 0x47, 0xe3, 0xc7, 0x0e, 0x58, 0x25, 0x9c, 0x19, 0x91, 0xa9, 0xaa,
0x1d, 0xcb, 0x1a, 0x93, 0x00, 0x7c, 0x66, 0x57, 0x4f, 0x07, 0x53, 0x6f, 0x36, 0x3c, 0x19, 0x39,
0x4b, 0x84, 0x68, 0x87, 0xd8, 0x85, 0x6c, 0x57, 0xad, 0xea, 0x22, 0xa5, 0xe0, 0x6e, 0x47, 0x40,
0x5e, 0xc3, 0x98, 0xab, 0xc2, 0x88, 0xc2, 0x9c, 0x3d, 0xb0, 0x5c, 0xb2, 0x44, 0x0a, 0x3a, 0x9c,
0x7a, 0xb3, 0x7e, 0xfc, 0x0f, 0x6f, 0x15, 0x98, 0x45, 0x25, 0x58, 0x7a, 0xfd, 0x81, 0x8e, 0x9c,
0x82, 0x16, 0x93, 0x57, 0x70, 0xb0, 0xac, 0x8d, 0x4d, 0x3b, 0x77, 0x65, 0x74, 0x1f, 0xbb, 0xfc,
0xc5, 0x92, 0x37, 0xd0, 0x4d, 0x99, 0x61, 0xf4, 0x00, 0x85, 0x3e, 0x0f, 0x9d, 0xa5, 0xc3, 0xd6,
0xd2, 0xe1, 0x1c, 0x2d, 0x1d, 0x63, 0x92, 0x95, 0x9c, 0xa3, 0x81, 0x0e, 0x9d, 0x64, 0x04, 0xc1,
0x05, 0x3c, 0xd9, 0xdc, 0x60, 0x29, 0xd1, 0x15, 0xba, 0xe6, 0x5c, 0x68, 0x8d, 0xae, 0xef, 0xc7,
0x2d, 0xb4, 0x9b, 0xe5, 0xaa, 0x2e, 0x8c, 0x6e, 0xf6, 0xd7, 0xa0, 0x20, 0x04, 0x72, 0x25, 0x98,
0x34, 0x8b, 0xf3, 0x85, 0xe0, 0xf7, 0xad, 0x0f, 0x6c, 0x1f, 0x51, 0x3d, 0xe4, 0xbc, 0xfd, 0xf7,
0xb4, 0x30, 0xf8, 0xe1, 0xc1, 0xd1, 0x46, 0x81, 0x2e, 0x55, 0xa1, 0x05, 0x79, 0x0f, 0x3d, 0x6d,
0x98, 0xa9, 0xdd, 0xc5, 0x07, 0x27, 0xb3, 0x66, 0xf8, 0x5b, 0x72, 0xc3, 0xb9, 0xed, 0x55, 0x64,
0x73, 0xcc, 0x8f, 0x9b, 0xba, 0xe0, 0x1d, 0xec, 0x6f, 0x04, 0xc8, 0x10, 0xf6, 0x3e, 0x47, 0x37,
0xd1, 0xed, 0xd7, 0x68, 0xbc, 0x63, 0xc1, 0xfc, 0x22, 0xfe, 0x72, 0x1d, 0x5d, 0x8e, 0x3d, 0x72,
0x08, 0xc3, 0xe8, 0xf6, 0xd3, 0xb7, 0x96, 0xd8, 0x3d, 0xb9, 0x82, 0xde, 0x25, 0x7e, 0x2a, 0xc8,
0x29, 0x74, 0xe7, 0xa2, 0x48, 0xc9, 0xa4, 0xb9, 0x7f, 0x8b, 0xcb, 0x27, 0x74, 0x6b, 0xac, 0x94,
0xab, 0x60, 0xc7, 0x76, 0x72, 0x92, 0xc9, 0x29, 0xf8, 0x28, 0x9b, 0xbc, 0xd8, 0xf6, 0x14, 0xd7,
0x69, 0xf2, 0xff, 0x57, 0x26, 0x3d, 0x0c, 0xbd, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xcb,
0xd2, 0xf3, 0xc5, 0x04, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
var _ context.Context
var _ grpc.ClientConn
var _ grpc.ClientConnInterface
// This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion4
const _ = grpc.SupportPackageIsVersion6
// GorushClient is the client API for Gorush service.
//
@@ -499,10 +512,10 @@ type GorushClient interface {
}
type gorushClient struct {
cc *grpc.ClientConn
cc grpc.ClientConnInterface
}
func NewGorushClient(cc *grpc.ClientConn) GorushClient {
func NewGorushClient(cc grpc.ClientConnInterface) GorushClient {
return &gorushClient{cc}
}
@@ -520,6 +533,14 @@ type GorushServer interface {
Send(context.Context, *NotificationRequest) (*NotificationReply, error)
}
// UnimplementedGorushServer can be embedded to have forward compatible implementations.
type UnimplementedGorushServer struct {
}
func (*UnimplementedGorushServer) Send(ctx context.Context, req *NotificationRequest) (*NotificationReply, error) {
return nil, status.Errorf(codes.Unimplemented, "method Send not implemented")
}
func RegisterGorushServer(s *grpc.Server, srv GorushServer) {
s.RegisterService(&_Gorush_serviceDesc, srv)
}
@@ -563,10 +584,10 @@ type HealthClient interface {
}
type healthClient struct {
cc *grpc.ClientConn
cc grpc.ClientConnInterface
}
func NewHealthClient(cc *grpc.ClientConn) HealthClient {
func NewHealthClient(cc grpc.ClientConnInterface) HealthClient {
return &healthClient{cc}
}
@@ -584,6 +605,14 @@ type HealthServer interface {
Check(context.Context, *HealthCheckRequest) (*HealthCheckResponse, error)
}
// UnimplementedHealthServer can be embedded to have forward compatible implementations.
type UnimplementedHealthServer struct {
}
func (*UnimplementedHealthServer) Check(ctx context.Context, req *HealthCheckRequest) (*HealthCheckResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method Check not implemented")
}
func RegisterHealthServer(s *grpc.Server, srv HealthServer) {
s.RegisterService(&_Health_serviceDesc, srv)
}

1
rpc/proto/gorush.proto
View File

@@ -31,6 +31,7 @@ message NotificationRequest {
string threadID = 12;
bool mutableContent = 13;
google.protobuf.Struct data = 14;
string image = 15;
}
message NotificationReply {

1
rpc/server.go
View File

@@ -61,6 +61,7 @@ func (s *Server) Send(ctx context.Context, in *proto.NotificationRequest) (*prot
ContentAvailable: in.ContentAvailable,
ThreadID: in.ThreadID,
MutableContent: in.MutableContent,
Image: in.Image,
}
if badge > 0 {