Skip to content

Commit 3bccdf2

Browse files
committed
Set default bson
1 parent 814d35b commit 3bccdf2

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

discovery/instance.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
package discovery
1919

2020
type MicroServiceInstance struct {
21-
InstanceId string `protobuf:"bytes,1,opt,name=instanceId" json:"instanceId,omitempty"`
22-
ServiceId string `protobuf:"bytes,2,opt,name=serviceId" json:"serviceId,omitempty"`
21+
InstanceId string `protobuf:"bytes,1,opt,name=instanceId" json:"instanceId,omitempty" bson:"instance_id"`
22+
ServiceId string `protobuf:"bytes,2,opt,name=serviceId" json:"serviceId,omitempty" bson:"service_id"`
2323
Endpoints []string `protobuf:"bytes,3,rep,name=endpoints" json:"endpoints,omitempty"`
2424
HostName string `protobuf:"bytes,4,opt,name=hostName" json:"hostName,omitempty"`
2525
Status string `protobuf:"bytes,5,opt,name=status" json:"status,omitempty"`
2626
Properties map[string]string `protobuf:"bytes,6,rep,name=properties" json:"properties,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
27-
HealthCheck *HealthCheck `protobuf:"bytes,7,opt,name=healthCheck" json:"healthCheck,omitempty"`
27+
HealthCheck *HealthCheck `protobuf:"bytes,7,opt,name=healthCheck" json:"healthCheck,omitempty" bson:"health_check"`
2828
Timestamp string `protobuf:"bytes,8,opt,name=timestamp" json:"timestamp,omitempty"`
29-
DataCenterInfo *DataCenterInfo `protobuf:"bytes,9,opt,name=dataCenterInfo" json:"dataCenterInfo,omitempty"`
30-
ModTimestamp string `protobuf:"bytes,10,opt,name=modTimestamp" json:"modTimestamp,omitempty"`
29+
DataCenterInfo *DataCenterInfo `protobuf:"bytes,9,opt,name=dataCenterInfo" json:"dataCenterInfo,omitempty" bson:"data_center_info"`
30+
ModTimestamp string `protobuf:"bytes,10,opt,name=modTimestamp" json:"modTimestamp,omitempty" bson:"mod_timestamp"`
3131
Version string `protobuf:"bytes,11,opt,name=version" json:"version,omitempty"`
3232
}
3333
type RegisterInstanceRequest struct {

discovery/schema.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type ModifySchemasRequest struct {
2323
}
2424

2525
type Schema struct {
26-
SchemaId string `protobuf:"bytes,1,opt,name=schemaId" json:"schemaId,omitempty"`
26+
SchemaId string `protobuf:"bytes,1,opt,name=schemaId" json:"schemaId,omitempty" bson:"schema_id"`
2727
Summary string `protobuf:"bytes,2,opt,name=summary" json:"summary,omitempty"`
2828
Schema string `protobuf:"bytes,3,opt,name=schema" json:"schema,omitempty"`
2929
}

discovery/service.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
package discovery
1919

2020
type MicroService struct {
21-
ServiceId string `protobuf:"bytes,1,opt,name=serviceId" json:"serviceId,omitempty"`
21+
ServiceId string `protobuf:"bytes,1,opt,name=serviceId" json:"serviceId,omitempty" bson:"service_id"`
2222
AppId string `protobuf:"bytes,2,opt,name=appId" json:"appId,omitempty" bson:"app"`
23-
ServiceName string `protobuf:"bytes,3,opt,name=serviceName" json:"serviceName,omitempty"`
23+
ServiceName string `protobuf:"bytes,3,opt,name=serviceName" json:"serviceName,omitempty" bson:"service_name"`
2424
Version string `protobuf:"bytes,4,opt,name=version" json:"version,omitempty"`
2525
Description string `protobuf:"bytes,5,opt,name=description" json:"description,omitempty"`
2626
Level string `protobuf:"bytes,6,opt,name=level" json:"level,omitempty"`
@@ -31,10 +31,10 @@ type MicroService struct {
3131
Timestamp string `protobuf:"bytes,11,opt,name=timestamp" json:"timestamp,omitempty"`
3232
Providers []*MicroServiceKey `protobuf:"bytes,12,rep,name=providers" json:"providers,omitempty"`
3333
Alias string `protobuf:"bytes,13,opt,name=alias" json:"alias,omitempty"`
34-
LBStrategy map[string]string `protobuf:"bytes,14,rep,name=LBStrategy" json:"LBStrategy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
35-
ModTimestamp string `protobuf:"bytes,15,opt,name=modTimestamp" json:"modTimestamp,omitempty"`
34+
LBStrategy map[string]string `protobuf:"bytes,14,rep,name=LBStrategy" json:"LBStrategy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value" bson:"lb_strategy"`
35+
ModTimestamp string `protobuf:"bytes,15,opt,name=modTimestamp" json:"modTimestamp,omitempty" bson:"mod_timestamp"`
3636
Environment string `protobuf:"bytes,16,opt,name=environment" json:"environment,omitempty" bson:"env"`
37-
RegisterBy string `protobuf:"bytes,17,opt,name=registerBy" json:"registerBy,omitempty"`
37+
RegisterBy string `protobuf:"bytes,17,opt,name=registerBy" json:"registerBy,omitempty" bson:"register_by"`
3838
Framework *FrameWorkProperty `protobuf:"bytes,18,opt,name=framework" json:"framework,omitempty"`
3939
}
4040

