Skip to content

Commit

Permalink
feat:begin sc 2024.
Browse files Browse the repository at this point in the history
  • Loading branch information
SkyeBeFreeman committed Dec 18, 2024
1 parent a5dc460 commit b791225
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 74 deletions.
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ closes #

## Checklist (Optional)

- [ ] Will pull request to branch of 2024.
- [ ] Will pull request to branch of 2023.
- [ ] Will pull request to branch of 2022.
- [ ] Will pull request to branch of 2021.
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Codecov
on:
push:
branches:
- 2024
- 2023
- 2022
- 2021
Expand All @@ -11,6 +12,7 @@ on:
- greenwich
pull_request:
branches:
- 2024
- 2023
- 2022
- 2021
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/junit_test17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ name: Test with Junit (JDK17)
on:
push:
branches:
- 2024
- 2023
- 2022
pull_request:
branches:
- 2024
- 2023
- 2022

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/license-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: License checker
on:
push:
branches:
- 2024
- 2023
- 2022
- 2021
Expand All @@ -11,6 +12,7 @@ on:
- greenwich
pull_request:
branches:
- 2024
- 2023
- 2022
- 2021
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Snapshot
on:
push:
branches:
- 2024
- 2023
- 2022
- 2021
Expand Down
43 changes: 0 additions & 43 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,46 +1,3 @@
# Change Log
---

