fix: 调整

Author: dongsheng.qi

Diff for: client.go

@@ -176,7 +176,15 @@ func (c *internalClient) GetConfigAndInit(namespace string) *storage.Config {
 
 func (c *internalClient) SyncAndUpdate(namespace string, apolloConfig *config.ApolloConfig) {
 	// update appConfig only if namespace does not exist yet
-	if !strings.Contains(c.appConfig.NamespaceName, namespace) {
+	namespaces := strings.Split(c.appConfig.NamespaceName, ",")
+	exists := false
+	for _, n := range namespaces {
+		if n == namespace {
+			exists = true
+			break
+		}
+	}
+	if !exists {
 		c.appConfig.NamespaceName += "," + namespace
 	}
 

Diff for: client_test.go

@@ -368,7 +368,6 @@ func TestGetConfigAndInitValNotNil(t *testing.T) {
 			Configurations: map[string]interface{}{"testKey": "testUpdatedValue"},
 		}
 	})
-	defer patch.Reset()
 
 	client := createMockApolloConfig(120)
 	cf := client.GetConfig("testNotFound")
@@ -380,6 +379,26 @@ func TestGetConfigAndInitValNotNil(t *testing.T) {
 	// cache should be updated with new configuration
 	Assert(t, client.cache.GetConfig("testNotFound"), NotNilVal())
 	Assert(t, client.cache.GetConfig("testNotFound").GetValue("testKey"), Equal("testUpdatedValue"))
+	Assert(t, client.appConfig.NamespaceName, Equal("application,testNotFound"))
+	patch.Reset()
+
+	// second replace
+	patch1 := gomonkey.ApplyMethod(reflect.TypeOf(apc), "SyncWithNamespace", func(_ *remote.AbsApolloConfig, namespace string, appConfigFunc func() config.AppConfig) *config.ApolloConfig {
+		return &config.ApolloConfig{
+			ApolloConnConfig: config.ApolloConnConfig{
+				AppID:         "testID",
+				NamespaceName: "testNotFound1",
+			},
+			Configurations: map[string]interface{}{"testKey": "testUpdatedValue"},
+		}
+	})
+	defer patch1.Reset()
+	client.appConfig.NamespaceName = "testNotFound1"
+	cf1 := client.GetConfig("testNotFound1")
+	Assert(t, cf1, NotNilVal())
+	Assert(t, client.cache.GetConfig("testNotFound1"), NotNilVal())
+	// appConfig namespace existed, should not be appended
+	Assert(t, client.appConfig.NamespaceName, Equal("testNotFound1"))
 }
 
 func TestGetConfigAndInitValNil(t *testing.T) {