Merge pull request #67 from hookszhang/dev

Add property instanceId and optimize
hudl · Jun 14, 2018 · fce5cf4 · fce5cf4
2 parents d214741 + 37138cc
commit fce5cf4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.test
 eureka
 .vagrant/
+.idea/
diff --git a/net.go b/net.go
@@ -803,6 +803,9 @@ func (e *EurekaConnection) HeartBeatInstance(ins *Instance) error {
 }
 
 func (i *Instance) Id() string {
+	if i.InstanceId != "" {
+		return i.InstanceId
+	}
 	if i.UniqueID != nil {
 		return i.UniqueID(*i)
 	}

diff --git a/struct.go b/struct.go
@@ -77,6 +77,7 @@ type RegisterInstanceJson struct {
 
 // Instance [de]serializeable [to|from] Eureka [XML|JSON].
 type Instance struct {
+	InstanceId       string `xml:"instanceId" json:"instanceId"`
 	HostName         string `xml:"hostName" json:"hostName"`
 	App              string `xml:"app" json:"app"`
 	IPAddr           string `xml:"ipAddr" json:"ipAddr"`