Commit db0d748f5ac033fa6c9a1c849c0dc8509bfe079b
1 parent
f8ce769e
fix: rsp
Showing
2 changed files
with
34 additions
and
34 deletions
Show diff stats
cmd/httpserver/action/AccountAction.go
| @@ -85,7 +85,7 @@ func (h *AccountAction) Login(c *gin.Context) (int, interface{}) { | @@ -85,7 +85,7 @@ func (h *AccountAction) Login(c *gin.Context) (int, interface{}) { | ||
| 85 | return 3, "password error" | 85 | return 3, "password error" |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | - rsp := &pb.AccountLogin{ | 88 | + rsp := &pb.AccountLoginRsp{ |
| 89 | Token: account.Uid, | 89 | Token: account.Uid, |
| 90 | GameService: common.GlobalConf.GameService.ServiceInfo, | 90 | GameService: common.GlobalConf.GameService.ServiceInfo, |
| 91 | } | 91 | } |
pb/account.pb.go
| @@ -99,7 +99,7 @@ func (x *ServiceInfo) GetGmport() int32 { | @@ -99,7 +99,7 @@ func (x *ServiceInfo) GetGmport() int32 { | ||
| 99 | return 0 | 99 | return 0 |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | -type AccountLogin struct { | 102 | +type AccountLoginRsp struct { |
| 103 | state protoimpl.MessageState | 103 | state protoimpl.MessageState |
| 104 | sizeCache protoimpl.SizeCache | 104 | sizeCache protoimpl.SizeCache |
| 105 | unknownFields protoimpl.UnknownFields | 105 | unknownFields protoimpl.UnknownFields |
| @@ -108,8 +108,8 @@ type AccountLogin struct { | @@ -108,8 +108,8 @@ type AccountLogin struct { | ||
| 108 | GameService []*ServiceInfo `protobuf:"bytes,2,rep,name=game_service,json=gameService,proto3" json:"game_service,omitempty"` | 108 | GameService []*ServiceInfo `protobuf:"bytes,2,rep,name=game_service,json=gameService,proto3" json:"game_service,omitempty"` |
| 109 | } | 109 | } |
| 110 | 110 | ||
| 111 | -func (x *AccountLogin) Reset() { | ||
| 112 | - *x = AccountLogin{} | 111 | +func (x *AccountLoginRsp) Reset() { |
| 112 | + *x = AccountLoginRsp{} | ||
| 113 | if protoimpl.UnsafeEnabled { | 113 | if protoimpl.UnsafeEnabled { |
| 114 | mi := &file_account_proto_msgTypes[1] | 114 | mi := &file_account_proto_msgTypes[1] |
| 115 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 115 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| @@ -117,13 +117,13 @@ func (x *AccountLogin) Reset() { | @@ -117,13 +117,13 @@ func (x *AccountLogin) Reset() { | ||
| 117 | } | 117 | } |
| 118 | } | 118 | } |
| 119 | 119 | ||
| 120 | -func (x *AccountLogin) String() string { | 120 | +func (x *AccountLoginRsp) String() string { |
| 121 | return protoimpl.X.MessageStringOf(x) | 121 | return protoimpl.X.MessageStringOf(x) |
| 122 | } | 122 | } |
| 123 | 123 | ||
| 124 | -func (*AccountLogin) ProtoMessage() {} | 124 | +func (*AccountLoginRsp) ProtoMessage() {} |
| 125 | 125 | ||
| 126 | -func (x *AccountLogin) ProtoReflect() protoreflect.Message { | 126 | +func (x *AccountLoginRsp) ProtoReflect() protoreflect.Message { |
| 127 | mi := &file_account_proto_msgTypes[1] | 127 | mi := &file_account_proto_msgTypes[1] |
| 128 | if protoimpl.UnsafeEnabled && x != nil { | 128 | if protoimpl.UnsafeEnabled && x != nil { |
| 129 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) | 129 | ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) |
| @@ -135,19 +135,19 @@ func (x *AccountLogin) ProtoReflect() protoreflect.Message { | @@ -135,19 +135,19 @@ func (x *AccountLogin) ProtoReflect() protoreflect.Message { | ||
| 135 | return mi.MessageOf(x) | 135 | return mi.MessageOf(x) |
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | -// Deprecated: Use AccountLogin.ProtoReflect.Descriptor instead. | ||
| 139 | -func (*AccountLogin) Descriptor() ([]byte, []int) { | 138 | +// Deprecated: Use AccountLoginRsp.ProtoReflect.Descriptor instead. |
| 139 | +func (*AccountLoginRsp) Descriptor() ([]byte, []int) { | ||
| 140 | return file_account_proto_rawDescGZIP(), []int{1} | 140 | return file_account_proto_rawDescGZIP(), []int{1} |
| 141 | } | 141 | } |
| 142 | 142 | ||
| 143 | -func (x *AccountLogin) GetToken() string { | 143 | +func (x *AccountLoginRsp) GetToken() string { |
| 144 | if x != nil { | 144 | if x != nil { |
| 145 | return x.Token | 145 | return x.Token |
| 146 | } | 146 | } |
| 147 | return "" | 147 | return "" |
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | -func (x *AccountLogin) GetGameService() []*ServiceInfo { | 150 | +func (x *AccountLoginRsp) GetGameService() []*ServiceInfo { |
| 151 | if x != nil { | 151 | if x != nil { |
| 152 | return x.GameService | 152 | return x.GameService |
| 153 | } | 153 | } |
| @@ -292,23 +292,23 @@ var file_account_proto_rawDesc = []byte{ | @@ -292,23 +292,23 @@ var file_account_proto_rawDesc = []byte{ | ||
| 292 | 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6d, 0x65, 0x70, 0x6f, 0x72, | 292 | 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6d, 0x65, 0x70, 0x6f, 0x72, |
| 293 | 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x67, 0x61, 0x6d, 0x65, 0x70, 0x6f, 0x72, | 293 | 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x67, 0x61, 0x6d, 0x65, 0x70, 0x6f, 0x72, |
| 294 | 0x74, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, | 294 | 0x74, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, |
| 295 | - 0x05, 0x52, 0x06, 0x67, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x5d, 0x0a, 0x0c, 0x41, 0x63, 0x63, | ||
| 296 | - 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, | ||
| 297 | - 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, | ||
| 298 | - 0x37, 0x0a, 0x0c, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, | ||
| 299 | - 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x2e, | ||
| 300 | - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, 0x67, 0x61, 0x6d, | ||
| 301 | - 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x08, 0x52, 0x65, 0x67, 0x69, | ||
| 302 | - 0x73, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x18, 0x01, 0x20, | ||
| 303 | - 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, | ||
| 304 | - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, | ||
| 305 | - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, | ||
| 306 | - 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x39, 0x0a, 0x0d, 0x55, 0x70, | ||
| 307 | - 0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0c, 0x0a, 0x01, 0x69, | ||
| 308 | - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x69, 0x12, 0x0c, 0x0a, 0x01, 0x78, 0x18, 0x02, | ||
| 309 | - 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, 0x03, 0x20, 0x01, | ||
| 310 | - 0x28, 0x05, 0x52, 0x01, 0x79, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, 0x62, 0x3b, 0x70, | ||
| 311 | - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | 295 | + 0x05, 0x52, 0x06, 0x67, 0x6d, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x60, 0x0a, 0x0f, 0x41, 0x63, 0x63, |
| 296 | + 0x6f, 0x75, 0x6e, 0x74, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, | ||
| 297 | + 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, | ||
| 298 | + 0x65, 0x6e, 0x12, 0x37, 0x0a, 0x0c, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, | ||
| 299 | + 0x63, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x63, 0x63, 0x6f, 0x75, | ||
| 300 | + 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b, | ||
| 301 | + 0x67, 0x61, 0x6d, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x50, 0x0a, 0x08, 0x52, | ||
| 302 | + 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, | ||
| 303 | + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x12, 0x1a, 0x0a, | ||
| 304 | + 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, | ||
| 305 | + 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, | ||
| 306 | + 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x39, 0x0a, | ||
| 307 | + 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x0c, | ||
| 308 | + 0x0a, 0x01, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x69, 0x12, 0x0c, 0x0a, 0x01, | ||
| 309 | + 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x78, 0x12, 0x0c, 0x0a, 0x01, 0x79, 0x18, | ||
| 310 | + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x01, 0x79, 0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2e, 0x2f, 0x70, | ||
| 311 | + 0x62, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, | ||
| 312 | } | 312 | } |
| 313 | 313 | ||
| 314 | var ( | 314 | var ( |
| @@ -325,13 +325,13 @@ func file_account_proto_rawDescGZIP() []byte { | @@ -325,13 +325,13 @@ func file_account_proto_rawDescGZIP() []byte { | ||
| 325 | 325 | ||
| 326 | var file_account_proto_msgTypes = make([]protoimpl.MessageInfo, 4) | 326 | var file_account_proto_msgTypes = make([]protoimpl.MessageInfo, 4) |
| 327 | var file_account_proto_goTypes = []interface{}{ | 327 | var file_account_proto_goTypes = []interface{}{ |
| 328 | - (*ServiceInfo)(nil), // 0: account.ServiceInfo | ||
| 329 | - (*AccountLogin)(nil), // 1: account.AccountLogin | ||
| 330 | - (*Register)(nil), // 2: account.Register | ||
| 331 | - (*UpdateVersion)(nil), // 3: account.UpdateVersion | 328 | + (*ServiceInfo)(nil), // 0: account.ServiceInfo |
| 329 | + (*AccountLoginRsp)(nil), // 1: account.AccountLoginRsp | ||
| 330 | + (*Register)(nil), // 2: account.Register | ||
| 331 | + (*UpdateVersion)(nil), // 3: account.UpdateVersion | ||
| 332 | } | 332 | } |
| 333 | var file_account_proto_depIdxs = []int32{ | 333 | var file_account_proto_depIdxs = []int32{ |
| 334 | - 0, // 0: account.AccountLogin.game_service:type_name -> account.ServiceInfo | 334 | + 0, // 0: account.AccountLoginRsp.game_service:type_name -> account.ServiceInfo |
| 335 | 1, // [1:1] is the sub-list for method output_type | 335 | 1, // [1:1] is the sub-list for method output_type |
| 336 | 1, // [1:1] is the sub-list for method input_type | 336 | 1, // [1:1] is the sub-list for method input_type |
| 337 | 1, // [1:1] is the sub-list for extension type_name | 337 | 1, // [1:1] is the sub-list for extension type_name |
| @@ -358,7 +358,7 @@ func file_account_proto_init() { | @@ -358,7 +358,7 @@ func file_account_proto_init() { | ||
| 358 | } | 358 | } |
| 359 | } | 359 | } |
| 360 | file_account_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { | 360 | file_account_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { |
| 361 | - switch v := v.(*AccountLogin); i { | 361 | + switch v := v.(*AccountLoginRsp); i { |
| 362 | case 0: | 362 | case 0: |
| 363 | return &v.state | 363 | return &v.state |
| 364 | case 1: | 364 | case 1: |