From 35567d57aacea1a7987bf220e84e5e4cfef82750 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Wed, 6 Jul 2022 16:57:49 +0800 Subject: [PATCH] release:release 1.6.0-Hoxton.SR12. (#398) --- CHANGELOG.md | 1 + pom.xml | 2 +- spring-cloud-tencent-dependencies/pom.xml | 4 +- .../service/callee/BusinessController.java | 46 +++++++++++-------- 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7075f87f..819415784 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,5 +37,6 @@ - [UT: add Polaris LoadBalancer unit test](https://github.com/Tencent/spring-cloud-tencent/pull/373) - [docs:update docs](https://github.com/Tencent/spring-cloud-tencent/pull/378) - [docs:optimize example](https://github.com/Tencent/spring-cloud-tencent/pull/385) +- [Optimize starters auto-configuration. (main)](https://github.com/Tencent/spring-cloud-tencent/pull/391/files) - [Feature: format code](https://github.com/Tencent/spring-cloud-tencent/pull/394) - [test: add PostInitPolarisSDKContextTest](https://github.com/Tencent/spring-cloud-tencent/pull/397) diff --git a/pom.xml b/pom.xml index 6e726b7b8..945ba7d21 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ - 1.6.0-Hoxton.SR12-SNAPSHOT + 1.6.0-Hoxton.SR12 Hoxton.SR12 diff --git a/spring-cloud-tencent-dependencies/pom.xml b/spring-cloud-tencent-dependencies/pom.xml index bd1ae87f7..3bd689656 100644 --- a/spring-cloud-tencent-dependencies/pom.xml +++ b/spring-cloud-tencent-dependencies/pom.xml @@ -70,8 +70,8 @@ - 1.6.0-Hoxton.SR12-SNAPSHOT - 1.7.0-SNAPSHOT + 1.6.0-Hoxton.SR12 + 1.7.0 1.2.11 4.5.1 1.12.10 diff --git a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/BusinessController.java b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/BusinessController.java index 05e18a191..258f76454 100644 --- a/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/BusinessController.java +++ b/spring-cloud-tencent-examples/polaris-ratelimit-example/ratelimit-callee-service/src/main/java/com/tencent/cloud/ratelimit/example/service/callee/BusinessController.java @@ -17,6 +17,7 @@ package com.tencent.cloud.ratelimit.example.service.callee; +import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -45,17 +46,15 @@ public class BusinessController { private static final Logger LOG = LoggerFactory.getLogger(BusinessController.class); private final AtomicInteger index = new AtomicInteger(0); - + private final AtomicLong lastTimestamp = new AtomicLong(0); @Autowired private RestTemplate restTemplate; - @Value("${spring.application.name}") private String appName; - private AtomicLong lastTimestamp = new AtomicLong(0); - /** * Get information. + * * @return information */ @GetMapping("/info") @@ -63,30 +62,41 @@ public class BusinessController { return "hello world for ratelimit service " + index.incrementAndGet(); } + /** + * Get information 30 times per 1 second. + * + * @return result of 30 calls. + * @throws InterruptedException exception + */ @GetMapping("/invoke") - public String invokeInfo() { - StringBuilder builder = new StringBuilder(); + public String invokeInfo() throws InterruptedException { + StringBuffer builder = new StringBuffer(); + CountDownLatch count = new CountDownLatch(30); for (int i = 0; i < 30; i++) { - try { - ResponseEntity entity = restTemplate.getForEntity( - "http://" + appName + "/business/info", String.class); - builder.append(entity.getBody()).append("
"); - } - catch (RestClientException e) { - if (e instanceof TooManyRequests) { - builder.append(((TooManyRequests) e).getResponseBodyAsString()) - .append(index.incrementAndGet()).append("
"); + new Thread(() -> { + try { + ResponseEntity entity = restTemplate.getForEntity("http://" + appName + "/business/info", + String.class); + builder.append(entity.getBody() + "\n"); } - else { - throw e; + catch (RestClientException e) { + if (e instanceof TooManyRequests) { + builder.append("TooManyRequests " + index.incrementAndGet() + "\n"); + } + else { + throw e; + } } - } + count.countDown(); + }).start(); } + count.await(); return builder.toString(); } /** * Get information with unirate. + * * @return information */ @GetMapping("/unirate")