Commit daf39f64f30f4ef08351d5a7306da65503fa45ee
1 parent
dff17021
fix: EmailNty.emails -> EmailNty.email
Showing
2 changed files
with
11 additions
and
11 deletions
Show diff stats
models/rolePlugin.go
| @@ -384,7 +384,7 @@ func (m *RoleModel) InsertEmail(email *pb.Email) error { | @@ -384,7 +384,7 @@ func (m *RoleModel) InsertEmail(email *pb.Email) error { | ||
| 384 | return err | 384 | return err |
| 385 | } | 385 | } |
| 386 | 386 | ||
| 387 | - nty := &pb.EmailNewNty{Emails: email} | 387 | + nty := &pb.EmailNewNty{Email: email} |
| 388 | if m.GetConn() != nil { | 388 | if m.GetConn() != nil { |
| 389 | m.GetConn().SendPB(0, pb.ProtoCode_EmailNewNty, nty, 0) | 389 | m.GetConn().SendPB(0, pb.ProtoCode_EmailNewNty, nty, 0) |
| 390 | } | 390 | } |
pb/game.pb.go
| @@ -1418,7 +1418,7 @@ type EmailNewNty struct { | @@ -1418,7 +1418,7 @@ type EmailNewNty struct { | ||
| 1418 | sizeCache protoimpl.SizeCache | 1418 | sizeCache protoimpl.SizeCache |
| 1419 | unknownFields protoimpl.UnknownFields | 1419 | unknownFields protoimpl.UnknownFields |
| 1420 | 1420 | ||
| 1421 | - Emails *Email `protobuf:"bytes,1,opt,name=emails,proto3" json:"emails,omitempty"` | 1421 | + Email *Email `protobuf:"bytes,1,opt,name=email,proto3" json:"email,omitempty"` |
| 1422 | } | 1422 | } |
| 1423 | 1423 | ||
| 1424 | func (x *EmailNewNty) Reset() { | 1424 | func (x *EmailNewNty) Reset() { |
| @@ -1453,9 +1453,9 @@ func (*EmailNewNty) Descriptor() ([]byte, []int) { | @@ -1453,9 +1453,9 @@ func (*EmailNewNty) Descriptor() ([]byte, []int) { | ||
| 1453 | return file_game_proto_rawDescGZIP(), []int{27} | 1453 | return file_game_proto_rawDescGZIP(), []int{27} |
| 1454 | } | 1454 | } |
| 1455 | 1455 | ||
| 1456 | -func (x *EmailNewNty) GetEmails() *Email { | 1456 | +func (x *EmailNewNty) GetEmail() *Email { |
| 1457 | if x != nil { | 1457 | if x != nil { |
| 1458 | - return x.Emails | 1458 | + return x.Email |
| 1459 | } | 1459 | } |
| 1460 | return nil | 1460 | return nil |
| 1461 | } | 1461 | } |
| @@ -1566,12 +1566,12 @@ var file_game_proto_rawDesc = []byte{ | @@ -1566,12 +1566,12 @@ var file_game_proto_rawDesc = []byte{ | ||
| 1566 | 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x0d, 0x0a, 0x0b, 0x45, 0x6d, 0x61, | 1566 | 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x0d, 0x0a, 0x0b, 0x45, 0x6d, 0x61, |
| 1567 | 0x69, 0x6c, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x1f, 0x0a, 0x0b, 0x45, 0x6d, 0x61, 0x69, | 1567 | 0x69, 0x6c, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x22, 0x1f, 0x0a, 0x0b, 0x45, 0x6d, 0x61, 0x69, |
| 1568 | 0x6c, 0x44, 0x65, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, | 1568 | 0x6c, 0x44, 0x65, 0x6c, 0x52, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, |
| 1569 | - 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x34, 0x0a, 0x0b, 0x45, 0x6d, 0x61, | ||
| 1570 | - 0x69, 0x6c, 0x4e, 0x65, 0x77, 0x4e, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x65, 0x6d, 0x61, 0x69, | ||
| 1571 | - 0x6c, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, | ||
| 1572 | - 0x73, 0x2e, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x06, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x73, 0x42, | ||
| 1573 | - 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, | ||
| 1574 | - 0x74, 0x6f, 0x33, | 1569 | + 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0b, 0x45, 0x6d, 0x61, |
| 1570 | + 0x69, 0x6c, 0x4e, 0x65, 0x77, 0x4e, 0x74, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, | ||
| 1571 | + 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, | ||
| 1572 | + 0x2e, 0x45, 0x6d, 0x61, 0x69, 0x6c, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x42, 0x0a, 0x5a, | ||
| 1573 | + 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, | ||
| 1574 | + 0x33, | ||
| 1575 | } | 1575 | } |
| 1576 | 1576 | ||
| 1577 | var ( | 1577 | var ( |
| @@ -1634,7 +1634,7 @@ var file_game_proto_depIdxs = []int32{ | @@ -1634,7 +1634,7 @@ var file_game_proto_depIdxs = []int32{ | ||
| 1634 | 31, // 8: game.EquipmentAddNty.equip:type_name -> models.Equipment | 1634 | 31, // 8: game.EquipmentAddNty.equip:type_name -> models.Equipment |
| 1635 | 29, // 9: game.HeroUpLevelRsp.hero:type_name -> models.Hero | 1635 | 29, // 9: game.HeroUpLevelRsp.hero:type_name -> models.Hero |
| 1636 | 32, // 10: game.EmailListRsp.emails:type_name -> models.Email | 1636 | 32, // 10: game.EmailListRsp.emails:type_name -> models.Email |
| 1637 | - 32, // 11: game.EmailNewNty.emails:type_name -> models.Email | 1637 | + 32, // 11: game.EmailNewNty.email:type_name -> models.Email |
| 1638 | 12, // [12:12] is the sub-list for method output_type | 1638 | 12, // [12:12] is the sub-list for method output_type |
| 1639 | 12, // [12:12] is the sub-list for method input_type | 1639 | 12, // [12:12] is the sub-list for method input_type |
| 1640 | 12, // [12:12] is the sub-list for extension type_name | 1640 | 12, // [12:12] is the sub-list for extension type_name |