You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@dubbo.apache.org by li...@apache.org on 2019/02/15 02:29:10 UTC

[incubator-dubbo-samples] branch samples-for-2.7.0-SNAPSHOT updated: update configcenter samples

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 6dab7bf  update configcenter samples
6dab7bf is described below

commit 6dab7bf5638f326e8a8852dce118c3f2006fe3e1
Author: ken.lj <ke...@gmail.com>
AuthorDate: Fri Feb 15 08:16:04 2019 +0800

    update configcenter samples
---
 .../org/apache/dubbo/samples/governance/AsyncConsumer.java  | 13 ++++++++++++-
 .../apache/dubbo/samples/governance/FrontendConsumer.java   |  4 ++--
 .../src/main/resources/spring/dubbo-consumer.properties     |  2 +-
 .../src/main/resources/spring/dubbo-provider.properties     |  2 +-
 .../dubbo-properties-in-configcenter.properties             |  2 +-
 .../src/main/resources/spring/dubbo-consumer.properties     |  4 ++--
 .../src/main/resources/spring/dubbo-provider.properties     |  4 ++--
 .../java/org/apache/dubbo/samples/governance/ZKTools.java   |  5 ++---
 .../src/main/resources/dubbo-override.yml                   |  7 +++----
 .../src/main/resources/dubbo-override.yml                   |  2 +-
 .../java/org/apache/dubbo/samples/governance/ZKTools.java   | 10 ++++++++--
 .../src/main/resources/spring/dubbo-demo-provider.xml       |  1 -
 .../src/main/resources/spring/dubbo-consumer.properties     |  2 +-
 .../src/main/resources/spring/dubbo-provider.properties     |  4 ++--
 .../src/main/resources/spring/rest-provider.xml             |  2 +-
 15 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/dubbo-samples-async/dubbo-samples-async-simple/src/main/java/org/apache/dubbo/samples/governance/AsyncConsumer.java b/dubbo-samples-async/dubbo-samples-async-simple/src/main/java/org/apache/dubbo/samples/governance/AsyncConsumer.java
