diff --git a/go.mod b/go.mod index 31b5d2b24..c632988c2 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/go-playground/validator/v10 v10.10.1 github.com/go-redis/redis/v8 v8.11.5 github.com/golang-jwt/jwt v3.2.2+incompatible - github.com/golang/protobuf v1.5.2 github.com/gorilla/websocket v1.4.2 github.com/hashicorp/consul/api v1.12.0 github.com/json-iterator/go v1.1.12 diff --git a/pb/friend_db.pb.go b/pb/friend_db.pb.go index 5d880e135..c961ac9aa 100644 --- a/pb/friend_db.pb.go +++ b/pb/friend_db.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: friend_db.proto +// source: friend/friend_db.proto package pb @@ -32,7 +32,7 @@ type Cache_FriendData struct { func (x *Cache_FriendData) Reset() { *x = Cache_FriendData{} if protoimpl.UnsafeEnabled { - mi := &file_friend_db_proto_msgTypes[0] + mi := &file_friend_friend_db_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *Cache_FriendData) String() string { func (*Cache_FriendData) ProtoMessage() {} func (x *Cache_FriendData) ProtoReflect() protoreflect.Message { - mi := &file_friend_db_proto_msgTypes[0] + mi := &file_friend_friend_db_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *Cache_FriendData) ProtoReflect() protoreflect.Message { // Deprecated: Use Cache_FriendData.ProtoReflect.Descriptor instead. func (*Cache_FriendData) Descriptor() ([]byte, []int) { - return file_friend_db_proto_rawDescGZIP(), []int{0} + return file_friend_friend_db_proto_rawDescGZIP(), []int{0} } func (x *Cache_FriendData) GetUserId() string { @@ -75,35 +75,35 @@ func (x *Cache_FriendData) GetFriendId() []string { return nil } -var File_friend_db_proto protoreflect.FileDescriptor +var File_friend_friend_db_proto protoreflect.FileDescriptor -var file_friend_db_proto_rawDesc = []byte{ - 0x0a, 0x0f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x22, 0x46, 0x0a, 0x10, 0x43, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, - 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_friend_friend_db_proto_rawDesc = []byte{ + 0x0a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, + 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x46, 0x0a, 0x10, 0x43, 0x61, 0x63, 0x68, + 0x65, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, + 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, + 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_friend_db_proto_rawDescOnce sync.Once - file_friend_db_proto_rawDescData = file_friend_db_proto_rawDesc + file_friend_friend_db_proto_rawDescOnce sync.Once + file_friend_friend_db_proto_rawDescData = file_friend_friend_db_proto_rawDesc ) -func file_friend_db_proto_rawDescGZIP() []byte { - file_friend_db_proto_rawDescOnce.Do(func() { - file_friend_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_friend_db_proto_rawDescData) +func file_friend_friend_db_proto_rawDescGZIP() []byte { + file_friend_friend_db_proto_rawDescOnce.Do(func() { + file_friend_friend_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_friend_friend_db_proto_rawDescData) }) - return file_friend_db_proto_rawDescData + return file_friend_friend_db_proto_rawDescData } -var file_friend_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1) -var file_friend_db_proto_goTypes = []interface{}{ +var file_friend_friend_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_friend_friend_db_proto_goTypes = []interface{}{ (*Cache_FriendData)(nil), // 0: Cache_FriendData } -var file_friend_db_proto_depIdxs = []int32{ +var file_friend_friend_db_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for method output_type 0, // [0:0] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name @@ -111,13 +111,13 @@ var file_friend_db_proto_depIdxs = []int32{ 0, // [0:0] is the sub-list for field type_name } -func init() { file_friend_db_proto_init() } -func file_friend_db_proto_init() { - if File_friend_db_proto != nil { +func init() { file_friend_friend_db_proto_init() } +func file_friend_friend_db_proto_init() { + if File_friend_friend_db_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_friend_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Cache_FriendData); i { case 0: return &v.state @@ -134,18 +134,18 @@ func file_friend_db_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_friend_db_proto_rawDesc, + RawDescriptor: file_friend_friend_db_proto_rawDesc, NumEnums: 0, NumMessages: 1, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_friend_db_proto_goTypes, - DependencyIndexes: file_friend_db_proto_depIdxs, - MessageInfos: file_friend_db_proto_msgTypes, + GoTypes: file_friend_friend_db_proto_goTypes, + DependencyIndexes: file_friend_friend_db_proto_depIdxs, + MessageInfos: file_friend_friend_db_proto_msgTypes, }.Build() - File_friend_db_proto = out.File - file_friend_db_proto_rawDesc = nil - file_friend_db_proto_goTypes = nil - file_friend_db_proto_depIdxs = nil + File_friend_friend_db_proto = out.File + file_friend_friend_db_proto_rawDesc = nil + file_friend_friend_db_proto_goTypes = nil + file_friend_friend_db_proto_depIdxs = nil } diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go index 2da051f1d..7770af397 100644 --- a/pb/friend_msg.pb.go +++ b/pb/friend_msg.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: friend_msg.proto +// source: friend/friend_msg.proto package pb @@ -37,7 +37,7 @@ type FriendBase struct { func (x *FriendBase) Reset() { *x = FriendBase{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[0] + mi := &file_friend_friend_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -50,7 +50,7 @@ func (x *FriendBase) String() string { func (*FriendBase) ProtoMessage() {} func (x *FriendBase) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[0] + mi := &file_friend_friend_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -63,7 +63,7 @@ func (x *FriendBase) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendBase.ProtoReflect.Descriptor instead. func (*FriendBase) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{0} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{0} } func (x *FriendBase) GetUserId() string { @@ -125,7 +125,7 @@ type FriendListReq struct { func (x *FriendListReq) Reset() { *x = FriendListReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[1] + mi := &file_friend_friend_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -138,7 +138,7 @@ func (x *FriendListReq) String() string { func (*FriendListReq) ProtoMessage() {} func (x *FriendListReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[1] + mi := &file_friend_friend_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -151,7 +151,7 @@ func (x *FriendListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendListReq.ProtoReflect.Descriptor instead. func (*FriendListReq) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{1} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{1} } type FriendListRsp struct { @@ -165,7 +165,7 @@ type FriendListRsp struct { func (x *FriendListRsp) Reset() { *x = FriendListRsp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[2] + mi := &file_friend_friend_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -178,7 +178,7 @@ func (x *FriendListRsp) String() string { func (*FriendListRsp) ProtoMessage() {} func (x *FriendListRsp) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[2] + mi := &file_friend_friend_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -191,7 +191,7 @@ func (x *FriendListRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendListRsp.ProtoReflect.Descriptor instead. func (*FriendListRsp) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{2} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{2} } func (x *FriendListRsp) GetList() []*Cache_FriendData { @@ -213,7 +213,7 @@ type FriendAddReq struct { func (x *FriendAddReq) Reset() { *x = FriendAddReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[3] + mi := &file_friend_friend_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -226,7 +226,7 @@ func (x *FriendAddReq) String() string { func (*FriendAddReq) ProtoMessage() {} func (x *FriendAddReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[3] + mi := &file_friend_friend_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -239,7 +239,7 @@ func (x *FriendAddReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendAddReq.ProtoReflect.Descriptor instead. func (*FriendAddReq) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{3} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{3} } func (x *FriendAddReq) GetFriendId() string { @@ -260,7 +260,7 @@ type FriendAddRsp struct { func (x *FriendAddRsp) Reset() { *x = FriendAddRsp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[4] + mi := &file_friend_friend_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -273,7 +273,7 @@ func (x *FriendAddRsp) String() string { func (*FriendAddRsp) ProtoMessage() {} func (x *FriendAddRsp) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[4] + mi := &file_friend_friend_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -286,7 +286,7 @@ func (x *FriendAddRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendAddRsp.ProtoReflect.Descriptor instead. func (*FriendAddRsp) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{4} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{4} } func (x *FriendAddRsp) GetUserId() string { @@ -308,7 +308,7 @@ type FriendDelReq struct { func (x *FriendDelReq) Reset() { *x = FriendDelReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[5] + mi := &file_friend_friend_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -321,7 +321,7 @@ func (x *FriendDelReq) String() string { func (*FriendDelReq) ProtoMessage() {} func (x *FriendDelReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[5] + mi := &file_friend_friend_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -334,7 +334,7 @@ func (x *FriendDelReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendDelReq.ProtoReflect.Descriptor instead. func (*FriendDelReq) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{5} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{5} } func (x *FriendDelReq) GetFriendId() string { @@ -356,7 +356,7 @@ type FriendDelRsp struct { func (x *FriendDelRsp) Reset() { *x = FriendDelRsp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[6] + mi := &file_friend_friend_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -369,7 +369,7 @@ func (x *FriendDelRsp) String() string { func (*FriendDelRsp) ProtoMessage() {} func (x *FriendDelRsp) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[6] + mi := &file_friend_friend_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -382,7 +382,7 @@ func (x *FriendDelRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendDelRsp.ProtoReflect.Descriptor instead. func (*FriendDelRsp) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{6} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{6} } func (x *FriendDelRsp) GetFriendId() string { @@ -412,7 +412,7 @@ type FriendAgreeOrRefuseReq struct { func (x *FriendAgreeOrRefuseReq) Reset() { *x = FriendAgreeOrRefuseReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[7] + mi := &file_friend_friend_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -425,7 +425,7 @@ func (x *FriendAgreeOrRefuseReq) String() string { func (*FriendAgreeOrRefuseReq) ProtoMessage() {} func (x *FriendAgreeOrRefuseReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[7] + mi := &file_friend_friend_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -438,7 +438,7 @@ func (x *FriendAgreeOrRefuseReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendAgreeOrRefuseReq.ProtoReflect.Descriptor instead. func (*FriendAgreeOrRefuseReq) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{7} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{7} } func (x *FriendAgreeOrRefuseReq) GetFriendId() string { @@ -467,7 +467,7 @@ type FriendAgressOrRefuseRsp struct { func (x *FriendAgressOrRefuseRsp) Reset() { *x = FriendAgressOrRefuseRsp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[8] + mi := &file_friend_friend_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -480,7 +480,7 @@ func (x *FriendAgressOrRefuseRsp) String() string { func (*FriendAgressOrRefuseRsp) ProtoMessage() {} func (x *FriendAgressOrRefuseRsp) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[8] + mi := &file_friend_friend_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -493,7 +493,7 @@ func (x *FriendAgressOrRefuseRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendAgressOrRefuseRsp.ProtoReflect.Descriptor instead. func (*FriendAgressOrRefuseRsp) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{8} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{8} } func (x *FriendAgressOrRefuseRsp) GetNum() int32 { @@ -520,7 +520,7 @@ type FriendApplyListReq struct { func (x *FriendApplyListReq) Reset() { *x = FriendApplyListReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[9] + mi := &file_friend_friend_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -533,7 +533,7 @@ func (x *FriendApplyListReq) String() string { func (*FriendApplyListReq) ProtoMessage() {} func (x *FriendApplyListReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[9] + mi := &file_friend_friend_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -546,7 +546,7 @@ func (x *FriendApplyListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendApplyListReq.ProtoReflect.Descriptor instead. func (*FriendApplyListReq) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{9} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{9} } type FriendApplyListRsp struct { @@ -558,7 +558,7 @@ type FriendApplyListRsp struct { func (x *FriendApplyListRsp) Reset() { *x = FriendApplyListRsp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[10] + mi := &file_friend_friend_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -571,7 +571,7 @@ func (x *FriendApplyListRsp) String() string { func (*FriendApplyListRsp) ProtoMessage() {} func (x *FriendApplyListRsp) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[10] + mi := &file_friend_friend_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -584,7 +584,7 @@ func (x *FriendApplyListRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendApplyListRsp.ProtoReflect.Descriptor instead. func (*FriendApplyListRsp) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{10} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{10} } //好友搜索 @@ -600,7 +600,7 @@ type FriendSearchReq struct { func (x *FriendSearchReq) Reset() { *x = FriendSearchReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[11] + mi := &file_friend_friend_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -613,7 +613,7 @@ func (x *FriendSearchReq) String() string { func (*FriendSearchReq) ProtoMessage() {} func (x *FriendSearchReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[11] + mi := &file_friend_friend_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -626,7 +626,7 @@ func (x *FriendSearchReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendSearchReq.ProtoReflect.Descriptor instead. func (*FriendSearchReq) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{11} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{11} } func (x *FriendSearchReq) GetFriendId() string { @@ -654,7 +654,7 @@ type FriendSearchRsp struct { func (x *FriendSearchRsp) Reset() { *x = FriendSearchRsp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[12] + mi := &file_friend_friend_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -667,7 +667,7 @@ func (x *FriendSearchRsp) String() string { func (*FriendSearchRsp) ProtoMessage() {} func (x *FriendSearchRsp) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[12] + mi := &file_friend_friend_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -680,7 +680,7 @@ func (x *FriendSearchRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendSearchRsp.ProtoReflect.Descriptor instead. func (*FriendSearchRsp) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{12} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{12} } func (x *FriendSearchRsp) GetFriends() []*FriendBase { @@ -700,7 +700,7 @@ type FriendBlackListReq struct { func (x *FriendBlackListReq) Reset() { *x = FriendBlackListReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[13] + mi := &file_friend_friend_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -713,7 +713,7 @@ func (x *FriendBlackListReq) String() string { func (*FriendBlackListReq) ProtoMessage() {} func (x *FriendBlackListReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[13] + mi := &file_friend_friend_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -726,7 +726,7 @@ func (x *FriendBlackListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendBlackListReq.ProtoReflect.Descriptor instead. func (*FriendBlackListReq) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{13} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{13} } type FriendBlackListRsp struct { @@ -740,7 +740,7 @@ type FriendBlackListRsp struct { func (x *FriendBlackListRsp) Reset() { *x = FriendBlackListRsp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[14] + mi := &file_friend_friend_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -753,7 +753,7 @@ func (x *FriendBlackListRsp) String() string { func (*FriendBlackListRsp) ProtoMessage() {} func (x *FriendBlackListRsp) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[14] + mi := &file_friend_friend_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -766,7 +766,7 @@ func (x *FriendBlackListRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendBlackListRsp.ProtoReflect.Descriptor instead. func (*FriendBlackListRsp) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{14} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{14} } func (x *FriendBlackListRsp) GetFriends() []*FriendBase { @@ -788,7 +788,7 @@ type FriendBlackAddReq struct { func (x *FriendBlackAddReq) Reset() { *x = FriendBlackAddReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[15] + mi := &file_friend_friend_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -801,7 +801,7 @@ func (x *FriendBlackAddReq) String() string { func (*FriendBlackAddReq) ProtoMessage() {} func (x *FriendBlackAddReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[15] + mi := &file_friend_friend_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -814,7 +814,7 @@ func (x *FriendBlackAddReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendBlackAddReq.ProtoReflect.Descriptor instead. func (*FriendBlackAddReq) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{15} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{15} } func (x *FriendBlackAddReq) GetFriendId() string { @@ -836,7 +836,7 @@ type FriendBlackAddRsp struct { func (x *FriendBlackAddRsp) Reset() { *x = FriendBlackAddRsp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[16] + mi := &file_friend_friend_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -849,7 +849,7 @@ func (x *FriendBlackAddRsp) String() string { func (*FriendBlackAddRsp) ProtoMessage() {} func (x *FriendBlackAddRsp) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[16] + mi := &file_friend_friend_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -862,7 +862,7 @@ func (x *FriendBlackAddRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendBlackAddRsp.ProtoReflect.Descriptor instead. func (*FriendBlackAddRsp) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{16} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{16} } func (x *FriendBlackAddRsp) GetFriendId() string { @@ -892,7 +892,7 @@ type FriendReceiveOrSendReq struct { func (x *FriendReceiveOrSendReq) Reset() { *x = FriendReceiveOrSendReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[17] + mi := &file_friend_friend_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -905,7 +905,7 @@ func (x *FriendReceiveOrSendReq) String() string { func (*FriendReceiveOrSendReq) ProtoMessage() {} func (x *FriendReceiveOrSendReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[17] + mi := &file_friend_friend_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -918,7 +918,7 @@ func (x *FriendReceiveOrSendReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendReceiveOrSendReq.ProtoReflect.Descriptor instead. func (*FriendReceiveOrSendReq) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{17} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{17} } func (x *FriendReceiveOrSendReq) GetFriendId() string { @@ -948,7 +948,7 @@ type FriendReceiveOrSendRsp struct { func (x *FriendReceiveOrSendRsp) Reset() { *x = FriendReceiveOrSendRsp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[18] + mi := &file_friend_friend_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -961,7 +961,7 @@ func (x *FriendReceiveOrSendRsp) String() string { func (*FriendReceiveOrSendRsp) ProtoMessage() {} func (x *FriendReceiveOrSendRsp) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[18] + mi := &file_friend_friend_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -974,7 +974,7 @@ func (x *FriendReceiveOrSendRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendReceiveOrSendRsp.ProtoReflect.Descriptor instead. func (*FriendReceiveOrSendRsp) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{18} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{18} } func (x *FriendReceiveOrSendRsp) GetFriendId() string { @@ -1010,7 +1010,7 @@ type FriendTotalReq struct { func (x *FriendTotalReq) Reset() { *x = FriendTotalReq{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[19] + mi := &file_friend_friend_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1023,7 +1023,7 @@ func (x *FriendTotalReq) String() string { func (*FriendTotalReq) ProtoMessage() {} func (x *FriendTotalReq) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[19] + mi := &file_friend_friend_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1036,7 +1036,7 @@ func (x *FriendTotalReq) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendTotalReq.ProtoReflect.Descriptor instead. func (*FriendTotalReq) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{19} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{19} } func (x *FriendTotalReq) GetFriendId() string { @@ -1058,7 +1058,7 @@ type FriendTotalRsp struct { func (x *FriendTotalRsp) Reset() { *x = FriendTotalRsp{} if protoimpl.UnsafeEnabled { - mi := &file_friend_msg_proto_msgTypes[20] + mi := &file_friend_friend_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1071,7 +1071,7 @@ func (x *FriendTotalRsp) String() string { func (*FriendTotalRsp) ProtoMessage() {} func (x *FriendTotalRsp) ProtoReflect() protoreflect.Message { - mi := &file_friend_msg_proto_msgTypes[20] + mi := &file_friend_friend_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1084,7 +1084,7 @@ func (x *FriendTotalRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use FriendTotalRsp.ProtoReflect.Descriptor instead. func (*FriendTotalRsp) Descriptor() ([]byte, []int) { - return file_friend_msg_proto_rawDescGZIP(), []int{20} + return file_friend_friend_msg_proto_rawDescGZIP(), []int{20} } func (x *FriendTotalRsp) GetFriendId() string { @@ -1101,111 +1101,111 @@ func (x *FriendTotalRsp) GetTotal() int32 { return 0 } -var File_friend_msg_proto protoreflect.FileDescriptor +var File_friend_friend_msg_proto protoreflect.FileDescriptor -var file_friend_msg_proto_rawDesc = []byte{ - 0x0a, 0x10, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x0f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0xc8, 0x01, 0x0a, 0x0a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, - 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, - 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, - 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x16, 0x0a, 0x06, - 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, - 0x61, 0x74, 0x61, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, - 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, - 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, - 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x0f, - 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, - 0x36, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, 0x70, - 0x12, 0x25, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, - 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x61, 0x74, - 0x61, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2a, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x49, 0x64, 0x22, 0x26, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, - 0x52, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0c, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x44, 0x65, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x16, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x4f, 0x72, 0x52, 0x65, 0x66, 0x75, - 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, +var file_friend_friend_msg_proto_rawDesc = []byte{ + 0x0a, 0x17, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, + 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x22, 0xc8, 0x01, 0x0a, 0x0a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, + 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, + 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, + 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, + 0x61, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, + 0x61, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x1a, + 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x6f, 0x66, + 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x0b, 0x6f, 0x66, 0x66, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, + 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, 0x70, 0x12, 0x25, + 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x43, + 0x61, 0x63, 0x68, 0x65, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2a, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, + 0x64, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, - 0x64, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x41, 0x67, 0x72, 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x41, 0x67, 0x72, 0x65, 0x65, 0x22, 0x45, 0x0a, 0x17, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x73, 0x73, 0x4f, 0x72, 0x52, 0x65, 0x66, - 0x75, 0x73, 0x65, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x41, 0x67, - 0x72, 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x41, 0x67, 0x72, - 0x65, 0x65, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, - 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, 0x70, 0x22, 0x49, - 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, - 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x1a, 0x0a, - 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x38, 0x0a, 0x0f, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, - 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, - 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, - 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3b, 0x0a, 0x12, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, 0x70, 0x12, - 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, + 0x64, 0x22, 0x26, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x52, 0x73, + 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0c, 0x46, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, + 0x65, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, + 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x16, 0x46, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x4f, 0x72, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, + 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, + 0x18, 0x0a, 0x07, 0x69, 0x73, 0x41, 0x67, 0x72, 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x07, 0x69, 0x73, 0x41, 0x67, 0x72, 0x65, 0x65, 0x22, 0x45, 0x0a, 0x17, 0x46, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x73, 0x73, 0x4f, 0x72, 0x52, 0x65, 0x66, 0x75, 0x73, + 0x65, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x41, 0x67, 0x72, 0x65, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x41, 0x67, 0x72, 0x65, 0x65, + 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, + 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, 0x70, 0x22, 0x49, 0x0a, 0x0f, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, + 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, + 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, + 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x38, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x73, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, + 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3b, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x73, 0x70, 0x12, 0x25, 0x0a, + 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, + 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x47, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, + 0x6c, 0x61, 0x63, 0x6b, 0x41, 0x64, 0x64, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x52, + 0x0a, 0x16, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x4f, + 0x72, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x52, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x22, 0x6a, 0x0a, 0x16, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x4f, 0x72, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, - 0x22, 0x52, 0x0a, 0x16, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x4f, 0x72, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x52, 0x65, 0x63, 0x65, - 0x69, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x52, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x22, 0x6a, 0x0a, 0x16, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, - 0x63, 0x65, 0x69, 0x76, 0x65, 0x4f, 0x72, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x73, 0x70, 0x12, 0x1a, - 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, - 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, - 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, - 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x42, - 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x73, 0x70, + 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x22, 0x2c, + 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, - 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, - 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x0e, + 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x1a, + 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, + 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_friend_msg_proto_rawDescOnce sync.Once - file_friend_msg_proto_rawDescData = file_friend_msg_proto_rawDesc + file_friend_friend_msg_proto_rawDescOnce sync.Once + file_friend_friend_msg_proto_rawDescData = file_friend_friend_msg_proto_rawDesc ) -func file_friend_msg_proto_rawDescGZIP() []byte { - file_friend_msg_proto_rawDescOnce.Do(func() { - file_friend_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_friend_msg_proto_rawDescData) +func file_friend_friend_msg_proto_rawDescGZIP() []byte { + file_friend_friend_msg_proto_rawDescOnce.Do(func() { + file_friend_friend_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_friend_friend_msg_proto_rawDescData) }) - return file_friend_msg_proto_rawDescData + return file_friend_friend_msg_proto_rawDescData } -var file_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21) -var file_friend_msg_proto_goTypes = []interface{}{ +var file_friend_friend_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21) +var file_friend_friend_msg_proto_goTypes = []interface{}{ (*FriendBase)(nil), // 0: FriendBase (*FriendListReq)(nil), // 1: FriendListReq (*FriendListRsp)(nil), // 2: FriendListRsp @@ -1229,7 +1229,7 @@ var file_friend_msg_proto_goTypes = []interface{}{ (*FriendTotalRsp)(nil), // 20: FriendTotalRsp (*Cache_FriendData)(nil), // 21: Cache_FriendData } -var file_friend_msg_proto_depIdxs = []int32{ +var file_friend_friend_msg_proto_depIdxs = []int32{ 21, // 0: FriendListRsp.list:type_name -> Cache_FriendData 0, // 1: FriendSearchRsp.friends:type_name -> FriendBase 0, // 2: FriendBlackListRsp.friends:type_name -> FriendBase @@ -1240,14 +1240,14 @@ var file_friend_msg_proto_depIdxs = []int32{ 0, // [0:3] is the sub-list for field type_name } -func init() { file_friend_msg_proto_init() } -func file_friend_msg_proto_init() { - if File_friend_msg_proto != nil { +func init() { file_friend_friend_msg_proto_init() } +func file_friend_friend_msg_proto_init() { + if File_friend_friend_msg_proto != nil { return } - file_friend_db_proto_init() + file_friend_friend_db_proto_init() if !protoimpl.UnsafeEnabled { - file_friend_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendBase); i { case 0: return &v.state @@ -1259,7 +1259,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendListReq); i { case 0: return &v.state @@ -1271,7 +1271,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendListRsp); i { case 0: return &v.state @@ -1283,7 +1283,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendAddReq); i { case 0: return &v.state @@ -1295,7 +1295,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendAddRsp); i { case 0: return &v.state @@ -1307,7 +1307,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendDelReq); i { case 0: return &v.state @@ -1319,7 +1319,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendDelRsp); i { case 0: return &v.state @@ -1331,7 +1331,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendAgreeOrRefuseReq); i { case 0: return &v.state @@ -1343,7 +1343,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendAgressOrRefuseRsp); i { case 0: return &v.state @@ -1355,7 +1355,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendApplyListReq); i { case 0: return &v.state @@ -1367,7 +1367,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendApplyListRsp); i { case 0: return &v.state @@ -1379,7 +1379,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendSearchReq); i { case 0: return &v.state @@ -1391,7 +1391,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendSearchRsp); i { case 0: return &v.state @@ -1403,7 +1403,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendBlackListReq); i { case 0: return &v.state @@ -1415,7 +1415,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendBlackListRsp); i { case 0: return &v.state @@ -1427,7 +1427,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendBlackAddReq); i { case 0: return &v.state @@ -1439,7 +1439,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendBlackAddRsp); i { case 0: return &v.state @@ -1451,7 +1451,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendReceiveOrSendReq); i { case 0: return &v.state @@ -1463,7 +1463,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendReceiveOrSendRsp); i { case 0: return &v.state @@ -1475,7 +1475,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendTotalReq); i { case 0: return &v.state @@ -1487,7 +1487,7 @@ func file_friend_msg_proto_init() { return nil } } - file_friend_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_friend_friend_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*FriendTotalRsp); i { case 0: return &v.state @@ -1504,18 +1504,18 @@ func file_friend_msg_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_friend_msg_proto_rawDesc, + RawDescriptor: file_friend_friend_msg_proto_rawDesc, NumEnums: 0, NumMessages: 21, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_friend_msg_proto_goTypes, - DependencyIndexes: file_friend_msg_proto_depIdxs, - MessageInfos: file_friend_msg_proto_msgTypes, + GoTypes: file_friend_friend_msg_proto_goTypes, + DependencyIndexes: file_friend_friend_msg_proto_depIdxs, + MessageInfos: file_friend_friend_msg_proto_msgTypes, }.Build() - File_friend_msg_proto = out.File - file_friend_msg_proto_rawDesc = nil - file_friend_msg_proto_goTypes = nil - file_friend_msg_proto_depIdxs = nil + File_friend_friend_msg_proto = out.File + file_friend_friend_msg_proto_rawDesc = nil + file_friend_friend_msg_proto_goTypes = nil + file_friend_friend_msg_proto_depIdxs = nil } diff --git a/pb/mail_db.pb.go b/pb/mail_db.pb.go index 95a663a28..1172f18d5 100644 --- a/pb/mail_db.pb.go +++ b/pb/mail_db.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: mail_db.proto +// source: mail/mail_db.proto package pb @@ -32,7 +32,7 @@ type MailAttachment struct { func (x *MailAttachment) Reset() { *x = MailAttachment{} if protoimpl.UnsafeEnabled { - mi := &file_mail_db_proto_msgTypes[0] + mi := &file_mail_mail_db_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *MailAttachment) String() string { func (*MailAttachment) ProtoMessage() {} func (x *MailAttachment) ProtoReflect() protoreflect.Message { - mi := &file_mail_db_proto_msgTypes[0] + mi := &file_mail_mail_db_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *MailAttachment) ProtoReflect() protoreflect.Message { // Deprecated: Use MailAttachment.ProtoReflect.Descriptor instead. func (*MailAttachment) Descriptor() ([]byte, []int) { - return file_mail_db_proto_rawDescGZIP(), []int{0} + return file_mail_mail_db_proto_rawDescGZIP(), []int{0} } func (x *MailAttachment) GetItemId() uint32 { @@ -94,7 +94,7 @@ type DB_MailData struct { func (x *DB_MailData) Reset() { *x = DB_MailData{} if protoimpl.UnsafeEnabled { - mi := &file_mail_db_proto_msgTypes[1] + mi := &file_mail_mail_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -107,7 +107,7 @@ func (x *DB_MailData) String() string { func (*DB_MailData) ProtoMessage() {} func (x *DB_MailData) ProtoReflect() protoreflect.Message { - mi := &file_mail_db_proto_msgTypes[1] + mi := &file_mail_mail_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -120,7 +120,7 @@ func (x *DB_MailData) ProtoReflect() protoreflect.Message { // Deprecated: Use DB_MailData.ProtoReflect.Descriptor instead. func (*DB_MailData) Descriptor() ([]byte, []int) { - return file_mail_db_proto_rawDescGZIP(), []int{1} + return file_mail_mail_db_proto_rawDescGZIP(), []int{1} } func (x *DB_MailData) GetObjId() string { @@ -186,52 +186,52 @@ func (x *DB_MailData) GetItems() []*MailAttachment { return nil } -var File_mail_db_proto protoreflect.FileDescriptor +var File_mail_mail_db_proto protoreflect.FileDescriptor -var file_mail_db_proto_rawDesc = []byte{ - 0x0a, 0x0d, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0x46, 0x0a, 0x0e, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, - 0x74, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0d, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x49, 0x74, 0x65, - 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x49, 0x74, - 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xf8, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x4d, - 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x16, 0x0a, - 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, - 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x43, - 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x43, 0x6f, 0x6e, - 0x74, 0x65, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, - 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x44, 0x75, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x44, 0x75, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, - 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x43, 0x68, - 0x65, 0x63, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x25, 0x0a, 0x05, 0x49, - 0x74, 0x65, 0x6d, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x4d, 0x61, 0x69, - 0x6c, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x49, 0x74, 0x65, - 0x6d, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, +var file_mail_mail_db_proto_rawDesc = []byte{ + 0x0a, 0x12, 0x6d, 0x61, 0x69, 0x6c, 0x2f, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 0x64, 0x62, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x46, 0x0a, 0x0e, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x1c, + 0x0a, 0x09, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x09, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xf8, 0x01, 0x0a, + 0x0b, 0x44, 0x42, 0x5f, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, + 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4f, 0x62, 0x6a, + 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x69, + 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x69, 0x74, 0x6c, 0x65, + 0x12, 0x16, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0a, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x44, 0x75, 0x65, 0x54, + 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x07, 0x44, 0x75, 0x65, 0x54, 0x69, + 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x08, 0x52, 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x12, 0x25, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0f, 0x2e, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, + 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_mail_db_proto_rawDescOnce sync.Once - file_mail_db_proto_rawDescData = file_mail_db_proto_rawDesc + file_mail_mail_db_proto_rawDescOnce sync.Once + file_mail_mail_db_proto_rawDescData = file_mail_mail_db_proto_rawDesc ) -func file_mail_db_proto_rawDescGZIP() []byte { - file_mail_db_proto_rawDescOnce.Do(func() { - file_mail_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_mail_db_proto_rawDescData) +func file_mail_mail_db_proto_rawDescGZIP() []byte { + file_mail_mail_db_proto_rawDescOnce.Do(func() { + file_mail_mail_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_mail_mail_db_proto_rawDescData) }) - return file_mail_db_proto_rawDescData + return file_mail_mail_db_proto_rawDescData } -var file_mail_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_mail_db_proto_goTypes = []interface{}{ +var file_mail_mail_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_mail_mail_db_proto_goTypes = []interface{}{ (*MailAttachment)(nil), // 0: MailAttachment (*DB_MailData)(nil), // 1: DB_MailData } -var file_mail_db_proto_depIdxs = []int32{ +var file_mail_mail_db_proto_depIdxs = []int32{ 0, // 0: DB_MailData.Items:type_name -> MailAttachment 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -240,13 +240,13 @@ var file_mail_db_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_mail_db_proto_init() } -func file_mail_db_proto_init() { - if File_mail_db_proto != nil { +func init() { file_mail_mail_db_proto_init() } +func file_mail_mail_db_proto_init() { + if File_mail_mail_db_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_mail_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_mail_mail_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MailAttachment); i { case 0: return &v.state @@ -258,7 +258,7 @@ func file_mail_db_proto_init() { return nil } } - file_mail_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_mail_mail_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DB_MailData); i { case 0: return &v.state @@ -275,18 +275,18 @@ func file_mail_db_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_mail_db_proto_rawDesc, + RawDescriptor: file_mail_mail_db_proto_rawDesc, NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_mail_db_proto_goTypes, - DependencyIndexes: file_mail_db_proto_depIdxs, - MessageInfos: file_mail_db_proto_msgTypes, + GoTypes: file_mail_mail_db_proto_goTypes, + DependencyIndexes: file_mail_mail_db_proto_depIdxs, + MessageInfos: file_mail_mail_db_proto_msgTypes, }.Build() - File_mail_db_proto = out.File - file_mail_db_proto_rawDesc = nil - file_mail_db_proto_goTypes = nil - file_mail_db_proto_depIdxs = nil + File_mail_mail_db_proto = out.File + file_mail_mail_db_proto_rawDesc = nil + file_mail_mail_db_proto_goTypes = nil + file_mail_mail_db_proto_depIdxs = nil } diff --git a/pb/mail_msg.pb.go b/pb/mail_msg.pb.go index 6034a2005..388595803 100644 --- a/pb/mail_msg.pb.go +++ b/pb/mail_msg.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: mail_msg.proto +// source: mail/mail_msg.proto package pb @@ -29,7 +29,7 @@ type QueryUserMailReq struct { func (x *QueryUserMailReq) Reset() { *x = QueryUserMailReq{} if protoimpl.UnsafeEnabled { - mi := &file_mail_msg_proto_msgTypes[0] + mi := &file_mail_mail_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -42,7 +42,7 @@ func (x *QueryUserMailReq) String() string { func (*QueryUserMailReq) ProtoMessage() {} func (x *QueryUserMailReq) ProtoReflect() protoreflect.Message { - mi := &file_mail_msg_proto_msgTypes[0] + mi := &file_mail_mail_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -55,7 +55,7 @@ func (x *QueryUserMailReq) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryUserMailReq.ProtoReflect.Descriptor instead. func (*QueryUserMailReq) Descriptor() ([]byte, []int) { - return file_mail_msg_proto_rawDescGZIP(), []int{0} + return file_mail_mail_msg_proto_rawDescGZIP(), []int{0} } // 查询邮件信息 @@ -70,7 +70,7 @@ type QueryUserMailResp struct { func (x *QueryUserMailResp) Reset() { *x = QueryUserMailResp{} if protoimpl.UnsafeEnabled { - mi := &file_mail_msg_proto_msgTypes[1] + mi := &file_mail_mail_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -83,7 +83,7 @@ func (x *QueryUserMailResp) String() string { func (*QueryUserMailResp) ProtoMessage() {} func (x *QueryUserMailResp) ProtoReflect() protoreflect.Message { - mi := &file_mail_msg_proto_msgTypes[1] + mi := &file_mail_mail_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -96,7 +96,7 @@ func (x *QueryUserMailResp) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryUserMailResp.ProtoReflect.Descriptor instead. func (*QueryUserMailResp) Descriptor() ([]byte, []int) { - return file_mail_msg_proto_rawDescGZIP(), []int{1} + return file_mail_mail_msg_proto_rawDescGZIP(), []int{1} } func (x *QueryUserMailResp) GetMails() []*DB_MailData { @@ -118,7 +118,7 @@ type ReadUserMailReq struct { func (x *ReadUserMailReq) Reset() { *x = ReadUserMailReq{} if protoimpl.UnsafeEnabled { - mi := &file_mail_msg_proto_msgTypes[2] + mi := &file_mail_mail_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -131,7 +131,7 @@ func (x *ReadUserMailReq) String() string { func (*ReadUserMailReq) ProtoMessage() {} func (x *ReadUserMailReq) ProtoReflect() protoreflect.Message { - mi := &file_mail_msg_proto_msgTypes[2] + mi := &file_mail_mail_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -144,7 +144,7 @@ func (x *ReadUserMailReq) ProtoReflect() protoreflect.Message { // Deprecated: Use ReadUserMailReq.ProtoReflect.Descriptor instead. func (*ReadUserMailReq) Descriptor() ([]byte, []int) { - return file_mail_msg_proto_rawDescGZIP(), []int{2} + return file_mail_mail_msg_proto_rawDescGZIP(), []int{2} } func (x *ReadUserMailReq) GetObjID() string { @@ -165,7 +165,7 @@ type ReadUserMailResp struct { func (x *ReadUserMailResp) Reset() { *x = ReadUserMailResp{} if protoimpl.UnsafeEnabled { - mi := &file_mail_msg_proto_msgTypes[3] + mi := &file_mail_mail_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -178,7 +178,7 @@ func (x *ReadUserMailResp) String() string { func (*ReadUserMailResp) ProtoMessage() {} func (x *ReadUserMailResp) ProtoReflect() protoreflect.Message { - mi := &file_mail_msg_proto_msgTypes[3] + mi := &file_mail_mail_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -191,7 +191,7 @@ func (x *ReadUserMailResp) ProtoReflect() protoreflect.Message { // Deprecated: Use ReadUserMailResp.ProtoReflect.Descriptor instead. func (*ReadUserMailResp) Descriptor() ([]byte, []int) { - return file_mail_msg_proto_rawDescGZIP(), []int{3} + return file_mail_mail_msg_proto_rawDescGZIP(), []int{3} } func (x *ReadUserMailResp) GetMail() *DB_MailData { @@ -213,7 +213,7 @@ type GetUserMailAttachmentReq struct { func (x *GetUserMailAttachmentReq) Reset() { *x = GetUserMailAttachmentReq{} if protoimpl.UnsafeEnabled { - mi := &file_mail_msg_proto_msgTypes[4] + mi := &file_mail_mail_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -226,7 +226,7 @@ func (x *GetUserMailAttachmentReq) String() string { func (*GetUserMailAttachmentReq) ProtoMessage() {} func (x *GetUserMailAttachmentReq) ProtoReflect() protoreflect.Message { - mi := &file_mail_msg_proto_msgTypes[4] + mi := &file_mail_mail_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -239,7 +239,7 @@ func (x *GetUserMailAttachmentReq) ProtoReflect() protoreflect.Message { // Deprecated: Use GetUserMailAttachmentReq.ProtoReflect.Descriptor instead. func (*GetUserMailAttachmentReq) Descriptor() ([]byte, []int) { - return file_mail_msg_proto_rawDescGZIP(), []int{4} + return file_mail_mail_msg_proto_rawDescGZIP(), []int{4} } func (x *GetUserMailAttachmentReq) GetObjID() string { @@ -260,7 +260,7 @@ type GetUserMailAttachmentResp struct { func (x *GetUserMailAttachmentResp) Reset() { *x = GetUserMailAttachmentResp{} if protoimpl.UnsafeEnabled { - mi := &file_mail_msg_proto_msgTypes[5] + mi := &file_mail_mail_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -273,7 +273,7 @@ func (x *GetUserMailAttachmentResp) String() string { func (*GetUserMailAttachmentResp) ProtoMessage() {} func (x *GetUserMailAttachmentResp) ProtoReflect() protoreflect.Message { - mi := &file_mail_msg_proto_msgTypes[5] + mi := &file_mail_mail_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -286,7 +286,7 @@ func (x *GetUserMailAttachmentResp) ProtoReflect() protoreflect.Message { // Deprecated: Use GetUserMailAttachmentResp.ProtoReflect.Descriptor instead. func (*GetUserMailAttachmentResp) Descriptor() ([]byte, []int) { - return file_mail_msg_proto_rawDescGZIP(), []int{5} + return file_mail_mail_msg_proto_rawDescGZIP(), []int{5} } func (x *GetUserMailAttachmentResp) GetMail() *DB_MailData { @@ -308,7 +308,7 @@ type DelUserMailReq struct { func (x *DelUserMailReq) Reset() { *x = DelUserMailReq{} if protoimpl.UnsafeEnabled { - mi := &file_mail_msg_proto_msgTypes[6] + mi := &file_mail_mail_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -321,7 +321,7 @@ func (x *DelUserMailReq) String() string { func (*DelUserMailReq) ProtoMessage() {} func (x *DelUserMailReq) ProtoReflect() protoreflect.Message { - mi := &file_mail_msg_proto_msgTypes[6] + mi := &file_mail_mail_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -334,7 +334,7 @@ func (x *DelUserMailReq) ProtoReflect() protoreflect.Message { // Deprecated: Use DelUserMailReq.ProtoReflect.Descriptor instead. func (*DelUserMailReq) Descriptor() ([]byte, []int) { - return file_mail_msg_proto_rawDescGZIP(), []int{6} + return file_mail_mail_msg_proto_rawDescGZIP(), []int{6} } func (x *DelUserMailReq) GetObjID() string { @@ -355,7 +355,7 @@ type DelUserMailResp struct { func (x *DelUserMailResp) Reset() { *x = DelUserMailResp{} if protoimpl.UnsafeEnabled { - mi := &file_mail_msg_proto_msgTypes[7] + mi := &file_mail_mail_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -368,7 +368,7 @@ func (x *DelUserMailResp) String() string { func (*DelUserMailResp) ProtoMessage() {} func (x *DelUserMailResp) ProtoReflect() protoreflect.Message { - mi := &file_mail_msg_proto_msgTypes[7] + mi := &file_mail_mail_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -381,7 +381,7 @@ func (x *DelUserMailResp) ProtoReflect() protoreflect.Message { // Deprecated: Use DelUserMailResp.ProtoReflect.Descriptor instead. func (*DelUserMailResp) Descriptor() ([]byte, []int) { - return file_mail_msg_proto_rawDescGZIP(), []int{7} + return file_mail_mail_msg_proto_rawDescGZIP(), []int{7} } func (x *DelUserMailResp) GetMail() []*DB_MailData { @@ -391,52 +391,53 @@ func (x *DelUserMailResp) GetMail() []*DB_MailData { return nil } -var File_mail_msg_proto protoreflect.FileDescriptor +var File_mail_mail_msg_proto protoreflect.FileDescriptor -var file_mail_msg_proto_rawDesc = []byte{ - 0x0a, 0x0e, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x0d, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0x12, 0x0a, 0x10, 0x51, 0x75, 0x65, 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, - 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x11, 0x51, 0x75, 0x65, 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, - 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x05, 0x4d, 0x61, 0x69, 0x6c, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x4d, 0x61, 0x69, - 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x4d, 0x61, 0x69, 0x6c, 0x73, 0x22, 0x27, 0x0a, 0x0f, - 0x52, 0x65, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x12, - 0x14, 0x0a, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x34, 0x0a, 0x10, 0x52, 0x65, 0x61, 0x64, 0x55, 0x73, 0x65, - 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x4d, 0x61, 0x69, - 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x4d, 0x61, 0x69, - 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x22, 0x30, 0x0a, 0x18, 0x47, - 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x44, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x3d, 0x0a, - 0x19, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x4d, 0x61, - 0x69, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x4d, 0x61, - 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x22, 0x26, 0x0a, 0x0e, - 0x44, 0x65, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x14, - 0x0a, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4f, - 0x62, 0x6a, 0x49, 0x44, 0x22, 0x33, 0x0a, 0x0f, 0x44, 0x65, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x4d, - 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x4d, 0x61, 0x69, 0x6c, 0x44, - 0x61, 0x74, 0x61, 0x52, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_mail_mail_msg_proto_rawDesc = []byte{ + 0x0a, 0x13, 0x6d, 0x61, 0x69, 0x6c, 0x2f, 0x6d, 0x61, 0x69, 0x6c, 0x5f, 0x6d, 0x73, 0x67, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x6d, 0x61, 0x69, 0x6c, 0x2f, 0x6d, 0x61, 0x69, 0x6c, + 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x12, 0x0a, 0x10, 0x51, 0x75, 0x65, + 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, + 0x11, 0x51, 0x75, 0x65, 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x22, 0x0a, 0x05, 0x4d, 0x61, 0x69, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x05, 0x4d, 0x61, 0x69, 0x6c, 0x73, 0x22, 0x27, 0x0a, 0x0f, 0x52, 0x65, 0x61, 0x64, 0x55, 0x73, + 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x62, 0x6a, + 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, + 0x34, 0x0a, 0x10, 0x52, 0x65, 0x61, 0x64, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x22, 0x30, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, + 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, + 0x71, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x3d, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x55, 0x73, + 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x22, 0x26, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x55, 0x73, 0x65, + 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x62, 0x6a, 0x49, + 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x33, + 0x0a, 0x0f, 0x44, 0x65, 0x6c, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x20, 0x0a, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x4d, + 0x61, 0x69, 0x6c, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( - file_mail_msg_proto_rawDescOnce sync.Once - file_mail_msg_proto_rawDescData = file_mail_msg_proto_rawDesc + file_mail_mail_msg_proto_rawDescOnce sync.Once + file_mail_mail_msg_proto_rawDescData = file_mail_mail_msg_proto_rawDesc ) -func file_mail_msg_proto_rawDescGZIP() []byte { - file_mail_msg_proto_rawDescOnce.Do(func() { - file_mail_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_mail_msg_proto_rawDescData) +func file_mail_mail_msg_proto_rawDescGZIP() []byte { + file_mail_mail_msg_proto_rawDescOnce.Do(func() { + file_mail_mail_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_mail_mail_msg_proto_rawDescData) }) - return file_mail_msg_proto_rawDescData + return file_mail_mail_msg_proto_rawDescData } -var file_mail_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) -var file_mail_msg_proto_goTypes = []interface{}{ +var file_mail_mail_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_mail_mail_msg_proto_goTypes = []interface{}{ (*QueryUserMailReq)(nil), // 0: QueryUserMailReq (*QueryUserMailResp)(nil), // 1: QueryUserMailResp (*ReadUserMailReq)(nil), // 2: ReadUserMailReq @@ -447,7 +448,7 @@ var file_mail_msg_proto_goTypes = []interface{}{ (*DelUserMailResp)(nil), // 7: DelUserMailResp (*DB_MailData)(nil), // 8: DB_MailData } -var file_mail_msg_proto_depIdxs = []int32{ +var file_mail_mail_msg_proto_depIdxs = []int32{ 8, // 0: QueryUserMailResp.Mails:type_name -> DB_MailData 8, // 1: ReadUserMailResp.Mail:type_name -> DB_MailData 8, // 2: GetUserMailAttachmentResp.Mail:type_name -> DB_MailData @@ -459,14 +460,14 @@ var file_mail_msg_proto_depIdxs = []int32{ 0, // [0:4] is the sub-list for field type_name } -func init() { file_mail_msg_proto_init() } -func file_mail_msg_proto_init() { - if File_mail_msg_proto != nil { +func init() { file_mail_mail_msg_proto_init() } +func file_mail_mail_msg_proto_init() { + if File_mail_mail_msg_proto != nil { return } - file_mail_db_proto_init() + file_mail_mail_db_proto_init() if !protoimpl.UnsafeEnabled { - file_mail_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_mail_mail_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*QueryUserMailReq); i { case 0: return &v.state @@ -478,7 +479,7 @@ func file_mail_msg_proto_init() { return nil } } - file_mail_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_mail_mail_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*QueryUserMailResp); i { case 0: return &v.state @@ -490,7 +491,7 @@ func file_mail_msg_proto_init() { return nil } } - file_mail_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_mail_mail_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ReadUserMailReq); i { case 0: return &v.state @@ -502,7 +503,7 @@ func file_mail_msg_proto_init() { return nil } } - file_mail_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_mail_mail_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ReadUserMailResp); i { case 0: return &v.state @@ -514,7 +515,7 @@ func file_mail_msg_proto_init() { return nil } } - file_mail_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_mail_mail_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetUserMailAttachmentReq); i { case 0: return &v.state @@ -526,7 +527,7 @@ func file_mail_msg_proto_init() { return nil } } - file_mail_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_mail_mail_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetUserMailAttachmentResp); i { case 0: return &v.state @@ -538,7 +539,7 @@ func file_mail_msg_proto_init() { return nil } } - file_mail_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_mail_mail_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DelUserMailReq); i { case 0: return &v.state @@ -550,7 +551,7 @@ func file_mail_msg_proto_init() { return nil } } - file_mail_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_mail_mail_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DelUserMailResp); i { case 0: return &v.state @@ -567,18 +568,18 @@ func file_mail_msg_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_mail_msg_proto_rawDesc, + RawDescriptor: file_mail_mail_msg_proto_rawDesc, NumEnums: 0, NumMessages: 8, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_mail_msg_proto_goTypes, - DependencyIndexes: file_mail_msg_proto_depIdxs, - MessageInfos: file_mail_msg_proto_msgTypes, + GoTypes: file_mail_mail_msg_proto_goTypes, + DependencyIndexes: file_mail_mail_msg_proto_depIdxs, + MessageInfos: file_mail_mail_msg_proto_msgTypes, }.Build() - File_mail_msg_proto = out.File - file_mail_msg_proto_rawDesc = nil - file_mail_msg_proto_goTypes = nil - file_mail_msg_proto_depIdxs = nil + File_mail_mail_msg_proto = out.File + file_mail_mail_msg_proto_rawDesc = nil + file_mail_mail_msg_proto_goTypes = nil + file_mail_mail_msg_proto_depIdxs = nil } diff --git a/pb/pack_db.pb.go b/pb/pack_db.pb.go index bea236e19..73460579a 100644 --- a/pb/pack_db.pb.go +++ b/pb/pack_db.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: pack_db.proto +// source: pack/pack_db.proto package pb @@ -36,7 +36,7 @@ type DB_GridData struct { func (x *DB_GridData) Reset() { *x = DB_GridData{} if protoimpl.UnsafeEnabled { - mi := &file_pack_db_proto_msgTypes[0] + mi := &file_pack_pack_db_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -49,7 +49,7 @@ func (x *DB_GridData) String() string { func (*DB_GridData) ProtoMessage() {} func (x *DB_GridData) ProtoReflect() protoreflect.Message { - mi := &file_pack_db_proto_msgTypes[0] + mi := &file_pack_pack_db_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -62,7 +62,7 @@ func (x *DB_GridData) ProtoReflect() protoreflect.Message { // Deprecated: Use DB_GridData.ProtoReflect.Descriptor instead. func (*DB_GridData) Descriptor() ([]byte, []int) { - return file_pack_db_proto_rawDescGZIP(), []int{0} + return file_pack_pack_db_proto_rawDescGZIP(), []int{0} } func (x *DB_GridData) GetGridId() int32 { @@ -113,7 +113,7 @@ type DB_UserPackData struct { func (x *DB_UserPackData) Reset() { *x = DB_UserPackData{} if protoimpl.UnsafeEnabled { - mi := &file_pack_db_proto_msgTypes[1] + mi := &file_pack_pack_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -126,7 +126,7 @@ func (x *DB_UserPackData) String() string { func (*DB_UserPackData) ProtoMessage() {} func (x *DB_UserPackData) ProtoReflect() protoreflect.Message { - mi := &file_pack_db_proto_msgTypes[1] + mi := &file_pack_pack_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -139,7 +139,7 @@ func (x *DB_UserPackData) ProtoReflect() protoreflect.Message { // Deprecated: Use DB_UserPackData.ProtoReflect.Descriptor instead. func (*DB_UserPackData) Descriptor() ([]byte, []int) { - return file_pack_db_proto_rawDescGZIP(), []int{1} + return file_pack_pack_db_proto_rawDescGZIP(), []int{1} } func (x *DB_UserPackData) GetUserId() string { @@ -156,45 +156,46 @@ func (x *DB_UserPackData) GetPack() []*DB_GridData { return nil } -var File_pack_db_proto protoreflect.FileDescriptor +var File_pack_pack_db_proto protoreflect.FileDescriptor -var file_pack_db_proto_rawDesc = []byte{ - 0x0a, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0x8d, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x47, 0x72, 0x69, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, - 0x16, 0x0a, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x73, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x49, 0x73, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x49, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x49, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x22, - 0x4b, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x63, 0x6b, 0x44, 0x61, - 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x04, 0x50, 0x61, - 0x63, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x47, 0x72, - 0x69, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x50, 0x61, 0x63, 0x6b, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_pack_pack_db_proto_rawDesc = []byte{ + 0x0a, 0x12, 0x70, 0x61, 0x63, 0x6b, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8d, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x47, 0x72, 0x69, 0x64, + 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, + 0x49, 0x73, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x49, + 0x73, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, + 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x49, 0x73, 0x4e, 0x65, 0x77, 0x49, + 0x74, 0x65, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x49, 0x73, 0x4e, 0x65, 0x77, + 0x49, 0x74, 0x65, 0x6d, 0x22, 0x4b, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x50, + 0x61, 0x63, 0x6b, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, + 0x20, 0x0a, 0x04, 0x50, 0x61, 0x63, 0x6b, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, + 0x44, 0x42, 0x5f, 0x47, 0x72, 0x69, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x50, 0x61, 0x63, + 0x6b, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( - file_pack_db_proto_rawDescOnce sync.Once - file_pack_db_proto_rawDescData = file_pack_db_proto_rawDesc + file_pack_pack_db_proto_rawDescOnce sync.Once + file_pack_pack_db_proto_rawDescData = file_pack_pack_db_proto_rawDesc ) -func file_pack_db_proto_rawDescGZIP() []byte { - file_pack_db_proto_rawDescOnce.Do(func() { - file_pack_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_pack_db_proto_rawDescData) +func file_pack_pack_db_proto_rawDescGZIP() []byte { + file_pack_pack_db_proto_rawDescOnce.Do(func() { + file_pack_pack_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_pack_pack_db_proto_rawDescData) }) - return file_pack_db_proto_rawDescData + return file_pack_pack_db_proto_rawDescData } -var file_pack_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_pack_db_proto_goTypes = []interface{}{ +var file_pack_pack_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_pack_pack_db_proto_goTypes = []interface{}{ (*DB_GridData)(nil), // 0: DB_GridData (*DB_UserPackData)(nil), // 1: DB_UserPackData } -var file_pack_db_proto_depIdxs = []int32{ +var file_pack_pack_db_proto_depIdxs = []int32{ 0, // 0: DB_UserPackData.Pack:type_name -> DB_GridData 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -203,13 +204,13 @@ var file_pack_db_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_pack_db_proto_init() } -func file_pack_db_proto_init() { - if File_pack_db_proto != nil { +func init() { file_pack_pack_db_proto_init() } +func file_pack_pack_db_proto_init() { + if File_pack_pack_db_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_pack_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_pack_pack_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DB_GridData); i { case 0: return &v.state @@ -221,7 +222,7 @@ func file_pack_db_proto_init() { return nil } } - file_pack_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_pack_pack_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DB_UserPackData); i { case 0: return &v.state @@ -238,18 +239,18 @@ func file_pack_db_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_pack_db_proto_rawDesc, + RawDescriptor: file_pack_pack_db_proto_rawDesc, NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_pack_db_proto_goTypes, - DependencyIndexes: file_pack_db_proto_depIdxs, - MessageInfos: file_pack_db_proto_msgTypes, + GoTypes: file_pack_pack_db_proto_goTypes, + DependencyIndexes: file_pack_pack_db_proto_depIdxs, + MessageInfos: file_pack_pack_db_proto_msgTypes, }.Build() - File_pack_db_proto = out.File - file_pack_db_proto_rawDesc = nil - file_pack_db_proto_goTypes = nil - file_pack_db_proto_depIdxs = nil + File_pack_pack_db_proto = out.File + file_pack_pack_db_proto_rawDesc = nil + file_pack_pack_db_proto_goTypes = nil + file_pack_pack_db_proto_depIdxs = nil } diff --git a/pb/pack_msg.pb.go b/pb/pack_msg.pb.go index b8cb25588..bdba428d8 100644 --- a/pb/pack_msg.pb.go +++ b/pb/pack_msg.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: pack_msg.proto +// source: pack/pack_msg.proto package pb @@ -32,7 +32,7 @@ type QueryUserPackReq struct { func (x *QueryUserPackReq) Reset() { *x = QueryUserPackReq{} if protoimpl.UnsafeEnabled { - mi := &file_pack_msg_proto_msgTypes[0] + mi := &file_pack_pack_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *QueryUserPackReq) String() string { func (*QueryUserPackReq) ProtoMessage() {} func (x *QueryUserPackReq) ProtoReflect() protoreflect.Message { - mi := &file_pack_msg_proto_msgTypes[0] + mi := &file_pack_pack_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *QueryUserPackReq) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryUserPackReq.ProtoReflect.Descriptor instead. func (*QueryUserPackReq) Descriptor() ([]byte, []int) { - return file_pack_msg_proto_rawDescGZIP(), []int{0} + return file_pack_pack_msg_proto_rawDescGZIP(), []int{0} } func (x *QueryUserPackReq) GetIType() int32 { @@ -80,7 +80,7 @@ type QueryUserPackResp struct { func (x *QueryUserPackResp) Reset() { *x = QueryUserPackResp{} if protoimpl.UnsafeEnabled { - mi := &file_pack_msg_proto_msgTypes[1] + mi := &file_pack_pack_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -93,7 +93,7 @@ func (x *QueryUserPackResp) String() string { func (*QueryUserPackResp) ProtoMessage() {} func (x *QueryUserPackResp) ProtoReflect() protoreflect.Message { - mi := &file_pack_msg_proto_msgTypes[1] + mi := &file_pack_pack_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -106,7 +106,7 @@ func (x *QueryUserPackResp) ProtoReflect() protoreflect.Message { // Deprecated: Use QueryUserPackResp.ProtoReflect.Descriptor instead. func (*QueryUserPackResp) Descriptor() ([]byte, []int) { - return file_pack_msg_proto_rawDescGZIP(), []int{1} + return file_pack_pack_msg_proto_rawDescGZIP(), []int{1} } func (x *QueryUserPackResp) GetGrids() []*DB_GridData { @@ -130,7 +130,7 @@ type UseItemReq struct { func (x *UseItemReq) Reset() { *x = UseItemReq{} if protoimpl.UnsafeEnabled { - mi := &file_pack_msg_proto_msgTypes[2] + mi := &file_pack_pack_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -143,7 +143,7 @@ func (x *UseItemReq) String() string { func (*UseItemReq) ProtoMessage() {} func (x *UseItemReq) ProtoReflect() protoreflect.Message { - mi := &file_pack_msg_proto_msgTypes[2] + mi := &file_pack_pack_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -156,7 +156,7 @@ func (x *UseItemReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UseItemReq.ProtoReflect.Descriptor instead. func (*UseItemReq) Descriptor() ([]byte, []int) { - return file_pack_msg_proto_rawDescGZIP(), []int{2} + return file_pack_pack_msg_proto_rawDescGZIP(), []int{2} } func (x *UseItemReq) GetGridId() int32 { @@ -190,7 +190,7 @@ type UseItemResp struct { func (x *UseItemResp) Reset() { *x = UseItemResp{} if protoimpl.UnsafeEnabled { - mi := &file_pack_msg_proto_msgTypes[3] + mi := &file_pack_pack_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -203,7 +203,7 @@ func (x *UseItemResp) String() string { func (*UseItemResp) ProtoMessage() {} func (x *UseItemResp) ProtoReflect() protoreflect.Message { - mi := &file_pack_msg_proto_msgTypes[3] + mi := &file_pack_pack_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -216,7 +216,7 @@ func (x *UseItemResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UseItemResp.ProtoReflect.Descriptor instead. func (*UseItemResp) Descriptor() ([]byte, []int) { - return file_pack_msg_proto_rawDescGZIP(), []int{3} + return file_pack_pack_msg_proto_rawDescGZIP(), []int{3} } //出售道具请求 @@ -233,7 +233,7 @@ type SellItemReq struct { func (x *SellItemReq) Reset() { *x = SellItemReq{} if protoimpl.UnsafeEnabled { - mi := &file_pack_msg_proto_msgTypes[4] + mi := &file_pack_pack_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -246,7 +246,7 @@ func (x *SellItemReq) String() string { func (*SellItemReq) ProtoMessage() {} func (x *SellItemReq) ProtoReflect() protoreflect.Message { - mi := &file_pack_msg_proto_msgTypes[4] + mi := &file_pack_pack_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -259,7 +259,7 @@ func (x *SellItemReq) ProtoReflect() protoreflect.Message { // Deprecated: Use SellItemReq.ProtoReflect.Descriptor instead. func (*SellItemReq) Descriptor() ([]byte, []int) { - return file_pack_msg_proto_rawDescGZIP(), []int{4} + return file_pack_pack_msg_proto_rawDescGZIP(), []int{4} } func (x *SellItemReq) GetGridId() int32 { @@ -293,7 +293,7 @@ type SellItemResp struct { func (x *SellItemResp) Reset() { *x = SellItemResp{} if protoimpl.UnsafeEnabled { - mi := &file_pack_msg_proto_msgTypes[5] + mi := &file_pack_pack_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -306,7 +306,7 @@ func (x *SellItemResp) String() string { func (*SellItemResp) ProtoMessage() {} func (x *SellItemResp) ProtoReflect() protoreflect.Message { - mi := &file_pack_msg_proto_msgTypes[5] + mi := &file_pack_pack_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -319,50 +319,51 @@ func (x *SellItemResp) ProtoReflect() protoreflect.Message { // Deprecated: Use SellItemResp.ProtoReflect.Descriptor instead. func (*SellItemResp) Descriptor() ([]byte, []int) { - return file_pack_msg_proto_rawDescGZIP(), []int{5} + return file_pack_pack_msg_proto_rawDescGZIP(), []int{5} } -var File_pack_msg_proto protoreflect.FileDescriptor +var File_pack_pack_msg_proto protoreflect.FileDescriptor -var file_pack_msg_proto_rawDesc = []byte{ - 0x0a, 0x0e, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x0d, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0x28, 0x0a, 0x10, 0x51, 0x75, 0x65, 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x63, 0x6b, - 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x49, 0x54, 0x79, 0x70, 0x65, 0x22, 0x37, 0x0a, 0x11, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, - 0x0a, 0x05, 0x47, 0x72, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, - 0x44, 0x42, 0x5f, 0x47, 0x72, 0x69, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x47, 0x72, 0x69, - 0x64, 0x73, 0x22, 0x54, 0x0a, 0x0a, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, +var file_pack_pack_msg_proto_rawDesc = []byte{ + 0x0a, 0x13, 0x70, 0x61, 0x63, 0x6b, 0x2f, 0x70, 0x61, 0x63, 0x6b, 0x5f, 0x6d, 0x73, 0x67, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x70, 0x61, 0x63, 0x6b, 0x2f, 0x70, 0x61, 0x63, 0x6b, + 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28, 0x0a, 0x10, 0x51, 0x75, 0x65, + 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, + 0x05, 0x49, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x49, 0x54, + 0x79, 0x70, 0x65, 0x22, 0x37, 0x0a, 0x11, 0x51, 0x75, 0x65, 0x72, 0x79, 0x55, 0x73, 0x65, 0x72, + 0x50, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x05, 0x47, 0x72, 0x69, 0x64, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x47, 0x72, 0x69, + 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x47, 0x72, 0x69, 0x64, 0x73, 0x22, 0x54, 0x0a, 0x0a, + 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x72, + 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, + 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, + 0x70, 0x22, 0x55, 0x0a, 0x0b, 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x55, 0x0a, 0x0b, 0x53, 0x65, 0x6c, 0x6c, 0x49, - 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x16, - 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, - 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x0e, - 0x0a, 0x0c, 0x53, 0x65, 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x0e, 0x0a, 0x0c, 0x53, 0x65, 0x6c, 0x6c, + 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_pack_msg_proto_rawDescOnce sync.Once - file_pack_msg_proto_rawDescData = file_pack_msg_proto_rawDesc + file_pack_pack_msg_proto_rawDescOnce sync.Once + file_pack_pack_msg_proto_rawDescData = file_pack_pack_msg_proto_rawDesc ) -func file_pack_msg_proto_rawDescGZIP() []byte { - file_pack_msg_proto_rawDescOnce.Do(func() { - file_pack_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_pack_msg_proto_rawDescData) +func file_pack_pack_msg_proto_rawDescGZIP() []byte { + file_pack_pack_msg_proto_rawDescOnce.Do(func() { + file_pack_pack_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_pack_pack_msg_proto_rawDescData) }) - return file_pack_msg_proto_rawDescData + return file_pack_pack_msg_proto_rawDescData } -var file_pack_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) -var file_pack_msg_proto_goTypes = []interface{}{ +var file_pack_pack_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_pack_pack_msg_proto_goTypes = []interface{}{ (*QueryUserPackReq)(nil), // 0: QueryUserPackReq (*QueryUserPackResp)(nil), // 1: QueryUserPackResp (*UseItemReq)(nil), // 2: UseItemReq @@ -371,7 +372,7 @@ var file_pack_msg_proto_goTypes = []interface{}{ (*SellItemResp)(nil), // 5: SellItemResp (*DB_GridData)(nil), // 6: DB_GridData } -var file_pack_msg_proto_depIdxs = []int32{ +var file_pack_pack_msg_proto_depIdxs = []int32{ 6, // 0: QueryUserPackResp.Grids:type_name -> DB_GridData 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -380,14 +381,14 @@ var file_pack_msg_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_pack_msg_proto_init() } -func file_pack_msg_proto_init() { - if File_pack_msg_proto != nil { +func init() { file_pack_pack_msg_proto_init() } +func file_pack_pack_msg_proto_init() { + if File_pack_pack_msg_proto != nil { return } - file_pack_db_proto_init() + file_pack_pack_db_proto_init() if !protoimpl.UnsafeEnabled { - file_pack_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_pack_pack_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*QueryUserPackReq); i { case 0: return &v.state @@ -399,7 +400,7 @@ func file_pack_msg_proto_init() { return nil } } - file_pack_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_pack_pack_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*QueryUserPackResp); i { case 0: return &v.state @@ -411,7 +412,7 @@ func file_pack_msg_proto_init() { return nil } } - file_pack_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_pack_pack_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UseItemReq); i { case 0: return &v.state @@ -423,7 +424,7 @@ func file_pack_msg_proto_init() { return nil } } - file_pack_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_pack_pack_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UseItemResp); i { case 0: return &v.state @@ -435,7 +436,7 @@ func file_pack_msg_proto_init() { return nil } } - file_pack_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_pack_pack_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SellItemReq); i { case 0: return &v.state @@ -447,7 +448,7 @@ func file_pack_msg_proto_init() { return nil } } - file_pack_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_pack_pack_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SellItemResp); i { case 0: return &v.state @@ -464,18 +465,18 @@ func file_pack_msg_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_pack_msg_proto_rawDesc, + RawDescriptor: file_pack_pack_msg_proto_rawDesc, NumEnums: 0, NumMessages: 6, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_pack_msg_proto_goTypes, - DependencyIndexes: file_pack_msg_proto_depIdxs, - MessageInfos: file_pack_msg_proto_msgTypes, + GoTypes: file_pack_pack_msg_proto_goTypes, + DependencyIndexes: file_pack_pack_msg_proto_depIdxs, + MessageInfos: file_pack_pack_msg_proto_msgTypes, }.Build() - File_pack_msg_proto = out.File - file_pack_msg_proto_rawDesc = nil - file_pack_msg_proto_goTypes = nil - file_pack_msg_proto_depIdxs = nil + File_pack_pack_msg_proto = out.File + file_pack_pack_msg_proto_rawDesc = nil + file_pack_pack_msg_proto_goTypes = nil + file_pack_pack_msg_proto_depIdxs = nil } diff --git a/pb/proto/friend_db.proto b/pb/proto/friend/friend_db.proto similarity index 100% rename from pb/proto/friend_db.proto rename to pb/proto/friend/friend_db.proto diff --git a/pb/proto/friend_msg.proto b/pb/proto/friend/friend_msg.proto similarity index 98% rename from pb/proto/friend_msg.proto rename to pb/proto/friend/friend_msg.proto index a19d04084..8f10ab953 100644 --- a/pb/proto/friend_msg.proto +++ b/pb/proto/friend/friend_msg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option go_package = ".;pb"; -import "friend_db.proto"; +import "friend/friend_db.proto"; message FriendBase { string userId = 1; //ID @@ -16,6 +16,7 @@ message FriendBase { message FriendListReq{ } + message FriendListRsp{ repeated Cache_FriendData list = 1; } diff --git a/pb/proto/mail_db.proto b/pb/proto/mail/mail_db.proto similarity index 100% rename from pb/proto/mail_db.proto rename to pb/proto/mail/mail_db.proto diff --git a/pb/proto/mail_msg.proto b/pb/proto/mail/mail_msg.proto similarity index 95% rename from pb/proto/mail_msg.proto rename to pb/proto/mail/mail_msg.proto index 024ed1a70..16466a18b 100644 --- a/pb/proto/mail_msg.proto +++ b/pb/proto/mail/mail_msg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option go_package = ".;pb"; -import "mail_db.proto"; +import "mail/mail_db.proto"; message QueryUserMailReq { diff --git a/pb/proto/pack_db.proto b/pb/proto/pack/pack_db.proto similarity index 99% rename from pb/proto/pack_db.proto rename to pb/proto/pack/pack_db.proto index 7ac9d4d92..6cafe582e 100644 --- a/pb/proto/pack_db.proto +++ b/pb/proto/pack/pack_db.proto @@ -1,6 +1,7 @@ syntax = "proto3"; option go_package = ".;pb"; + //背包格子 message DB_GridData { int32 GridId = 1; //背包格子Id 所在背包数组的下表 diff --git a/pb/proto/pack_msg.proto b/pb/proto/pack/pack_msg.proto similarity index 95% rename from pb/proto/pack_msg.proto rename to pb/proto/pack/pack_msg.proto index 995560832..219a6caf7 100644 --- a/pb/proto/pack_msg.proto +++ b/pb/proto/pack/pack_msg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option go_package = ".;pb"; -import "pack_db.proto"; +import "pack/pack_db.proto"; //查询用户背包请求 message QueryUserPackReq { diff --git a/pb/proto/user_db.proto b/pb/proto/user/user_db.proto similarity index 100% rename from pb/proto/user_db.proto rename to pb/proto/user/user_db.proto diff --git a/pb/proto/user_msg.proto b/pb/proto/user/user_msg.proto similarity index 93% rename from pb/proto/user_msg.proto rename to pb/proto/user/user_msg.proto index 3458babd1..9fba6e8ac 100644 --- a/pb/proto/user_msg.proto +++ b/pb/proto/user/user_msg.proto @@ -1,7 +1,7 @@ syntax = "proto3"; option go_package = ".;pb"; import "errorcode.proto"; -import "user_db.proto"; +import "user/user_db.proto"; //用户登录 message UserLoginReq { diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index f7897e40a..8d954cb8b 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: user_db.proto +// source: user/user_db.proto package pb @@ -33,7 +33,7 @@ type Cache_UserData struct { func (x *Cache_UserData) Reset() { *x = Cache_UserData{} if protoimpl.UnsafeEnabled { - mi := &file_user_db_proto_msgTypes[0] + mi := &file_user_user_db_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -46,7 +46,7 @@ func (x *Cache_UserData) String() string { func (*Cache_UserData) ProtoMessage() {} func (x *Cache_UserData) ProtoReflect() protoreflect.Message { - mi := &file_user_db_proto_msgTypes[0] + mi := &file_user_user_db_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -59,7 +59,7 @@ func (x *Cache_UserData) ProtoReflect() protoreflect.Message { // Deprecated: Use Cache_UserData.ProtoReflect.Descriptor instead. func (*Cache_UserData) Descriptor() ([]byte, []int) { - return file_user_db_proto_rawDescGZIP(), []int{0} + return file_user_user_db_proto_rawDescGZIP(), []int{0} } func (x *Cache_UserData) GetSessionId() string { @@ -99,7 +99,7 @@ type DB_UserData struct { func (x *DB_UserData) Reset() { *x = DB_UserData{} if protoimpl.UnsafeEnabled { - mi := &file_user_db_proto_msgTypes[1] + mi := &file_user_user_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -112,7 +112,7 @@ func (x *DB_UserData) String() string { func (*DB_UserData) ProtoMessage() {} func (x *DB_UserData) ProtoReflect() protoreflect.Message { - mi := &file_user_db_proto_msgTypes[1] + mi := &file_user_user_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -125,7 +125,7 @@ func (x *DB_UserData) ProtoReflect() protoreflect.Message { // Deprecated: Use DB_UserData.ProtoReflect.Descriptor instead. func (*DB_UserData) Descriptor() ([]byte, []int) { - return file_user_db_proto_rawDescGZIP(), []int{1} + return file_user_user_db_proto_rawDescGZIP(), []int{1} } func (x *DB_UserData) GetUserId() string { @@ -170,51 +170,51 @@ func (x *DB_UserData) GetAvatar() int32 { return 0 } -var File_user_db_proto protoreflect.FileDescriptor +var File_user_user_db_proto protoreflect.FileDescriptor -var file_user_db_proto_rawDesc = []byte{ - 0x0a, 0x0d, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, - 0x84, 0x01, 0x0a, 0x0e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, - 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, - 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x08, - 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, - 0x2e, 0x44, 0x42, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x55, 0x73, - 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x22, 0xb1, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x55, 0x73, - 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x18, - 0x0a, 0x07, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x07, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x65, - 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x65, - 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x64, - 0x12, 0x20, 0x0a, 0x0b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, - 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_user_user_db_proto_rawDesc = []byte{ + 0x0a, 0x12, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x84, 0x01, 0x0a, 0x0e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x55, + 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x65, 0x73, 0x73, 0x69, + 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x65, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, + 0x64, 0x12, 0x28, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x08, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x22, 0xb1, 0x01, 0x0a, 0x0b, + 0x44, 0x42, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x55, + 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, + 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, + 0x08, 0x4e, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x4e, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x65, 0x72, + 0x76, 0x65, 0x72, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x53, 0x65, 0x72, + 0x76, 0x65, 0x72, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, + 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, + 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( - file_user_db_proto_rawDescOnce sync.Once - file_user_db_proto_rawDescData = file_user_db_proto_rawDesc + file_user_user_db_proto_rawDescOnce sync.Once + file_user_user_db_proto_rawDescData = file_user_user_db_proto_rawDesc ) -func file_user_db_proto_rawDescGZIP() []byte { - file_user_db_proto_rawDescOnce.Do(func() { - file_user_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_user_db_proto_rawDescData) +func file_user_user_db_proto_rawDescGZIP() []byte { + file_user_user_db_proto_rawDescOnce.Do(func() { + file_user_user_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_user_user_db_proto_rawDescData) }) - return file_user_db_proto_rawDescData + return file_user_user_db_proto_rawDescData } -var file_user_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_user_db_proto_goTypes = []interface{}{ +var file_user_user_db_proto_msgTypes = make([]protoimpl.MessageInfo, 2) +var file_user_user_db_proto_goTypes = []interface{}{ (*Cache_UserData)(nil), // 0: Cache_UserData (*DB_UserData)(nil), // 1: DB_UserData } -var file_user_db_proto_depIdxs = []int32{ +var file_user_user_db_proto_depIdxs = []int32{ 1, // 0: Cache_UserData.UserData:type_name -> DB_UserData 1, // [1:1] is the sub-list for method output_type 1, // [1:1] is the sub-list for method input_type @@ -223,13 +223,13 @@ var file_user_db_proto_depIdxs = []int32{ 0, // [0:1] is the sub-list for field type_name } -func init() { file_user_db_proto_init() } -func file_user_db_proto_init() { - if File_user_db_proto != nil { +func init() { file_user_user_db_proto_init() } +func file_user_user_db_proto_init() { + if File_user_user_db_proto != nil { return } if !protoimpl.UnsafeEnabled { - file_user_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_user_user_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Cache_UserData); i { case 0: return &v.state @@ -241,7 +241,7 @@ func file_user_db_proto_init() { return nil } } - file_user_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_user_user_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DB_UserData); i { case 0: return &v.state @@ -258,18 +258,18 @@ func file_user_db_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_user_db_proto_rawDesc, + RawDescriptor: file_user_user_db_proto_rawDesc, NumEnums: 0, NumMessages: 2, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_user_db_proto_goTypes, - DependencyIndexes: file_user_db_proto_depIdxs, - MessageInfos: file_user_db_proto_msgTypes, + GoTypes: file_user_user_db_proto_goTypes, + DependencyIndexes: file_user_user_db_proto_depIdxs, + MessageInfos: file_user_user_db_proto_msgTypes, }.Build() - File_user_db_proto = out.File - file_user_db_proto_rawDesc = nil - file_user_db_proto_goTypes = nil - file_user_db_proto_depIdxs = nil + File_user_user_db_proto = out.File + file_user_user_db_proto_rawDesc = nil + file_user_user_db_proto_goTypes = nil + file_user_user_db_proto_depIdxs = nil } diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index 58f347003..56cdf10aa 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -2,7 +2,7 @@ // versions: // protoc-gen-go v1.28.0 // protoc v3.20.0 -// source: user_msg.proto +// source: user/user_msg.proto package pb @@ -32,7 +32,7 @@ type UserLoginReq struct { func (x *UserLoginReq) Reset() { *x = UserLoginReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_msg_proto_msgTypes[0] + mi := &file_user_user_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -45,7 +45,7 @@ func (x *UserLoginReq) String() string { func (*UserLoginReq) ProtoMessage() {} func (x *UserLoginReq) ProtoReflect() protoreflect.Message { - mi := &file_user_msg_proto_msgTypes[0] + mi := &file_user_user_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -58,7 +58,7 @@ func (x *UserLoginReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserLoginReq.ProtoReflect.Descriptor instead. func (*UserLoginReq) Descriptor() ([]byte, []int) { - return file_user_msg_proto_rawDescGZIP(), []int{0} + return file_user_user_msg_proto_rawDescGZIP(), []int{0} } func (x *UserLoginReq) GetSec() string { @@ -79,7 +79,7 @@ type UserLoginResp struct { func (x *UserLoginResp) Reset() { *x = UserLoginResp{} if protoimpl.UnsafeEnabled { - mi := &file_user_msg_proto_msgTypes[1] + mi := &file_user_user_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -92,7 +92,7 @@ func (x *UserLoginResp) String() string { func (*UserLoginResp) ProtoMessage() {} func (x *UserLoginResp) ProtoReflect() protoreflect.Message { - mi := &file_user_msg_proto_msgTypes[1] + mi := &file_user_user_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -105,7 +105,7 @@ func (x *UserLoginResp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserLoginResp.ProtoReflect.Descriptor instead. func (*UserLoginResp) Descriptor() ([]byte, []int) { - return file_user_msg_proto_rawDescGZIP(), []int{1} + return file_user_user_msg_proto_rawDescGZIP(), []int{1} } func (x *UserLoginResp) GetData() *Cache_UserData { @@ -126,7 +126,7 @@ type UserRegisterReq struct { func (x *UserRegisterReq) Reset() { *x = UserRegisterReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_msg_proto_msgTypes[2] + mi := &file_user_user_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -139,7 +139,7 @@ func (x *UserRegisterReq) String() string { func (*UserRegisterReq) ProtoMessage() {} func (x *UserRegisterReq) ProtoReflect() protoreflect.Message { - mi := &file_user_msg_proto_msgTypes[2] + mi := &file_user_user_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -152,7 +152,7 @@ func (x *UserRegisterReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserRegisterReq.ProtoReflect.Descriptor instead. func (*UserRegisterReq) Descriptor() ([]byte, []int) { - return file_user_msg_proto_rawDescGZIP(), []int{2} + return file_user_user_msg_proto_rawDescGZIP(), []int{2} } func (x *UserRegisterReq) GetAccount() string { @@ -173,7 +173,7 @@ type UserRegisterRsp struct { func (x *UserRegisterRsp) Reset() { *x = UserRegisterRsp{} if protoimpl.UnsafeEnabled { - mi := &file_user_msg_proto_msgTypes[3] + mi := &file_user_user_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -186,7 +186,7 @@ func (x *UserRegisterRsp) String() string { func (*UserRegisterRsp) ProtoMessage() {} func (x *UserRegisterRsp) ProtoReflect() protoreflect.Message { - mi := &file_user_msg_proto_msgTypes[3] + mi := &file_user_user_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -199,7 +199,7 @@ func (x *UserRegisterRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserRegisterRsp.ProtoReflect.Descriptor instead. func (*UserRegisterRsp) Descriptor() ([]byte, []int) { - return file_user_msg_proto_rawDescGZIP(), []int{3} + return file_user_user_msg_proto_rawDescGZIP(), []int{3} } func (x *UserRegisterRsp) GetCode() ErrorCode { @@ -220,7 +220,7 @@ type UserLoadRsp struct { func (x *UserLoadRsp) Reset() { *x = UserLoadRsp{} if protoimpl.UnsafeEnabled { - mi := &file_user_msg_proto_msgTypes[4] + mi := &file_user_user_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -233,7 +233,7 @@ func (x *UserLoadRsp) String() string { func (*UserLoadRsp) ProtoMessage() {} func (x *UserLoadRsp) ProtoReflect() protoreflect.Message { - mi := &file_user_msg_proto_msgTypes[4] + mi := &file_user_user_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -246,7 +246,7 @@ func (x *UserLoadRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserLoadRsp.ProtoReflect.Descriptor instead. func (*UserLoadRsp) Descriptor() ([]byte, []int) { - return file_user_msg_proto_rawDescGZIP(), []int{4} + return file_user_user_msg_proto_rawDescGZIP(), []int{4} } func (x *UserLoadRsp) GetData() *Cache_UserData { @@ -268,7 +268,7 @@ type UserCreateReq struct { func (x *UserCreateReq) Reset() { *x = UserCreateReq{} if protoimpl.UnsafeEnabled { - mi := &file_user_msg_proto_msgTypes[5] + mi := &file_user_user_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -281,7 +281,7 @@ func (x *UserCreateReq) String() string { func (*UserCreateReq) ProtoMessage() {} func (x *UserCreateReq) ProtoReflect() protoreflect.Message { - mi := &file_user_msg_proto_msgTypes[5] + mi := &file_user_user_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -294,7 +294,7 @@ func (x *UserCreateReq) ProtoReflect() protoreflect.Message { // Deprecated: Use UserCreateReq.ProtoReflect.Descriptor instead. func (*UserCreateReq) Descriptor() ([]byte, []int) { - return file_user_msg_proto_rawDescGZIP(), []int{5} + return file_user_user_msg_proto_rawDescGZIP(), []int{5} } func (x *UserCreateReq) GetNickName() string { @@ -313,7 +313,7 @@ type UserCreateRsp struct { func (x *UserCreateRsp) Reset() { *x = UserCreateRsp{} if protoimpl.UnsafeEnabled { - mi := &file_user_msg_proto_msgTypes[6] + mi := &file_user_user_msg_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -326,7 +326,7 @@ func (x *UserCreateRsp) String() string { func (*UserCreateRsp) ProtoMessage() {} func (x *UserCreateRsp) ProtoReflect() protoreflect.Message { - mi := &file_user_msg_proto_msgTypes[6] + mi := &file_user_user_msg_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -339,51 +339,52 @@ func (x *UserCreateRsp) ProtoReflect() protoreflect.Message { // Deprecated: Use UserCreateRsp.ProtoReflect.Descriptor instead. func (*UserCreateRsp) Descriptor() ([]byte, []int) { - return file_user_msg_proto_rawDescGZIP(), []int{6} + return file_user_user_msg_proto_rawDescGZIP(), []int{6} } -var File_user_msg_proto protoreflect.FileDescriptor +var File_user_user_msg_proto protoreflect.FileDescriptor -var file_user_msg_proto_rawDesc = []byte{ - 0x0a, 0x0e, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x1a, 0x0d, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0x20, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, - 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, - 0x65, 0x63, 0x22, 0x34, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, - 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, - 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x31, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, - 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, - 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x32, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, - 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x55, 0x73, - 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x0d, - 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, - 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x55, 0x73, 0x65, - 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +var file_user_user_msg_proto_rawDesc = []byte{ + 0x0a, 0x13, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, + 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x20, 0x0a, 0x0c, 0x55, 0x73, + 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, + 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x63, 0x22, 0x34, 0x0a, 0x0d, + 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x61, + 0x63, 0x68, 0x65, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, + 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, + 0x31, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, + 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, + 0x64, 0x65, 0x22, 0x32, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x73, + 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0f, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, + 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, + 0x61, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x52, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( - file_user_msg_proto_rawDescOnce sync.Once - file_user_msg_proto_rawDescData = file_user_msg_proto_rawDesc + file_user_user_msg_proto_rawDescOnce sync.Once + file_user_user_msg_proto_rawDescData = file_user_user_msg_proto_rawDesc ) -func file_user_msg_proto_rawDescGZIP() []byte { - file_user_msg_proto_rawDescOnce.Do(func() { - file_user_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_user_msg_proto_rawDescData) +func file_user_user_msg_proto_rawDescGZIP() []byte { + file_user_user_msg_proto_rawDescOnce.Do(func() { + file_user_user_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_user_user_msg_proto_rawDescData) }) - return file_user_msg_proto_rawDescData + return file_user_user_msg_proto_rawDescData } -var file_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 7) -var file_user_msg_proto_goTypes = []interface{}{ +var file_user_user_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_user_user_msg_proto_goTypes = []interface{}{ (*UserLoginReq)(nil), // 0: UserLoginReq (*UserLoginResp)(nil), // 1: UserLoginResp (*UserRegisterReq)(nil), // 2: UserRegisterReq @@ -394,7 +395,7 @@ var file_user_msg_proto_goTypes = []interface{}{ (*Cache_UserData)(nil), // 7: Cache_UserData (ErrorCode)(0), // 8: ErrorCode } -var file_user_msg_proto_depIdxs = []int32{ +var file_user_user_msg_proto_depIdxs = []int32{ 7, // 0: UserLoginResp.data:type_name -> Cache_UserData 8, // 1: UserRegisterRsp.Code:type_name -> ErrorCode 7, // 2: UserLoadRsp.data:type_name -> Cache_UserData @@ -405,15 +406,15 @@ var file_user_msg_proto_depIdxs = []int32{ 0, // [0:3] is the sub-list for field type_name } -func init() { file_user_msg_proto_init() } -func file_user_msg_proto_init() { - if File_user_msg_proto != nil { +func init() { file_user_user_msg_proto_init() } +func file_user_user_msg_proto_init() { + if File_user_user_msg_proto != nil { return } file_errorcode_proto_init() - file_user_db_proto_init() + file_user_user_db_proto_init() if !protoimpl.UnsafeEnabled { - file_user_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + file_user_user_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserLoginReq); i { case 0: return &v.state @@ -425,7 +426,7 @@ func file_user_msg_proto_init() { return nil } } - file_user_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + file_user_user_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserLoginResp); i { case 0: return &v.state @@ -437,7 +438,7 @@ func file_user_msg_proto_init() { return nil } } - file_user_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_user_user_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserRegisterReq); i { case 0: return &v.state @@ -449,7 +450,7 @@ func file_user_msg_proto_init() { return nil } } - file_user_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_user_user_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserRegisterRsp); i { case 0: return &v.state @@ -461,7 +462,7 @@ func file_user_msg_proto_init() { return nil } } - file_user_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_user_user_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserLoadRsp); i { case 0: return &v.state @@ -473,7 +474,7 @@ func file_user_msg_proto_init() { return nil } } - file_user_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_user_user_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserCreateReq); i { case 0: return &v.state @@ -485,7 +486,7 @@ func file_user_msg_proto_init() { return nil } } - file_user_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_user_user_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UserCreateRsp); i { case 0: return &v.state @@ -502,18 +503,18 @@ func file_user_msg_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_user_msg_proto_rawDesc, + RawDescriptor: file_user_user_msg_proto_rawDesc, NumEnums: 0, NumMessages: 7, NumExtensions: 0, NumServices: 0, }, - GoTypes: file_user_msg_proto_goTypes, - DependencyIndexes: file_user_msg_proto_depIdxs, - MessageInfos: file_user_msg_proto_msgTypes, + GoTypes: file_user_user_msg_proto_goTypes, + DependencyIndexes: file_user_user_msg_proto_depIdxs, + MessageInfos: file_user_user_msg_proto_msgTypes, }.Build() - File_user_msg_proto = out.File - file_user_msg_proto_rawDesc = nil - file_user_msg_proto_goTypes = nil - file_user_msg_proto_depIdxs = nil + File_user_user_msg_proto = out.File + file_user_user_msg_proto_rawDesc = nil + file_user_user_msg_proto_goTypes = nil + file_user_user_msg_proto_depIdxs = nil } diff --git a/pb_2.7.py b/pb_2.7.py index 9f19bee65..77fd6d866 100644 --- a/pb_2.7.py +++ b/pb_2.7.py @@ -2,8 +2,8 @@ import io import os import re -def buildProto(pbpath,outpath,pbfile): - cmdstr = 'protoc.exe --go_out={0} -I{1} {1}/{2}.proto'.format(outpath,pbpath,pbfile) +def buildProto(outpath,ipath,pbpath,pbfile): + cmdstr = 'protoc.exe --go_out={0} -I{1} {2}/{3}.proto'.format(outpath,ipath,pbpath,pbfile) os.system(cmdstr) file_data = "" tags = {} @@ -25,13 +25,13 @@ def buildProto(pbpath,outpath,pbfile): with io.open(file,"w",encoding='utf-8') as f: f.write(file_data) -buildProto('./pb/proto','./pb','comm') -buildProto('./pb/proto','./pb','errorcode') -buildProto('./pb/proto','./pb','user_db') -buildProto('./pb/proto','./pb','user_msg') -buildProto('./pb/proto','./pb','pack_db') -buildProto('./pb/proto','./pb','pack_msg') -buildProto('./pb/proto','./pb','mail_db') -buildProto('./pb/proto','./pb','mail_msg') -buildProto('./pb/proto','./pb','friend_db') -buildProto('./pb/proto','./pb','friend_msg') \ No newline at end of file +buildProto('./pb','./pb/proto','./pb/proto','comm') +buildProto('./pb','./pb/proto','./pb/proto','errorcode') +buildProto('./pb','./pb/proto','./pb/proto/user','user_db') +buildProto('./pb','./pb/proto','./pb/proto/user','user_msg') +buildProto('./pb','./pb/proto','./pb/proto/pack','pack_db') +buildProto('./pb','./pb/proto','./pb/proto/pack','pack_msg') +buildProto('./pb','./pb/proto','./pb/proto/mail','mail_db') +buildProto('./pb','./pb/proto','./pb/proto/mail','mail_msg') +buildProto('./pb','./pb/proto','./pb/proto/friend','friend_db') +buildProto('./pb','./pb/proto','./pb/proto/friend','friend_msg') \ No newline at end of file