Merge pull request #163 from sunmi-OS/feature/updatenacos

upgrade nacos sdk version

config/config.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	"github.com/nacos-group/nacos-sdk-go/clients"
-	"github.com/nacos-group/nacos-sdk-go/common/constant"
-	"github.com/nacos-group/nacos-sdk-go/vo"
+	"github.com/nacos-group/nacos-sdk-go/v2/clients"
+	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 	"github.com/sunmi-OS/gocore/retry"
 )
 
@@ -26,6 +26,7 @@ const (
 )
 
 // 解析 acm 或本地 toml 配置到结构体
+//
 //	confPtr： 结构体指针
 func ParseToml(group, dataId, localConfig string, confPtr interface{}) (err error) {
 	beanValue := reflect.ValueOf(confPtr)
@@ -83,6 +84,7 @@ func ParseToml(group, dataId, localConfig string, confPtr interface{}) (err erro
 }
 
 // 解析 acm 或本地 yaml 配置到结构体
+//
 //	confPtr： 结构体指针
 func ParseYaml(group, dataId, localConfig string, confPtr interface{}) (err error) {
 	beanValue := reflect.ValueOf(confPtr)

example/nacos/config/nacos.go

@@ -3,7 +3,7 @@ package config
 import (
 	"os"
 
-	"github.com/nacos-group/nacos-sdk-go/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
 	"github.com/sunmi-OS/gocore/nacos"
 )
 

go.mod

@@ -13,14 +13,17 @@ require (
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-redis/redis/v8 v8.6.0
 	github.com/go-resty/resty/v2 v2.3.0
-	github.com/golang/protobuf v1.4.3
+	github.com/golang/protobuf v1.5.2
 	github.com/google/uuid v1.1.2
 	github.com/hashicorp/go-multierror v1.1.0
 	github.com/jinzhu/gorm v1.9.16
 	github.com/jolestar/go-commons-pool v2.0.0+incompatible
 	github.com/labstack/echo/v4 v4.2.0
 	github.com/labstack/gommon v0.3.0
-	github.com/nacos-group/nacos-sdk-go v1.0.6
+	github.com/nacos-group/nacos-sdk-go/v2 v2.2.2
+	github.com/opentracing/opentracing-go v1.1.0
+	github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5
+	github.com/openzipkin/zipkin-go v0.2.2
 	github.com/rakyll/statik v0.1.7
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/segmentio/kafka-go v0.4.10
@@ -29,12 +32,13 @@ require (
 	github.com/streadway/amqp v1.0.0
 	github.com/tidwall/gjson v1.6.8
 	github.com/urfave/cli v1.22.5
-	go.uber.org/zap v1.16.0
+	go.uber.org/zap v1.21.0
 	gobot.io/x/gobot v1.14.0
-	google.golang.org/grpc v1.32.0
-	google.golang.org/protobuf v1.25.0
+	google.golang.org/grpc v1.48.0
+	google.golang.org/protobuf v1.27.1
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
+	gopkg.in/natefinch/lumberjack.v2 v2.0.0
 	gopkg.in/redis.v5 v5.2.9
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )

nacos/local.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"io/ioutil"
 
-	"github.com/nacos-group/nacos-sdk-go/clients/config_client"
-	"github.com/nacos-group/nacos-sdk-go/vo"
+	"github.com/nacos-group/nacos-sdk-go/v2/clients/config_client"
+	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 )
 
 type LocalNacos struct {

nacos/nacos.go

@@ -1,10 +1,10 @@
 package nacos
 
 import (
-	"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"
+	"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"
 )
 
 type nacos struct {

nacos/viper.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/nacos-group/nacos-sdk-go/vo"
+	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 	"github.com/spf13/cast"
 	"github.com/sunmi-OS/gocore/viper"
 )
@@ -117,7 +117,6 @@ func (vt *ViperToml) NacosToViper() {
 	viper.MerageConfigToToml(s)
 }
 
-//
 func (vt *ViperToml) SetviperBase(configs string) {
 
 	viper.MerageConfigToToml(configs)