Merge branch 'master' of https://github.com/apache/dubbo-samples

chickenlj · Mar 20, 2024 · a1b357a · a1b357a
2 parents f15b942 + b53e33b
commit a1b357a
Show file tree

Hide file tree

Showing 11 changed files with 97 additions and 334 deletions.
diff --git a/2-advanced/dubbo-samples-autowire/case-configuration.yml b/2-advanced/dubbo-samples-autowire/case-configuration.yml
@@ -29,7 +29,7 @@ services:
     tests:
       - "**/*IT.class"
     systemProps:
-      - zookeeper.address=autowire-provider
+      - zookeeper.address=zookeeper
       - zookeeper.port=2181
       - dubbo.address=autowire-provider
       - dubbo.port=20880

diff --git a/2-advanced/dubbo-samples-direct/case-configuration.yml b/2-advanced/dubbo-samples-direct/case-configuration.yml
@@ -14,9 +14,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from: app-external-zookeeper.yml
+services:
+    zookeeper:
+        image: zookeeper:latest
 
-props:
-    project_name: dubbo-samples-direct
-    main_class: org.apache.dubbo.samples.direct.ProviderApplication
-    dubbo_port: 20880
+    direct-provider:
+        type: app
+        basedir: dubbo-samples-direct-provider
+        mainClass: org.apache.dubbo.samples.direct.ProviderApplication
+        systemProps:
+            - zookeeper.address=zookeeper
+        waitPortsBeforeRun:
+            - zookeeper:2181
+        checkPorts:
+            - 20880
+        checkLog: "dubbo service started"
+
+    direct-consumer:
+        type: test
+        basedir: dubbo-samples-direct-consumer
+        tests:
+            - "**/*IT.class"
+        systemProps:
+            - zookeeper.address=zookeeper
+            - zookeeper.port=2181
+            - dubbo.address=direct-provider
+            - dubbo.port=20880
+        waitPortsBeforeRun:
+            - zookeeper:2181
+            - direct-provider:20880
+        depends_on:
+            - direct-provider
diff --git a/...es-direct-provider/src/main/java/org/apache/dubbo/samples/direct/ProviderApplication.java b/...es-direct-provider/src/main/java/org/apache/dubbo/samples/direct/ProviderApplication.java
@@ -27,5 +27,6 @@
 public class ProviderApplication {
     public static void main(String[] args) {
         SpringApplication.run(ProviderApplication.class);
+        System.out.println("dubbo service started");
     }
 }
diff --git a/2-advanced/dubbo-samples-environment-keys/case-configuration.yml b/2-advanced/dubbo-samples-environment-keys/case-configuration.yml
@@ -27,7 +27,7 @@ services:
         waitPortsBeforeRun:
             - zookeeper:2181
         checkPorts:
-            - 20880
+            - 50052
         checkLog: "dubbo service started"
 
     test:
@@ -39,7 +39,7 @@ services:
             - zookeeper.address=zookeeper
         waitPortsBeforeRun:
             - zookeeper:2181
-            - provider:20880
+            - provider:50052
         depends_on:
             - provider
 
diff --git a/2-advanced/dubbo-samples-mock/case-configuration.yml b/2-advanced/dubbo-samples-mock/case-configuration.yml
@@ -14,11 +14,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from: app-builtin-zookeeper.yml
+services:
+    zookeeper:
+        image: zookeeper:latest
 
-props:
-  project_name: dubbo-samples-mock
-  main_class: org.apache.dubbo.samples.mock.MockProvider
-  zookeeper_port: 2181
-  dubbo_port: 20880
+    provider:
+        type: app
+        basedir: dubbo-samples-mock-provider
+        mainClass: org.apache.dubbo.samples.mock.provider.ProviderApplication
+        systemProps:
+            - zookeeper.address=zookeeper
+        waitPortsBeforeRun:
+            - zookeeper:2181
+        checkPorts:
+            - 50052
+        checkLog: "dubbo service started"
 
+    direct-consumer:
+        type: test
+        basedir: dubbo-samples-mock-consumer
+        tests:
+            - "**/*IT.class"
+        systemProps:
+            - zookeeper.address=zookeeper
+            - zookeeper.port=2181
+            - dubbo.address=provider
+            - dubbo.port=50052
+        waitPortsBeforeRun:
+            - zookeeper:2181
+            - provider:50052
+        depends_on:
+            - provider
diff --git a/...ck-provider/src/main/java/org/apache/dubbo/samples/mock/provider/ProviderApplication.java b/...ck-provider/src/main/java/org/apache/dubbo/samples/mock/provider/ProviderApplication.java
@@ -27,5 +27,6 @@
 public class ProviderApplication {
     public static void main(String[] args) {
         SpringApplication.run(ProviderApplication.class, args);
+        System.out.println("dubbo service started");
     }
 }
diff --git a/2-advanced/dubbo-samples-seata/case-configuration.yml b/2-advanced/dubbo-samples-seata/case-configuration.yml
@@ -29,7 +29,7 @@ services:
     image: mysql:5.7
     environment:
       - MYSQL_DATABASE=seata
-      - MYSQL_ROOT_PASSWORD=helloworld
+      - MYSQL_ROOT_PASSWORD=root
     volumes:
       - ${_basedir}/script/db:/docker-entrypoint-initdb.d
   seata-server:

diff --git a/3-extensions/configcenter/dubbo-samples-configcenter-annotation/case-configuration.yml b/3-extensions/configcenter/dubbo-samples-configcenter-annotation/case-configuration.yml
@@ -14,11 +14,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from: app-builtin-zookeeper.yml
+services:
+    zookeeper:
+        image: zookeeper:latest
 
-props:
-  project_name: dubbo-samples-configcenter-annotation
-  main_class: org.apache.dubbo.samples.configcenter.annotation.AnnotationProvider
-  zookeeper_port: 2181
-  dubbo_port: 20990
+    configcenter-provider:
+        type: app
+        basedir: dubbo-samples-configcenter-annotation-provider
+        mainClass: org.apache.dubbo.samples.configcenter.annotation.ProviderApplication
+        systemProps:
+            - zookeeper.address=zookeeper
+        waitPortsBeforeRun:
+            - zookeeper:2181
+        checkPorts:
+            - 20990
+        checkLog: "dubbo service started"
 
+    configcenter-consumer:
+        type: test
+        basedir: dubbo-samples-configcenter-annotation-consumer
+        tests:
+            - "**/*IT.class"
+        systemProps:
+            - zookeeper.address=zookeeper
+            - zookeeper.port=2181
+            - dubbo.address=configcenter-provider
+            - dubbo.port=20990
+        waitPortsBeforeRun:
+            - zookeeper:2181
+            - configcenter-provider:20990
+        depends_on:
+            - configcenter-provider