- [fix: fix RouterLabelRestTemplateInterceptor add response headers exception with httpclient5.](https://github.com/Tencent/spring-cloud-tencent/pull/1239)
- [feat: support lossless online and offline](https://github.com/Tencent/spring-cloud-tencent/pull/1254)
- [feat: support lane router](https://github.com/Tencent/spring-cloud-tencent/pull/1256)
- [feat: add lane router examples](https://github.com/Tencent/spring-cloud-tencent/pull/1260)
- [feat:upgrade jackson version.](https://github.com/Tencent/spring-cloud-tencent/pull/1262)
- [fix: fix the lossless provider override in multiple registries scenario](https://github.com/Tencent/spring-cloud-tencent/pull/1263)
- [refactor:let the configuration SDK context stand alone.](https://github.com/Tencent/spring-cloud-tencent/pull/1266)
- [fix:fix nearby router properties loading bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1272)
- [fix: fix grammar issues for lane router example & optimize the gateway dependency](https://github.com/Tencent/spring-cloud-tencent/pull/1274)
- [fix: fix lossless deregister failed when no healthcheck configured](https://github.com/Tencent/spring-cloud-tencent/pull/1279)
- [fix:fix ApplicationContextAwareUtils NPE bug.](https://github.com/Tencent/spring-cloud-tencent/pull/1297)
- [feat:upgrade jacoco version.](https://github.com/Tencent/spring-cloud-tencent/pull/1310)
- [fix:fix no registry when lossless is disabled.](https://github.com/Tencent/spring-cloud-tencent/pull/1312)
- [fix:fix the ratelimit bug for 2023](https://github.com/Tencent/spring-cloud-tencent/pull/1316)
- [fix:update spring boot version](https://github.com/Tencent/spring-cloud-tencent/pull/1333)
- [feat:add scg-mvc example](https://github.com/Tencent/spring-cloud-tencent/pull/1367)
- [feat:add zero protection.](https://github.com/Tencent/spring-cloud-tencent/pull/1408)
- [feat:add Tencent Cloud TSF support.](https://github.com/Tencent/spring-cloud-tencent/pull/1409)
- [feat:support consul config.](https://github.com/Tencent/spring-cloud-tencent/pull/1410)
- [feat:add trace report support.](https://github.com/Tencent/spring-cloud-tencent/pull/1411)
- [fix: fix lossless test case unstable issues.](https://github.com/Tencent/spring-cloud-tencent/pull/1412)
- [feat:support consul service update task.](https://github.com/Tencent/spring-cloud-tencent/pull/1413)
- [fix:fix app starting failed when user using custom OpenAPI bean.](https://github.com/Tencent/spring-cloud-tencent/pull/1414)
- [fix: move ConditionalOnTsfEnabled to spring-cloud-tencent-commons and fix PolarisInetUtilsAutoConfiguration.](https://github.com/Tencent/spring-cloud-tencent/pull/1415)
- [fix: memory cost too many when using wildcard feign calls](https://github.com/Tencent/spring-cloud-tencent/pull/1416)
- [feat:support consul config data. ](https://github.com/Tencent/spring-cloud-tencent/pull/1417)
- [feat: support otel trace](https://github.com/Tencent/spring-cloud-tencent/pull/1419)
- [feat:support TSF router.](https://github.com/Tencent/spring-cloud-tencent/pull/1420)
- [feat:upgrade nearby router and add namespace nearby router.](https://github.com/Tencent/spring-cloud-tencent/pull/1421)
- [fix:fix contract reporting bug when using TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1422)
- [fix: fix TSF context bootstrap configuration](https://github.com/Tencent/spring-cloud-tencent/pull/1424)
- [fix: fix PolarisCircuitBreakerConfiguration not clear when gateway invoke by wildcard apis](https://github.com/Tencent/spring-cloud-tencent/pull/1426)
- [fix:fix actuator name warning from #1428 .](https://github.com/Tencent/spring-cloud-tencent/pull/1431)
- [feat:upgrade api circuit breaker.](https://github.com/Tencent/spring-cloud-tencent/pull/1442)
- [feat: support lossless config from console & support warmup.](https://github.com/Tencent/spring-cloud-tencent/pull/1445)
- [feat:add admin http handler.](https://github.com/Tencent/spring-cloud-tencent/pull/1450)
- [feat:upgrade spring cloud 2023 version.](https://github.com/Tencent/spring-cloud-tencent/pull/1451)
- [feat:support concurrency rate limit.](https://github.com/Tencent/spring-cloud-tencent/pull/1455)
- [feat:support auth.](https://github.com/Tencent/spring-cloud-tencent/pull/1479)
- [feat:upgrade trace plugin.](https://github.com/Tencent/spring-cloud-tencent/pull/1480)
- [feat:support smooth upgrade from tsf.](https://github.com/Tencent/spring-cloud-tencent/pull/1482)
- [fix:fix caller disposable metadata handle when using tracing.](https://github.com/Tencent/spring-cloud-tencent/pull/1483)
- [refactor:update registry status.](https://github.com/Tencent/spring-cloud-tencent/pull/1484)
3 changes: 0 additions & 3 deletions README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ Spring Cloud 集成北极星可以解决以下问题:
Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库,只需要引入依赖即可。

> 注意:
>
> 支持Spring Cloud 版本:2023、2022、2021、2020、Hoxton。
>
> Spring Cloud Tencent
> 的版本列表可以查看
> [Spring Cloud Tencent 版本管理](https://github.com/Tencent/spring-cloud-tencent/wiki/Spring-Cloud-Tencent-%E7%89%88%E6%9C%AC%E7%AE%A1%E7%90%86)
Expand Down
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,6 @@ All the components of Spring Cloud Tencent have been uploaded to the Maven centr
dependencies.

> Notice:
>
> Support Spring Cloud 2023, 2022, 2021, 2020, Hoxton.
>
> The version list of Spring Cloud Tencent can be found
> in
> [Spring Cloud Tencent Version Management](https://github.com/Tencent/spring-cloud-tencent/wiki/Spring-Cloud-Tencent-%E7%89%88%E6%9C%AC%E7%AE%A1%E7%90%86)
Expand Down
4 changes: 0 additions & 4 deletions changes/changes-1.13.0.md

This file was deleted.

4 changes: 0 additions & 4 deletions changes/changes-1.13.1.md

This file was deleted.

14 changes: 7 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-build</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -16,7 +16,7 @@
<version>${revision}</version>
<name>Spring Cloud Tencent</name>
<description>Spring Cloud Tencent</description>
<url>https://github.com/Tencent/spring-cloud-tencent/tree/2023</url>
<url>https://github.com/Tencent/spring-cloud-tencent/tree/2024</url>

<organization>
<name>Tencent</name>
Expand All @@ -26,7 +26,7 @@
<licenses>
<license>
<name>The BSD 3-Clause License (BSD3)</name>
<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2023/LICENSE</url>
<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2024/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down Expand Up @@ -90,16 +90,16 @@

<properties>
<!-- Project revision -->
<revision>2.0.0.0-2023.0.3-SNAPSHOT</revision>
<revision>2.0.0.0-2024.0.0-SNAPSHOT</revision>

<!-- Spring Framework -->
<spring.framework.version>6.1.14</spring.framework.version>
<spring.framework.version>6.2.1</spring.framework.version>

<!-- Spring Boot -->
<spring.boot.version>3.3.5</spring.boot.version>
<spring.boot.version>3.4.0</spring.boot.version>

<!-- Spring Cloud -->
<spring.cloud.version>2023.0.3</spring.cloud.version>
<spring.cloud.version>2024.0.0</spring.cloud.version>

<!-- Maven Plugin Versions -->
<jacoco.version>0.8.12</jacoco.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@

import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.client.AbstractClientHttpResponse;
import org.springframework.http.HttpStatusCode;
import org.springframework.http.client.ClientHttpResponse;

/**
* PolarisCircuitBreakerHttpResponse.
*
* @author sean yu
*/
public class PolarisCircuitBreakerHttpResponse extends AbstractClientHttpResponse {
public class PolarisCircuitBreakerHttpResponse implements ClientHttpResponse {

private final CircuitBreakerStatus.FallbackInfo fallbackInfo;

Expand Down Expand Up @@ -64,13 +65,13 @@ public PolarisCircuitBreakerHttpResponse(int code, Map<String, String> headers,
}

@Override
public final int getRawStatusCode() {
return fallbackInfo.getCode();
public HttpStatusCode getStatusCode() {
return HttpStatus.valueOf(fallbackInfo.getCode());
}

@Override
public final String getStatusText() {
HttpStatus status = HttpStatus.resolve(getRawStatusCode());
HttpStatus status = HttpStatus.resolve(getStatusCode().value());
return (status != null ? status.getReasonPhrase() : "");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
package com.tencent.cloud.polaris.router.instrument.resttemplate;

import java.net.URI;
import java.util.HashMap;
import java.util.Map;

import com.tencent.cloud.common.constant.OrderConstant;
import com.tencent.cloud.common.metadata.MetadataContextHolder;
Expand Down Expand Up @@ -110,6 +112,11 @@ public URI getURI() {
return uri;
}

@Override
public Map<String, Object> getAttributes() {
return new HashMap<>();
}

@Override
public HttpHeaders getHeaders() {
return httpHeaders;
Expand Down
10 changes: 5 additions & 5 deletions spring-cloud-tencent-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<version>4.1.3</version>
<version>4.2.0</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand All @@ -16,7 +16,7 @@
<packaging>pom</packaging>
<name>Spring Cloud Tencent Dependencies</name>
<description>Spring Cloud Tencent Dependencies</description>
<url>https://github.com/Tencent/spring-cloud-tencent/tree/2023</url>
<url>https://github.com/Tencent/spring-cloud-tencent/tree/2024</url>

<organization>
<name>Tencent</name>
Expand All @@ -26,7 +26,7 @@
<licenses>
<license>
<name>The BSD 3-Clause License (BSD3)</name>
<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2023/LICENSE</url>
<url>https://raw.githubusercontent.com/Tencent/spring-cloud-tencent/2024/LICENSE</url>
<distribution>repo</distribution>
</license>
</licenses>
Expand Down Expand Up @@ -71,10 +71,10 @@

<properties>
<!-- Project revision -->
<revision>2.0.0.0-2023.0.3-SNAPSHOT</revision>
<revision>2.0.0.0-2024.0.0-SNAPSHOT</revision>

<!-- Polaris SDK version -->
<polaris.version>2.0.0.0-SNAPSHOT</polaris.version>
<polaris.version>2.0.0.0</polaris.version>

<!-- Dependencies -->
<guava.version>32.0.1-jre</guava.version>
Expand Down

0 comments on commit b791225

Please sign in to comment.