Merge branch 'main' of github.com:Tencent/spring-cloud-tencent

 Conflicts:

	CHANGELOG.md

CHANGELOG.md

@@ -12,3 +12,4 @@
 - [feat:add rate limit of unirate.](https://github.com/Tencent/spring-cloud-tencent/pull/197)
 - [test:add junit test to polaris-circuitbreaker.](https://github.com/Tencent/spring-cloud-tencent/pull/202)
 - [test:add junit test to polaris-discovery.](https://github.com/Tencent/spring-cloud-tencent/pull/205)
+- [Example:set example polaris address to demo environment.](https://github.com/Tencent/spring-cloud-tencent/pull/206)

README-zh.md

@@ -36,6 +36,14 @@ Spring Cloud Tencent提供的能力包括但不限于：
    - ...
 - 标签透传
 
+## 体验环境
+
+- 管控台地址： http://14.116.241.63:8080/
+  - 账号：polaris
+  - 密码：polaris 
+- 控制面地址： grpc://183.47.111.80:8091
+- 
+  `spring-cloud-tencent-example` 下 example 地址都默认指向了体验服务地址（grpc://183.47.111.80:8091），如果您只是体验 Spring Cloud Tencent，可直接一键运行任何 example。
 ## 管控台
 
 <img width="1792" alt="image" src="https://user-images.githubusercontent.com/4991116/163402268-48493802-4555-4b93-8e31-011410f2166b.png">

README.md

@@ -34,6 +34,16 @@ The capabilities provided by Spring Cloud Tencent include but are not limited to
   - ...
 - Label transparent transmission
 
+## Demo Environment
+
+- Console Address : http://14.116.241.63:8080/
+  - Username: polaris
+  - Password: polaris 
+- Server Address: grpc://183.47.111.80:8091 
+
+The example addresses under `spring-cloud-tencent-example` all point to the experience service address (grpc://183.47.111.80:8091) by default. 
+If you only experience Spring Cloud Tencent, you can run any example directly with one click.  
+
 ## Screenshots
 
 <img width="1792" alt="image" src="https://user-images.githubusercontent.com/4991116/163402268-48493802-4555-4b93-8e31-011410f2166b.png">

spring-cloud-tencent-examples/metadata-transfer-example/metadata-callee-service/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: MetadataCalleeService
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       discovery:

spring-cloud-tencent-examples/metadata-transfer-example/metadata-caller-service/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: MetadataCallerService
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       discovery:

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-a/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: polaris-circuitbreaker-example-a
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       circuitbreaker:

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-b/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: polaris-circuitbreaker-example-b
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
 is-throw-runtime-exception: false

spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-example-b2/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: polaris-circuitbreaker-example-b
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
 is-throw-runtime-exception: true

spring-cloud-tencent-examples/polaris-config-example/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: polaris-config-example
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       config:
         auto-refresh: true # auto refresh when config file changed

spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: DiscoveryCalleeService
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       discovery:

spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
     name: DiscoveryCallerService
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       discovery:

spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/bootstrap.yml

@@ -6,5 +6,5 @@ spring:
     name: GatewayCalleeService
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default

spring-cloud-tencent-examples/polaris-gateway-example/gateway-scg-service/src/main/resources/bootstrap.yml

@@ -12,7 +12,7 @@ spring:
         transitive:
           - a
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       discovery:

spring-cloud-tencent-examples/polaris-gateway-example/gateway-zuul-service/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
     name: GatewayZuulService
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
     tencent:
       metadata:

spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/bootstrap.yml

@@ -5,7 +5,7 @@ spring:
     name: RateLimitCalleeService
   cloud:
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       ratelimit:

spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/bootstrap.yml

@@ -9,6 +9,6 @@ spring:
         content:
           label1: value1
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true

spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/bootstrap.yml

@@ -9,6 +9,6 @@ spring:
         content:
           label1: value2
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true

spring-cloud-tencent-examples/polaris-router-example/router-caller-service/src/main/resources/bootstrap.yml

@@ -9,7 +9,7 @@ spring:
         content:
           k1: v1
     polaris:
-      address: grpc://127.0.0.1:8091
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       loadbalancer:

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-backend/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
     name: gray-release-back
   cloud:
     polaris:
-      address: ${polaris_address}
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       discovery:

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-backend/src/main/resources/polaris.yml

@@ -1,6 +0,0 @@
-global:
-  statReporter:
-    enable: true
-    plugin:
-      prometheus:
-        pushgatewayAddress: ${prometheus_address}

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-frontend/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
     name: gray-release-front
   cloud:
     polaris:
-      address: ${polaris_address}
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       discovery:

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-frontend/src/main/resources/polaris.yml

@@ -1,6 +0,0 @@
-global:
-  statReporter:
-    enable: true
-    plugin:
-      prometheus:
-        pushgatewayAddress: ${prometheus_address}

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-gateway/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
     name: gray-release-gateway
   cloud:
     polaris:
-      address: ${polaris_address}
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       discovery:

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-gateway/src/main/resources/polaris.yml

@@ -1,6 +0,0 @@
-global:
-  statReporter:
-    enable: true
-    plugin:
-      prometheus:
-        pushgatewayAddress: ${prometheus_address}

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-middle/src/main/resources/bootstrap.yml

@@ -6,7 +6,7 @@ spring:
     name: gray-release-middle
   cloud:
     polaris:
-      address: ${polaris_address}
+      address: grpc://183.47.111.80:8091
       namespace: default
       enabled: true
       discovery:

spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-middle/src/main/resources/polaris.yml

@@ -1,6 +0,0 @@
-global:
-  statReporter:
-    enable: true
-    plugin:
-      prometheus:
-        pushgatewayAddress: ${prometheus_address}