This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch samples-for-2.7.0-SNAPSHOT
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-samples.git
The following commit(s) were added to refs/heads/samples-for-2.7.0-SNAPSHOT by
this push:
new a01fa67 update samples of 2.7.0 features
a01fa67 is described below
commit a01fa67448a753bb76034da12c712b7bc7997e56
Author: ken.lj <[email protected]>
AuthorDate: Wed Jan 9 16:25:21 2019 +0800
update samples of 2.7.0 features
---
.../apache/dubbo/samples/governance/ZKTools.java | 4 +-
.../samples/configcenter/annotation/ZKTools.java | 5 ++-
.../src/main/resources/config-center.properties | 3 +-
.../resources/spring/dubbo-consumer.properties | 8 ++--
.../resources/spring/dubbo-provider.properties | 8 ++--
.../client/{Application.java => Consumer.java} | 21 +++++----
.../server/{Application.java => Provider.java} | 21 +++++----
.../consumer/AnnotationConsumer.java | 2 +-
.../provider/AnnotationProvider.java | 4 +-
.../dubbo-properties-in-configcenter.properties | 2 +-
.../resources/spring/dubbo-consumer.properties | 4 +-
.../resources/spring/dubbo-provider.properties | 4 +-
.../apache/dubbo/samples/configcenter/ZKTools.java | 52 +---------------------
.../src/main/resources/config-center.properties | 5 +--
.../apache/dubbo/samples/governance/ZKTools.java | 6 +--
.../apache/dubbo/samples/governance/ZKTools.java | 11 +----
...bo-override.yml => dubbo-routers-condition.yml} | 0
.../main/resources/spring/dubbo-demo-consumer.xml | 2 +-
.../main/resources/spring/dubbo-demo-provider.xml | 2 +-
.../apache/dubbo/samples/governance/ZKTools.java | 8 ++--
.../apache/dubbo/samples/governance/ZKTools.java | 9 ++--
.../{dubbo-override.yml => dubbo-routers-tag.yml} | 0
.../main/resources/spring/dubbo-demo-consumer.xml | 2 +-
.../main/resources/spring/dubbo-demo-provider.xml | 4 +-
24 files changed, 66 insertions(+), 121 deletions(-)
diff --git
a/dubbo-samples-chain/dubbo-samples-chain-api/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
b/dubbo-samples-chain/dubbo-samples-chain-api/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
index b91b56b..5f90138 100644
---
a/dubbo-samples-chain/dubbo-samples-chain-api/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
+++
b/dubbo-samples-chain/dubbo-samples-chain-api/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
@@ -63,7 +63,7 @@ public class ZKTools {
System.out.println(str);
try {
- String path =
"/dubbo/config/governance-tagrouter-provider/tagrouters";
+ String path =
"/dubbo/config/governance-tagrouter-provider/router-tag";
if (client.checkExists().forPath(path) == null) {
client.create().creatingParentsIfNeeded().forPath(path);
}
@@ -79,7 +79,7 @@ public class ZKTools {
System.out.println(str);
try {
- String path =
"/dubbo/config/governance-tagrouter-provider/tagrouters";
+ String path =
"/dubbo/config/governance-tagrouter-provider/tag-router";
if (client.checkExists().forPath(path) == null) {
client.create().creatingParentsIfNeeded().forPath(path);
}
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/java/org/apache/dubbo/samples/configcenter/annotation/ZKTools.java
b/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/java/org/apache/dubbo/samples/configcenter/annotation/ZKTools.java
index 1710bfd..0326ead 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/java/org/apache/dubbo/samples/configcenter/annotation/ZKTools.java
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/java/org/apache/dubbo/samples/configcenter/annotation/ZKTools.java
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.samples.hystrix.annotation;
+package org.apache.dubbo.samples.configcenter.annotation;
+
+import org.apache.dubbo.common.utils.StringUtils;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.apache.dubbo.common.utils.StringUtils;
/**
*
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/config-center.properties
b/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/config-center.properties
index 62a16a1..559bcc0 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/config-center.properties
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/config-center.properties
@@ -19,7 +19,8 @@ dubbo.consumer.loadbalance=random
#global config for provider
dubbo.protocol.port=20990
dubbo.provider.timeout=5000
-dubbo.registryData.simpleConsumerConfig=true
+dubbo.registry.simplified=true
+
# Optional. Add the following application(Provider) specific external
properties
# to `/dubbo/config/configcenter-annotation-provider/dubbo.properties`
dubbo.protocol.threadpool=fixed
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/spring/dubbo-consumer.properties
b/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/spring/dubbo-consumer.properties
index 61b3eed..b54a55f 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/spring/dubbo-consumer.properties
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/spring/dubbo-consumer.properties
@@ -16,10 +16,12 @@
# limitations under the License.
#
#
+
dubbo.applications.configcenter-annotation-provider.name=configcenter-annotation-provider
-dubbo.configCenters.zookeeper.address=zookeeper://127.0.0.1:2181
-dubbo.configCenters.zookeeper.configfile=dubbo.properties
-dubbo.configCenters.zookeeper.highestPriority=true
+dubbo.config-centers.zookeeper.address=zookeeper://127.0.0.1:2181
+dubbo.config-centers.zookeeper.config-file=dubbo.properties
+dubbo.config-centers.zookeeper.highest-priority=true
+
# The common part, for example registry, protocol can be stored under the
global group in ConfigCenter
#dubbo.registry.address=zookeeper://127.0.0.1:2181
# The application specific part, can be stored under the app group in the
ConfigCenter
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/spring/dubbo-provider.properties
b/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/spring/dubbo-provider.properties
index 5d47905..fce003c 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/spring/dubbo-provider.properties
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-annotation/src/main/resources/spring/dubbo-provider.properties
@@ -16,10 +16,12 @@
# limitations under the License.
#
#
+
dubbo.application.name=configcenter-annotation-provider
-dubbo.configCenter.address=zookeeper://127.0.0.1:2181
-dubbo.configCenter.configFile=dubbo.properties
-dubbo.configCenter.highestPriority=true
+dubbo.config-center.address=zookeeper://127.0.0.1:2181
+dubbo.config-center.config-file=dubbo.properties
+dubbo.config-center.highest-priority=true
+
# The common part, for example registry, protocol can be stored under the
global group in ConfigCenter
# The application specific part, can be stored under the app group in the
ConfigCenter
#dubbo.registry.address=zookeeper://127.0.0.1:2181
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/client/Application.java
b/dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/client/Consumer.java
similarity index 82%
rename from
dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/client/Application.java
rename to
dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/client/Consumer.java
index 7da966c..e435835 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/client/Application.java
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/client/Consumer.java
@@ -23,22 +23,21 @@ import org.apache.dubbo.config.ConfigCenterConfig;
import org.apache.dubbo.config.ReferenceConfig;
import org.apache.dubbo.samples.api.GreetingsService;
-public class Application {
- public static void main(String[] args) throws Exception {
- loadConfigByDubbo();
+public class Consumer {
+ private static ConfigCenterConfig configCenter = new ConfigCenterConfig();
+ private static ApplicationConfig applicationConfig = new
ApplicationConfig("api-dubbo-consumer");
+
+ static {
+ configCenter.setAddress("zookeeper://127.0.0.1:2181");
+ }
+ public static void main(String[] args) throws Exception {
ReferenceConfig<GreetingsService> reference = new ReferenceConfig<>();
- reference.setApplication(new ApplicationConfig("first-dubbo-client"));
+ reference.setApplication(applicationConfig);
+ reference.setConfigCenter(configCenter);
reference.setInterface(GreetingsService.class);
GreetingsService greetingsService = reference.get();
String message = greetingsService.sayHi("dubbo");
System.out.println(message);
}
-
- public static void loadConfigByDubbo() {
- // Enable Config Center.
- ConfigCenterConfig configCenter = new ConfigCenterConfig();
- configCenter.setAddress("zookeeper://127.0.0.1:2181");
- configCenter.init();
- }
}
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/server/Application.java
b/dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/server/Provider.java
similarity index 82%
rename from
dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/server/Application.java
rename to
dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/server/Provider.java
index 1ad614d..e44e947 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/server/Application.java
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-api/src/main/java/org/apache/dubbo/samples/server/Provider.java
@@ -26,12 +26,19 @@ import org.apache.dubbo.samples.api.GreetingsService;
import java.util.HashMap;
import java.util.Map;
-public class Application {
- public static void main(String[] args) throws Exception {
- setExternalConfigurationDirectly();
+public class Provider {
+
+ private static ConfigCenterConfig configCenter = new ConfigCenterConfig();
+ private static ApplicationConfig applicationConfig = new
ApplicationConfig("api-dubbo-provider");
+ static {
+ configCenter.setExternalConfig(getExternalConfiguration());
+ }
+
+ public static void main(String[] args) throws Exception {
ServiceConfig<GreetingsService> service = new ServiceConfig<>();
- service.setApplication(new ApplicationConfig("api-dubbo-provider"));
+ service.setApplication(applicationConfig);
+ service.setConfigCenter(configCenter);
service.setInterface(GreetingsService.class);
service.setRef(new GreetingsServiceImpl());
service.export();
@@ -44,15 +51,13 @@ public class Application {
* In this sample, we created a Map instance manually and put a value into
it, but in reality,
* the external configurations will most likely being generated from other
plugins in your system.
*/
- public static void setExternalConfigurationDirectly() {
+ public static Map<String, String> getExternalConfiguration() {
Map<String, String> dubboConfigurations = new HashMap<>();
dubboConfigurations.put("dubbo.registry.address",
"zookeeper://127.0.0.1:2181");
// you will need to add the configcenter address if you want to use
the service governance features in 2.7, e.g., overrides and routers.
// but notice it will not be used for gathering startup configurations.
dubboConfigurations.put("dubbo.configcenter.address",
"zookeeper://127.0.0.1:2181");
- ConfigCenterConfig configCenter = new ConfigCenterConfig();
- configCenter.setExternalConfig(dubboConfigurations);
- configCenter.init();
+ return dubboConfigurations;
}
}
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/java/org/apache/dubbo/samples/externalconfiguration/consumer/AnnotationConsumer.java
b/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/java/org/apache/dubbo/samples/externalconfiguration/consumer/AnnotationConsumer.java
index 4c80a62..1c85c0e 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/java/org/apache/dubbo/samples/externalconfiguration/consumer/AnnotationConsumer.java
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/java/org/apache/dubbo/samples/externalconfiguration/consumer/AnnotationConsumer.java
@@ -56,7 +56,7 @@ public class AnnotationConsumer {
public ConfigCenterBean configCenterBean() {
ConfigCenterBean configCenterBean = new ConfigCenterBean();
// This is a critical switch to tell Dubbo framework to get
configs from standard Spring Environment
- configCenterBean.setFromSpring(true);
+ configCenterBean.setIncludeSpringEnv(true);
configCenterBean.setConfigFile("dubbo.properties");// by default
is dubbo.properties
configCenterBean.setAppConfigFile("configcenter-annotation-provider.dubbo.properties");
// by default is application.dubbo.properties
return configCenterBean;
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/java/org/apache/dubbo/samples/externalconfiguration/provider/AnnotationProvider.java
b/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/java/org/apache/dubbo/samples/externalconfiguration/provider/AnnotationProvider.java
index fd0ca76..1fcb1a1 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/java/org/apache/dubbo/samples/externalconfiguration/provider/AnnotationProvider.java
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/java/org/apache/dubbo/samples/externalconfiguration/provider/AnnotationProvider.java
@@ -48,7 +48,7 @@ public class AnnotationProvider {
static public class ProviderConfiguration {
/**
- * It's still required to initialize ConfigCenterBean, here we use the
JavaBean method, but it doesn't matter which way you use, for example, xml or
.properties are all ok to go.
+ * It's still required to initialize ConfigCenterBean, here we use the
JavaBean method, but it doesn't matter which way you use, which means xml or
.properties are all ok to go.
* <p>
* Notice that if you have a
*/
@@ -56,7 +56,7 @@ public class AnnotationProvider {
public ConfigCenterBean configCenterBean() {
ConfigCenterBean configCenterBean = new ConfigCenterBean();
// This is a critical switch to tell Dubbo framework to get
configs from standard Spring Environment
- configCenterBean.setFromSpring(true);
+ configCenterBean.setIncludeSpringEnv(true);
configCenterBean.setConfigFile("dubbo.properties");// by default
is dubbo.properties
configCenterBean.setAppConfigFile("configcenter-annotation-provider.dubbo.properties");
// by default is application.dubbo.properties
return configCenterBean;
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/resources/yourconfigcenter/dubbo-properties-in-configcenter.properties
b/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/resources/yourconfigcenter/dubbo-properties-in-configcenter.properties
index eee0ec6..6968ba5 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/resources/yourconfigcenter/dubbo-properties-in-configcenter.properties
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-externalconfiguration/src/main/resources/yourconfigcenter/dubbo-properties-in-configcenter.properties
@@ -16,7 +16,7 @@
# limitations under the License.
#
#
-dubbo.configcenter.address=zookeeper://127.0.0.1:2181
+dubbo.config-center.address=zookeeper://127.0.0.1:2181
dubbo.registry.address=zookeeper://127.0.0.1:2181
dubbo.protocol.name=dubbo
dubbo.protocol.port=20880
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-multi-registries/src/main/resources/spring/dubbo-consumer.properties
b/dubbo-samples-configcenter/dubbo-samples-configcenter-multi-registries/src/main/resources/spring/dubbo-consumer.properties
index c474256..cde07f5 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-multi-registries/src/main/resources/spring/dubbo-consumer.properties
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-multi-registries/src/main/resources/spring/dubbo-consumer.properties
@@ -17,8 +17,8 @@
#
#
dubbo.application.name=configcenter-annotation-provider
-dubbo.configCenter.address=zookeeper://127.0.0.1:2181
-dubbo.configCenter.configFile=dubbo.properties
+dubbo.config-center.address=zookeeper://127.0.0.1:2181
+dubbo.config-center.config-file=dubbo.properties
# The common part, for example registry, protocol can be stored under the
global group in ConfigCenter
#dubbo.registry.address=zookeeper://127.0.0.1:2181
# The application specific part, can be stored under the app group in the
ConfigCenter
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-multi-registries/src/main/resources/spring/dubbo-provider.properties
b/dubbo-samples-configcenter/dubbo-samples-configcenter-multi-registries/src/main/resources/spring/dubbo-provider.properties
index 333e3fb..258845b 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-multi-registries/src/main/resources/spring/dubbo-provider.properties
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-multi-registries/src/main/resources/spring/dubbo-provider.properties
@@ -17,6 +17,6 @@
#
#
dubbo.application.name=configcenter-annotation-provider
-dubbo.configCenter.address=zookeeper://127.0.0.1:2181
-dubbo.configCenter.configfile=dubbo.properties
+dubbo.config-center.address=zookeeper://127.0.0.1:2181
+dubbo.config-center.config-file=dubbo.properties
dubbo.registries.registry1.address=xxx
\ No newline at end of file
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/src/main/java/org/apache/dubbo/samples/configcenter/ZKTools.java
b/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/src/main/java/org/apache/dubbo/samples/configcenter/ZKTools.java
index cfa3bca..a89242c 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/src/main/java/org/apache/dubbo/samples/configcenter/ZKTools.java
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/src/main/java/org/apache/dubbo/samples/configcenter/ZKTools.java
@@ -16,12 +16,9 @@
*/
package org.apache.dubbo.samples.configcenter;
-import org.apache.dubbo.common.utils.StringUtils;
-
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.apache.zookeeper.data.Stat;
/**
*
@@ -40,7 +37,7 @@ public class ZKTools {
}
public static void generateDubboPropertiesForGlobal() {
- String str = "dubbo.registry.address=zookeeper://127.0.0.1:2181\n" +
"dubbo.metadataReport.address=zookeeper://127.0.0.1:2181\n" +
"dubbo.protocol.port=-1\n" + "dubbo.registryData.simpleProviderConfig=true\n" +
"dubbo.registryData.simpleConsumerConfig=true\n";
+ String str = "dubbo.registry.address=zookeeper://127.0.0.1:2181\n" +
"dubbo.metadata-report.address=zookeeper://127.0.0.1:2181\n" +
"dubbo.protocol.port=-1\n" + "dubbo.registry.simplified=true\n";
System.out.println(str);
@@ -85,52 +82,5 @@ public class ZKTools {
client.setData().forPath(path, data.getBytes());
}
- private static String pathToKey(String path) {
- if (StringUtils.isEmpty(path)) {
- return path;
- }
- return path.replace("/dubbo/config/", "").replaceAll("/", ".");
- }
-
- public static void quickOnlineOfline() {
- String providerUrl =
"dubbo%3A%2F%2F30.5.120.251%3A20880%2Forg.apache.dubbo.samples.configcenter.api.DemoService%3Fapplication%3Dconfigcenter-provider%26dubbo%3D2.0.2%26group%3Dtest2%26specVersion%3D2.7.0-SNAPSHOT%26timestamp%3D1545282828049";
-
- new Thread() {
- @Override
- public void run() {
- try {
- while (true) {
-
createNode("/dubbo/org.apache.dubbo.samples.configcenter.api.DemoService/providers/"
+ providerUrl);
- Stat stat =
client.checkExists().forPath("/dubbo/org.apache.dubbo.samples.configcenter.api.DemoService/providers/"
+ providerUrl);
- if (stat != null) {
-
deleteNode("/dubbo/org.apache.dubbo.samples.configcenter.api.DemoService/providers/"
+ providerUrl);
- }
- Thread.sleep(20);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }.start();
-
- new Thread() {
- @Override
- public void run() {
- while (true) {
- try {
- Thread.sleep(100);
- Stat stat =
client.checkExists().forPath("/dubbo/org.apache.dubbo.samples.configcenter.api.DemoService/providers/"
+ providerUrl);
- if (stat != null) {
-
deleteNode("/dubbo/org.apache.dubbo.samples.configcenter.api.DemoService/providers/"
+ providerUrl);
- }
- Thread.sleep(10);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- }.start();
-
- }
}
diff --git
a/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/src/main/resources/config-center.properties
b/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/src/main/resources/config-center.properties
index 4f4946f..ef421ba 100644
---
a/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/src/main/resources/config-center.properties
+++
b/dubbo-samples-configcenter/dubbo-samples-configcenter-xml/src/main/resources/config-center.properties
@@ -15,9 +15,8 @@
# Add the following global external properties to
`/dubbo/config/dubbo/dubbo.properties`
dubbo.registry.address=zookeeper://127.0.0.1:2181
dubbo.protocol.port=20880
-dubbo.metadataReport.address=zookeeper://127.0.0.1:2181
-dubbo.registryData.simpleProviderConfig=true
-dubbo.registryData.simpleConsumerConfig=true
+dubbo.metadata-report.address=zookeeper://127.0.0.1:2181
+dubbo.registry.simplified=true
# Optional. Add the following application(Consumer) specific external
properties
# to `/dubbo/config/configcenter-consumer/dubbo.properties`
dubbo.consumer.timeout=6666
diff --git
a/dubbo-samples-governance/dubbo-samples-applevel-override/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
b/dubbo-samples-governance/dubbo-samples-applevel-override/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
index ac3f123..39e8697 100644
---
a/dubbo-samples-governance/dubbo-samples-applevel-override/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
+++
b/dubbo-samples-governance/dubbo-samples-applevel-override/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
@@ -49,8 +49,7 @@ public class ZKTools {
"scope: application\n" +
"key: governance-appoverride-provider\n" +
"enabled: true\n" +
- "configs:\n" +
- "- addresses: [\"0.0.0.0:20880\"]\n" + " side: provider\n" +
" parameters:\n" + " weight: 100\n" +
+ "configs:\n" + "- addresses: [\"0.0.0.0:20880\"]\n" + " side:
provider\n" + " parameters:\n" + " weight: 1000\n" +
"...";
System.out.println(str);
@@ -79,8 +78,7 @@ public class ZKTools {
"enabled: true\n" +
"configs:\n" +
"- addresses: [\"0.0.0.0\"]\n" +
- " side: consumer\n" +
- " parameters:\n" + " weight: 100\n" +
+ " side: consumer\n" + " parameters:\n" + " weight: 100\n"
+
"...\n";
System.out.println(str);
diff --git
a/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
b/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
index 7f38b15..c455348 100644
---
a/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
+++
b/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
@@ -37,19 +37,12 @@ public class ZKTools {
}
public static void generateAppevelRouter() {
- String str = "---\n" +
- "scope: application\n" +
- "force: true\n" +
- "runtime: true\n" + "enabled: false\n" +
- "priority: 2\n" +
- "key: demo-consumer\n" +
- "conditions:\n" + " -
interface=org.apache.dubbo.samples.governance.api.DemoService=>address=*:20880\n"
+ " -
interface=org.apache.dubbo.samples.governance.api.DemoService2=>address=*:20881\n"
+ "blackWhiteList:\n" + " enabled: true\n" + " conditions:\n" + " -
interface=org.apache.dubbo.samples.governance.api.DemoService=>address=*:20880\n"
+ " -
interface=org.apache.dubbo.samples.governance.api.DemoService2=>address=*:20881\n"
+
- "...";
+ String str = "---\n" + "scope: application\n" + "force: true\n" +
"runtime: true\n" + "enabled: true\n" + "priority: 2\n" + "key:
governance-conditionrouter-consumer\n" + "conditions:\n" + " -
interface=org.apache.dubbo.samples.governance.api.DemoService=>address=*:20880\n"
+ " -
interface=org.apache.dubbo.samples.governance.api.DemoService2=>address=*:20881\n"
+ "...";
System.out.println(str);
try {
- String path =
"/dubbo/config/governance-conditionrouter-consumer/routers";
+ String path =
"/dubbo/config/governance-conditionrouter-consumer/condition-router";
if (client.checkExists().forPath(path) == null) {
client.create().creatingParentsIfNeeded().forPath(path);
}
diff --git
a/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/dubbo-override.yml
b/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/dubbo-routers-condition.yml
similarity index 100%
rename from
dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/dubbo-override.yml
rename to
dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/dubbo-routers-condition.yml
diff --git
a/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/spring/dubbo-demo-consumer.xml
b/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/spring/dubbo-demo-consumer.xml
index 5bdb8e4..8b7ac98 100644
---
a/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/spring/dubbo-demo-consumer.xml
+++
b/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/spring/dubbo-demo-consumer.xml
@@ -31,7 +31,7 @@
<!-- optional, use multicast registry center to discover service -->
<dubbo:registry address="zookeeper://127.0.0.1:2181"/>
- <dubbo:config-center enable="false" address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:config-center highest-priority="false"
address="zookeeper://127.0.0.1:2181"/>
<!-- generate proxy for the remote service, then demoService can be used
in the same way as the
local regular interface -->
diff --git
a/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/spring/dubbo-demo-provider.xml
b/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/spring/dubbo-demo-provider.xml
index abe8c35..7e3cb21 100644
---
a/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/spring/dubbo-demo-provider.xml
+++
b/dubbo-samples-governance/dubbo-samples-configconditionrouter/src/main/resources/spring/dubbo-demo-provider.xml
@@ -33,7 +33,7 @@
<!--optional, use dubbo protocol to export service on port 20880 -->
<dubbo:protocol name="dubbo" port="-1"/>
- <dubbo:config-center enable="false" address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:config-center highest-priority="false"
address="zookeeper://127.0.0.1:2181"/>
<!-- service implementation, as same as regular local bean -->
<bean id="demoService"
class="org.apache.dubbo.samples.governance.impl.DemoServiceImpl"/>
diff --git
a/dubbo-samples-governance/dubbo-samples-servicelevel-override/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
b/dubbo-samples-governance/dubbo-samples-servicelevel-override/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
index b1fd025..380b09b 100644
---
a/dubbo-samples-governance/dubbo-samples-servicelevel-override/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
+++
b/dubbo-samples-governance/dubbo-samples-servicelevel-override/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
@@ -38,14 +38,12 @@ public class ZKTools {
}
public static void generateServiceLevelOverride() {
- String str = "# All Consumers that consume the service
org.apache.dubbo.samples.governance.api.DemoService will increase the timeout
value to 6000\n" +
- "---\n" + "configVersion: v2.7\n" +
+ String str = "# All Consumers that consume the service
org.apache.dubbo.samples.governance.api.DemoService will increase the timeout
value to 6000\n" + "---\n" + "configVersion: v2.7\n" +
"scope: service\n" +
"key: org.apache.dubbo.samples.governance.api.DemoService\n" +
"enabled: true\n" +
"configs:\n" +
- "- addresses: [0.0.0.0]\n" +
- " side: consumer\n" + " parameters:\n" + " timeout:
1000\n" +
+ "- addresses: [0.0.0.0]\n" + " side: consumer\n" + "
parameters:\n" + " timeout: 5000\n" +
"...\n";
System.out.println(str);
@@ -62,7 +60,7 @@ public class ZKTools {
}
public static void generateApplicationLevelOverride() {
- String str = "# All Consumers that consume the service
org.apache.dubbo.samples.governance.api.DemoService will increase the timeout
value to 6000\n" + "---\n" + "configVersion: v2.7\n" + "scope: application\n" +
"key: governance-serviceoverride-consumer\n" + "enabled: true\n" + "configs:\n"
+ "- addresses: [0.0.0.0]\n" + " side: consumer\n" + " parameters:\n" + "
timeout: 5000\n" + "...\n";
+ String str = "# All Consumers that consume the service
org.apache.dubbo.samples.governance.api.DemoService will increase the timeout
value to 6000\n" + "---\n" + "configVersion: v2.7\n" + "scope: application\n" +
"key: governance-serviceoverride-consumer\n" + "enabled: true\n" + "configs:\n"
+ "- addresses: [0.0.0.0]\n" + " side: consumer\n" + " parameters:\n" + "
timeout: 2000\n" + "...\n";
System.out.println(str);
diff --git
a/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
b/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
index 9761b67..39558ad 100644
---
a/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
+++
b/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/java/org/apache/dubbo/samples/governance/ZKTools.java
@@ -40,17 +40,14 @@ public class ZKTools {
String str = "---\n" +
"force: false\n" +
"runtime: true\n" +
- "enabled: true\n" +
- "priority: 1\n" + "key: governance-tagrouter-provider\n" +
- "tags:\n" +
- " - name: tag1\n" + " addresses:
[\"30.5.121.131:20880\"]\n" +
- " - name: tag2\n" + " addresses:
[\"30.5.121.131:20881\"]\n" +
+ "enabled: true\n" + "priority: 1\n" + "key:
governance-tagrouter-provider\n" +
+ "tags:\n" + " - name: tag1\n" + " addresses:
[\"30.5.121.151:20880\"]\n" + " - name: tag2\n" + " addresses:
[\"30.5.121.151:20881\"]\n" +
"...";
System.out.println(str);
try {
- String path =
"/dubbo/config/governance-tagrouter-provider/tagrouters";
+ String path =
"/dubbo/config/governance-tagrouter-provider/tag-router";
if (client.checkExists().forPath(path) == null) {
client.create().creatingParentsIfNeeded().forPath(path);
}
diff --git
a/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/dubbo-override.yml
b/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/dubbo-routers-tag.yml
similarity index 100%
rename from
dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/dubbo-override.yml
rename to
dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/dubbo-routers-tag.yml
diff --git
a/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/spring/dubbo-demo-consumer.xml
b/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/spring/dubbo-demo-consumer.xml
index 1ba31de..e15e851 100644
---
a/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/spring/dubbo-demo-consumer.xml
+++
b/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/spring/dubbo-demo-consumer.xml
@@ -31,7 +31,7 @@
<!-- optional, use multicast registry center to discover service -->
<dubbo:registry address="zookeeper://127.0.0.1:2181"/>
- <dubbo:config-center enable="false" address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:config-center highest-priority="false"
address="zookeeper://127.0.0.1:2181"/>
<!-- generate proxy for the remote service, then demoService can be used
in the same way as the
local regular interface -->
diff --git
a/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/spring/dubbo-demo-provider.xml
b/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/spring/dubbo-demo-provider.xml
index 718c3aa..148e330 100644
---
a/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/spring/dubbo-demo-provider.xml
+++
b/dubbo-samples-governance/dubbo-samples-tagrouter/src/main/resources/spring/dubbo-demo-provider.xml
@@ -31,9 +31,9 @@
<dubbo:registry address="zookeeper://127.0.0.1:2181"/>
<!--optional, use dubbo protocol to export service on port 20880 -->
- <dubbo:protocol name="dubbo" port="-1"/>
+ <dubbo:protocol name="dubbo" port="-1" heartbeat="10000"/>
- <dubbo:config-center enable="false" address="zookeeper://127.0.0.1:2181"/>
+ <dubbo:config-center highest-priority="false"
address="zookeeper://127.0.0.1:2181"/>
<!-- service implementation, as same as regular local bean -->
<bean id="demoService"
class="org.apache.dubbo.samples.governance.impl.DemoServiceImpl"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
