This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-samples.git
The following commit(s) were added to refs/heads/master by this push:
new d2dedfbd0 refactor(triple-apisix-nacos) : construct the triple
gateway example (#1127)
d2dedfbd0 is described below
commit d2dedfbd0ea5509ee702a285a7e9c9b2d4da7d94
Author: hhuang <[email protected]>
AuthorDate: Mon Apr 22 15:41:47 2024 +0800
refactor(triple-apisix-nacos) : construct the triple gateway example
(#1127)
---
.../case-configuration.yml | 24 ++++++++++++++++------
.../dubbo-samples-triple-rest-jaxrs/pom.xml | 3 ++-
.../src/main/resources/application.yml | 2 +-
.../case-configuration.yml | 24 ++++++++++++++++------
.../dubbo-samples-triple-rest-springmvc/pom.xml | 3 ++-
.../src/main/resources/application.yml | 2 +-
.../case-configuration.yml | 4 ++--
.../case-versions.conf | 6 +++---
.../dubbo-samples-nacos-registry/pom.xml | 8 ++++----
.../resources/spring/dubbo-provider.properties | 6 +++---
10 files changed, 54 insertions(+), 28 deletions(-)
diff --git
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/case-configuration.yml
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/case-configuration.yml
index 44e11ed34..00f3ea3db 100644
---
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/case-configuration.yml
+++
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/case-configuration.yml
@@ -15,20 +15,30 @@
# limitations under the License.
services:
- zookeeper:
- image: zookeeper:latest
+ nacos:
+ image: nacos/nacos-server:${nacos-server.version:2.0.0}
+ environment:
+ - PREFER_HOST_MODE=hostname
+ - MODE=standalone
+ - NACOS_AUTH_ENABLE=true
+ - JVM_XMS=512m
+ - JVM_XMX=512m
+ - JVM_XMN=256m
jaxrs-provider:
type: app
basedir: .
mainClass: org.apache.dubbo.rest.demo.JaxrsRestApplication
systemProps:
- - zookeeper.address=zookeeper
+ - nacos.address=nacos
+ - nacos.port=8848
waitPortsBeforeRun:
- - zookeeper:2181
+ - nacos:8848
checkPorts:
- 50052
checkLog: "Current Spring Boot Application is await..."
+ depends_on:
+ - nacos
test:
type: test
@@ -36,10 +46,12 @@ services:
tests:
- "**/*IT.class"
systemProps:
- - zookeeper.address=zookeeper
+ - nacos.address=nacos
+ - nacos.port=8848
- dubbo.address=jaxrs-provider
waitPortsBeforeRun:
- - zookeeper:2181
+ - nacos:8848
- jaxrs-provider:50052
depends_on:
+ - nacos
- jaxrs-provider
diff --git
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/pom.xml
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/pom.xml
index 42a519e00..71673bb47 100644
---
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/pom.xml
+++
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/pom.xml
@@ -35,7 +35,8 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
-
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <version>3.3.0-beta.2</version>
</dependency>
<!-- spring web annotation support -->
diff --git
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/resources/application.yml
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/resources/application.yml
index b10439d00..2bc5fa4d3 100644
---
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/resources/application.yml
+++
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-jaxrs/src/main/resources/application.yml
@@ -20,7 +20,7 @@ dubbo:
name: dubbo-springboot-triple-rest-jaxrs
qos-port: 33333
registry:
- address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+ address:
nacos://${nacos.address:localhost}:8848?username=nacos&password=nacos
protocol:
name: tri
port: 50052
diff --git
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/case-configuration.yml
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/case-configuration.yml
index 76ca90b63..6f86892a6 100644
---
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/case-configuration.yml
+++
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/case-configuration.yml
@@ -15,20 +15,30 @@
# limitations under the License.
services:
- zookeeper:
- image: zookeeper:latest
+ nacos:
+ image: nacos/nacos-server:${nacos-server.version:2.0.0}
+ environment:
+ - PREFER_HOST_MODE=hostname
+ - MODE=standalone
+ - NACOS_AUTH_ENABLE=true
+ - JVM_XMS=512m
+ - JVM_XMX=512m
+ - JVM_XMN=256m
springmvc-provider:
type: app
basedir: .
mainClass: org.apache.dubbo.rest.demo.SpringmvcRestApplication
systemProps:
- - zookeeper.address=zookeeper
+ - nacos.address=nacos
+ - nacos.port=8848
waitPortsBeforeRun:
- - zookeeper:2181
+ - nacos:8848
checkPorts:
- 50052
checkLog: "Current Spring Boot Application is await..."
+ depends_on:
+ - nacos
test:
type: test
@@ -36,10 +46,12 @@ services:
tests:
- "**/*IT.class"
systemProps:
- - zookeeper.address=zookeeper
+ - nacos.address=nacos
+ - nacos.port=8848
- dubbo.address=springmvc-provider
waitPortsBeforeRun:
- - zookeeper:2181
+ - nacos:8848
- springmvc-provider:50052
depends_on:
+ - nacos
- springmvc-provider
diff --git
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/pom.xml
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/pom.xml
index 21eb16029..033f9ea10 100644
---
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/pom.xml
+++
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/pom.xml
@@ -35,7 +35,8 @@
</dependency>
<dependency>
<groupId>org.apache.dubbo</groupId>
-
<artifactId>dubbo-zookeeper-curator5-spring-boot-starter</artifactId>
+ <artifactId>dubbo-nacos-spring-boot-starter</artifactId>
+ <version>3.3.0-beta.2</version>
</dependency>
<!-- spring web annotation support -->
diff --git
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/src/main/resources/application.yml
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/src/main/resources/application.yml
index 47b28603a..7596034ad 100644
---
a/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/src/main/resources/application.yml
+++
b/2-advanced/dubbo-samples-triple-rest/dubbo-samples-triple-rest-springmvc/src/main/resources/application.yml
@@ -20,7 +20,7 @@ dubbo:
name: dubbo-springboot-triple-rest-springmvc
qos-port: 33333
registry:
- address: zookeeper://${zookeeper.address:127.0.0.1}:2181
+ address:
nacos://${nacos.address:localhost}:8848?username=nacos&password=nacos
protocol:
name: tri
port: 50052
diff --git
a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml
b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml
index 7bc80332b..9aa99254f 100644
---
a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml
+++
b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-configuration.yml
@@ -37,7 +37,7 @@ services:
waitPortsBeforeRun:
- nacos:8848
checkPorts:
- - 20880
+ - 50052
checkLog: "dubbo service started"
depends_on:
- nacos
@@ -52,7 +52,7 @@ services:
- nacos.port=8848
waitPortsBeforeRun:
- nacos:8848
- - dubbo-samples-nacos-registry:20880
+ - dubbo-samples-nacos-registry:50052
depends_on:
- nacos
- dubbo-samples-nacos-registry
diff --git
a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf
b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf
index dc1ca0a59..7fdb83dd2 100644
---
a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf
+++
b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/case-versions.conf
@@ -20,8 +20,8 @@
# Supported component versions of the test case
# Spring app
-dubbo.version=2.7*, 3.*
-spring.version=4.*, 5.*
-java.version= [>= 8]
+dubbo.version=3.3.*
+spring.version=6.*
+java.version= [>= 17]
nacos.version="!*-BETA","!*-ALPHA*",2.*
#nacos-server.version="!*-slim","!*-BETA",2.*
diff --git
a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml
b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml
index 66a27ad20..1f44cbe73 100644
---
a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml
+++
b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/pom.xml
@@ -29,12 +29,12 @@
<artifactId>dubbo-samples-nacos-registry</artifactId>
<properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <dubbo.version>3.2.6</dubbo.version>
- <spring.version>4.3.30.RELEASE</spring.version>
+ <dubbo.version>3.3.0-beta.2</dubbo.version>
+ <spring.version>6.1.5</spring.version>
<log4j2.version>2.20.0</log4j2.version>
<junit.version>4.13.1</junit.version>
diff --git
a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-provider.properties
b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-provider.properties
index 6bf6c6519..2c4080383 100644
---
a/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-provider.properties
+++
b/3-extensions/registry/dubbo-samples-nacos/dubbo-samples-nacos-registry/src/main/resources/spring/dubbo-provider.properties
@@ -18,6 +18,6 @@
#
dubbo.application.name=nacos-registry-demo-provider
dubbo.registry.address=nacos://${nacos.address:localhost}:8848?username=nacos&password=nacos
-dubbo.protocol.name=dubbo
-dubbo.protocol.port=20880
-dubbo.provider.token=true
\ No newline at end of file
+dubbo.protocol.name=tri
+dubbo.protocol.port=50052
+dubbo.provider.token=true
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
