Merge pull request #67 from hookszhang/dev

damtur · web-flow · commit fce5cf495554 · 2018-06-14T10:28:39.000+01:00
Add property instanceId and optimize
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"`

-Original file line number
+Diff line change
 *.test
 eureka
 .vagrant/
 +.idea/
Original file line number	Diff line number	Diff line change
`@@ -803,6 +803,9 @@ func (e EurekaConnection) HeartBeatInstance(ins Instance) error {`
`803`	`803`	`}`
`804`	`804`
`805`	`805`	`func (i *Instance) Id() string {`
	`806`	`+ if i.InstanceId != "" {`
	`807`	`+ return i.InstanceId`
	`808`	`+ }`
`806`	`809`	`if i.UniqueID != nil {`
`807`	`810`	`return i.UniqueID(*i)`
`808`	`811`	`}`