Update demo default registry config

jd-opensource · Jan 18, 2025 · b0fc8f5 · b0fc8f5
1 parent aca75d5
commit b0fc8f5
Show file tree

Hide file tree

Showing 37 changed files with 149 additions and 149 deletions.
diff --git a/...o/joylive-demo-dubbo2.7/joylive-demo-dubbo2.7-consumer/src/main/resources/application.yml b/...o/joylive-demo-dubbo2.7/joylive-demo-dubbo2.7-consumer/src/main/resources/application.yml
@@ -39,13 +39,13 @@ dubbo:
     port: -1
   registry:
     id: nacos-registry
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
     group: "live-demo"
     parameters:
       namespace: ${NACOS_NAMESPACE:public}
       registry-type: service
   config-center:
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
   metadata-report:
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 
diff --git a/...o/joylive-demo-dubbo2.7/joylive-demo-dubbo2.7-provider/src/main/resources/application.yml b/...o/joylive-demo-dubbo2.7/joylive-demo-dubbo2.7-provider/src/main/resources/application.yml
@@ -27,15 +27,15 @@ dubbo:
     port: -1
   registry:
     id: nacos-registry
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
     group: "live-demo"
     parameters:
       namespace: ${NACOS_NAMESPACE:public}
       registry-type: service
   config-center:
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
   metadata-report:
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
   metrics:
     protocol: prometheus
     enable-jvm: true

diff --git a/...-demo/joylive-demo-dubbo3/joylive-demo-dubbo3-consumer/src/main/resources/application.yml b/...-demo/joylive-demo-dubbo3/joylive-demo-dubbo3-consumer/src/main/resources/application.yml
@@ -40,12 +40,12 @@ dubbo:
     port: -1
   registry:
     id: nacos-registry
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
     group: "live-demo"
     parameters:
       namespace: ${NACOS_NAMESPACE:public}
   config-center:
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
   metadata-report:
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 
diff --git a/...-demo/joylive-demo-dubbo3/joylive-demo-dubbo3-provider/src/main/resources/application.yml b/...-demo/joylive-demo-dubbo3/joylive-demo-dubbo3-provider/src/main/resources/application.yml
@@ -29,14 +29,14 @@ dubbo:
     port: -1
   registry:
     id: nacos-registry
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
     group: "live-demo"
     parameters:
       namespace: ${NACOS_NAMESPACE:public}
   config-center:
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
   metadata-report:
-    address: nacos://${NACOS_USERNAME}:${NACOS_PASSWORD}@${NACOS_ADDR}
+    address: nacos://${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}:${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}@${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
   metrics:
     protocol: prometheus
     enable-jvm: true

diff --git a/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-consumer/src/main/resources/application.yml b/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-consumer/src/main/resources/application.yml
@@ -7,10 +7,10 @@ spring:
         heart-beat:
           enabled: true
         heart-beat-interval: 5000
