Merge pull request #61 from SkyeBeFreeman/main

Fix url 404 of README.md.
3 years ago · 6197a7fc75
parent 01eb275669 582e6cd4ce
commit 6197a7fc75
5 changed files with 55 additions and 30 deletions
--- a/README-zh.md
+++ b/README-zh.md
@ -57,13 +57,15 @@ Example 列表：
 - [PolarisMesh](https://github.com/polarismesh)接入相关的样例：

  - [服务发现](spring-cloud-tencent-examples/polaris-discovery-example/README-zh.md)
-  
+
  - [故障熔断](spring-cloud-tencent-examples/polaris-circuitbreaker-example/README-zh.md)
-  
+
  - [限流](spring-cloud-tencent-examples/polaris-ratelimit-example/README-zh.md)
-  
+
  - [网关](spring-cloud-tencent-examples/polaris-gateway-example/README-zh.md)

+更多详细功能，请参考[polaris-java](https://github.com/polarismesh/polaris-java/blob/main/README-zh.md)。
+
 ## 版本号规范

 采取与Spring Cloud大版本号相关的版本策略。
--- a/README.md
+++ b/README.md
@ -72,7 +72,7 @@ Example List:

 - [Polaris Gateway Example](spring-cloud-tencent-examples/polaris-gateway-example/README.md)

-For more features, please refer to [使用polaris-java](https://github.com/polarismesh/website/blob/main/docs/zh/doc/%E5%BF%AB%E9%80%9F%E5%85%A5%E9%97%A8/%E4%BD%BF%E7%94%A8polaris-java.md).
+For more features, please refer to [polaris-java](https://github.com/polarismesh/polaris-java).

 ### Version Standard

--- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
+++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java
@ -49,7 +49,8 @@ import static org.springframework.util.ReflectionUtils.rethrowRuntimeException;
 */
 public class PolarisServiceRegistry implements ServiceRegistry<Registration> {

-	private static final Logger log = LoggerFactory.getLogger(PolarisServiceRegistry.class);
+	private static final Logger log = LoggerFactory
+			.getLogger(PolarisServiceRegistry.class);

 	private static final int ttl = 5;

@ -61,14 +62,15 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {

 	private final ScheduledExecutorService heartbeatExecutor;

-	public PolarisServiceRegistry(PolarisProperties polarisProperties, PolarisDiscoveryHandler polarisDiscoveryHandler,
+	public PolarisServiceRegistry(PolarisProperties polarisProperties,
+			PolarisDiscoveryHandler polarisDiscoveryHandler,
 			MetadataLocalProperties metadataLocalProperties) {
 		this.polarisProperties = polarisProperties;
 		this.polarisDiscoveryHandler = polarisDiscoveryHandler;
 		this.metadataLocalProperties = metadataLocalProperties;
 		if (polarisProperties.isHeartbeatEnabled()) {
-			ScheduledThreadPoolExecutor heartbeatExecutor = new ScheduledThreadPoolExecutor(0,
-					new NamedThreadFactory("spring-cloud-heartbeat"));
+			ScheduledThreadPoolExecutor heartbeatExecutor = new ScheduledThreadPoolExecutor(
+					0, new NamedThreadFactory("spring-cloud-heartbeat"));
 			heartbeatExecutor.setMaximumPoolSize(1);
 			this.heartbeatExecutor = heartbeatExecutor;
 		}
@ -101,19 +103,20 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 			ProviderAPI providerClient = polarisDiscoveryHandler.getProviderAPI();
 			providerClient.register(instanceRegisterRequest);
 			log.info("polaris registry, {} {} {}:{} {} register finished",
-					polarisProperties.getNamespace(),
-					registration.getServiceId(), registration.getHost(),
-					registration.getPort(), metadataLocalProperties.getContent());
+					polarisProperties.getNamespace(), registration.getServiceId(),
+					registration.getHost(), registration.getPort(),
+					metadataLocalProperties.getContent());

 			if (null != heartbeatExecutor) {
 				InstanceHeartbeatRequest heartbeatRequest = new InstanceHeartbeatRequest();
 				BeanUtils.copyProperties(instanceRegisterRequest, heartbeatRequest);
-				//注册成功后开始启动心跳线程
+				// 注册成功后开始启动心跳线程
 				heartbeat(heartbeatRequest);
 			}
 		}
 		catch (Exception e) {
-			log.error("polaris registry, {} register failed...{},", registration.getServiceId(), registration, e);
+			log.error("polaris registry, {} register failed...{},",
+					registration.getServiceId(), registration, e);
 			rethrowRuntimeException(e);
 		}
 	}
@ -140,7 +143,8 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 			providerClient.deRegister(deRegisterRequest);
 		}
 		catch (Exception e) {
-			log.error("ERR_POLARIS_DEREGISTER, de-register failed...{},", registration, e);
+			log.error("ERR_POLARIS_DEREGISTER, de-register failed...{},", registration,
+					e);
 		}
 		finally {
 			if (null != heartbeatExecutor) {
@ -163,7 +167,8 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 	@Override
 	public Object getStatus(Registration registration) {
 		String serviceName = registration.getServiceId();
-		InstancesResponse instancesResponse = polarisDiscoveryHandler.getInstances(serviceName);
+		InstancesResponse instancesResponse = polarisDiscoveryHandler
+				.getInstances(serviceName);
 		Instance[] instances = instancesResponse.getInstances();
 		if (null == instances || instances.length == 0) {
 			return null;
@ -179,23 +184,26 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {

 	/**
 	 * Start the heartbeat thread.
-	 *
 	 * @param heartbeatRequest heartbeat request
 	 */
 	public void heartbeat(InstanceHeartbeatRequest heartbeatRequest) {
 		heartbeatExecutor.scheduleWithFixedDelay(() -> {
 			try {
 				String healthCheckEndpoint = polarisProperties.getHealthCheckUrl();
-				//先判断是否配置了health-check-url，如果配置了，需要先进行服务实例健康检查，如果健康检查通过，则进行心跳上报，如果不通过，则不上报心跳
+				// 先判断是否配置了health-check-url，如果配置了，需要先进行服务实例健康检查，如果健康检查通过，则进行心跳上报，如果不通过，则不上报心跳
 				if (Strings.isNotEmpty(healthCheckEndpoint)) {
 					if (!healthCheckEndpoint.startsWith("/")) {
 						healthCheckEndpoint = "/" + healthCheckEndpoint;
 					}

-					String healthCheckUrl = String.format("http://%s:%s%s", heartbeatRequest.getHost(), heartbeatRequest.getPort(), healthCheckEndpoint);
+					String healthCheckUrl = String.format("http://%s:%s%s",
+							heartbeatRequest.getHost(), heartbeatRequest.getPort(),
+							healthCheckEndpoint);

 					if (!OkHttpUtil.get(healthCheckUrl, null)) {
-						log.error("backend service health check failed. health check endpoint = {}", healthCheckEndpoint);
+						log.error(
+								"backend service health check failed. health check endpoint = {}",
+								healthCheckEndpoint);
 						return;
 					}
 				}
--- a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/feign/Metadata2HeaderFeignInterceptorTest.java
+++ b/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/feign/Metadata2HeaderFeignInterceptorTest.java
@ -68,14 +68,22 @@ public class Metadata2HeaderFeignInterceptorTest {
 	public void test1() throws JsonProcessingException {
 		String metadata = testFeign.test();
 		ObjectMapper mapper = new ObjectMapper();
-		Assertions.assertThat(mapper.readTree(metadata))
-				.isEqualTo(mapper.readTree("{\"a\":\"11\",\"b\":\"22\",\"c\":\"33\"}{\"LOCAL_SERVICE\":\"test"
+		Assertions.assertThat(mapper.readTree(metadata)).isEqualTo(mapper.readTree(
+				"{\"a\":\"11\",\"b\":\"22\",\"c\":\"33\"}{\"LOCAL_SERVICE\":\"test"
 						+ "\",\"LOCAL_PATH\":\"/test\",\"LOCAL_NAMESPACE\":\"default\"}"));
-		Assertions.assertThat(metadataLocalProperties.getContent().get("a")).isEqualTo("1");
-		Assertions.assertThat(metadataLocalProperties.getContent().get("b")).isEqualTo("2");
-		Assertions.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("a")).isEqualTo("11");
-		Assertions.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("b")).isEqualTo("22");
-		Assertions.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("c")).isEqualTo("33");
+		Assertions.assertThat(metadataLocalProperties.getContent().get("a"))
+				.isEqualTo("1");
+		Assertions.assertThat(metadataLocalProperties.getContent().get("b"))
+				.isEqualTo("2");
+		Assertions
+				.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("a"))
+				.isEqualTo("11");
+		Assertions
+				.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("b"))
+				.isEqualTo("22");
+		Assertions
+				.assertThat(MetadataContextHolder.get().getTransitiveCustomMetadata("c"))
+				.isEqualTo("33");
 	}

 	@SpringBootApplication
@ -84,18 +92,22 @@ public class Metadata2HeaderFeignInterceptorTest {
 	protected static class TestApplication {

 		@RequestMapping("/test")
-		public String test(@RequestHeader(MetadataConstant.HeaderName.CUSTOM_METADATA) String customMetadataStr)
+		public String test(
+				@RequestHeader(MetadataConstant.HeaderName.CUSTOM_METADATA) String customMetadataStr)
 				throws UnsupportedEncodingException {
-			String systemMetadataStr = JacksonUtils.serialize2Json(MetadataContextHolder.get().getAllSystemMetadata());
+			String systemMetadataStr = JacksonUtils
+					.serialize2Json(MetadataContextHolder.get().getAllSystemMetadata());
 			return URLDecoder.decode(customMetadataStr, "UTF-8") + systemMetadataStr;
 		}

 		@FeignClient(name = "test-feign", url = "http://localhost:8081")
 		public interface TestFeign {

-			@RequestMapping(value = "/test", headers = {MetadataConstant.HeaderName.CUSTOM_METADATA + "={\"a\":\"11"
-					+ "\",\"b\":\"22\",\"c\":\"33\"}"})
+			@RequestMapping(value = "/test",
+					headers = { MetadataConstant.HeaderName.CUSTOM_METADATA
+							+ "={\"a\":\"11" + "\",\"b\":\"22\",\"c\":\"33\"}" })
 			String test();
+
 		}

 		@Configuration
@ -106,7 +118,9 @@ public class Metadata2HeaderFeignInterceptorTest {
 				template.header(MetadataConstant.HeaderName.CUSTOM_METADATA,
 						"{\"a\":\"11\",\"b\":\"22\",\"c\":\"33\"}");
 			}
+
 		}

 	}
+
 }
--- a/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/resttemplate/MetadataRestTemplateInterceptorTest.java
+++ b/spring-cloud-tencent-metadata/src/test/java/com/tencent/cloud/metadata/core/intercepter/resttemplate/MetadataRestTemplateInterceptorTest.java
@ -112,4 +112,5 @@ public class MetadataRestTemplateInterceptorTest {
 		}

 	}
+
 }