diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c62e81b..1039307e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,4 +2,5 @@ --- - [feature: support reactive discovery client health indicator.](https://github.com/Tencent/spring-cloud-tencent/pull/988) -- [feature: Enhance default configuration to support `application*.yaml` and `bootstrap*.yaml`.](https://github.com/Tencent/spring-cloud-tencent/pull/988) \ No newline at end of file +- [feature: Enhance default configuration to support `application*.yaml` and `bootstrap*.yaml`.](https://github.com/Tencent/spring-cloud-tencent/pull/988) +- [feat:Remove error log from `DecodeTransferMetadataReactiveFilter`.](https://github.com/Tencent/spring-cloud-tencent/pull/991) diff --git a/README-zh.md b/README-zh.md index 1c0eea03..b02bd928 100644 --- a/README-zh.md +++ b/README-zh.md @@ -21,7 +21,8 @@ README: ## 介绍 -Spring Cloud Tencent 是基于 Spring Cloud SPI 实现的一站式微服务解决方案。通过集成 Spring Cloud 和腾讯中间件，让分布式服务和微服务的开发、测试、发布和运维变得更加简单。 +Spring Cloud Tencent 是基于 Spring Cloud SPI 实现的一站式微服务解决方案。通过集成 Spring Cloud +和腾讯中间件，让分布式服务和微服务的开发、测试、发布和运维变得更加简单。 @@ -31,7 +32,7 @@ Spring Cloud Tencent 集成 Spring Cloud 和北极星。北极星是一个支持 - [北极星 Github](https://github.com/polarismesh/polaris) -Spring Cloud 集成北极星可以解决以下问题： +Spring Cloud 集成北极星可以解决以下问题： - 服务管理：服务发现、服务发现、健康检查 - 流量控制：可自定义的流量路由、负载均衡、限频限流、访问控制 @@ -98,10 +99,10 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库，只需要 北极星为开发者提供体验环境： -- [北极星控制台](http://14.116.241.63:8080) -- 北极星服务端地址：`grpc://183.47.111.80:8091` +- [北极星控制台](http://14.22.2.220:80) +- 北极星服务端地址：`grpc://14.22.2.171:8091` -在 spring-cloud-tencent-example 项目里，北极星服务端地址默认配置为`grpc://183.47.111.80:8091`。 +在 spring-cloud-tencent-example 项目里，北极星服务端地址默认配置为`grpc://14.22.2.171:8091`。 ## 交流群 diff --git a/README.md b/README.md index c856b9ea..e5734c0a 100644 --- a/README.md +++ b/README.md @@ -21,17 +21,19 @@ Visit [Wiki](https://github.com/Tencent/spring-cloud-tencent/wiki) to learn more ## Introduction -Spring Cloud Tencent is an one-stop microservice solution which implements the standard Spring Cloud SPI. It integrates Spring Cloud with Tencent middlewares and makes it easy to develop microservice. +Spring Cloud Tencent is an one-stop microservice solution which implements the standard Spring Cloud SPI. It integrates +Spring Cloud with Tencent middlewares and makes it easy to develop microservice. **Service discovery and governance** -Spring Cloud Tencent integrates Spring Cloud with Polaris which is an open source system for service discovery and governance. +Spring Cloud Tencent integrates Spring Cloud with Polaris which is an open source system for service discovery and +governance. - [Polaris Github](https://github.com/polarismesh/polaris) -Spring Cloud with Polaris can solve these problem: +Spring Cloud with Polaris can solve these problem: - service management: service discovery, service registry and health check - traffic control: customizable routing, load balance, rate limiting and access control @@ -99,10 +101,10 @@ For example: The experience environment of Polaris is provided for developers: -- [Polaris Console](http://14.116.241.63:8080) -- Polaris Server Address: `grpc://183.47.111.80:8091` +- [Polaris Console](http://14.22.2.220:80) +- Polaris Server Address: `grpc://14.22.2.171:8091` -The address of Polaris server in spring-cloud-tencent-example is `grpc://183.47.111.80:8091` by default. +The address of Polaris server in spring-cloud-tencent-example is `grpc://14.22.2.171:8091` by default. ## Chat Group diff --git a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java index 03259a30..3c5617f8 100644 --- a/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java +++ b/spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/DecodeTransferMetadataReactiveFilter.java @@ -81,8 +81,6 @@ public class DecodeTransferMetadataReactiveFilter implements WebFilter, Ordered TransHeadersTransfer.transfer(serverHttpRequest); return webFilterChain.filter(serverWebExchange) - .doOnError(throwable -> LOG.error("handle metadata[{}] error.", - MetadataContextHolder.get(), throwable)) .doFinally((type) -> MetadataContextHolder.remove()); } diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java index 1c9d902f..22a9503f 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisRegistration.java @@ -69,7 +69,7 @@ public class PolarisRegistration implements Registration { private Map metadata; - private String host; + private final String host; private int port; @@ -133,10 +133,6 @@ public class PolarisRegistration implements Registration { return port; } - protected void setPort(int port) { - this.port = port; - } - @Override public boolean isSecure() { return StringUtils.equalsIgnoreCase(polarisDiscoveryProperties.getProtocol(), "https"); diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 275c6aac..493d7b61 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -73,7 +73,7 @@ 1.12.0-2022.0.1-SNAPSHOT - 1.12.0 + 1.12.3 31.1-jre 4.9.0 1.12.19 diff --git a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-backend/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-backend/src/main/resources/bootstrap.yml index b854ea34..b5147b86 100644 --- a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-backend/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-backend/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: MetadataBackendService cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true discovery: diff --git a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/resources/bootstrap.yml index a2f71d74..d91bc62c 100644 --- a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-frontend/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: MetadataFrontendService cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true discovery: diff --git a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-middle/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-middle/src/main/resources/bootstrap.yml index 36dfc070..bd50d755 100644 --- a/spring-cloud-tencent-examples/metadata-transfer-example/metadata-middle/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/metadata-transfer-example/metadata-middle/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: MetadataMiddleService cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true discovery: diff --git a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/src/main/resources/bootstrap.yml index 654ef41a..b2a96d93 100644 --- a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-a/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: NacosCalleeService cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true stat: diff --git a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/src/main/resources/bootstrap.yml index 76c1bc56..c3697c04 100644 --- a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-callee-service-b/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: NacosCalleeService cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true stat: diff --git a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/src/main/resources/bootstrap.yml index 3133ebf4..f549f760 100644 --- a/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/multiple-discovery-example/multiple-discovery-nacos-example/nacos-discovery-caller/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: NacosCallerService cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true loadbalancer: diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-callee-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-callee-service/src/main/resources/bootstrap.yml index 5fa99c25..442c8ef8 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-callee-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-callee-service/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: polaris-circuitbreaker-callee-service cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true stat: diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-callee-service2/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-callee-service2/src/main/resources/bootstrap.yml index 54cb2135..1c1f523c 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-callee-service2/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-callee-service2/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: polaris-circuitbreaker-callee-service cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true stat: diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/resources/bootstrap.yml index 4cc768ed..285bf6b1 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-feign-example/src/main/resources/bootstrap.yml @@ -8,7 +8,7 @@ spring: circuitbreaker: enabled: true polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true loadbalancer: diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-gateway-example/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-gateway-example/src/main/resources/bootstrap.yml index a7bdb3f4..9074c09c 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-gateway-example/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-gateway-example/src/main/resources/bootstrap.yml @@ -16,7 +16,7 @@ spring: feature-env: enabled: true polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true gateway: @@ -36,7 +36,7 @@ spring: name: CircuitBreaker args: # statusCodes 缺省时会自动识别 "5**" 为错误 -# statusCodes: '''404,5**''' + # statusCodes: '''404,5**''' # fallbackUri 缺省时会在熔断触发后拉取 plaris server 配置的降级作为 response fallbackUri: '''forward:/polaris-fallback''' # routes: diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/resources/bootstrap.yml index 720c3df8..fb7d0a30 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-resttemplate-example/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: polaris-circuitbreaker-resttemplate-example cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true loadbalancer: diff --git a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-webclient-example/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-webclient-example/src/main/resources/bootstrap.yml index 7e75556f..e3731cd5 100644 --- a/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-webclient-example/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-circuitbreaker-example/polaris-circuitbreaker-webclient-example/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: polaris-circuitbreaker-webclient-example cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true loadbalancer: diff --git a/spring-cloud-tencent-examples/polaris-config-data-example/src/main/resources/application.yml b/spring-cloud-tencent-examples/polaris-config-data-example/src/main/resources/application.yml index cf786f71..46131032 100644 --- a/spring-cloud-tencent-examples/polaris-config-data-example/src/main/resources/application.yml +++ b/spring-cloud-tencent-examples/polaris-config-data-example/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: name: polaris-config-data-example cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default config: auto-refresh: true # auto refresh when config file changed diff --git a/spring-cloud-tencent-examples/polaris-config-example/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-config-example/src/main/resources/bootstrap.yml index 7ac704ca..a860101d 100644 --- a/spring-cloud-tencent-examples/polaris-config-example/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-config-example/src/main/resources/bootstrap.yml @@ -7,12 +7,12 @@ spring: active: abc cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default config: auto-refresh: true # auto refresh when config file changed -# data-source: local # config data source default is polaris. -# local-file-root-path: # set root path for reading config file, when in local data source + # data-source: local # config data source default is polaris. + # local-file-root-path: # set root path for reading config file, when in local data source groups: - name: ${spring.application.name} # group name files: [ "config/application.properties", "config/bootstrap.yml" ] # config/application.properties takes precedence over config/bootstrap.yml diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml index 87b751a4..084382ba 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/resources/bootstrap.yml +++ b/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://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true discovery: diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml index 2f77154b..8a083771 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/resources/bootstrap.yml @@ -13,7 +13,7 @@ spring: reporter: enabled: true polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true discovery: diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/bootstrap.yml index c6d40440..ae2887d2 100644 --- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service/src/main/resources/bootstrap.yml @@ -10,5 +10,5 @@ spring: content: env: blue polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/bootstrap.yml index a0cf1258..3b76bc9b 100644 --- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-callee-service2/src/main/resources/bootstrap.yml @@ -10,5 +10,5 @@ spring: content: env: green polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default diff --git a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-scg-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-scg-service/src/main/resources/bootstrap.yml index b0890b99..4210b9f9 100644 --- a/spring-cloud-tencent-examples/polaris-gateway-example/gateway-scg-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-gateway-example/gateway-scg-service/src/main/resources/bootstrap.yml @@ -21,7 +21,7 @@ spring: transitive: - a polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true gateway: diff --git a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/bootstrap.yml index c25ab077..e8217cad 100644 --- a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/resources/bootstrap.yml +++ b/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://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true ratelimit: diff --git a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/bootstrap.yml index fdd9f277..63a103a2 100644 --- a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service1/src/main/resources/bootstrap.yml +++ b/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://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true diff --git a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/bootstrap.yml index d4b54a58..82f1d2b9 100644 --- a/spring-cloud-tencent-examples/polaris-router-example/router-callee-service2/src/main/resources/bootstrap.yml +++ b/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://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true diff --git a/spring-cloud-tencent-examples/polaris-router-example/router-caller-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-example/router-caller-service/src/main/resources/bootstrap.yml index 148f3da0..b07f85a2 100644 --- a/spring-cloud-tencent-examples/polaris-router-example/router-caller-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-router-example/router-caller-service/src/main/resources/bootstrap.yml @@ -12,7 +12,7 @@ spring: reporter: enabled: true polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true loadbalancer: diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/README-zh.md b/spring-cloud-tencent-examples/polaris-router-featureenv-example/README-zh.md index 85a17f4f..06360a7e 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/README-zh.md +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/README-zh.md @@ -26,7 +26,7 @@ 应用默认指向北极星官方的体验环境，启动成功后可直接到体验站点查看服务注册数据。 -- 管控台地址： http://14.116.241.63:8080/ +- 管控台地址： http://14.22.2.220:80/ - 账号：polaris - 密码：polaris @@ -84,7 +84,7 @@ featureenv-front-example[feature2] -> featureenv-middle-example[base] -> feature **配置染色规则** -配置地址：http://14.116.241.63:8080/#/filegroup-detail?group=featureenv-gateway&namespace=default +配置地址：http://14.22.2.220:80/#/filegroup-detail?group=featureenv-gateway&namespace=default 修改 rule/staining.json 配置文件，填写以下规则: diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/README.md b/spring-cloud-tencent-examples/polaris-router-featureenv-example/README.md index 8cf15c31..065df9bd 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/README.md +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/README.md @@ -31,7 +31,7 @@ directly. By default, the applications point to the official Polaris experience environment, and you can directly view the service registration data at the experience site after a successful launch. -- Console address: http://14.116.241.63:8080/ +- Console address: http://14.22.2.220:80/ - Account: polaris - Password: polaris @@ -89,7 +89,7 @@ Simulate a real-world scenario, assuming that the client request has a uid reque **Configure coloring rules** -Polaris Configuration Address: http://14.116.241.63:8080/#/filegroup-detail?group=featureenv-gateway&namespace=default +Polaris Configuration Address: http://14.22.2.220:80/#/filegroup-detail?group=featureenv-gateway&namespace=default Modify the `rule/staining.json` configuration file and fill in the following rule: diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-backend/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-backend/src/main/resources/bootstrap.yml index 34267f03..d222b0a5 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-backend/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-backend/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: name: featureenv-backend-example cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true logging: diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-front/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-front/src/main/resources/bootstrap.yml index aab4e3e1..a9b6d925 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-front/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-front/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: name: featureenv-front-example cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true logging: diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-middle/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-middle/src/main/resources/bootstrap.yml index d4a9b931..cdd426b1 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-middle/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/base/base-middle/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: name: featureenv-middle-example cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true logging: diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature1/feature1-backend/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature1/feature1-backend/src/main/resources/bootstrap.yml index 04b3ca3a..4be2df32 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature1/feature1-backend/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature1/feature1-backend/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: name: featureenv-backend-example cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true tencent: diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature1/feature1-middle/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature1/feature1-middle/src/main/resources/bootstrap.yml index 1a46790a..e6ff8256 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature1/feature1-middle/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature1/feature1-middle/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: name: featureenv-middle-example cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true tencent: diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature2/feature2-backend/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature2/feature2-backend/src/main/resources/bootstrap.yml index aece1f3f..24e6fd4b 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature2/feature2-backend/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature2/feature2-backend/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: name: featureenv-backend-example cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true tencent: diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature2/feature2-front/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature2/feature2-front/src/main/resources/bootstrap.yml index 9fdaa2ad..d4c4037f 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature2/feature2-front/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/feature2/feature2-front/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ spring: name: featureenv-front-example cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true tencent: diff --git a/spring-cloud-tencent-examples/polaris-router-featureenv-example/featureenv-gateway/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-featureenv-example/featureenv-gateway/src/main/resources/bootstrap.yml index 6e197255..b1a75903 100644 --- a/spring-cloud-tencent-examples/polaris-router-featureenv-example/featureenv-gateway/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/polaris-router-featureenv-example/featureenv-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ spring: cloud: tencent: plugin: - scg: + scg: staining: enabled: true rule-staining: @@ -16,7 +16,7 @@ spring: feature-env: enabled: true polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true gateway: diff --git a/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-backend/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-backend/src/main/resources/bootstrap.yml index a6715a57..ad080d60 100644 --- a/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-backend/src/main/resources/bootstrap.yml +++ b/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: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true logging: diff --git a/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-frontend/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-frontend/src/main/resources/bootstrap.yml index cb7232d1..4b534f1a 100644 --- a/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-frontend/src/main/resources/bootstrap.yml +++ b/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: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true logging: diff --git a/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-gateway/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-gateway/src/main/resources/bootstrap.yml index 44041c26..66e6e35a 100644 --- a/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-gateway/src/main/resources/bootstrap.yml +++ b/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: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true logging: diff --git a/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-middle/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-middle/src/main/resources/bootstrap.yml index 9638411e..8cdad3c2 100644 --- a/spring-cloud-tencent-examples/polaris-router-grayrelease-example/router-grayrelease-middle/src/main/resources/bootstrap.yml +++ b/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: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true logging: diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/bootstrap.yml index 2f1bd923..d8e97040 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-a/src/main/resources/bootstrap.yml @@ -5,14 +5,14 @@ spring: name: QuickstartCalleeService cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true discovery: enabled: true register: true config: - address: grpc://183.47.111.80:8093 + address: grpc://14.22.2.171:8093 auto-refresh: true groups: - name: ${spring.application.name} diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/resources/bootstrap.yml index 60442040..006f452f 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-callee-service-b/src/main/resources/bootstrap.yml @@ -5,14 +5,14 @@ spring: name: QuickstartCalleeService cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true discovery: enabled: true register: true config: - address: grpc://183.47.111.80:8093 + address: grpc://14.22.2.171:8093 auto-refresh: true groups: - name: ${spring.application.name} diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-caller-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/quickstart-example/quickstart-caller-service/src/main/resources/bootstrap.yml index 33425c08..f2dbe45b 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-caller-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-caller-service/src/main/resources/bootstrap.yml @@ -5,7 +5,7 @@ spring: name: QuickstartCallerService cloud: polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true discovery: diff --git a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/bootstrap.yml b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/bootstrap.yml index fa49aa66..7506c289 100644 --- a/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/bootstrap.yml +++ b/spring-cloud-tencent-examples/quickstart-example/quickstart-gateway-service/src/main/resources/bootstrap.yml @@ -15,7 +15,7 @@ spring: feature-env: enabled: true polaris: - address: grpc://183.47.111.80:8091 + address: grpc://14.22.2.171:8091 namespace: default enabled: true gateway: diff --git a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisContextGetHostTest.java b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisContextGetHostTest.java index 88b73064..c9b9258c 100644 --- a/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisContextGetHostTest.java +++ b/spring-cloud-tencent-polaris-context/src/test/java/com/tencent/cloud/polaris/context/PolarisContextGetHostTest.java @@ -58,5 +58,6 @@ public class PolarisContextGetHostTest { assertThat(polarisContextProperties.getEnabled()).isTrue(); assertThat(polarisContextProperties.getNamespace()).isEqualTo("dev"); assertThat(polarisContextProperties.getService()).isEqualTo("TestApp"); + assertThat(polarisContextProperties.getLocalPort()).isEqualTo(9090); } } diff --git a/spring-cloud-tencent-polaris-context/src/test/resources/bootstrap.yml b/spring-cloud-tencent-polaris-context/src/test/resources/bootstrap.yml index c8ae7ede..c445dd22 100644 --- a/spring-cloud-tencent-polaris-context/src/test/resources/bootstrap.yml +++ b/spring-cloud-tencent-polaris-context/src/test/resources/bootstrap.yml @@ -6,3 +6,4 @@ spring: namespace: dev service: TestApp enabled: true + local-port: 9090