fix: get error resolver when user uses different nacos in few seconds

hertz-contrib · Jan 26, 2024 · 696f572 · 696f572
1 parent d07355f
commit 696f572
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/nacos/resolver.go b/nacos/resolver.go
@@ -20,6 +20,7 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/cloudwego/hertz/pkg/app/client/discovery"
 	"github.com/hertz-contrib/registry/nacos/common"
@@ -31,8 +32,9 @@ var _ discovery.Resolver = (*nacosResolver)(nil)
 
 type (
 	resolverOptions struct {
-		cluster string
-		group   string
+		cluster   string
+		group     string
+		timestamp string
 	}
 
 	// ResolverOption Option is nacos registry option.
@@ -126,7 +128,7 @@ func (n *nacosResolver) Resolve(_ context.Context, desc string) (discovery.Resul
 }
 
 func (n *nacosResolver) Name() string {
-	return "nacos" + ":" + n.opts.cluster + ":" + n.opts.group
+	return "nacos" + ":" + n.opts.timestamp
 }
 
 // NewDefaultNacosResolver create a default service resolver using nacos.
@@ -141,8 +143,9 @@ func NewDefaultNacosResolver(opts ...ResolverOption) (discovery.Resolver, error)
 // NewNacosResolver create a service resolver using nacos.
 func NewNacosResolver(cli naming_client.INamingClient, opts ...ResolverOption) discovery.Resolver {
 	opt := resolverOptions{
-		cluster: "DEFAULT",
-		group:   "DEFAULT_GROUP",
+		cluster:   "DEFAULT",
+		group:     "DEFAULT_GROUP",
+		timestamp: time.Now().String(),
 	}
 	for _, option := range opts {
 		option(&opt)

diff --git a/nacos/v2/resolver.go b/nacos/v2/resolver.go
@@ -20,6 +20,7 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/cloudwego/hertz/pkg/app/client/discovery"
 	"github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client"
@@ -116,8 +117,9 @@ func NewDefaultNacosResolver(opts ...ResolverOption) (discovery.Resolver, error)
 // NewNacosResolver create a service resolver using nacos.
 func NewNacosResolver(cli naming_client.INamingClient, opts ...ResolverOption) discovery.Resolver {
 	opt := resolverOptions{
-		cluster: "DEFAULT",
-		group:   "DEFAULT_GROUP",
+		cluster:   "DEFAULT",
+		group:     "DEFAULT_GROUP",
+		timestamp: time.Now().String(),
 	}
 	for _, option := range opts {
 		option(&opt)

diff --git a/nacos/v2/resolver_option.go b/nacos/v2/resolver_option.go
@@ -15,8 +15,9 @@
 package nacos
 
 type resolverOptions struct {
-	cluster string
-	group   string
+	cluster   string
+	group     string
+	timestamp string
 }
 
 // ResolverOption Option is nacos registry option.