diff --git a/config/v1/config.pb.go b/config/v1/config.pb.go index f52f3a5..23cda00 100644 --- a/config/v1/config.pb.go +++ b/config/v1/config.pb.go @@ -162,7 +162,7 @@ type Service struct { Redis *Redis `protobuf:"bytes,7,opt,name=redis,proto3" json:"redis,omitempty"` Mq *MQ `protobuf:"bytes,8,opt,name=mq,proto3" json:"mq,omitempty"` Mysql *MySQL `protobuf:"bytes,9,opt,name=mysql,proto3" json:"mysql,omitempty"` - Hbase *HBase `protobuf:"bytes,10,opt,name=hbase,proto3" json:"hbase,omitempty"` + HBase *HBase `protobuf:"bytes,10,opt,name=hBase,proto3" json:"hBase,omitempty"` // services name GatewayService string `protobuf:"bytes,11,opt,name=gatewayService,proto3" json:"gatewayService,omitempty"` UserService string `protobuf:"bytes,12,opt,name=userService,proto3" json:"userService,omitempty"` @@ -267,9 +267,9 @@ func (x *Service) GetMysql() *MySQL { return nil } -func (x *Service) GetHbase() *HBase { +func (x *Service) GetHBase() *HBase { if x != nil { - return x.Hbase + return x.HBase } return nil } @@ -723,10 +723,10 @@ var file_config_v1_config_proto_rawDesc = []byte{ 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x51, 0x52, 0x02, 0x6d, 0x71, 0x12, 0x2a, 0x0a, 0x05, 0x6d, 0x79, 0x73, 0x71, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x79, - 0x53, 0x51, 0x4c, 0x52, 0x05, 0x6d, 0x79, 0x73, 0x71, 0x6c, 0x12, 0x2a, 0x0a, 0x05, 0x68, 0x62, + 0x53, 0x51, 0x4c, 0x52, 0x05, 0x6d, 0x79, 0x73, 0x71, 0x6c, 0x12, 0x2a, 0x0a, 0x05, 0x68, 0x42, 0x61, 0x73, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x48, 0x42, 0x61, 0x73, 0x65, 0x52, - 0x05, 0x68, 0x62, 0x61, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, + 0x05, 0x68, 0x42, 0x61, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x75, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x0c, 0x20, @@ -841,7 +841,7 @@ var file_config_v1_config_proto_depIdxs = []int32{ 4, // 5: api.config.v1.Service.redis:type_name -> api.config.v1.Redis 5, // 6: api.config.v1.Service.mq:type_name -> api.config.v1.MQ 6, // 7: api.config.v1.Service.mysql:type_name -> api.config.v1.MySQL - 7, // 8: api.config.v1.Service.hbase:type_name -> api.config.v1.HBase + 7, // 8: api.config.v1.Service.hBase:type_name -> api.config.v1.HBase 0, // 9: api.config.v1.Log.level:type_name -> api.config.v1.Level 9, // 10: api.config.v1.Redis.dial_timeout:type_name -> google.protobuf.Duration 9, // 11: api.config.v1.Redis.idle_timeout:type_name -> google.protobuf.Duration diff --git a/config/v1/config.pb.validate.go b/config/v1/config.pb.validate.go index 892034d..edc8447 100644 --- a/config/v1/config.pb.validate.go +++ b/config/v1/config.pb.validate.go @@ -354,11 +354,11 @@ func (m *Service) validate(all bool) error { } if all { - switch v := interface{}(m.GetHbase()).(type) { + switch v := interface{}(m.GetHBase()).(type) { case interface{ ValidateAll() error }: if err := v.ValidateAll(); err != nil { errors = append(errors, ServiceValidationError{ - field: "Hbase", + field: "HBase", reason: "embedded message failed validation", cause: err, }) @@ -366,16 +366,16 @@ func (m *Service) validate(all bool) error { case interface{ Validate() error }: if err := v.Validate(); err != nil { errors = append(errors, ServiceValidationError{ - field: "Hbase", + field: "HBase", reason: "embedded message failed validation", cause: err, }) } } - } else if v, ok := interface{}(m.GetHbase()).(interface{ Validate() error }); ok { + } else if v, ok := interface{}(m.GetHBase()).(interface{ Validate() error }); ok { if err := v.Validate(); err != nil { return ServiceValidationError{ - field: "Hbase", + field: "HBase", reason: "embedded message failed validation", cause: err, } diff --git a/config/v1/config.proto b/config/v1/config.proto index ae1d565..9a0e4cd 100644 --- a/config/v1/config.proto +++ b/config/v1/config.proto @@ -52,7 +52,7 @@ message Service { Redis redis = 7; MQ mq = 8; MySQL mysql = 9; - HBase hbase = 10; + HBase hBase = 10; // services name string gatewayService = 11; string userService = 12;