test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-30 18:58:02 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FIX] merge error

Browse Source
This commit is contained in:
huangrh 2019-03-04 14:52:42 +08:00
parent 0e034ff12f
commit 6344843de0
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/parser/discovery/etcd.go
View File

@ -88,7 +88,7 @@ func (e *etcd) Fetch() ([]*Endpoint, error) {
if err := json.Unmarshal(kv.Value, &ep); err != nil {
return nil, fmt.Errorf("error parsing the data from etcd: %v", err)
}
ep.UUID = strings.Replace(string(kv.Key), e.key+"/", "", -1)
ep.Ep = strings.Replace(string(kv.Key), e.key+"/", "", -1)
res = append(res, &ep)
}
return res, nil

1
db/mysql/dao/tenants.go
View File

@ -589,6 +589,7 @@ func (t *TenantServicesPortDaoImpl) HasOpenPort(sid string) bool {
return false
}
return true
}
//GetDepUDPPort get all depend service udp port
func (t *TenantServicesPortDaoImpl) GetDepUDPPort(serviceID string) ([]*model.TenantServicesPort, error) {