Skip to content

O
Open-IM-Server

zhaominxu / Open-IM-Server
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
O
Open-IM-Server

体验新版 GitCode，发现更多精彩内容 >>

提交 3f9c3704 编写于 作者: 落凡尘.'s avatar 落凡尘.
浏览文件
操作

update proto

上级 1e4a1dff
展开全部 隐藏空白更改
内联 并排
Showing with 2925 addition and 875 deletion
src/proto/auth/auth.pb.go
浏览文件 @ 3f9c3704
......@@ -275,7 +275,9 @@ func init() {
proto.RegisterType((*UserTokenResp)(nil), "pbAuth.UserTokenResp")
}
func init() { proto.RegisterFile("auth/auth.proto", fileDescriptor_712ec48c1eaf43a2) }
func init() {
proto.RegisterFile("auth/auth.proto", fileDescriptor_712ec48c1eaf43a2)
}
var fileDescriptor_712ec48c1eaf43a2 = []byte{
// 346 bytes of a gzipped FileDescriptorProto
......@@ -305,11 +307,11 @@ var fileDescriptor_712ec48c1eaf43a2 = []byte{
// 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
// AuthClient is the client API for Auth service.
//
......@@ -320,10 +322,10 @@ type AuthClient interface {
}
type authClient struct {
cc *grpc.ClientConn
cc grpc.ClientConnInterface
}
func NewAuthClient(cc *grpc.ClientConn) AuthClient {
func NewAuthClient(cc grpc.ClientConnInterface) AuthClient {
return &authClient{cc}
}
......
src/proto/auto_proto.sh
浏览文件 @ 3f9c3704
......@@ -5,6 +5,9 @@ source ./proto_dir.cfg
for ((i = 0; i < ${#all_proto[*]}; i++)); do
proto=${all_proto[$i]}
protoc --go_out=plugins=grpc:. $proto
s=$(echo $proto | sed 's/ //g')
v=${s//proto/pb.go}
protoc-go-inject-tag -input=./$v
echo "protoc --go_out=plugins=grpc:." $proto
done
echo "proto file generate success..."
src/proto/chat/chat.pb.go
浏览文件 @ 3f9c3704
......@@ -879,8 +879,9 @@ type UserSendMsgResp struct {
ErrMsg string `protobuf:"bytes,2,opt,name=ErrMsg,proto3" json:"ErrMsg,omitempty"`
ReqIdentifier int32 `protobuf:"varint,3,opt,name=ReqIdentifier,proto3" json:"ReqIdentifier,omitempty"`
MsgIncr int32 `protobuf:"varint,4,opt,name=MsgIncr,proto3" json:"MsgIncr,omitempty"`
ServerMsgID string `protobuf:"bytes,5,opt,name=ServerMsgID,proto3" json:"ServerMsgID,omitempty"`
ClientMsgID string `protobuf:"bytes,6,opt,name=ClientMsgID,proto3" json:"ClientMsgID,omitempty"`
SendTime int64 `protobuf:"varint,5,opt,name=SendTime,proto3" json:"SendTime,omitempty"`
ServerMsgID string `protobuf:"bytes,6,opt,name=ServerMsgID,proto3" json:"ServerMsgID,omitempty"`
ClientMsgID string `protobuf:"bytes,7,opt,name=ClientMsgID,proto3" json:"ClientMsgID,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
......@@ -939,6 +940,13 @@ func (m *UserSendMsgResp) GetMsgIncr() int32 {
return 0
}
func (m *UserSendMsgResp) GetSendTime() int64 {
if m != nil {
return m.SendTime
}
return 0
}
func (m *UserSendMsgResp) GetServerMsgID() string {
if m != nil {
return m.ServerMsgID
......@@ -966,74 +974,76 @@ func init() {
proto.RegisterType((*UserSendMsgResp)(nil), "pbChat.UserSendMsgResp")
}
func init() { proto.RegisterFile("chat/chat.proto", fileDescriptor_767a49518b351716) }
func init() {
proto.RegisterFile("chat/chat.proto", fileDescriptor_767a49518b351716)
}
var fileDescriptor_767a49518b351716 = []byte{
// 867 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x6a, 0xfb, 0x46,
0x18, 0x45, 0x96, 0x2d, 0x5b, 0x9f, 0xff, 0x25, 0x43, 0x9a, 0x0e, 0xa1, 0x14, 0x21, 0x5a, 0x30,
0x5d, 0xa4, 0x90, 0x6e, 0x42, 0x0b, 0x5d, 0x24, 0x76, 0x52, 0x41, 0xd4, 0x04, 0xc9, 0xa5, 0xd0,
0x9d, 0x62, 0x8f, 0x65, 0x51, 0x5b, 0x92, 0x67, 0x94, 0x34, 0xed, 0xa2, 0x37, 0xe8, 0x19, 0x7a,
0x81, 0x1e, 0xa2, 0xbb, 0x5e, 0xa2, 0x17, 0xf8, 0xdd, 0xe2, 0xc7, 0xcc, 0x48, 0xd6, 0xc8, 0x76,
0x6c, 0x08, 0x64, 0x63, 0xfc, 0xde, 0xfc, 0xf1, 0xcc, 0x7b, 0xdf, 0xf7, 0xc6, 0xd0, 0x9f, 0xcc,
0x83, 0xec, 0x6b, 0xfe, 0x71, 0x9e, 0xd2, 0x24, 0x4b, 0x90, 0x91, 0x3e, 0x5e, 0xcf, 0x83, 0xcc,
0xfe, 0x5b, 0x87, 0xe3, 0x9f, 0xfd, 0x71, 0xe2, 0xb2, 0xd0, 0x7f, 0xa6, 0x9c, 0x72, 0x59, 0x88,
0x4e, 0xc1, 0xf0, 0x49, 0x3c, 0x75, 0x86, 0x58, 0xb3, 0xb4, 0x81, 0xe9, 0xe5, 0x88, 0xf3, 0x1e,
0x99, 0x3c, 0x3b, 0x43, 0x5c, 0x93, 0xbc, 0x44, 0x08, 0x43, 0xf3, 0x3a, 0x89, 0x33, 0x12, 0x67,
0x58, 0x17, 0x03, 0x05, 0x44, 0x67, 0xd0, 0xe2, 0x6b, 0xc7, 0xd1, 0x92, 0xe0, 0xba, 0xa5, 0x0d,
0x74, 0x6f, 0x8d, 0xf9, 0x2a, 0x97, 0x85, 0x37, 0x34, 0x59, 0xe2, 0x86, 0xa5, 0x0d, 0x1a, 0x5e,
0x01, 0x91, 0x05, 0xed, 0x7c, 0x83, 0xf1, 0xef, 0x29, 0xc1, 0x86, 0x18, 0x55, 0x29, 0x3e, 0xc3,
0x27, 0x8c, 0x45, 0x49, 0x2c, 0x66, 0x34, 0xe5, 0x0c, 0x85, 0xe2, 0x33, 0xee, 0x53, 0x42, 0x83,
0x2c, 0x4a, 0x62, 0x67, 0x88, 0x5b, 0xe2, 0x5c, 0x2a, 0x85, 0x4e, 0xa0, 0xe1, 0xb2, 0xd0, 0x19,
0x62, 0x53, 0x8c, 0x49, 0xc0, 0xd9, 0x71, 0xf2, 0x2b, 0x89, 0x31, 0x48, 0x56, 0x00, 0xb1, 0xdb,
0x6c, 0xb6, 0x88, 0x62, 0xe2, 0xc4, 0xb3, 0x04, 0xb7, 0xf3, 0xdd, 0x4a, 0x8a, 0xdf, 0xe6, 0x3e,
0xe5, 0x3b, 0x33, 0xdc, 0x91, 0x1a, 0xe4, 0x10, 0x7d, 0x0e, 0xf0, 0xb0, 0x08, 0xb2, 0x59, 0x42,
0x97, 0xce, 0x10, 0x77, 0xc5, 0x51, 0x15, 0x06, 0x7d, 0x06, 0xe6, 0x4d, 0x42, 0x27, 0xe4, 0x2e,
0x62, 0x19, 0xee, 0x59, 0xfa, 0xc0, 0xf4, 0x4a, 0xc2, 0xfe, 0x47, 0x87, 0x53, 0xe9, 0xce, 0x38,
0x79, 0x78, 0x62, 0xf3, 0x77, 0xb1, 0x09, 0x43, 0x93, 0xcf, 0xf1, 0xc9, 0x2a, 0x77, 0xa9, 0x80,
0x15, 0x03, 0x1b, 0xaf, 0x1b, 0x68, 0xec, 0x35, 0xb0, 0x79, 0xd0, 0xc0, 0xd6, 0x41, 0x03, 0xcd,
0x3d, 0x06, 0x82, 0x6a, 0xe0, 0x7b, 0x5a, 0x65, 0x41, 0xdb, 0x61, 0xa3, 0x65, 0x3a, 0x0f, 0x58,
0xf4, 0x07, 0xc1, 0x3d, 0x4b, 0x1b, 0xb4, 0x3c, 0x95, 0xb2, 0xff, 0x84, 0xde, 0xc3, 0xd3, 0x62,
0xe1, 0x12, 0xc6, 0x82, 0x90, 0x78, 0x64, 0xc5, 0xdd, 0xf8, 0x89, 0x11, 0x5a, 0xba, 0x24, 0x91,
0x54, 0x76, 0x75, 0x45, 0xc2, 0x28, 0x16, 0x3e, 0x09, 0x65, 0x25, 0x96, 0xce, 0xae, 0x46, 0xf1,
0x54, 0x18, 0xa5, 0x7b, 0x39, 0xda, 0xd4, 0xa4, 0xbe, 0xa5, 0x89, 0xfd, 0x41, 0x83, 0x7e, 0xe5,
0x00, 0x2c, 0xe5, 0xf7, 0x1d, 0x51, 0x7a, 0x9d, 0x4c, 0x89, 0x38, 0x42, 0xc3, 0x2b, 0x20, 0xff,
0x9d, 0x11, 0xa5, 0x2e, 0x0b, 0x8b, 0x4a, 0x91, 0x88, 0xf3, 0x6e, 0xf0, 0xc2, 0xcb, 0x21, 0xff,
0x7d, 0x89, 0x04, 0x1f, 0xc5, 0x65, 0x99, 0xe4, 0x08, 0x7d, 0x0b, 0x5d, 0x3f, 0x8a, 0xc3, 0x05,
0xe1, 0x77, 0xe3, 0xdb, 0x35, 0x2c, 0x7d, 0xd0, 0xbe, 0x38, 0x39, 0x97, 0x31, 0x73, 0x7e, 0x1b,
0x64, 0x73, 0x42, 0x6f, 0x12, 0xba, 0x0c, 0x32, 0xaf, 0x3a, 0x15, 0x5d, 0x42, 0xe7, 0x96, 0x26,
0x4f, 0x69, 0xb1, 0xd4, 0xd8, 0xb3, 0xb4, 0x32, 0xd3, 0xfe, 0x01, 0x3a, 0xb7, 0x24, 0xfb, 0x91,
0xfc, 0xe6, 0x93, 0xd5, 0x3e, 0xa5, 0x37, 0x54, 0xab, 0x6d, 0xab, 0xe6, 0x43, 0x57, 0xd9, 0xe9,
0x4d, 0x92, 0x1d, 0x81, 0x5e, 0xea, 0xc5, 0xbf, 0xda, 0x23, 0xe8, 0xa8, 0x87, 0x47, 0x3d, 0xa8,
0xad, 0x8f, 0x56, 0x73, 0x86, 0xe8, 0x4b, 0xa8, 0x8b, 0x96, 0xaf, 0x89, 0x0b, 0x1f, 0x17, 0x17,
0xe6, 0x3d, 0x24, 0x6f, 0x2b, 0x86, 0xed, 0xbf, 0x6a, 0x60, 0xae, 0xb9, 0xb7, 0xf4, 0x7c, 0xd1,
0xa3, 0xfa, 0xde, 0x1e, 0xad, 0xbf, 0xd2, 0xa3, 0xf4, 0x59, 0x88, 0xed, 0x0c, 0x45, 0xfb, 0x9b,
0x9e, 0x4a, 0xa9, 0x89, 0x62, 0x54, 0x13, 0x25, 0x97, 0xa3, 0xb9, 0x96, 0xa3, 0x92, 0x24, 0xad,
0x8d, 0x24, 0xf9, 0x0a, 0x8e, 0xf8, 0x77, 0x42, 0x95, 0xee, 0x33, 0xc5, 0x81, 0xb6, 0x78, 0xfb,
0x7f, 0x1d, 0x7a, 0xdc, 0x58, 0x3e, 0xe0, 0xb2, 0x90, 0x1b, 0xff, 0x05, 0x74, 0x3d, 0xb2, 0x72,
0xa6, 0x24, 0xce, 0xa2, 0x59, 0x44, 0x68, 0xee, 0x59, 0x95, 0x2c, 0x93, 0xbd, 0xa6, 0x26, 0x7b,
0x29, 0xa8, 0x5e, 0x11, 0xf4, 0x60, 0xab, 0xe5, 0xd2, 0x3a, 0xf1, 0x84, 0x2a, 0xef, 0x17, 0x87,
0x1b, 0x31, 0x62, 0xec, 0x8a, 0x91, 0x03, 0xaf, 0x97, 0x62, 0x5b, 0x6b, 0xaf, 0x6d, 0xe6, 0xb6,
0x6d, 0x65, 0x29, 0x40, 0xa5, 0x14, 0x2a, 0xef, 0x4c, 0x7b, 0xe3, 0x9d, 0x51, 0xad, 0xec, 0x6c,
0x3d, 0x0e, 0x45, 0x5c, 0x76, 0xab, 0x71, 0xc9, 0xcf, 0xb2, 0x88, 0x48, 0x9c, 0xc9, 0x02, 0xe9,
0x49, 0x8d, 0x14, 0x2a, 0x0f, 0xe3, 0xbb, 0x22, 0x8c, 0xfb, 0xeb, 0x30, 0x2e, 0x28, 0xde, 0x15,
0xa3, 0x17, 0x7c, 0x24, 0xbb, 0x62, 0xf4, 0x62, 0xff, 0xa7, 0x41, 0xbf, 0x62, 0xef, 0x9b, 0xba,
0x71, 0xab, 0x22, 0xf4, 0x5d, 0x15, 0xa1, 0x38, 0x58, 0xaf, 0x3a, 0x78, 0xb8, 0xf4, 0x37, 0xee,
0x6e, 0x6c, 0xdd, 0xfd, 0xe2, 0x5f, 0x0d, 0xea, 0xbc, 0xa3, 0xd1, 0x25, 0x98, 0xeb, 0x74, 0x41,
0x65, 0xb0, 0x29, 0xd1, 0x75, 0xf6, 0xc9, 0x0e, 0x96, 0xa5, 0xe8, 0x7b, 0x68, 0x2b, 0x61, 0x8e,
0x4e, 0x8b, 0x59, 0xd5, 0x27, 0xe6, 0xec, 0xd3, 0x9d, 0xbc, 0x5c, 0xaf, 0x68, 0x59, 0xae, 0xaf,
0xf6, 0x4f, 0xb9, 0x7e, 0x43, 0xf8, 0xab, 0xee, 0x2f, 0x6d, 0xfe, 0xa7, 0xf1, 0x3b, 0x39, 0xfc,
0x68, 0x88, 0x3f, 0x8f, 0xdf, 0x7c, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x19, 0x33, 0xb6, 0xc4, 0x4f,
0x0a, 0x00, 0x00,
// 874 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xeb, 0x44,
0x18, 0x95, 0xe3, 0xc4, 0x89, 0xbf, 0xfc, 0xf5, 0x8e, 0x2e, 0x65, 0x54, 0x21, 0x64, 0x59, 0x20,
0x45, 0x2c, 0x8a, 0x74, 0xd9, 0x5c, 0x81, 0xc4, 0xe2, 0x36, 0x69, 0xb1, 0x74, 0xcd, 0xad, 0xec,
0x20, 0x24, 0x76, 0x6e, 0x32, 0x71, 0x2c, 0x12, 0xdb, 0x99, 0x71, 0x4b, 0x61, 0xc1, 0x1b, 0xf0,
0x0c, 0xbc, 0x00, 0x0f, 0xc1, 0x83, 0xb0, 0x63, 0xc5, 0x5b, 0xa0, 0x99, 0xb1, 0xe3, 0xb1, 0x9d,
0x26, 0x52, 0xa5, 0x6e, 0xa2, 0x9c, 0x33, 0x3f, 0x99, 0x39, 0xe7, 0xfb, 0xce, 0x04, 0xc6, 0x8b,
0x75, 0x90, 0x7d, 0xc9, 0x3f, 0x2e, 0x53, 0x9a, 0x64, 0x09, 0x32, 0xd2, 0xbb, 0xab, 0x75, 0x90,
0xd9, 0x7f, 0xea, 0xf0, 0xea, 0x47, 0x7f, 0x9e, 0xb8, 0x2c, 0xf4, 0x1f, 0x28, 0xa7, 0x5c, 0x16,
0xa2, 0x73, 0x30, 0x7c, 0x12, 0x2f, 0x9d, 0x29, 0xd6, 0x2c, 0x6d, 0x62, 0x7a, 0x39, 0xe2, 0xbc,
0x47, 0x16, 0x0f, 0xce, 0x14, 0xb7, 0x24, 0x2f, 0x11, 0xc2, 0xd0, 0xbd, 0x4a, 0xe2, 0x8c, 0xc4,
0x19, 0xd6, 0xc5, 0x40, 0x01, 0xd1, 0x05, 0xf4, 0xf8, 0xda, 0x79, 0xb4, 0x25, 0xb8, 0x6d, 0x69,
0x13, 0xdd, 0xdb, 0x63, 0xbe, 0xca, 0x65, 0xe1, 0x35, 0x4d, 0xb6, 0xb8, 0x63, 0x69, 0x93, 0x8e,
0x57, 0x40, 0x64, 0x41, 0x3f, 0xdf, 0x60, 0xfe, 0x6b, 0x4a, 0xb0, 0x21, 0x46, 0x55, 0x8a, 0xcf,
0xf0, 0x09, 0x63, 0x51, 0x12, 0x8b, 0x19, 0x5d, 0x39, 0x43, 0xa1, 0xf8, 0x8c, 0x0f, 0x29, 0xa1,
0x41, 0x16, 0x25, 0xb1, 0x33, 0xc5, 0x3d, 0x71, 0x2e, 0x95, 0x42, 0xaf, 0xa1, 0xe3, 0xb2, 0xd0,
0x99, 0x62, 0x53, 0x8c, 0x49, 0xc0, 0xd9, 0x79, 0xf2, 0x33, 0x89, 0x31, 0x48, 0x56, 0x00, 0xb1,
0xdb, 0x6a, 0xb5, 0x89, 0x62, 0xe2, 0xc4, 0xab, 0x04, 0xf7, 0xf3, 0xdd, 0x4a, 0x8a, 0xdf, 0xe6,
0x43, 0xca, 0x77, 0x66, 0x78, 0x20, 0x35, 0xc8, 0x21, 0xfa, 0x14, 0xe0, 0x76, 0x13, 0x64, 0xab,
0x84, 0x6e, 0x9d, 0x29, 0x1e, 0x8a, 0xa3, 0x2a, 0x0c, 0xfa, 0x04, 0xcc, 0xeb, 0x84, 0x2e, 0xc8,
0xfb, 0x88, 0x65, 0x78, 0x64, 0xe9, 0x13, 0xd3, 0x2b, 0x09, 0xfb, 0x2f, 0x1d, 0xce, 0xa5, 0x3b,
0xf3, 0xe4, 0xf6, 0x9e, 0xad, 0x5f, 0xc4, 0x26, 0x0c, 0x5d, 0x3e, 0xc7, 0x27, 0xbb, 0xdc, 0xa5,
0x02, 0x56, 0x0c, 0xec, 0x3c, 0x6d, 0xa0, 0x71, 0xd4, 0xc0, 0xee, 0x49, 0x03, 0x7b, 0x27, 0x0d,
0x34, 0x8f, 0x18, 0x08, 0xaa, 0x81, 0x2f, 0x69, 0x95, 0x05, 0x7d, 0x87, 0xcd, 0xb6, 0xe9, 0x3a,
0x60, 0xd1, 0x6f, 0x04, 0x8f, 0x2c, 0x6d, 0xd2, 0xf3, 0x54, 0xca, 0xfe, 0x1d, 0x46, 0xb7, 0xf7,
0x9b, 0x8d, 0x4b, 0x18, 0x0b, 0x42, 0xe2, 0x91, 0x1d, 0x77, 0xe3, 0x07, 0x46, 0x68, 0xe9, 0x92,
0x44, 0x52, 0xd9, 0xdd, 0x3b, 0x12, 0x46, 0xb1, 0xf0, 0x49, 0x28, 0x2b, 0xb1, 0x74, 0x76, 0x37,
0x8b, 0x97, 0xc2, 0x28, 0xdd, 0xcb, 0x51, 0x5d, 0x93, 0x76, 0x43, 0x13, 0xfb, 0x3f, 0x0d, 0xc6,
0x95, 0x03, 0xb0, 0x94, 0xdf, 0x77, 0x46, 0xe9, 0x55, 0xb2, 0x24, 0xe2, 0x08, 0x1d, 0xaf, 0x80,
0xfc, 0x77, 0x66, 0x94, 0xba, 0x2c, 0x2c, 0x2a, 0x45, 0x22, 0xce, 0xbb, 0xc1, 0x23, 0x2f, 0x87,
0xfc, 0xf7, 0x25, 0x12, 0x7c, 0x14, 0x97, 0x65, 0x92, 0x23, 0xf4, 0x35, 0x0c, 0xfd, 0x28, 0x0e,
0x37, 0x84, 0xdf, 0x8d, 0x6f, 0xd7, 0xb1, 0xf4, 0x49, 0xff, 0xcd, 0xeb, 0x4b, 0x19, 0x33, 0x97,
0x37, 0x41, 0xb6, 0x26, 0xf4, 0x3a, 0xa1, 0xdb, 0x20, 0xf3, 0xaa, 0x53, 0xd1, 0x5b, 0x18, 0xdc,
0xd0, 0xe4, 0x3e, 0x2d, 0x96, 0x1a, 0x47, 0x96, 0x56, 0x66, 0xda, 0xdf, 0xc1, 0xe0, 0x86, 0x64,
0xdf, 0x93, 0x5f, 0x7c, 0xb2, 0x3b, 0xa6, 0x74, 0x4d, 0xb5, 0x56, 0x53, 0x35, 0x1f, 0x86, 0xca,
0x4e, 0xcf, 0x92, 0xec, 0x0c, 0xf4, 0x52, 0x2f, 0xfe, 0xd5, 0x9e, 0xc1, 0x40, 0x3d, 0x3c, 0x1a,
0x41, 0x6b, 0x7f, 0xb4, 0x96, 0x33, 0x45, 0x9f, 0x43, 0x5b, 0xb4, 0x7c, 0x4b, 0x5c, 0xf8, 0x55,
0x71, 0x61, 0xde, 0x43, 0xf2, 0xb6, 0x62, 0xd8, 0xfe, 0xa3, 0x05, 0xe6, 0x9e, 0x7b, 0x4e, 0xcf,
0x17, 0x3d, 0xaa, 0x1f, 0xed, 0xd1, 0xf6, 0x13, 0x3d, 0x4a, 0x1f, 0x84, 0xd8, 0xce, 0x54, 0xb4,
0xbf, 0xe9, 0xa9, 0x94, 0x9a, 0x28, 0x46, 0x35, 0x51, 0x72, 0x39, 0xba, 0x7b, 0x39, 0x2a, 0x49,
0xd2, 0xab, 0x25, 0xc9, 0x17, 0x70, 0xc6, 0xbf, 0x13, 0xaa, 0x74, 0x9f, 0x29, 0x0e, 0xd4, 0xe0,
0xed, 0x7f, 0x74, 0x18, 0x71, 0x63, 0xf9, 0x80, 0xcb, 0x42, 0x6e, 0xfc, 0x67, 0x30, 0xf4, 0xc8,
0xce, 0x59, 0x92, 0x38, 0x8b, 0x56, 0x11, 0xa1, 0xb9, 0x67, 0x55, 0xb2, 0x4c, 0xf6, 0x96, 0x9a,
0xec, 0xa5, 0xa0, 0x7a, 0x45, 0xd0, 0x93, 0xad, 0x96, 0x4b, 0xeb, 0xc4, 0x0b, 0xaa, 0xbc, 0x5f,
0x1c, 0xd6, 0x62, 0xc4, 0x38, 0x14, 0x23, 0x27, 0x5e, 0x2f, 0xc5, 0xb6, 0xde, 0x51, 0xdb, 0xcc,
0xa6, 0x6d, 0x65, 0x29, 0x40, 0xa5, 0x14, 0x2a, 0xef, 0x4c, 0xbf, 0xf6, 0xce, 0xa8, 0x56, 0x0e,
0x1a, 0x8f, 0x43, 0x11, 0x97, 0xc3, 0x6a, 0x5c, 0xf2, 0xb3, 0x6c, 0x22, 0x12, 0x67, 0xb2, 0x40,
0x46, 0x52, 0x23, 0x85, 0xca, 0xc3, 0xf8, 0x7d, 0x11, 0xc6, 0xe3, 0x7d, 0x18, 0x17, 0x14, 0xef,
0x8a, 0xd9, 0x23, 0x3e, 0x93, 0x5d, 0x31, 0x7b, 0xb4, 0xff, 0xd5, 0x60, 0x5c, 0xb1, 0xf7, 0x59,
0xdd, 0xd8, 0xa8, 0x08, 0xfd, 0x50, 0x45, 0x28, 0x0e, 0xb6, 0xab, 0x0e, 0x1e, 0x7b, 0xf6, 0x6a,
0x6d, 0x61, 0x34, 0xdb, 0xa2, 0xa6, 0x4b, 0xb7, 0xa1, 0xcb, 0x9b, 0xbf, 0x35, 0x68, 0xf3, 0x6e,
0x47, 0x6f, 0xc1, 0xdc, 0x27, 0x0f, 0x2a, 0x43, 0x4f, 0x89, 0xb5, 0x8b, 0x8f, 0x0e, 0xb0, 0x2c,
0x45, 0xdf, 0x42, 0x5f, 0x09, 0x7a, 0x74, 0x5e, 0xcc, 0xaa, 0x3e, 0x3f, 0x17, 0x1f, 0x1f, 0xe4,
0xe5, 0x7a, 0x45, 0xe7, 0x72, 0x7d, 0xb5, 0xb7, 0xca, 0xf5, 0x35, 0x53, 0xde, 0x0d, 0x7f, 0xea,
0xf3, 0x3f, 0x94, 0xdf, 0xc8, 0xe1, 0x3b, 0x43, 0xfc, 0xb1, 0xfc, 0xea, 0xff, 0x00, 0x00, 0x00,
0xff, 0xff, 0x1f, 0x48, 0xc5, 0x48, 0x6b, 0x0a, 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
// ChatClient is the client API for Chat service.
//
......@@ -1045,10 +1055,10 @@ type ChatClient interface {
}
type chatClient struct {
cc *grpc.ClientConn
cc grpc.ClientConnInterface
}
func NewChatClient(cc *grpc.ClientConn) ChatClient {
func NewChatClient(cc grpc.ClientConnInterface) ChatClient {
return &chatClient{cc}
}
......
src/proto/chat/chat.proto
浏览文件 @ 3f9c3704
......@@ -18,6 +18,8 @@ message WSToMsgSvrChatMsg{
int32 PlatformID =13;
repeated string ForceList = 14;
}
message MsgSvrToPushSvrChatMsg {
string SendID = 1;
string RecvID = 2;
......@@ -113,8 +115,9 @@ message UserSendMsgResp {
string ErrMsg = 2;
int32 ReqIdentifier = 3;
int32 MsgIncr = 4;
string ServerMsgID = 5;
string ClientMsgID = 6;
int64 SendTime = 5;
string ServerMsgID = 6;
string ClientMsgID = 7;
}
service Chat {
......
src/proto/friend/friend.pb.go
浏览文件 @ 3f9c3704
此差异已折叠。
src/proto/friend/friend.proto
浏览文件 @ 3f9c3704
......@@ -7,18 +7,18 @@ message CommonResp{
string errorMsg = 2;
}
message SearchFriendReq{
message GetFriendsInfoReq{
string uid = 1;
string OperationID = 2;
string Token = 3;
}
message SearchFriendResp{
message GetFriendInfoResp{
int32 errorCode = 1;
string errorMsg = 2;
SearchFriendData Data = 3;
GetFriendData Data = 3;
}
message SearchFriendData{
message GetFriendData{
string uid = 1;
string icon = 2;
string name = 3;
......@@ -111,7 +111,16 @@ message GetBlacklistResp{
repeated UserInfo data = 3;
}
message IsFriendReq{
string token = 1;
string receiveUid = 2;
string OperationID = 3;
}
message IsFriendResp{
int32 errorCode = 1;
string errorMsg = 2;
int32 shipType = 3;
}
message IsInBlackListReq{
string sendUid = 1;
string receiveUid = 2;
......@@ -130,7 +139,7 @@ message DeleteFriendReq{
}
message AddedFriendReq{
message AddFriendResponseReq{
string uid = 1;
int32 flag = 2;
string OperationID = 3;
......@@ -145,15 +154,17 @@ message SetFriendCommentReq{
}
service friend{
rpc searchFriend(SearchFriendReq) returns(SearchFriendResp);
rpc getFriendsInfo(GetFriendsInfoReq) returns(GetFriendInfoResp);
rpc addFriend(AddFriendReq) returns(CommonResp);
rpc getFriendApplyList(GetFriendApplyReq) returns(GetFriendApplyResp);
rpc getSelfApplyList(GetFriendApplyReq) returns(GetFriendApplyResp);
rpc getFriendList(getFriendListReq) returns(getFriendListResp);
rpc addBlacklist(AddBlacklistReq) returns(CommonResp);
rpc removeBlacklist(RemoveBlacklistReq) returns(CommonResp);
rpc isFriend(IsFriendReq) returns(IsFriendResp);
rpc isInBlackList(IsInBlackListReq) returns(IsInBlackListResp);
rpc getBlacklist(GetBlacklistReq) returns(GetBlacklistResp);
rpc deleteFriend(DeleteFriendReq) returns(CommonResp);
rpc addedFriend(AddedFriendReq) returns(CommonResp);
rpc addFriendResponse(AddFriendResponseReq) returns(CommonResp);
rpc setFriendComment(SetFriendCommentReq) returns(CommonResp);
}
\ No newline at end of file
src/proto/group/group.pb.go
浏览文件 @ 3f9c3704
此差异已折叠。
src/proto/group/group.proto
浏览文件 @ 3f9c3704
......@@ -8,9 +8,18 @@ message CommonResp{
}
message CreateGroupReq{
repeated string userIDList = 1;
string token = 2;
string OperationID = 3;
repeated GroupAddMemberInfo memberList = 1;
string groupName = 2;
string introduction = 3;
string notification = 4;
string faceUrl = 5;
string token = 6;
string operationID = 7;
}
message GroupAddMemberInfo{
string uid = 1;
int32 setRole = 2;
}
message CreateGroupResp{
int32 ErrorCode = 1;
......@@ -18,61 +27,102 @@ message CreateGroupResp{
string groupID = 3;
}
message GetGroupListReq{
string token = 1;
string OperationID = 2;
message GetGroupsInfoReq{
repeated string groupIDList = 1;
string token = 2;
string operationID = 3;
}
message GetGroupListResp{
message GetGroupsInfoResp{
int32 ErrorCode = 1;
string ErrorMsg = 2;
repeated string groupList = 3;
repeated GroupInfo data = 3;
}
message GetGroupInfoReq{
message SetGroupInfoReq{
string groupID = 1;
string groupName = 2;
string notification = 3;
string introduction = 4;
string faceUrl = 5;
string token = 6;
string operationID = 7;
}
message GetGroupApplicationListReq {
string UID = 1;
string OperationID = 2;
string token = 3;
}
message GetGroupInfoResp{
int32 ErrorCode = 1;
string ErrorMsg = 2;
string groupID = 3;
string groupName = 4;
string groupHeadURL = 5;
string bulletin = 6;
repeated MemberList groupMemberList = 7;
message GetGroupApplicationList_Data_User {
string GroupID = 1;
string FromUserID = 2;
string FromUserNickName = 3;
string FromUserFaceUrl = 4;
string ToUserID = 5;
int64 AddTime = 6;
string RequestMsg = 7;
string HandledMsg = 8;
int32 Type = 9;
int32 HandleStatus = 10;
int32 HandleResult = 11;
}
message MemberList{
string userID = 1;
string nickName = 2;
int32 isAdmin = 3;
message GetGroupApplicationListData {
int32 Count = 1;
repeated GetGroupApplicationList_Data_User User = 2;
}
message GetGroupApplicationListResp {
int32 ErrCode = 1;
string ErrMsg = 2;
GetGroupApplicationListData Data = 3;
}
message DeleteGroupMemberReq{
string groupID = 1;
string token = 2;
string OperationID = 3;
repeated string userIdList = 4;
message TransferGroupOwnerReq {
string GroupID = 1;
string OldOwner = 2;
string NewOwner = 3;
string OperationID = 4;
}
message TransferGroupOwnerResp{
int32 ErrCode = 1;
string ErrMsg = 2;
}
message SetGroupNameReq{
message JoinGroupReq{
string groupID = 1;
string name = 2;
string message = 2;
string token = 3;
string OperationID = 4;
}
message GroupApplicationResponseReq{
string OperationID = 1;
string OwnerID = 2;
string GroupID = 3;
string FromUserID = 4;
string FromUserNickName = 5;
string FromUserFaceUrl = 6;
string ToUserID = 7;
string ToUserNickName = 8;
string ToUserFaceUrl = 9;
int64 AddTime = 10;
string RequestMsg = 11;
string HandledMsg = 12;
int32 Type = 13;
int32 HandleStatus = 14;
int32 HandleResult = 15;
}
message SetGroupBulletinReq{
string groupID = 1;
string bulletin = 2;
string OperationID = 3;
string token = 4;
message GroupApplicationResponseResp{
int32 ErrCode = 1;
string ErrMsg = 2;
}
message SetOwnerGroupNickNameReq{
string groupID = 1;
string nickName = 2;
......@@ -81,37 +131,153 @@ message SetOwnerGroupNickNameReq{
}
message SetGroupHeadImageReq{
message QuitGroupReq{
string groupID = 1;
string headUrl = 2;
string OperationID = 3;
string token = 4;
string operationID = 2;
string token = 3;
}
message MemberExitGroupReq{
message GroupApplicationUserInfo{
string groupID = 1;
string OperationID = 2;
string uid = 2;
string name = 3;
string icon = 4;
string reqMsg = 5;
int64 applicationTime = 6;
int32 flag = 7;
string operatorID = 8;
string handledMsg = 9;
}
message GroupMemberFullInfo {
string userId = 1;
int32 role = 2;
uint64 joinTime = 3;
string nickName = 4;
string faceUrl = 5;
}
message GetGroupMemberListReq {
string groupID = 1;
string token = 2;
string operationID = 3;
int32 filter = 4;
int32 nextSeq = 5;
}
message GetGroupMemberListResp {
int32 errorCode = 1;
string errorMsg = 2;
repeated GroupMemberFullInfo memberList = 3;
int32 nextSeq = 4;
}
message GetGroupMembersInfoReq {
string groupID = 1;
repeated string memberList = 2;
string token = 3;
string operationID = 4;
}
message GetGroupMembersInfoResp {
int32 errorCode = 1;
string errorMsg = 2;
repeated GroupMemberFullInfo memberList = 3;
}
service group{
rpc createGroup(CreateGroupReq) returns(CreateGroupResp);
rpc getGroupList(GetGroupListReq) returns(GetGroupListResp);
rpc getGroupInfo(GetGroupInfoReq)returns(GetGroupInfoResp);
rpc deleteGroupMember(DeleteGroupMemberReq) returns(CommonResp);
rpc setGroupName(SetGroupNameReq) returns(CommonResp);
rpc setGroupBulletin(SetGroupBulletinReq) returns(CommonResp);
rpc setOwnerGroupNickName(SetOwnerGroupNickNameReq) returns(CommonResp);
rpc setGroupHeadImage(SetGroupHeadImageReq) returns(CommonResp);
rpc memberExitGroup(MemberExitGroupReq) returns(CommonResp);
message KickGroupMemberReq {
string groupID = 1;
repeated string uidList = 2;
string reason = 3;
string token = 4;
string operationID = 5;
}
message Id2Result {
string uId = 1;
int32 result = 2; //0 ok; -1 error
}
message KickGroupMemberResp {
int32 errorCode = 1;
string errorMsg = 2;
repeated Id2Result id2result = 3;
}
message getJoinedGroupListReq {
string token = 1;
string operationID = 2;
}
message GroupInfo {
string groupId = 1;
string groupName = 2;
string notification = 3;
string introduction = 4;
string faceUrl = 5;
uint64 createTime = 6;
string ownerId = 7;
uint32 memberCount = 8;
}
message getJoinedGroupListResp{
int32 errorCode = 1;
string errorMsg = 2;
repeated GroupInfo groupList = 3;
}
message inviteUserToGroupReq {
string token = 1;
string operationID = 2;
string groupID = 3;
string reason = 4;
repeated string uidList = 5;
}
message inviteUserToGroupResp {
int32 errorCode = 1;
string errorMsg = 2;
repeated Id2Result id2result = 3; // 0 ok, -1 error
}
message GetGroupAllMemberReq {
string groupID = 1;
string token = 2;
string operationID = 3;
}
message GetGroupAllMemberResp {
int32 errorCode = 1;
string errorMsg = 2;
repeated GroupMemberFullInfo memberList = 3;
}
service group{
rpc createGroup(CreateGroupReq) returns(CreateGroupResp);
rpc joinGroup(JoinGroupReq) returns(CommonResp);
rpc quitGroup(QuitGroupReq) returns(CommonResp);
rpc getGroupsInfo(GetGroupsInfoReq) returns(GetGroupsInfoResp);
rpc setGroupInfo(SetGroupInfoReq) returns(CommonResp);
rpc getGroupApplicationList(GetGroupApplicationListReq) returns(GetGroupApplicationListResp);
rpc transferGroupOwner(TransferGroupOwnerReq) returns(TransferGroupOwnerResp);
rpc groupApplicationResponse(GroupApplicationResponseReq) returns(GroupApplicationResponseResp);
// rpc setOwnerGroupNickName(SetOwnerGroupNickNameReq) returns(CommonResp);
rpc getGroupMemberList(GetGroupMemberListReq) returns(GetGroupMemberListResp);
rpc getGroupMembersInfo(GetGroupMembersInfoReq) returns(GetGroupMembersInfoResp);
rpc kickGroupMember(KickGroupMemberReq) returns (KickGroupMemberResp);
rpc getJoinedGroupList(getJoinedGroupListReq) returns (getJoinedGroupListResp);
rpc inviteUserToGroup(inviteUserToGroupReq) returns (inviteUserToGroupResp);
rpc getGroupAllMember(GetGroupAllMemberReq) returns(GetGroupAllMemberResp);
}
......
src/proto/push/push.pb.go
浏览文件 @ 3f9c3704
......@@ -211,7 +211,9 @@ func init() {
proto.RegisterType((*PushMsgResp)(nil), "push.PushMsgResp")
}
func init() { proto.RegisterFile("push/push.proto", fileDescriptor_ae0042da44e9a7a7) }
func init() {
proto.RegisterFile("push/push.proto", fileDescriptor_ae0042da44e9a7a7)
}
var fileDescriptor_ae0042da44e9a7a7 = []byte{
// 346 bytes of a gzipped FileDescriptorProto
......@@ -241,11 +243,11 @@ var fileDescriptor_ae0042da44e9a7a7 = []byte{
// 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
// PushMsgServiceClient is the client API for PushMsgService service.
//
......@@ -255,10 +257,10 @@ type PushMsgServiceClient interface {
}
type pushMsgServiceClient struct {
cc *grpc.ClientConn
cc grpc.ClientConnInterface
}
func NewPushMsgServiceClient(cc *grpc.ClientConn) PushMsgServiceClient {
func NewPushMsgServiceClient(cc grpc.ClientConnInterface) PushMsgServiceClient {
return &pushMsgServiceClient{cc}
}
......
src/proto/relay/relay.pb.go
浏览文件 @ 3f9c3704
......@@ -262,7 +262,9 @@ func init() {
proto.RegisterType((*SingleMsgToUser)(nil), "relay.SingleMsgToUser")
}
func init() { proto.RegisterFile("relay/relay.proto", fileDescriptor_b6da3b5c0d1535b3) }
func init() {
proto.RegisterFile("relay/relay.proto", fileDescriptor_b6da3b5c0d1535b3)
}
var fileDescriptor_b6da3b5c0d1535b3 = []byte{
// 381 bytes of a gzipped FileDescriptorProto
......@@ -294,11 +296,11 @@ var fileDescriptor_b6da3b5c0d1535b3 = []byte{
// 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
// OnlineMessageRelayServiceClient is the client API for OnlineMessageRelayService service.
//
......@@ -308,10 +310,10 @@ type OnlineMessageRelayServiceClient interface {
}
type onlineMessageRelayServiceClient struct {
cc *grpc.ClientConn
cc grpc.ClientConnInterface
}
func NewOnlineMessageRelayServiceClient(cc *grpc.ClientConn) OnlineMessageRelayServiceClient {
func NewOnlineMessageRelayServiceClient(cc grpc.ClientConnInterface) OnlineMessageRelayServiceClient {
return &onlineMessageRelayServiceClient{cc}
}
......
src/proto/user/user.pb.go
浏览文件 @ 3f9c3704
......@@ -435,7 +435,9 @@ func init() {
proto.RegisterType((*UpdateUserInfoReq)(nil), "user.UpdateUserInfoReq")
}
func init() { proto.RegisterFile("user/user.proto", fileDescriptor_ed89022014131a74) }
func init() {
proto.RegisterFile("user/user.proto", fileDescriptor_ed89022014131a74)
}
var fileDescriptor_ed89022014131a74 = []byte{
// 416 bytes of a gzipped FileDescriptorProto
......@@ -469,11 +471,11 @@ var fileDescriptor_ed89022014131a74 = []byte{
// 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
// UserClient is the client API for User service.
//
......@@ -484,10 +486,10 @@ type UserClient interface {
}
type userClient struct {
cc *grpc.ClientConn
cc grpc.ClientConnInterface
}
func NewUserClient(cc *grpc.ClientConn) UserClient {
func NewUserClient(cc grpc.ClientConnInterface) UserClient {
return &userClient{cc}
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或