diff --git a/.github/workflows/junit.yml b/.github/workflows/junit.yml index 34bb4153f..59c2a323a 100644 --- a/.github/workflows/junit.yml +++ b/.github/workflows/junit.yml @@ -10,6 +10,7 @@ on: - 2020 - hoxton - greenwich + - release/* pull_request: branches: - 2024 @@ -19,6 +20,7 @@ on: - 2020 - hoxton - greenwich + - release/* jobs: set-jdks: diff --git a/.github/workflows/license-checker.yml b/.github/workflows/license-checker.yml index 524788527..9ecb84425 100644 --- a/.github/workflows/license-checker.yml +++ b/.github/workflows/license-checker.yml @@ -10,6 +10,7 @@ on: - 2020 - hoxton - greenwich + - release/* pull_request: branches: - 2024 @@ -19,6 +20,7 @@ on: - 2020 - hoxton - greenwich + - release/* jobs: check-license: runs-on: ubuntu-latest diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 70b426b15..ec0a94033 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -10,6 +10,7 @@ on: - 2020 - hoxton - greenwich + - release/* jobs: check-snapshot: diff --git a/pom.xml b/pom.xml index 41bb7f1af..61492eeba 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ - 2.0.1.0-2023.0.3-SNAPSHOT + 2.0.1.0-2023.0.3 6.1.14 diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index 123b354be..5d942cfba 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -71,10 +71,10 @@ - 2.0.1.0-2023.0.3-SNAPSHOT + 2.0.1.0-2023.0.3 - 2.0.1.0-SNAPSHOT + 2.0.1.0 2.2.0 diff --git a/spring-cloud-tencent-examples/tsf-example/consumer-demo/src/main/java/com/tencent/cloud/tsf/demo/consumer/proxy/ProviderDemoService.java b/spring-cloud-tencent-examples/tsf-example/consumer-demo/src/main/java/com/tencent/cloud/tsf/demo/consumer/proxy/ProviderDemoService.java index a9c5b5907..adce6af05 100644 --- a/spring-cloud-tencent-examples/tsf-example/consumer-demo/src/main/java/com/tencent/cloud/tsf/demo/consumer/proxy/ProviderDemoService.java +++ b/spring-cloud-tencent-examples/tsf-example/consumer-demo/src/main/java/com/tencent/cloud/tsf/demo/consumer/proxy/ProviderDemoService.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -@FeignClient(name = "provider-demo") +@FeignClient(name = "${provider.name:provider-demo}") public interface ProviderDemoService { @RequestMapping(value = "/echo/{str}", method = RequestMethod.GET) String echo(@PathVariable("str") String str);