Merge branch '2021.0' into optimize/optimize-config

.github/workflows/codecov.yml

@@ -1,34 +0,0 @@
-name: Codecov
-
-on:
-  push:
-    branches:
-      - hoxton
-      - 2021.0
-      - 2020.0
-      - greenwich
-  pull_request:
-    branches:
-      - hoxton
-      - 2021.0
-      - 2020.0
-      - greenwich
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout codes
-        uses: actions/checkout@v3
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: 8
-      - name: Test with Maven
-        run: mvn -B test --file pom.xml
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
-        with:
-          file: ${{ github.workspace }}/target/site/jacoco/jacoco.xml

CHANGELOG.md

@@ -1,3 +1,4 @@
 # Change Log
 ---
+
 - [Optimize:optimize SpringValueProcessor.](https://github.com/Tencent/spring-cloud-tencent/pull/655)

README-zh.md

@@ -53,7 +53,7 @@ Tencent，可直接一键运行任何 example。
 
 ## 管控台
 
-<img width="1792" alt="image" src="https://user-images.githubusercontent.com/4991116/163402268-48493802-4555-4b93-8e31-011410f2166b.png">
+<img width="1727" alt="sc" src="https://user-images.githubusercontent.com/4991116/197529819-78b20ba8-0e60-450c-a8e3-0c2bf04caa15.png">
 
 ## 使用指南
 
@@ -62,7 +62,8 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库，只需要
 > 注意：
 >
 > 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)
+>
+的版本列表可以查看 [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)
 > 。
 
 例如：
@@ -75,7 +76,7 @@ Spring Cloud Tencent 所有组件都已上传到 Maven 中央仓库，只需要
             <groupId>com.tencent.cloud</groupId>
             <artifactId>spring-cloud-tencent-dependencies</artifactId>
             <!--version number-->
-            <version>1.8.0-2021.0.3</version>
+            <version>1.8.1-2021.0.3</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

README.md

@@ -51,7 +51,7 @@ directly with one click.
 
 ## Screenshots
 
-<img width="1792" alt="image" src="https://user-images.githubusercontent.com/4991116/163402268-48493802-4555-4b93-8e31-011410f2166b.png">
+<img width="1727" alt="sc" src="https://user-images.githubusercontent.com/4991116/197529819-78b20ba8-0e60-450c-a8e3-0c2bf04caa15.png">
 
 ## Use Guide
 
@@ -61,7 +61,8 @@ dependencies.
 > Notice:
 >
 > 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)
+>
+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)
 > .
 
 For example:
@@ -74,7 +75,7 @@ For example:
             <groupId>com.tencent.cloud</groupId>
             <artifactId>spring-cloud-tencent-dependencies</artifactId>
             <!--version number-->
-            <version>1.8.0-2021.0.3</version>
+            <version>1.8.1-2021.0.3</version>
             <type>pom</type>
             <scope>import</scope>
         </dependency>

changes/changes-1.8.1.md

@@ -0,0 +1,4 @@
+# Change Log
+---
+
+- [fix:fix transfer http headers not working bug.](https://github.com/Tencent/spring-cloud-tencent/pull/664)

spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataFeignInterceptor.java

@@ -60,7 +60,7 @@ public class EncodeTransferMedataFeignInterceptor implements RequestInterceptor,
 		MetadataContext metadataContext = MetadataContextHolder.get();
 		Map<String, String> customMetadata = metadataContext.getCustomMetadata();
 		Map<String, String> disposableMetadata = metadataContext.getDisposableMetadata();
-		Map<String, String> transHeaders = metadataContext.getTransHeaders();
+		Map<String, String> transHeaders = metadataContext.getTransHeadersKV();
 
 		this.buildMetadataHeader(requestTemplate, disposableMetadata, CUSTOM_DISPOSABLE_METADATA);
 

spring-cloud-starter-tencent-metadata-transfer/src/main/java/com/tencent/cloud/metadata/core/EncodeTransferMedataRestTemplateInterceptor.java

@@ -60,7 +60,7 @@ public class EncodeTransferMedataRestTemplateInterceptor implements ClientHttpRe
 		MetadataContext metadataContext = MetadataContextHolder.get();
 		Map<String, String> customMetadata = metadataContext.getCustomMetadata();
 		Map<String, String> disposableMetadata = metadataContext.getDisposableMetadata();
-		Map<String, String> transHeaders = metadataContext.getTransHeaders();
+		Map<String, String> transHeaders = metadataContext.getTransHeadersKV();
 
 		// build custom disposable metadata request header
 		this.buildMetadataHeader(httpRequest, disposableMetadata, CUSTOM_DISPOSABLE_METADATA);

spring-cloud-tencent-examples/polaris-gateway-example/gateway-scg-service/pom.xml

@@ -34,6 +34,11 @@
 			<artifactId>spring-cloud-tencent-gateway-plugin</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>com.tencent.cloud</groupId>
+			<artifactId>spring-cloud-starter-tencent-metadata-transfer</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>com.tencent.cloud</groupId>
 			<artifactId>spring-cloud-tencent-featureenv-plugin</artifactId>