update nacos v1 (#109)

Author: binbin0325

bytes/bytes_pool_test.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"testing"
 )
+
 import (
 	"github.com/stretchr/testify/assert"
 )

database/kv/nacos/config_client.go

@@ -23,10 +23,10 @@ import (
 )
 
 import (
-	"github.com/nacos-group/nacos-sdk-go/v2/clients"
-	"github.com/nacos-group/nacos-sdk-go/v2/clients/config_client"
-	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
-	"github.com/nacos-group/nacos-sdk-go/v2/vo"
+	"github.com/nacos-group/nacos-sdk-go/clients"
+	"github.com/nacos-group/nacos-sdk-go/clients/config_client"
+	"github.com/nacos-group/nacos-sdk-go/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/vo"
 )
 
 var (
@@ -120,13 +120,11 @@ func (n *NacosConfigClient) Close() {
 	n.activeCount--
 	if n.share {
 		if n.activeCount == 0 {
-			n.client.CloseClient()
 			n.client = nil
 			atomic.StoreUint32(&n.valid, 0)
 			delete(configClientPool.configClient, n.name)
 		}
 	} else {
-		n.client.CloseClient()
 		n.client = nil
 		atomic.StoreUint32(&n.valid, 0)
 		delete(configClientPool.configClient, n.name)

database/kv/nacos/config_client_test.go

@@ -27,8 +27,8 @@ import (
 )
 
 import (
-	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
-	"github.com/nacos-group/nacos-sdk-go/v2/vo"
+	"github.com/nacos-group/nacos-sdk-go/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/vo"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -45,7 +45,7 @@ func TestStructAlign(t *testing.T) {
 	}
 }
 
-//TestNewNacosConfigClient config client
+// TestNewNacosConfigClient config client
 func TestNewNacosConfigClient(t *testing.T) {
 
 	scs := []constant.ServerConfig{*constant.NewServerConfig("console.nacos.io", 80)}
@@ -89,7 +89,6 @@ func TestPublishConfig(t *testing.T) {
 		NotLoadCacheAtStart: true,
 		LogDir:              "/tmp/nacos/log",
 		CacheDir:            "/tmp/nacos/cache",
-		LogRollingConfig:    &constant.ClientLogRollingConfig{MaxAge: 3},
 		LogLevel:            "debug",
 	}
 

database/kv/nacos/naming_client.go

@@ -23,10 +23,10 @@ import (
 )
 
 import (
-	"github.com/nacos-group/nacos-sdk-go/v2/clients"
-	"github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client"
-	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
-	"github.com/nacos-group/nacos-sdk-go/v2/vo"
+	"github.com/nacos-group/nacos-sdk-go/clients"
+	"github.com/nacos-group/nacos-sdk-go/clients/naming_client"
+	"github.com/nacos-group/nacos-sdk-go/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/vo"
 )
 
 var (
@@ -121,13 +121,11 @@ func (n *NacosNamingClient) Close() {
 	n.activeCount--
 	if n.share {
 		if n.activeCount == 0 {
-			n.client.CloseClient()
 			n.client = nil
 			atomic.StoreUint32(&n.valid, 0)
 			delete(namingClientPool.namingClient, n.name)
 		}
 	} else {
-		n.client.CloseClient()
 		n.client = nil
 		atomic.StoreUint32(&n.valid, 0)
 		delete(namingClientPool.namingClient, n.name)

database/kv/nacos/naming_client_test.go

@@ -22,7 +22,8 @@ import (
 )
 
 import (
-	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/common/constant"
+
 	"github.com/stretchr/testify/assert"
 )
 

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
 	github.com/k0kubun/pp v3.0.1+incompatible
 	github.com/mattn/go-isatty v0.0.14
-	github.com/nacos-group/nacos-sdk-go/v2 v2.1.2
+	github.com/nacos-group/nacos-sdk-go v1.1.3
 	github.com/natefinch/lumberjack v2.0.0+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/shirou/gopsutil/v3 v3.22.2

go.sum

@@ -28,6 +28,7 @@ import (
 
 import (
 	"github.com/pkg/errors"
+
 	"golang.org/x/crypto/blake2b"
 )
 

hash/consistent/consistent.go

@@ -22,7 +22,9 @@ import (
 	"strconv"
 	"strings"
 	"testing"
+)
 
+import (
 	"github.com/stretchr/testify/require"
 )
 

math/big/decimal_test.go

@@ -17,7 +17,9 @@
 
 package gxstrings
 
-import "testing"
+import (
+	"testing"
+)
 
 func BenchmarkStrConvByteFast(b *testing.B) {
 	var s = "gost"