Compare commits

...

4 Commits

2 changed files with 8 additions and 5 deletions

View File

@@ -91,5 +91,5 @@ func (c *HttpClient) getApiUrl(api string) string {
apiAddr = api // default api run on 80 int port apiAddr = api // default api run on 80 int port
} }
return "http://" + apiAddr return "https://" + apiAddr
} }

View File

@@ -21,7 +21,7 @@ type Service struct {
ttl time.Duration ttl time.Duration
client *consul.Client client *consul.Client
agent *consul.Agent agent *consul.Agent
connect *consul.Connect connect *connect.Service
kv *consul.KV kv *consul.KV
} }
@@ -61,7 +61,7 @@ func (s *Service) GetID() string {
} }
func (s *Service) GetFullAddr() string { func (s *Service) GetFullAddr() string {
return fmt.Sprintf("http://%s:%d/", s.Address, s.port) return fmt.Sprintf("https://%s:%d/", s.Address, s.port)
} }
func (s *Service) Register() error { func (s *Service) Register() error {
@@ -107,7 +107,10 @@ func (s *Service) Unregister() error {
} }
func (s *Service) Connect() (*connect.Service, error) { func (s *Service) Connect() (*connect.Service, error) {
return connect.NewService(s.Name, s.client) svc, err := connect.NewService(s.Name, s.client)
s.connect = svc
return svc, err
} }
func (s *Service) KV() *consul.KV { func (s *Service) KV() *consul.KV {
@@ -117,7 +120,7 @@ func (s *Service) KV() *consul.KV {
func (s *Service) healthCheck() (bool, error) { func (s *Service) healthCheck() (bool, error) {
alive := func() bool { alive := func() bool {
client := &http.Client{} client := &http.Client{}
healthUrl := s.GetFullAddr() + "health" healthUrl := fmt.Sprintf("%s%s?name=%s", s.GetFullAddr(), "health", s.Name)
req, err := http.NewRequest(http.MethodGet, healthUrl, nil) req, err := http.NewRequest(http.MethodGet, healthUrl, nil)
if err != nil { if err != nil {
return false return false