fix:add consul all health check (#1620)

* fix:add consul all health check

Co-authored-by: chenzhihui <zhihui_chen@foxmail.com>

contrib/registry/consul/client.go

@@ -3,6 +3,7 @@ package consul
 import (
 	"context"
 	"fmt"
+	"net"
 	"net/url"
 	"strconv"
 	"strings"
@@ -69,15 +70,15 @@ func (d *Client) Service(ctx context.Context, service string, index uint64, pass
 // Register register service instacen to consul
 func (d *Client) Register(ctx context.Context, svc *registry.ServiceInstance, enableHealthCheck bool) error {
 	addresses := make(map[string]api.ServiceAddress)
-	var addr string
-	var port uint64
+	checkAddresses := make([]string, 0, len(svc.Endpoints))
 	for _, endpoint := range svc.Endpoints {
 		raw, err := url.Parse(endpoint)
 		if err != nil {
 			return err
 		}
-		addr = raw.Hostname()
-		port, _ = strconv.ParseUint(raw.Port(), 10, 16)
+		addr := raw.Hostname()
+		port, _ := strconv.ParseUint(raw.Port(), 10, 16)
+		checkAddresses = append(checkAddresses, fmt.Sprintf("%s:%d", addr, port))
 		addresses[raw.Scheme] = api.ServiceAddress{Address: endpoint, Port: int(port)}
 	}
 	asr := &api.AgentServiceRegistration{
@@ -86,24 +87,21 @@ func (d *Client) Register(ctx context.Context, svc *registry.ServiceInstance, en
 		Meta:            svc.Metadata,
 		Tags:            []string{fmt.Sprintf("version=%s", svc.Version)},
 		TaggedAddresses: addresses,
-		Address:         addr,
-		Port:            int(port),
-		Checks: []*api.AgentServiceCheck{
-			{
-				CheckID:                        "service:" + svc.ID,
-				TTL:                            "30s",
-				Status:                         "passing",
-				DeregisterCriticalServiceAfter: "90s",
-			},
-		},
+	}
+	if len(checkAddresses) > 0 {
+		host, portRaw, _ := net.SplitHostPort(checkAddresses[0])
+		port, _ := strconv.ParseInt(portRaw, 10, 32)
+		asr.Address = host
+		asr.Port = int(port)
 	}
 	if enableHealthCheck {
-		asr.Checks = append(asr.Checks, &api.AgentServiceCheck{
-			TCP:                            fmt.Sprintf("%s:%d", addr, port),
-			Interval:                       "20s",
-			Status:                         "passing",
-			DeregisterCriticalServiceAfter: "90s",
-		})
+		for _, address := range checkAddresses {
+			asr.Checks = append(asr.Checks, &api.AgentServiceCheck{
+				TCP:                            address,
+				Interval:                       "20s",
+				DeregisterCriticalServiceAfter: "70s",
+			})
+		}
 	}
 	err := d.cli.Agent().ServiceRegister(asr)
 	if err != nil {