-        server-addr: ${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+        server-addr: ${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
         namespace: ${NACOS_NAMESPACE:public}
-        username: ${NACOS_USERNAME:nacos}
-        password: ${NACOS_PASSWORD:nacos}
+        username: ${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+        password: ${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 grpc:
   client:
     grpc-provider:

diff --git a/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-provider/src/main/resources/application.yml b/joylive-demo/joylive-demo-grpc/joylive-demo-grpc-provider/src/main/resources/application.yml
@@ -4,10 +4,10 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+        server-addr: ${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
         namespace: ${NACOS_NAMESPACE:public}
-        username: ${NACOS_USERNAME:nacos}
-        password: ${NACOS_PASSWORD:nacos}
+        username: ${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+        password: ${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 grpc:
   server:
     port: ${GRPC_SERVER_PORT:${random.int[20000,21000]}}

diff --git a/joylive-demo/joylive-demo-rocketmq/src/main/resources/application.properties b/joylive-demo/joylive-demo-rocketmq/src/main/resources/application.properties
@@ -1,13 +1,13 @@
 spring.application.name=service-rocketmq
 server.port=${SERVER_PORT:${random.int[12000,12999]}}
 
-spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR}
+spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 spring.cloud.nacos.discovery.fail-fast=true
-spring.cloud.nacos.username=${NACOS_USERNAME}
-spring.cloud.nacos.password=${NACOS_PASSWORD}
+spring.cloud.nacos.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.cloud.nacos.discovery.namespace=${NACOS_NAMESPACE:public}
-spring.cloud.nacos.discovery.username=${NACOS_USERNAME}
-spring.cloud.nacos.discovery.password=${NACOS_PASSWORD}
+spring.cloud.nacos.discovery.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 
 spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ
 spring.jackson.default-property-inclusion=non_null

diff --git a/...emo/joylive-demo-sofarpc/joylive-demo-sofarpc-consumer/src/main/resources/application.yml b/...emo/joylive-demo-sofarpc/joylive-demo-sofarpc-consumer/src/main/resources/application.yml
@@ -17,7 +17,7 @@ com:
   alipay:
     sofa:
       rpc:
-        registry-address: nacos://${NACOS_ADDR}?username=${NACOS_USERNAME}&password=${NACOS_PASSWORD}&namespace=${NACOS_NAMESPACE}
+        registry-address: nacos://${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}?username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}&password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}&namespace=${NACOS_NAMESPACE}
 logging:
   level:
     com.alipay.sofa.rpc: INFO
diff --git a/...emo/joylive-demo-sofarpc/joylive-demo-sofarpc-provider/src/main/resources/application.yml b/...emo/joylive-demo-sofarpc/joylive-demo-sofarpc-provider/src/main/resources/application.yml
@@ -5,7 +5,7 @@ com:
   alipay:
     sofa:
       rpc:
-        registry-address: nacos://${NACOS_ADDR}?username=${NACOS_USERNAME}&password=${NACOS_PASSWORD}&namespace=${NACOS_NAMESPACE}
+        registry-address: nacos://${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}?username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}&password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}&namespace=${NACOS_NAMESPACE}
         bind-network-interface: en0
 logging:
   level:

diff --git a/...hoxton/joylive-demo-springcloud-hoxton-consumer/src/main/resources/application.properties b/...hoxton/joylive-demo-springcloud-hoxton-consumer/src/main/resources/application.properties
@@ -1,12 +1,12 @@
 spring.application.name=service-consumer
 server.port=${SERVER_PORT:${random.int[10000,10999]}}
-spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 spring.cloud.nacos.discovery.fail-fast=true
-spring.cloud.nacos.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.cloud.nacos.discovery.namespace=${NACOS_NAMESPACE:public}
-spring.cloud.nacos.discovery.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.discovery.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 #spring.cloud.nacos.discovery.ip-type=IPv6
 #spring.cloud.nacos.discovery.ip=::1
 spring.cloud.loadbalancer.cache.ttl=1s

diff --git a/...gcloud-hoxton/joylive-demo-springcloud-hoxton-gateway/src/main/resources/application.yaml b/...gcloud-hoxton/joylive-demo-springcloud-hoxton-gateway/src/main/resources/application.yaml
@@ -76,9 +76,9 @@ spring:
           enabled: true
     nacos:
       discovery:
-        server-addr: ${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
-        username: ${NACOS_USERNAME:nacos}
-        password: ${NACOS_PASSWORD:nacos}
+        server-addr: ${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
+        username: ${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+        password: ${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
         namespace: ${NACOS_NAMESPACE:public}
 
 logging:

diff --git a/...ylive-demo-springcloud-hoxton-provider-reactive/src/main/resources/application.properties b/...ylive-demo-springcloud-hoxton-provider-reactive/src/main/resources/application.properties
@@ -1,16 +1,16 @@
 server.port=${SERVER_PORT:${random.int[11000,11999]}}
 spring.application.name=service-provider-reactive
-spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 spring.cloud.nacos.discovery.enabled=true
 #spring.cloud.nacos.discovery.instance-enabled=true
 #register IPv6
 #spring.cloud.nacos.discovery.ip-type=IPv6
 #spring.cloud.nacos.discovery.ip=::1
-spring.cloud.nacos.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.cloud.nacos.discovery.namespace=${NACOS_NAMESPACE:public}
-spring.cloud.nacos.discovery.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.discovery.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.jackson.serialization.indent_output=true
 spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ
 spring.jackson.default-property-inclusion=non_null

diff --git a/...hoxton/joylive-demo-springcloud-hoxton-provider/src/main/resources/application.properties b/...hoxton/joylive-demo-springcloud-hoxton-provider/src/main/resources/application.properties
@@ -1,16 +1,16 @@
 server.port=${SERVER_PORT:${random.int[11000,11999]}}
 spring.application.name=service-provider
-spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 spring.cloud.nacos.discovery.enabled=true
 #spring.cloud.nacos.discovery.instance-enabled=true
 #register IPv6
 #spring.cloud.nacos.discovery.ip-type=IPv6
 #spring.cloud.nacos.discovery.ip=::1
-spring.cloud.nacos.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.cloud.nacos.discovery.namespace=${NACOS_NAMESPACE:public}
-spring.cloud.nacos.discovery.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.discovery.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.jackson.serialization.indent_output=true
 spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ
 spring.jackson.default-property-inclusion=non_null

diff --git a/...cloud2020/joylive-demo-springcloud2020-consumer/src/main/resources/application.properties b/...cloud2020/joylive-demo-springcloud2020-consumer/src/main/resources/application.properties
@@ -1,12 +1,12 @@
 spring.application.name=service-consumer
 server.port=${SERVER_PORT:${random.int[10000,10999]}}
-spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 spring.cloud.nacos.discovery.fail-fast=true
-spring.cloud.nacos.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.cloud.nacos.discovery.namespace=${NACOS_NAMESPACE:public}
-spring.cloud.nacos.discovery.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.discovery.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 #spring.cloud.nacos.discovery.ip-type=IPv6
 #spring.cloud.nacos.discovery.ip=::1
 spring.cloud.loadbalancer.cache.ttl=1s

diff --git a/...-springcloud2020/joylive-demo-springcloud2020-gateway/src/main/resources/application.yaml b/...-springcloud2020/joylive-demo-springcloud2020-gateway/src/main/resources/application.yaml
@@ -76,9 +76,9 @@ spring:
           enabled: true
     nacos:
       discovery:
-        server-addr: ${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
-        username: ${NACOS_USERNAME:nacos}
-        password: ${NACOS_PASSWORD:nacos}
+        server-addr: ${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
+        username: ${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+        password: ${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
         namespace: ${NACOS_NAMESPACE:public}
 
 logging:

diff --git a/.../joylive-demo-springcloud2020-provider-reactive/src/main/resources/application.properties b/.../joylive-demo-springcloud2020-provider-reactive/src/main/resources/application.properties
@@ -1,16 +1,16 @@
 server.port=${SERVER_PORT:${random.int[11000,11999]}}
 spring.application.name=service-provider-reactive
-spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 spring.cloud.nacos.discovery.enabled=true
 #spring.cloud.nacos.discovery.instance-enabled=true
 #register IPv6
 #spring.cloud.nacos.discovery.ip-type=IPv6
 #spring.cloud.nacos.discovery.ip=::1
-spring.cloud.nacos.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.cloud.nacos.discovery.namespace=${NACOS_NAMESPACE:public}
-spring.cloud.nacos.discovery.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.discovery.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.jackson.serialization.indent_output=true
 spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ
 spring.jackson.default-property-inclusion=non_null

diff --git a/...cloud2020/joylive-demo-springcloud2020-provider/src/main/resources/application.properties b/...cloud2020/joylive-demo-springcloud2020-provider/src/main/resources/application.properties
@@ -1,16 +1,16 @@
 server.port=${SERVER_PORT:${random.int[11000,11999]}}
 spring.application.name=service-provider
-spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 spring.cloud.nacos.discovery.enabled=true
 #spring.cloud.nacos.discovery.instance-enabled=true
 #register IPv6
 #spring.cloud.nacos.discovery.ip-type=IPv6
 #spring.cloud.nacos.discovery.ip=::1
-spring.cloud.nacos.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.cloud.nacos.discovery.namespace=${NACOS_NAMESPACE:public}
-spring.cloud.nacos.discovery.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.discovery.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.jackson.serialization.indent_output=true
 spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ
 spring.jackson.default-property-inclusion=non_null

diff --git a/...cloud2021/joylive-demo-springcloud2021-consumer/src/main/resources/application.properties b/...cloud2021/joylive-demo-springcloud2021-consumer/src/main/resources/application.properties
@@ -1,12 +1,12 @@
 spring.application.name=service-consumer
 server.port=${SERVER_PORT:${random.int[10000,10999]}}
-spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 spring.cloud.nacos.discovery.fail-fast=true
-spring.cloud.nacos.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.cloud.nacos.discovery.namespace=${NACOS_NAMESPACE:public}
-spring.cloud.nacos.discovery.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.discovery.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 #spring.cloud.nacos.discovery.ip-type=IPv6
 #spring.cloud.nacos.discovery.ip=::1
 spring.cloud.loadbalancer.cache.ttl=1s

diff --git a/...-springcloud2021/joylive-demo-springcloud2021-gateway/src/main/resources/application.yaml b/...-springcloud2021/joylive-demo-springcloud2021-gateway/src/main/resources/application.yaml
@@ -76,9 +76,9 @@ spring:
           enabled: true
     nacos:
       discovery:
-        server-addr: ${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
-        username: ${NACOS_USERNAME:nacos}
-        password: ${NACOS_PASSWORD:nacos}
+        server-addr: ${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
+        username: ${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+        password: ${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
         namespace: ${NACOS_NAMESPACE:public}
 
 logging:

diff --git a/...mo-springcloud2021/joylive-demo-springcloud2021-order/src/main/resources/application.yaml b/...mo-springcloud2021/joylive-demo-springcloud2021-order/src/main/resources/application.yaml
@@ -9,13 +9,13 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+        server-addr: ${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
         fail-fast: true
         namespace: ${NACOS_NAMESPACE:public}
-        username: ${NACOS_USERNAME}
-        password: ${NACOS_PASSWORD}
-      username: ${NACOS_USERNAME}
-      password: ${NACOS_PASSWORD}
+        username: ${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+        password: ${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
+      username: ${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+      password: ${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
   cache:
     type: ${CACHE_TYPE:CAFFEINE}
     redis:

diff --git a/.../joylive-demo-springcloud2021-provider-reactive/src/main/resources/application.properties b/.../joylive-demo-springcloud2021-provider-reactive/src/main/resources/application.properties
@@ -1,16 +1,16 @@
 server.port=${SERVER_PORT:${random.int[11000,11999]}}
 spring.application.name=service-provider-reactive
-spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${AP_SD_INTERNAL_ADDRESS}:${AP_SD_INTERNAL_HTTP_PORT}}
+spring.cloud.nacos.discovery.server-addr=${NACOS_ADDR:${REGISTRY_INTERNAL_HOST}:${REGISTRY_INTERNAL_HTTP_PORT}}
 spring.cloud.nacos.discovery.enabled=true
 #spring.cloud.nacos.discovery.instance-enabled=true
 #register IPv6
 #spring.cloud.nacos.discovery.ip-type=IPv6
 #spring.cloud.nacos.discovery.ip=::1
-spring.cloud.nacos.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.cloud.nacos.discovery.namespace=${NACOS_NAMESPACE:public}
-spring.cloud.nacos.discovery.username=${NACOS_USERNAME:nacos}
-spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:nacos}
+spring.cloud.nacos.discovery.username=${NACOS_USERNAME:${REGISTRY_USERNAME:nacos}}
+spring.cloud.nacos.discovery.password=${NACOS_PASSWORD:${REGISTRY_PASSWORD:nacos}}
 spring.jackson.serialization.indent_output=true
 spring.jackson.date-format=yyyy-MM-dd'T'HH:mm:ss.SSSZ
 spring.jackson.default-property-inclusion=non_null