From fa520f0ca378d712d974d5823329ee479629be89 Mon Sep 17 00:00:00 2001 From: pandaapo <1052156701@qq.com> Date: Wed, 28 Sep 2022 19:12:08 +0800 Subject: [PATCH 1/2] Fix issue 2799: add some configuration items. --- .../nacos-example/nacos-discovery-example/readme-zh.md | 4 ++++ .../nacos-example/nacos-discovery-example/readme.md | 3 +++ 2 files changed, 7 insertions(+) diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md index 8e23f6c1ae..f73343c6fb 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md @@ -200,6 +200,10 @@ Metadata|spring.cloud.nacos.discovery.metadata||使用Map格式配置 日志文件名|spring.cloud.nacos.discovery.log-name|| 接入点|spring.cloud.nacos.discovery.endpoint|UTF-8|地域的某个服务的入口域名,通过此域名可以动态地拿到服务端地址 是否集成Ribbon|ribbon.nacos.enabled|true| +集群|spring.cloud.nacos.discovery.cluster-name|DEFAULT|Nacos集群名称 +是否集成LoadBalancer|spring.cloud.loadbalancer.nacos.enabled|false| +是否开启Nacos Watch|spring.cloud.nacos.discovery.watch.enabled|true|可以设置成false来关闭 watch +是否启用Nacos|spring.cloud.nacos.discovery.enabled|true|默认启动,设置为false时会关闭自动向Nacos注册的功能 diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md index 6386360887..4baf793eec 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md @@ -206,7 +206,10 @@ AccessKey|spring.cloud.nacos.discovery.access-key|| SecretKey|spring.cloud.nacos.discovery.secret-key|| Metadata|spring.cloud.nacos.discovery.metadata||Extended data, Configure using Map format log name|spring.cloud.nacos.discovery.log-name|| +cluster|spring.cloud.nacos.discovery.cluster-name|DEFAULT|Nacos cluster name endpoint|spring.cloud.nacos.discovery.endpoint||The domain name of a service, through which the server address can be dynamically obtained. +Integration LoadBalancer|spring.cloud.loadbalancer.nacos.enabled|false| +enable Nacos Watch|spring.cloud.nacos.discovery.watch.enabled|true|Switch it to false to disable nacos watch Integration Ribbon|ribbon.nacos.enabled|true| enabled|spring.cloud.nacos.discovery.enabled|true|The switch to enable or disable nacos service discovery From 942743b025852d62ba4662de83b4eb7a2f09a4e5 Mon Sep 17 00:00:00 2001 From: pandaapo <1052156701@qq.com> Date: Fri, 30 Sep 2022 11:45:25 +0800 Subject: [PATCH 2/2] remove a configuration item --- .../nacos-example/nacos-discovery-example/readme-zh.md | 1 - .../nacos-example/nacos-discovery-example/readme.md | 1 - 2 files changed, 2 deletions(-) diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md index f73343c6fb..5ae9c4aaad 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme-zh.md @@ -201,7 +201,6 @@ Metadata|spring.cloud.nacos.discovery.metadata||使用Map格式配置 接入点|spring.cloud.nacos.discovery.endpoint|UTF-8|地域的某个服务的入口域名,通过此域名可以动态地拿到服务端地址 是否集成Ribbon|ribbon.nacos.enabled|true| 集群|spring.cloud.nacos.discovery.cluster-name|DEFAULT|Nacos集群名称 -是否集成LoadBalancer|spring.cloud.loadbalancer.nacos.enabled|false| 是否开启Nacos Watch|spring.cloud.nacos.discovery.watch.enabled|true|可以设置成false来关闭 watch 是否启用Nacos|spring.cloud.nacos.discovery.enabled|true|默认启动,设置为false时会关闭自动向Nacos注册的功能 diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md index 4baf793eec..28226f2315 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/readme.md @@ -208,7 +208,6 @@ Metadata|spring.cloud.nacos.discovery.metadata||Extended data, Configure using M log name|spring.cloud.nacos.discovery.log-name|| cluster|spring.cloud.nacos.discovery.cluster-name|DEFAULT|Nacos cluster name endpoint|spring.cloud.nacos.discovery.endpoint||The domain name of a service, through which the server address can be dynamically obtained. -Integration LoadBalancer|spring.cloud.loadbalancer.nacos.enabled|false| enable Nacos Watch|spring.cloud.nacos.discovery.watch.enabled|true|Switch it to false to disable nacos watch Integration Ribbon|ribbon.nacos.enabled|true| enabled|spring.cloud.nacos.discovery.enabled|true|The switch to enable or disable nacos service discovery