fix: nacos servicediscovery group、namespace

common/constant/key.go

@@ -138,8 +138,6 @@ const (
 	ServiceRegistryProtocol = "service-discovery-registry"
 	RegistryRoleKey         = "registry.role"
 	RegistryDefaultKey      = "registry.default"
-	RegistryUsernameKey     = "registry.username"
-	RegistryPasswordKey     = "registry.password"
 	RegistryAccessKey       = "registry.accesskey"
 	RegistrySecretKey       = "registry.secretkey"
 	RegistryTimeoutKey      = "registry.timeout"

config/config_center_config.go

@@ -60,6 +60,8 @@ type CenterConfig struct {
 	Namespace string            `yaml:"namespace"  json:"namespace,omitempty"`
 	AppID     string            `default:"dubbo" yaml:"app-id"  json:"app-id,omitempty"`
 	Timeout   string            `default:"10s" yaml:"timeout"  json:"timeout,omitempty"`
+	AccessKey string            `yaml:"access-key" json:"access-key,omitempty" property:"access-key"`
+	SecretKey string            `yaml:"secret-key" json:"secret-key,omitempty" property:"secret-key"`
 	Params    map[string]string `yaml:"params"  json:"parameters,omitempty"`
 }
 
@@ -94,6 +96,8 @@ func (c *CenterConfig) GetUrlMap() url.Values {
 	urlMap.Set(constant.ConfigClusterKey, c.Cluster)
 	urlMap.Set(constant.ConfigAppIDKey, c.AppID)
 	urlMap.Set(constant.ConfigUsernameKey, c.Username)
+	urlMap.Set(constant.ConfigAccessKey, c.AccessKey)
+	urlMap.Set(constant.ConfigSecretKey, c.SecretKey)
 	urlMap.Set(constant.ConfigPasswordKey, c.Password)
 	urlMap.Set(constant.ConfigTimeoutKey, c.Timeout)
 

config/registry_config.go

@@ -42,6 +42,8 @@ type RegistryConfig struct {
 	Group     string `yaml:"group" json:"group,omitempty" property:"group"`
 	Namespace string `yaml:"namespace" json:"namespace,omitempty" property:"namespace"`
 	TTL       string `default:"10s" yaml:"ttl" json:"ttl,omitempty" property:"ttl"` // unit: minute
+	AccessKey string `yaml:"access-key" json:"access-key,omitempty" property:"access-key"`
+	SecretKey string `yaml:"secret-key" json:"secret-key,omitempty" property:"secret-key"`
 	// for registry
 	Address    string `validate:"required" yaml:"address" json:"address,omitempty" property:"address"`
 	Username   string `yaml:"username" json:"username,omitempty" property:"username"`
@@ -130,6 +132,9 @@ func (c *RegistryConfig) toURL(roleType common.RoleType) (*common.URL, error) {
 		common.WithParamsValue(constant.RegistrySimplifiedKey, strconv.FormatBool(c.Simplified)),
 		common.WithParamsValue(constant.RegistryKey, c.Protocol),
 		common.WithParamsValue(constant.RegistryNamespaceKey, c.Namespace),
+		common.WithParamsValue(constant.RegistryAccessKey, c.AccessKey),
+		common.WithParamsValue(constant.RegistrySecretKey, c.SecretKey),
+		common.WithParamsValue(constant.RegistrySecretKey, c.SecretKey),
 		common.WithUsername(c.Username),
 		common.WithPassword(c.Password),
 		common.WithLocation(c.Address),

registry/nacos/registry.go

@@ -244,7 +244,8 @@ func newNacosRegistry(url *common.URL) (registry.Registry, error) {
 	logger.Infof("[Nacos Registry] New nacos registry with url = %+v", url.ToMap())
 	// key transfer: registry -> nacos
 	url.SetParam(constant.NacosNamespaceID, url.GetParam(constant.RegistryNamespaceKey, ""))
-	url.SetParam(constant.NacosUsername, url.GetParam(constant.RegistryUsernameKey, ""))
+	url.SetParam(constant.NacosUsername, url.Username)
+	url.SetParam(constant.NacosPassword, url.Password)
 	url.SetParam(constant.NacosAccessKey, url.GetParam(constant.RegistryAccessKey, ""))
 	url.SetParam(constant.NacosSecretKey, url.GetParam(constant.RegistrySecretKey, ""))
 	url.SetParam(constant.TimeoutKey, url.GetParam(constant.RegistryTimeoutKey, ""))

registry/nacos/service_discovery.go

@@ -332,21 +332,23 @@ func newNacosServiceDiscovery(url *common.URL) (registry.ServiceDiscovery, error
 	discoveryURL := common.NewURLWithOptions(
 		common.WithParams(url.GetParams()),
 		common.WithParamsValue(constant.TimeoutKey, url.GetParam(constant.RegistryTimeoutKey, constant.DefaultRegTimeout)),
-		common.WithParamsValue(constant.RegistryUsernameKey, url.GetParam(constant.RegistryUsernameKey, "")),
-		common.WithParamsValue(constant.RegistryPasswordKey, url.GetParam(constant.RegistryPasswordKey, "")),
+		common.WithParamsValue(constant.NacosGroupKey, url.GetParam(constant.RegistryGroupKey, defaultGroup)),
+		common.WithParamsValue(constant.NacosUsername, url.Username),
+		common.WithParamsValue(constant.NacosPassword, url.Password),
+		common.WithParamsValue(constant.NacosAccessKey, url.GetParam(constant.RegistryAccessKey, "")),
+		common.WithParamsValue(constant.NacosSecretKey, url.GetParam(constant.RegistrySecretKey, "")),
 		common.WithParamsValue(constant.NacosNamespaceID, url.GetParam(constant.RegistryNamespaceKey, "")))
 	discoveryURL.Location = url.Location
+	discoveryURL.Username = url.Username
+	discoveryURL.Password = url.Password
 	client, err := nacos.NewNacosClientByURL(discoveryURL)
 	if err != nil {
 		return nil, perrors.WithMessage(err, "create nacos namingClient failed.")
 	}
 
 	descriptor := fmt.Sprintf("nacos-service-discovery[%s]", discoveryURL.Location)
 
-	group := discoveryURL.Group()
-	if len(group) == 0 {
-		group = defaultGroup
-	}
+	group := url.GetParam(constant.RegistryGroupKey, defaultGroup)
 	newInstance := &nacosServiceDiscovery{
 		group:               group,
 		namingClient:        client,