use foundation 0.1.0 (#47)

go-chassis · Nov 8, 2019 · 0b3e5cc · 0b3e5cc
1 parent 0cb5c5e
commit 0b3e5cc
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/client_test.go b/client_test.go
@@ -13,6 +13,4 @@ func TestEnable(t *testing.T) {
 		ServerURI: "http://127.0.0.1:30100",
 	})
 	assert.NoError(t, err)
-	_, err = c.PullConfigs("service", "app", "1.0", "")
-	assert.Error(t, err)
 }
diff --git a/configcenter/config_center.go b/configcenter/config_center.go
@@ -18,13 +18,13 @@
 package configcenter
 
 import (
-	"github.com/go-mesh/openlogging"
-
 	"errors"
+	"strings"
+
 	"github.com/go-chassis/go-chassis-config"
 	"github.com/go-chassis/go-chassis-config/pkg/configcenter"
+	"github.com/go-mesh/openlogging"
 	"github.com/gorilla/websocket"
-	"strings"
 )
 
 const (

diff --git a/go.mod b/go.mod
@@ -1,8 +1,10 @@
 module github.com/go-chassis/go-chassis-config
 
 require (
-	github.com/go-chassis/foundation v0.0.0-20190621030543-c3b63f787f4c
+	github.com/go-chassis/foundation v0.1.0
 	github.com/go-mesh/openlogging v1.0.1
 	github.com/gorilla/websocket v1.4.0
 	github.com/stretchr/testify v1.3.0
 )
+
+go 1.13
diff --git a/go.sum b/go.sum
@@ -2,6 +2,8 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-chassis/foundation v0.0.0-20190621030543-c3b63f787f4c h1:p+Y6yq7RwHmYjEr/vwdVYGacBqFCc2lPQfNRIC3vRIs=
 github.com/go-chassis/foundation v0.0.0-20190621030543-c3b63f787f4c/go.mod h1:21/ajGtgJlWTCeM0TxGJdRhO8bJkKirWyV8Stlh6g6c=
+github.com/go-chassis/foundation v0.1.0 h1:ixjSxwUyJS8RkASYz0dNe5ApAL+gec7ejgsU84tIVnw=
+github.com/go-chassis/foundation v0.1.0/go.mod h1:21/ajGtgJlWTCeM0TxGJdRhO8bJkKirWyV8Stlh6g6c=
 github.com/go-mesh/openlogging v1.0.1 h1:6raaXo8SK+wuQX1VoNi6QJCSf1fTOFWh7f5f6b2ZEmY=
 github.com/go-mesh/openlogging v1.0.1/go.mod h1:qaKi+amO+hsGin2q1GmW+/NcbZpMPnTufwrWzDmIuuU=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=

diff --git a/pkg/configcenter/client.go b/pkg/configcenter/client.go
@@ -18,6 +18,7 @@
 package configcenter
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"github.com/go-chassis/foundation/httpclient"
@@ -75,7 +76,7 @@ var (
 type Client struct {
 	opts Options
 	sync.RWMutex
-	c            *httpclient.URLClient
+	c            *httpclient.Requests
 	wsDialer     *websocket.Dialer
 	wsConnection *websocket.Conn
 }
@@ -97,7 +98,7 @@ func New(opts Options) (*Client, error) {
 	}
 	updateAPIPath(apiVersion)
 
-	hc, err := httpclient.GetURLClient(&httpclient.URLClientOption{
+	hc, err := httpclient.New(&httpclient.Options{
 		SSLEnabled: opts.EnableSSL,
 		TLSConfig:  opts.TLSConfig,
 		Compressed: false,
@@ -188,7 +189,7 @@ func (c *Client) HTTPDo(method string, rawURL string, headers http.Header, body
 	for k, v := range GetDefaultHeaders(c.opts.TenantName) {
 		headers[k] = v
 	}
-	return c.c.HTTPDo(method, rawURL, headers, body)
+	return c.c.Do(context.Background(), method, rawURL, headers, body)
 }
 
 // Flatten pulls all the configuration from config center and merge kv in different dimension