Merge pull request #1919 from ray2011/master

Fix: ProviderConfig.Filter and ReferenceConfig.Filter not work

Author: LaurenceLiZhixin

config/reference_config.go

@@ -96,6 +96,9 @@ func (rc *ReferenceConfig) Init(root *RootConfig) error {
 			rc.Version = root.Application.Version
 		}
 	}
+	if rc.Filter == "" {
+		rc.Filter = root.Consumer.Filter
+	}
 	if rc.Cluster == "" {
 		rc.Cluster = "failover"
 	}
@@ -309,7 +312,7 @@ func (rc *ReferenceConfig) getURLMap() url.Values {
 	if rc.Generic != "" {
 		defaultReferenceFilter = constant.GenericFilterKey + "," + defaultReferenceFilter
 	}
-	urlMap.Set(constant.ReferenceFilterKey, mergeValue(rc.rootConfig.Consumer.Filter, "", defaultReferenceFilter))
+	urlMap.Set(constant.ReferenceFilterKey, mergeValue(rc.Filter, "", defaultReferenceFilter))
 
 	for _, v := range rc.Methods {
 		urlMap.Set("methods."+v.Name+"."+constant.LoadbalanceKey, v.LoadBalance)

config/service_config.go

@@ -109,6 +109,9 @@ func (s *ServiceConfig) Init(rc *RootConfig) error {
 	}
 	s.exported = atomic.NewBool(false)
 	s.metadataType = rc.Application.MetadataType
+	if s.Filter == "" {
+		s.Filter = rc.Provider.Filter
+	}
 	if s.Version == "" {
 		s.Version = rc.Application.Version
 	}