diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/resources/application.properties deleted file mode 100644 index 54c41e2772..0000000000 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/resources/application.properties +++ /dev/null @@ -1,24 +0,0 @@ -spring.application.name=service-consumer -server.port=18083 -management.endpoints.web.exposure.include=* -spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 -spring.cloud.nacos.discovery.fail-fast=true - -spring.cloud.nacos.username=nacos -spring.cloud.nacos.password=nacos - -feign.sentinel.enabled=true - -spring.cloud.sentinel.transport.dashboard=localhost:8080 -spring.cloud.sentinel.eager=true - -spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json -spring.cloud.sentinel.datasource.ds1.file.data-type=json -spring.cloud.sentinel.datasource.ds1.file.rule-type=flow - -spring.cloud.sentinel.datasource.ds2.file.file=classpath: degraderule.json -spring.cloud.sentinel.datasource.ds2.file.data-type=json -spring.cloud.sentinel.datasource.ds2.file.rule-type=degrade -spring.cloud.loadbalancer.nacos.enabled=true -# use feign client in GraalVM environment need to set below config -spring.cloud.refresh.enabled=false diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/resources/application.yml new file mode 100644 index 0000000000..f1f60174b6 --- /dev/null +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/resources/application.yml @@ -0,0 +1,44 @@ +spring: + application: + name: service-consumer + + cloud: + # use feign client in GraalVM environment need to set below config + refresh: + enabled: true + nacos: + discovery: + username: 'nacos' + password: 'nacos' + server-addr: 127.0.0.1:8848 + fail-fast: true + + sentinel: + transport: + dashboard: localhost:8080 + eager: true + datasource: + ds1: + file: + file: classpath:flowrule.json + data-type: json + rule-type: flow + ds2: + file: + file: classpath:degraderule.json + data-type: json + rule-type: degrade + +server: + port: 18083 + +management: + endpoints: + web: + exposure: + include: * + + +feign: + sentinel: + enabled: true diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-sclb-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-sclb-example/src/main/resources/application.properties deleted file mode 100644 index b695d17637..0000000000 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-sclb-example/src/main/resources/application.properties +++ /dev/null @@ -1,24 +0,0 @@ -spring.application.name=service-consumer-sclb -server.port=18083 -management.endpoints.web.exposure.include=* -spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 - -spring.cloud.nacos.username=nacos -spring.cloud.nacos.password=nacos - -spring.cloud.loadbalancer.ribbon.enabled=false -spring.cloud.loadbalancer.configurations=zone-preference -spring.cloud.loadbalancer.zone=hangzhou - -feign.sentinel.enabled=true - -spring.cloud.sentinel.transport.dashboard=localhost:8080 -spring.cloud.sentinel.eager=true - -spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json -spring.cloud.sentinel.datasource.ds1.file.data-type=json -spring.cloud.sentinel.datasource.ds1.file.rule-type=flow - -spring.cloud.sentinel.datasource.ds2.file.file=classpath: degraderule.json -spring.cloud.sentinel.datasource.ds2.file.data-type=json -spring.cloud.sentinel.datasource.ds2.file.rule-type=degrade diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-sclb-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-sclb-example/src/main/resources/application.yml new file mode 100644 index 0000000000..05d52fe06a --- /dev/null +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-sclb-example/src/main/resources/application.yml @@ -0,0 +1,44 @@ +spring: + application: + name: service-consumer-sclb + + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + username: nacos + password: nacos + loadbalancer: + ribbon: + enabled: false + configurations: zone-preference + zone: hangzhou + + sentinel: + transport: + dashboard: localhost:8080 + eager: true + datasource: + ds1: + file: + file: classpath:flowrule.json + data-type: json + rule-type: flow + ds2: + file: + file: classpath:degraderule.json + data-type: json + rule-type: degrade + +feign: + sentinel: + enabled: true + +server: + port: 18083 + +management: + endpoints: + web: + exposure: + include: '*' diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java index 93d824800b..312a2be9ae 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java @@ -18,7 +18,6 @@ import java.util.Map; - import com.alibaba.cloud.nacos.NacosDiscoveryProperties; import jakarta.annotation.Resource; diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/resources/application.properties deleted file mode 100755 index af358409dc..0000000000 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/resources/application.properties +++ /dev/null @@ -1,16 +0,0 @@ -server.port=0 -spring.application.name=service-provider -spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 -spring.cloud.nacos.discovery.enabled=true -#spring.cloud.nacos.discovery.instance-enabled=true -#only register IPv4 instance -#spring.cloud.nacos.discovery.ip-type=IPv4 -#only register IPv6 instance -#spring.cloud.nacos.discovery.ip-type=IPv6 - -spring.cloud.nacos.username=nacos -spring.cloud.nacos.password=nacos - -management.endpoints.web.exposure.include=* -management.endpoint.health.show-details=always - diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/resources/application.yml new file mode 100644 index 0000000000..af39bba364 --- /dev/null +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/resources/application.yml @@ -0,0 +1,26 @@ +spring: + application: + name: service-provider + + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + enabled: true + # instance-enabled: true + # ip-type: IPv4 # only register IPv4 instance + # ip-type: IPv6 # only register IPv6 instance + username: nacos + password: nacos + +server: + port: 0 + +management: + endpoints: + web: + exposure: + include: '*' + endpoint: + health: + show-details: always diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-reactivediscovery-consumer-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-reactivediscovery-consumer-example/src/main/resources/application.properties deleted file mode 100644 index 4cdd63be6e..0000000000 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-reactivediscovery-consumer-example/src/main/resources/application.properties +++ /dev/null @@ -1,9 +0,0 @@ -spring.application.name=service-consumer-reactive -server.port=18083 -management.endpoints.web.exposure.include=* -spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 - -spring.cloud.nacos.username=nacos -spring.cloud.nacos.password=nacos - -spring.cloud.loadbalancer.ribbon.enabled=false diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-reactivediscovery-consumer-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-reactivediscovery-consumer-example/src/main/resources/application.yml new file mode 100644 index 0000000000..d4b4bbb5c8 --- /dev/null +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-reactivediscovery-consumer-example/src/main/resources/application.yml @@ -0,0 +1,22 @@ +spring: + application: + name: service-consumer-reactive + + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + username: nacos + password: nacos + loadbalancer: + ribbon: + enabled: false + +server: + port: 18083 + +management: + endpoints: + web: + exposure: + include: '*' diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/resources/application.properties deleted file mode 100644 index b2e3f9ef1d..0000000000 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/resources/application.properties +++ /dev/null @@ -1,15 +0,0 @@ -server.port=18085 -spring.application.name=service-gateway -spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 - -spring.cloud.nacos.username=nacos -spring.cloud.nacos.password=nacos - -management.endpoints.web.exposure.include=* - -# spring cloud route config -spring.cloud.gateway.routes[0].id=nacos-route -spring.cloud.gateway.routes[0].uri=lb://service-gateway-provider -spring.cloud.gateway.routes[0].predicates[0].name=Path -spring.cloud.gateway.routes[0].predicates[0].args[pattern]=/nacos/** -spring.cloud.gateway.routes[0].filters[0]=StripPrefix=1 diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/resources/application.yml new file mode 100644 index 0000000000..5b0c87c6b4 --- /dev/null +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/resources/application.yml @@ -0,0 +1,28 @@ +spring: + application: + name: service-gateway + + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + username: nacos + password: nacos + + gateway: + routes: + - id: nacos-route + uri: lb://service-gateway-provider + predicates: + - Path=/nacos/** + filters: + - StripPrefix=1 + +server: + port: 18085 + +management: + endpoints: + web: + exposure: + include: '*' diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/resources/application.properties deleted file mode 100644 index bda46189e7..0000000000 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/resources/application.properties +++ /dev/null @@ -1,8 +0,0 @@ -server.port=18086 -spring.application.name=service-gateway-provider -spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848 - -spring.cloud.nacos.username=nacos -spring.cloud.nacos.password=nacos - -management.endpoints.web.exposure.include=* diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/resources/application.yml new file mode 100644 index 0000000000..ab86093d1e --- /dev/null +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/resources/application.yml @@ -0,0 +1,19 @@ +spring: + application: + name: service-gateway-provider + + cloud: + nacos: + discovery: + server-addr: 127.0.0.1:8848 + username: nacos + password: nacos + +server: + port: 18086 + +management: + endpoints: + web: + exposure: + include: '*'