Merge pull request #1367 from mercyblitz/finchley

Synchronizing samples to Spring Cloud Alibaba finchley branch

spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-consumer-example/src/main/resources/application.yml

@@ -6,6 +6,8 @@ spring:
     name: service-consumer
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         server-addr: 127.0.0.1:8848
 

spring-cloud-alibaba-examples/sentinel-example/sentinel-feign-example/sentinel-feign-provider-example/src/main/resources/application.yml

@@ -6,6 +6,8 @@ spring:
     name: service-provider
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         server-addr: 127.0.0.1:8848
 

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/resources/bootstrap.yaml

@@ -1,6 +1,4 @@
 dubbo:
-  registry:
-    address: spring-cloud://localhost
   cloud:
     subscribed-services: spring-cloud-alibaba-dubbo-server
 
@@ -11,5 +9,7 @@ spring:
     allow-bean-definition-overriding: true
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         server-addr: 127.0.0.1:8848

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/bootstrap.yaml

@@ -30,6 +30,8 @@ spring:
 
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         enabled: true
         register-enabled: true

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml

@@ -27,6 +27,8 @@ spring:
 
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         enabled: true
         register-enabled: true

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/resources/bootstrap.yaml

@@ -27,6 +27,8 @@ spring:
 
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         enabled: true
         register-enabled: true

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/resources/bootstrap.yaml

@@ -4,8 +4,6 @@ dubbo:
   protocol:
     name: dubbo
     port: -1
-  registry:
-    address: spring-cloud://localhost
 
 spring:
   application:
@@ -14,5 +12,7 @@ spring:
     allow-bean-definition-overriding: true
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         server-addr: 127.0.0.1:8848

spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/resources/bootstrap.yaml

@@ -30,6 +30,8 @@ spring:
 
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         enabled: true
         register-enabled: true

spring-cloud-alibaba-examples/spring-cloud-alibaba-sidecar-examples/spring-cloud-alibaba-sidecar-nacos-example/src/main/resources/application.yml

@@ -3,6 +3,8 @@ server:
 spring:
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         server-addr: localhost:8848
     gateway:

spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/test/resources/bootstrap.yaml

@@ -3,6 +3,8 @@ spring:
     name: spring-cloud-alibaba-dubbo
   cloud:
     nacos:
+      username: nacos
+      password: nacos
       discovery:
         server-addr: 127.0.0.1:8848
       config: