fix:nacos & polaris discovery

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryAutoConfiguration.java

@@ -21,8 +21,8 @@ package com.tencent.cloud.polaris.discovery;
 import com.tencent.cloud.polaris.PolarisDiscoveryProperties;
 import com.tencent.cloud.polaris.discovery.reactive.PolarisReactiveDiscoveryClientConfiguration;
 import com.tencent.cloud.polaris.discovery.refresh.PolarisRefreshConfiguration;
-
 import com.tencent.cloud.polaris.extend.nacos.NacosContextProperties;
+
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscovery.java

@@ -23,9 +23,9 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import com.tencent.cloud.common.pojo.PolarisServiceInstance;
+import com.tencent.cloud.common.util.DiscoveryUtil;
 import com.tencent.cloud.polaris.PolarisDiscoveryProperties;
 import com.tencent.cloud.polaris.extend.nacos.NacosContextProperties;
-import com.tencent.cloud.common.util.DiscoveryUtil;
 import com.tencent.polaris.api.exception.PolarisException;
 import com.tencent.polaris.api.pojo.Instance;
 import com.tencent.polaris.api.pojo.ServiceInfo;
@@ -49,7 +49,7 @@ public class PolarisServiceDiscovery {
 	public PolarisServiceDiscovery(
 			NacosContextProperties nacosContextProperties,
 			PolarisDiscoveryProperties polarisDiscoveryProperties,
-								   PolarisDiscoveryHandler polarisDiscoveryHandler) {
+			PolarisDiscoveryHandler polarisDiscoveryHandler) {
 		this.nacosContextProperties = nacosContextProperties;
 		this.polarisDiscoveryProperties = polarisDiscoveryProperties;
 		this.polarisDiscoveryHandler = polarisDiscoveryHandler;

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java

@@ -24,7 +24,6 @@ import java.util.concurrent.ScheduledExecutorService;
 import com.tencent.cloud.common.metadata.StaticMetadataManager;
 import com.tencent.cloud.polaris.PolarisDiscoveryProperties;
 import com.tencent.cloud.polaris.discovery.PolarisDiscoveryHandler;
-import com.tencent.cloud.common.util.DiscoveryUtil;
 import com.tencent.cloud.polaris.util.OkHttpUtil;
 import com.tencent.polaris.api.core.ProviderAPI;
 import com.tencent.polaris.api.exception.PolarisException;

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/discovery/PolarisServiceDiscoveryTest.java

@@ -19,12 +19,14 @@ package com.tencent.cloud.polaris.discovery;
 
 import java.util.List;
 
+import com.tencent.cloud.common.util.ApplicationContextAwareUtils;
 import com.tencent.polaris.api.exception.PolarisException;
 import com.tencent.polaris.api.pojo.DefaultInstance;
 import com.tencent.polaris.api.pojo.DefaultServiceInstances;
 import com.tencent.polaris.api.pojo.ServiceInfo;
 import com.tencent.polaris.api.rpc.InstancesResponse;
 import com.tencent.polaris.api.rpc.ServicesResponse;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -34,6 +36,7 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.StaticApplicationContext;
 
 import static com.tencent.polaris.test.common.Consts.SERVICE_PROVIDER;
 import static java.util.Collections.singletonList;
@@ -56,6 +59,11 @@ public class PolarisServiceDiscoveryTest {
 	@InjectMocks
 	private PolarisServiceDiscovery polarisServiceDiscovery;
 
+	@Before
+	public void before() {
+		new ApplicationContextAwareUtils().setApplicationContext(new StaticApplicationContext());
+	}
+
 	@Test
 	public void testGetInstances() {
 		DefaultServiceInstances mockDefaultServiceInstances = mock(DefaultServiceInstances.class);

spring-cloud-tencent-commons/src/main/java/com/tencent/cloud/common/util/DiscoveryUtil.java

@@ -26,7 +26,7 @@ public final class DiscoveryUtil {
 	}
 
 	/**
-	 * rewrite serviceId when open double registry and discovery by nacos and polaris
+	 * rewrite serviceId when open double registry and discovery by nacos and polaris.
 	 *
 	 * @param serviceId service id
 	 * @return new service id