Merge branch 'Tencent:hoxton' into hoxton

CHANGELOG.md

@@ -24,3 +24,5 @@
 - fix:add deregister judgment.
 - feat:added ribbon lb polaris weighted round robin rule.
 - fix:fix feign report -1 port bug.
+- fix:upgrade spring version.
+- fix:Update README-zh.md

README-zh.md

@@ -34,7 +34,7 @@ Spring Cloud Tencent 集成 Spring Cloud 和北极星。北极星是一个支持
 
 Spring Cloud 集成北极星可以解决以下问题：
 
-- 服务管理：服务发现、服务发现、健康检查
+- 服务管理：服务发现、服务注册、健康检查
 - 流量控制：可自定义的流量路由、负载均衡、限频限流、访问控制
 - 故障容错：服务和接口熔断和降级、实例熔断和切换
 - 配置管理：版本管理、灰度发布、动态更新

pom.xml

@@ -92,7 +92,7 @@
 		<revision>1.12.0-Hoxton.SR12-SNAPSHOT</revision>
 
 		<!-- Spring Framework -->
-		<spring.framework.version>5.2.22.RELEASE</spring.framework.version>
+		<spring.framework.version>5.2.25.RELEASE</spring.framework.version>
 
 		<!-- Spring Boot -->
 		<spring.boot.version>2.3.12.RELEASE</spring.boot.version>

spring-cloud-tencent-examples/polaris-router-featureenv-example/README-zh.md

@@ -26,7 +26,7 @@
 
 应用默认指向北极星官方的体验环境，启动成功后可直接到体验站点查看服务注册数据。
 
-- 管控台地址： http://14.116.241.63:8080/
+- 管控台地址： http://119.91.66.223:8080/
     - 账号：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://119.91.66.223:8080/#/filegroup-detail?group=featureenv-gateway&namespace=default
 
 修改 rule/staining.json 配置文件，填写以下规则:
 

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://119.91.66.223:8080/
     - 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://119.91.66.223:8080/#/filegroup-detail?group=featureenv-gateway&namespace=default
 
 Modify the `rule/staining.json` configuration file and fill in the following rule: