diff --git a/server/gamepay_backend/metamgr.go b/server/gamepay_backend/metamgr.go index 93fbd5f..64dcdc7 100644 --- a/server/gamepay_backend/metamgr.go +++ b/server/gamepay_backend/metamgr.go @@ -7,6 +7,8 @@ import ( const ( MT_SERVER_INFO = iota + MT_MYSQL_CONF = iota + MT_GAME_CONF = iota MT_MAX ) @@ -18,7 +20,7 @@ func (this *MetaMgr) Init() *MetaMgr { this.MetaMgr.Init() configDir := "../config/" if !f5.IsOnlineEnv() { - configDir = "/var/data/conf_test/rankserver/" + configDir = "/var/data/conf_test/gamepay_backend/" } metaClasses := &[]f5.MetaClass{ f5.MetaClass{ diff --git a/server/gamepay_backend/mt/mt.pb.go b/server/gamepay_backend/mt/mt.pb.go index 84ae3da..121f0f3 100644 --- a/server/gamepay_backend/mt/mt.pb.go +++ b/server/gamepay_backend/mt/mt.pb.go @@ -135,7 +135,7 @@ func (x *ServerInfoMetas) GetValues() []*ServerInfo { return nil } -type MysqlConfig struct { +type MysqlConf struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -147,8 +147,8 @@ type MysqlConfig struct { Passwd *string `protobuf:"bytes,5,opt,name=passwd" json:"passwd,omitempty"` } -func (x *MysqlConfig) Reset() { - *x = MysqlConfig{} +func (x *MysqlConf) Reset() { + *x = MysqlConf{} if protoimpl.UnsafeEnabled { mi := &file_mt_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -156,13 +156,13 @@ func (x *MysqlConfig) Reset() { } } -func (x *MysqlConfig) String() string { +func (x *MysqlConf) String() string { return protoimpl.X.MessageStringOf(x) } -func (*MysqlConfig) ProtoMessage() {} +func (*MysqlConf) ProtoMessage() {} -func (x *MysqlConfig) ProtoReflect() protoreflect.Message { +func (x *MysqlConf) ProtoReflect() protoreflect.Message { mi := &file_mt_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -174,46 +174,203 @@ func (x *MysqlConfig) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use MysqlConfig.ProtoReflect.Descriptor instead. -func (*MysqlConfig) Descriptor() ([]byte, []int) { +// Deprecated: Use MysqlConf.ProtoReflect.Descriptor instead. +func (*MysqlConf) Descriptor() ([]byte, []int) { return file_mt_proto_rawDescGZIP(), []int{2} } -func (x *MysqlConfig) GetInstanceId() int32 { +func (x *MysqlConf) GetInstanceId() int32 { if x != nil && x.InstanceId != nil { return *x.InstanceId } return 0 } -func (x *MysqlConfig) GetHost() string { +func (x *MysqlConf) GetHost() string { if x != nil && x.Host != nil { return *x.Host } return "" } -func (x *MysqlConfig) GetPort() int32 { +func (x *MysqlConf) GetPort() int32 { if x != nil && x.Port != nil { return *x.Port } return 0 } -func (x *MysqlConfig) GetUser() string { +func (x *MysqlConf) GetUser() string { if x != nil && x.User != nil { return *x.User } return "" } -func (x *MysqlConfig) GetPasswd() string { +func (x *MysqlConf) GetPasswd() string { if x != nil && x.Passwd != nil { return *x.Passwd } return "" } +type MysqlConfMetas struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Values []*MysqlConf `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"` +} + +func (x *MysqlConfMetas) Reset() { + *x = MysqlConfMetas{} + if protoimpl.UnsafeEnabled { + mi := &file_mt_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *MysqlConfMetas) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*MysqlConfMetas) ProtoMessage() {} + +func (x *MysqlConfMetas) ProtoReflect() protoreflect.Message { + mi := &file_mt_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use MysqlConfMetas.ProtoReflect.Descriptor instead. +func (*MysqlConfMetas) Descriptor() ([]byte, []int) { + return file_mt_proto_rawDescGZIP(), []int{3} +} + +func (x *MysqlConfMetas) GetValues() []*MysqlConf { + if x != nil { + return x.Values + } + return nil +} + +type GameConf struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Gameid *int32 `protobuf:"varint,1,opt,name=gameid" json:"gameid,omitempty"` + Channel *int32 `protobuf:"varint,2,opt,name=channel" json:"channel,omitempty"` + NotifyUrl *string `protobuf:"bytes,3,opt,name=notify_url,json=notifyUrl" json:"notify_url,omitempty"` +} + +func (x *GameConf) Reset() { + *x = GameConf{} + if protoimpl.UnsafeEnabled { + mi := &file_mt_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GameConf) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GameConf) ProtoMessage() {} + +func (x *GameConf) ProtoReflect() protoreflect.Message { + mi := &file_mt_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GameConf.ProtoReflect.Descriptor instead. +func (*GameConf) Descriptor() ([]byte, []int) { + return file_mt_proto_rawDescGZIP(), []int{4} +} + +func (x *GameConf) GetGameid() int32 { + if x != nil && x.Gameid != nil { + return *x.Gameid + } + return 0 +} + +func (x *GameConf) GetChannel() int32 { + if x != nil && x.Channel != nil { + return *x.Channel + } + return 0 +} + +func (x *GameConf) GetNotifyUrl() string { + if x != nil && x.NotifyUrl != nil { + return *x.NotifyUrl + } + return "" +} + +type GameConfMetas struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Values []*GameConf `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"` +} + +func (x *GameConfMetas) Reset() { + *x = GameConfMetas{} + if protoimpl.UnsafeEnabled { + mi := &file_mt_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *GameConfMetas) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*GameConfMetas) ProtoMessage() {} + +func (x *GameConfMetas) ProtoReflect() protoreflect.Message { + mi := &file_mt_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use GameConfMetas.ProtoReflect.Descriptor instead. +func (*GameConfMetas) Descriptor() ([]byte, []int) { + return file_mt_proto_rawDescGZIP(), []int{5} +} + +func (x *GameConfMetas) GetValues() []*GameConf { + if x != nil { + return x.Values + } + return nil +} + var File_mt_proto protoreflect.FileDescriptor var file_mt_proto_rawDesc = []byte{ @@ -225,14 +382,24 @@ var file_mt_proto_rawDesc = []byte{ 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x22, 0x31, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x12, 0x1e, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x6d, - 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x5c, 0x0a, 0x0b, - 0x4d, 0x79, 0x73, 0x71, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x13, 0x0a, 0x0b, 0x69, - 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x12, 0x0c, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x12, 0x0c, - 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x12, 0x0c, 0x0a, 0x04, - 0x75, 0x73, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x12, 0x0e, 0x0a, 0x06, 0x70, 0x61, - 0x73, 0x73, 0x77, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x6d, 0x74, + 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x5a, 0x0a, 0x09, + 0x4d, 0x79, 0x73, 0x71, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x12, 0x13, 0x0a, 0x0b, 0x69, 0x6e, 0x73, + 0x74, 0x61, 0x6e, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x12, 0x0c, + 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x12, 0x0c, 0x0a, 0x04, + 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x12, 0x0c, 0x0a, 0x04, 0x75, 0x73, + 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x12, 0x0e, 0x0a, 0x06, 0x70, 0x61, 0x73, 0x73, + 0x77, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x22, 0x2f, 0x0a, 0x0e, 0x4d, 0x79, 0x73, 0x71, + 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x12, 0x1d, 0x0a, 0x06, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x6d, 0x74, 0x2e, + 0x4d, 0x79, 0x73, 0x71, 0x6c, 0x43, 0x6f, 0x6e, 0x66, 0x22, 0x3f, 0x0a, 0x08, 0x47, 0x61, 0x6d, + 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x12, 0x0e, 0x0a, 0x06, 0x67, 0x61, 0x6d, 0x65, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x12, 0x0f, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x12, 0x12, 0x0a, 0x0a, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, + 0x5f, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x22, 0x2d, 0x0a, 0x0d, 0x47, 0x61, + 0x6d, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x12, 0x1c, 0x0a, 0x06, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6d, 0x74, + 0x2e, 0x47, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x6d, + 0x74, } var ( @@ -247,19 +414,24 @@ func file_mt_proto_rawDescGZIP() []byte { return file_mt_proto_rawDescData } -var file_mt_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_mt_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_mt_proto_goTypes = []interface{}{ (*ServerInfo)(nil), // 0: mt.ServerInfo (*ServerInfoMetas)(nil), // 1: mt.ServerInfoMetas - (*MysqlConfig)(nil), // 2: mt.MysqlConfig + (*MysqlConf)(nil), // 2: mt.MysqlConf + (*MysqlConfMetas)(nil), // 3: mt.MysqlConfMetas + (*GameConf)(nil), // 4: mt.GameConf + (*GameConfMetas)(nil), // 5: mt.GameConfMetas } var file_mt_proto_depIdxs = []int32{ 0, // 0: mt.ServerInfoMetas.values:type_name -> mt.ServerInfo - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 2, // 1: mt.MysqlConfMetas.values:type_name -> mt.MysqlConf + 4, // 2: mt.GameConfMetas.values:type_name -> mt.GameConf + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_mt_proto_init() } @@ -293,7 +465,43 @@ func file_mt_proto_init() { } } file_mt_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*MysqlConfig); i { + switch v := v.(*MysqlConf); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_mt_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*MysqlConfMetas); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_mt_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GameConf); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_mt_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*GameConfMetas); i { case 0: return &v.state case 1: @@ -311,7 +519,7 @@ func file_mt_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_mt_proto_rawDesc, NumEnums: 0, - NumMessages: 3, + NumMessages: 6, NumExtensions: 0, NumServices: 0, }, diff --git a/server/gamepay_backend/proto/mt.proto b/server/gamepay_backend/proto/mt.proto index 2d953c2..ef994a3 100644 --- a/server/gamepay_backend/proto/mt.proto +++ b/server/gamepay_backend/proto/mt.proto @@ -14,7 +14,7 @@ message ServerInfoMetas repeated ServerInfo values = 1; } -message MysqlConfig +message MysqlConf { optional int32 instance_id = 1; optional string host = 2; @@ -22,3 +22,20 @@ message MysqlConfig optional string user = 4; optional string passwd = 5; } + +message MysqlConfMetas +{ + repeated MysqlConf values = 1; +} + +message GameConf +{ + optional int32 gameid = 1; + optional int32 channel = 2; + optional string notify_url = 3; +} + +message GameConfMetas +{ + repeated GameConf values = 1; +}