discovery/types.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,9 @@ type GetServicesInfoResponse struct {
108108
type MicroServiceKey struct {
109109
// Tenant: The format is "{domain}/{project}"
110110
Tenant string `protobuf:"bytes,1,opt,name=tenant" json:"tenant,omitempty"`
111-
Environment string `protobuf:"bytes,2,opt,name=environment" json:"environment,omitempty"`
112-
AppId string `protobuf:"bytes,3,opt,name=appId" json:"appId,omitempty"`
113-
ServiceName string `protobuf:"bytes,4,opt,name=serviceName" json:"serviceName,omitempty"`
111+
Environment string `protobuf:"bytes,2,opt,name=environment" json:"environment,omitempty" bson:"env"`
112+
AppId string `protobuf:"bytes,3,opt,name=appId" json:"appId,omitempty" bson:"app"`
113+
ServiceName string `protobuf:"bytes,4,opt,name=serviceName" json:"serviceName,omitempty" bson:"service_name"`
114114
Alias string `protobuf:"bytes,5,opt,name=alias" json:"alias,omitempty"`
115115
Version string `protobuf:"bytes,6,opt,name=version" json:"version,omitempty"`
116116
}
@@ -125,13 +125,13 @@ type FrameWorkProperty struct {
125125
}
126126

127127
type ServiceRule struct {
128-
RuleId string `protobuf:"bytes,1,opt,name=ruleId" json:"ruleId,omitempty"`
129-
RuleType string `protobuf:"bytes,2,opt,name=ruleType" json:"ruleType,omitempty"`
128+
RuleId string `protobuf:"bytes,1,opt,name=ruleId" json:"ruleId,omitempty" bson:"rule_id"`
129+
RuleType string `protobuf:"bytes,2,opt,name=ruleType" json:"ruleType,omitempty" bson:"rule_type"`
130130
Attribute string `protobuf:"bytes,3,opt,name=attribute" json:"attribute,omitempty"`
131131
Pattern string `protobuf:"bytes,4,opt,name=pattern" json:"pattern,omitempty"`
132132
Description string `protobuf:"bytes,5,opt,name=description" json:"description,omitempty"`
133133
Timestamp string `protobuf:"bytes,6,opt,name=timestamp" json:"timestamp,omitempty"`
134-
ModTimestamp string `protobuf:"bytes,7,opt,name=modTimestamp" json:"modTimestamp,omitempty"`
134+
ModTimestamp string `protobuf:"bytes,7,opt,name=modTimestamp" json:"modTimestamp,omitempty" bson:"mod_timestamp"`
135135
}
136136

137137
type AddOrUpdateServiceRule struct {
@@ -330,7 +330,7 @@ type HealthCheck struct {
330330
type DataCenterInfo struct {
331331
Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
332332
Region string `protobuf:"bytes,2,opt,name=region" json:"region,omitempty"`
333-
AvailableZone string `protobuf:"bytes,3,opt,name=availableZone" json:"availableZone,omitempty"`
333+
AvailableZone string `protobuf:"bytes,3,opt,name=availableZone" json:"availableZone,omitempty" bson:"az"`
334334
}
335335

336336
type MicroServiceInstanceKey struct {

rbac/account.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ type Account struct {
2929
//Deprecated
3030
Role string `json:"role,omitempty"`
3131
Roles []string `json:"roles,omitempty"`
32-
TokenExpirationTime string `json:"tokenExpirationTime,omitempty"`
33-
CurrentPassword string `json:"currentPassword,omitempty"`
32+
TokenExpirationTime string `json:"tokenExpirationTime,omitempty" bson:"token_expiration_time"`
33+
CurrentPassword string `json:"currentPassword,omitempty" bson:"current_password"`
3434
Status string `json:"status,omitempty"`
3535
}
3636

0 commit comments

Comments
 (0)