index 671c13e..5d4bf4b 100644
--- a/dubbo-samples-async/dubbo-samples-async-simple/src/main/java/org/apache/dubbo/samples/governance/AsyncConsumer.java
+++ b/dubbo-samples-async/dubbo-samples-async-simple/src/main/java/org/apache/dubbo/samples/governance/AsyncConsumer.java
@@ -24,6 +24,7 @@ import org.apache.dubbo.samples.governance.api.AsyncService;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 
 /**
@@ -37,7 +38,17 @@ public class AsyncConsumer {
 
         final AsyncService asyncService = (AsyncService) context.getBean("asyncService");
 
-        Future<String> f = RpcContext.getContext().asyncCall(() -> asyncService.sayHello("async call request"));
+        asyncService.sayHello("world");
+        CompletableFuture<String> helloFuture = RpcContext.getContext().getCompletableFuture();
+        helloFuture.whenComplete((retValue, exception) -> {
+            if (exception == null) {
+                System.out.println(retValue);
+            } else {
+                exception.printStackTrace();
+            }
+        });
+
+        CompletableFuture<String> f = RpcContext.getContext().asyncCall(() -> asyncService.sayHello("async call request"));
 
         System.out.println("async call ret :" + f.get());
 
diff --git a/dubbo-samples-chain/dubbo-samples-chain-front/src/main/java/org/apache/dubbo/samples/governance/FrontendConsumer.java b/dubbo-samples-chain/dubbo-samples-chain-front/src/main/java/org/apache/dubbo/samples/governance/FrontendConsumer.java
index 6aa54f6..4cf6067 100644
--- a/dubbo-samples-chain/dubbo-samples-chain-front/src/main/java/org/apache/dubbo/samples/governance/FrontendConsumer.java
+++ b/dubbo-samples-chain/dubbo-samples-chain-front/src/main/java/org/apache/dubbo/samples/governance/FrontendConsumer.java
@@ -45,10 +45,10 @@ public class FrontendConsumer {
 
 
 //                cat(context);
-        dog(context);
+//        dog(context);
 //                tiger(context);
 //                lion(context);
-//        chinese(context);
+        chinese(context);
 //        american(context);
 
     }
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 dc7c3bc..2151eec 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
@@ -19,4 +19,4 @@
 
 # TODO application should not be restricted to plural mode.
 dubbo.applications.configcenter-annotation-provider.name=configcenter-annotation-provider
-dubbo.config-centers.zookeeper.address=zookeeper://127.0.0.1:2181
\ No newline at end of file
+dubbo.configCenters.zookeeper.address=zookeeper://127.0.0.1:2181
\ No newline at end of file
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 85eedef..8b02bb1 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
@@ -18,4 +18,4 @@
 #
 
 dubbo.application.name=configcenter-annotation-provider
-dubbo.config-center.address=zookeeper://127.0.0.1:2181
\ No newline at end of file
+dubbo.configCenter.address=zookeeper://127.0.0.1:2181
\ No newline at end of file
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 6968ba5..f409c53 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.config-center.address=zookeeper://127.0.0.1:2181
+dubbo.configCenter.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 cde07f5..c474256 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.config-center.address=zookeeper://127.0.0.1:2181
-dubbo.config-center.config-file=dubbo.properties
+dubbo.configCenter.address=zookeeper://127.0.0.1:2181
+dubbo.configCenter.configFile=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 258845b..468a23a 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.config-center.address=zookeeper://127.0.0.1:2181
-dubbo.config-center.config-file=dubbo.properties
+dubbo.configCenter.address=zookeeper://127.0.0.1:2181
+dubbo.configCenter.configFile=dubbo.properties
 dubbo.registries.registry1.address=xxx
\ No newline at end of file
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 39e8697..e14f1fe 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
@@ -42,9 +42,8 @@ public class ZKTools {
     }
 
     public static void generateAppLevelOverride() {
-        String str = "# Execute on governance-appoverride-provider only\n" +
-                "# the governance-appoverride-provider instances on those provides who's port is 20880 will be lifted to 1000\n" +
-                "# this will take effect on all services on governance-appoverride-provider.\n" +
+        String str = "# Execute on governance-appoverride-provider only and only those instances who's port is 20880 will be lifted to 1000.\n" +
+                "# This will take effect on all services in governance-appoverride-provider." +
                 "---\n" + "configVersion: v2.7\n" +
                 "scope: application\n" +
                 "key: governance-appoverride-provider\n" +
diff --git a/dubbo-samples-governance/dubbo-samples-applevel-override/src/main/resources/dubbo-override.yml b/dubbo-samples-governance/dubbo-samples-applevel-override/src/main/resources/dubbo-override.yml
index ce59be3..cd67949 100644
--- a/dubbo-samples-governance/dubbo-samples-applevel-override/src/main/resources/dubbo-override.yml
+++ b/dubbo-samples-governance/dubbo-samples-applevel-override/src/main/resources/dubbo-override.yml
@@ -17,9 +17,8 @@
 #
 #
 
-# Execute on governance-appoverride-provider only
-# the governance-appoverride-provider instances on those provides who's port is 20880 will be lifted to 1000
-# this will take effect on all services on governance-appoverride-provider.
+# Execute on governance-appoverride-provider only and only those instances who's port is 20880 will be lifted to 1000.
+# This will take effect on all services in governance-appoverride-provider.
 ---
 apiVersion: v2.7
 scope: application
@@ -27,7 +26,7 @@ key: governance-appoverride-provider
 enabled: true
 configs:
 - addresses: ["0.0.0.0:20880"]
-  side: consumer
+  side: provider
   parameters:
     weight: 1000
 ...
diff --git a/dubbo-samples-governance/dubbo-samples-servicelevel-override/src/main/resources/dubbo-override.yml b/dubbo-samples-governance/dubbo-samples-servicelevel-override/src/main/resources/dubbo-override.yml
index d3c1299..2d1b0f0 100644
--- a/dubbo-samples-governance/dubbo-samples-servicelevel-override/src/main/resources/dubbo-override.yml
+++ b/dubbo-samples-governance/dubbo-samples-servicelevel-override/src/main/resources/dubbo-override.yml
@@ -18,7 +18,7 @@
 #
 # All Consumers that consume the service org.apache.dubbo.samples.governance.api.DemoService will increase the timeout value to 6000
 ---
-apiVersion: v2.7
+configVersion: v2.7
 scope: service
 key: org.apache.dubbo.samples.governance.api.DemoService
 enabled: true
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 39558ad..512031a 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,8 +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.151:20880\"]\n" + "  - name: tag2\n" + "    addresses: [\"30.5.121.151:20881\"]\n" +
+                "enabled: true\n" +
+                "priority: 1\n" +
+                "key: governance-tagrouter-provider\n" +
+                "tags:\n" +
+                "  - name: tag1\n" +
+                "    addresses: [\"192.168.0.102:20880\"]\n" +
+                "  - name: tag2\n" +
+                "    addresses: [\"192.168.0.102:20881\"]\n" +
                 "...";
 
         System.out.println(str);
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 148e330..87a9592 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
@@ -24,7 +24,6 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
        http://dubbo.apache.org/schema/dubbo http://dubbo.apache.org/schema/dubbo/dubbo.xsd">
 
-    <!-- optional provider's application name, used for tracing dependency relationship -->
     <dubbo:application name="governance-tagrouter-provider"/>
 
     <!-- optional -->
diff --git a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/resources/spring/dubbo-consumer.properties b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/resources/spring/dubbo-consumer.properties
index 5915e3b..c98fb80 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/resources/spring/dubbo-consumer.properties
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/resources/spring/dubbo-consumer.properties
@@ -17,7 +17,7 @@
 #
 #
 dubbo.application.name=metadatareport-configcenter-consumer
-dubbo.config-center.address=zookeeper://127.0.0.1:2181
+dubbo.configCenter.address=zookeeper://127.0.0.1:2181
 # 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-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/resources/spring/dubbo-provider.properties b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/resources/spring/dubbo-provider.properties
index d4eee26..1171526 100644
--- a/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/resources/spring/dubbo-provider.properties
+++ b/dubbo-samples-metadata-report/dubbo-samples-metadata-report-configcenter/src/main/resources/spring/dubbo-provider.properties
@@ -17,8 +17,8 @@
 #
 #
 dubbo.application.name=metadatareport-configcenter-provider
-dubbo.config-center.address=zookeeper://127.0.0.1:2181
-dubbo.config-center.configFile=dubbo.properties
+dubbo.configCenter.address=zookeeper://127.0.0.1:2181
+dubbo.configCenter.configFile=dubbo.properties
 
 # 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
diff --git a/dubbo-samples-rest/src/main/resources/spring/rest-provider.xml b/dubbo-samples-rest/src/main/resources/spring/rest-provider.xml
index 570e601..1cbb84c 100644
--- a/dubbo-samples-rest/src/main/resources/spring/rest-provider.xml
+++ b/dubbo-samples-rest/src/main/resources/spring/rest-provider.xml
@@ -52,7 +52,7 @@
     <dubbo:service interface="org.apache.dubbo.samples.rest.api.UserService" ref="userService" protocol="dubbo"
                    group="xmlConfig"/>
 
-    <dubbo:service interface="org.apache.dubbo.samples.rest.api.facade.UserRestService" ref="userRestService"
+    <dubbo:service path="test" interface="org.apache.dubbo.samples.rest.api.facade.UserRestService" ref="userRestService"
                    protocol="rest" validation="true"/>
     <dubbo:service interface="org.apache.dubbo.samples.rest.api.facade.AnotherUserRestService"
                    ref="anotherUserRestService" protocol="rest,dubbo" timeout="2000" connections="100"


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@dubbo.apache.org
For additional commands, e-mail: notifications-help@dubbo.apache.org