diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 2b2f53701..1809ba7c6 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -10,8 +10,27 @@ on: - greenwich jobs: + check-snapshot: + runs-on: ubuntu-latest + outputs: + IS_SNAPSHOT: ${{ steps.set_output_1.outputs.IS_SNAPSHOT }} + steps: + - name: Checkout codes + uses: actions/checkout@v3 + - name: Check deploy type + id: set_output_1 + run: | + line="$(grep SNAPSHOT pom.xml || true)" + echo $line + if [ -n "$line" ]; then + echo "IS_SNAPSHOT=true" >> $GITHUB_OUTPUT + else + echo "IS_SNAPSHOT=false" >> $GITHUB_OUTPUT + fi snapshot: runs-on: ubuntu-latest + needs: check-snapshot + if: ${{ needs.check-snapshot.outputs.IS_SNAPSHOT == 'true' }} steps: - name: Checkout codes uses: actions/checkout@v3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 22cd228be..eb67ad2ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ # Change Log --- +- [feature: optimize polaris-discovery-example/discovery-callee-service, add client-ip return.](https://github.com/Tencent/spring-cloud-tencent/pull/941) - [feat:support webclient and gateway report call metrics](https://github.com/Tencent/spring-cloud-tencent/pull/942) +- [docs:prevent the release of the final version of the sdk.](https://github.com/Tencent/spring-cloud-tencent/pull/945) diff --git a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/java/com/tencent/cloud/polaris/discovery/service/callee/DiscoveryCalleeController.java b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/java/com/tencent/cloud/polaris/discovery/service/callee/DiscoveryCalleeController.java index 7c4d82171..a15336393 100644 --- a/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/java/com/tencent/cloud/polaris/discovery/service/callee/DiscoveryCalleeController.java +++ b/spring-cloud-tencent-examples/polaris-discovery-example/discovery-callee-service/src/main/java/com/tencent/cloud/polaris/discovery/service/callee/DiscoveryCalleeController.java @@ -35,30 +35,35 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("/discovery/service/callee") public class DiscoveryCalleeController { - private static Logger LOG = LoggerFactory.getLogger(DiscoveryCalleeController.class); + private static final Logger LOG = LoggerFactory.getLogger(DiscoveryCalleeController.class); @Value("${server.port:0}") private int port; + @Value("${spring.cloud.client.ip-address:127.0.0.1}") + private String ip; + /** * Get information of callee. + * * @return information of callee */ @GetMapping("/info") public String info() { - LOG.info("Discovery Service Callee [{}] is called.", port); - return String.format("Discovery Service Callee [%s] is called.", port); + LOG.info("Discovery Service Callee [{}:{}] is called.", ip, port); + return String.format("Discovery Service Callee [%s:%s] is called.", ip, port); } /** * Get sum of two value. + * * @param value1 value 1 * @param value2 value 2 * @return sum */ @GetMapping("/sum") public int sum(@RequestParam int value1, @RequestParam int value2) { - LOG.info("Discovery Service Callee is called and sum is {}.", value1 + value2); + LOG.info("Discovery Service Callee [{}:{}] is called and sum is {}.", ip, port, value1 + value2); return value1 + value2; } }