[dubbo] branch master updated: fix issue 6568, remove unnecessary parameter in registry cache key when cache NacosRegistry (#6571)

2020-08-10 Thread tswstarplanet
This is an automated email from the ASF dual-hosted git repository.

tswstarplanet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/master by this push:
 new 683db2b  fix issue 6568, remove unnecessary parameter in registry 
cache key when cache NacosRegistry (#6571)
683db2b is described below

commit 683db2b1b2e2af0bb7718005f54d74d8000cf41f
Author: tswstarplanet 
AuthorDate: Tue Aug 11 09:03:18 2020 +0800

fix issue 6568, remove unnecessary parameter in registry cache key when 
cache NacosRegistry (#6571)
---
 .../java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java | 7 +++
 1 file changed, 7 insertions(+)

diff --git 
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java
 
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java
index 380280e..a51b65b 100644
--- 
a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java
+++ 
b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/NacosRegistryFactory.java
@@ -17,10 +17,12 @@
 package org.apache.dubbo.registry.nacos;
 
 import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.utils.StringUtils;
 import org.apache.dubbo.registry.Registry;
 import org.apache.dubbo.registry.RegistryFactory;
 import org.apache.dubbo.registry.support.AbstractRegistryFactory;
 
+import static 
org.apache.dubbo.common.constants.CommonConstants.CONFIG_NAMESPACE_KEY;
 import static 
org.apache.dubbo.registry.nacos.util.NacosNamingServiceUtils.createNamingService;
 
 /**
@@ -32,6 +34,11 @@ public class NacosRegistryFactory extends 
AbstractRegistryFactory {
 
 @Override
 protected String createRegistryCacheKey(URL url) {
+String namespace = url.getParameter(CONFIG_NAMESPACE_KEY);
+url = URL.valueOf(url.toServiceStringWithoutResolving());
+if (StringUtils.isNotEmpty(namespace)) {
+url = url.addParameter(CONFIG_NAMESPACE_KEY, namespace);
+}
 return url.toFullString();
 }
 



[dubbo-php-framework] branch master updated: Create .asf.yaml

2020-08-10 Thread hyunkun
This is an automated email from the ASF dual-hosted git repository.

hyunkun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-php-framework.git


The following commit(s) were added to refs/heads/master by this push:
 new 1e3a504  Create .asf.yaml
1e3a504 is described below

commit 1e3a5041f3b13983b8a65032c948e323d8d75b65
Author: Huang YunKun 
AuthorDate: Mon Aug 10 17:30:15 2020 +0800

Create .asf.yaml
---
 .asf.yaml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 000..8d84e69
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,5 @@
+notifications:
+commits:  commits@dubbo.apache.org
+issues:   notificati...@dubbo.apache.org
+pullrequests: notificati...@dubbo.apache.org
+jira_options: link label link label



[dubbo-spring-boot-project] branch 2.7.x updated (0da9e97 -> ec32800)

2020-08-10 Thread mercyblitz
This is an automated email from the ASF dual-hosted git repository.

mercyblitz pushed a change to branch 2.7.x
in repository https://gitbox.apache.org/repos/asf/dubbo-spring-boot-project.git.


from 0da9e97  2.7.x (#742)
 add c1ff0a2  Merge to master (#724)
 add ec32800  Merge branch 'master' into 2.7.x

No new revisions were added by this update.

Summary of changes:
 .../config/ServiceBeanIdConflictProcessor.java | 115 +
 .../servlet-container-samples/pom.xml  |   1 +
 2 files changed, 116 insertions(+)
 create mode 100644 
dubbo-spring-boot-compatible/autoconfigure/src/main/java/org/apache/dubbo/spring/boot/beans/factory/config/ServiceBeanIdConflictProcessor.java