remove sca dependency

pull/936/head
seanyu 3 years ago
parent 93a75af7ff
commit 0ff02eec6d

@ -20,13 +20,6 @@
<artifactId>spring-cloud-starter-tencent-polaris-router</artifactId> <artifactId>spring-cloud-starter-tencent-polaris-router</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
<version>2022.0.0.0-RC1</version>
<optional>true</optional>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>

@ -18,7 +18,6 @@
package com.tencent.cloud.plugin.discovery.adapter.config; package com.tencent.cloud.plugin.discovery.adapter.config;
import com.alibaba.cloud.nacos.NacosServiceInstance;
import com.tencent.cloud.plugin.discovery.adapter.transformer.NacosInstanceTransformer; import com.tencent.cloud.plugin.discovery.adapter.transformer.NacosInstanceTransformer;
import com.tencent.cloud.polaris.router.config.ConditionalOnPolarisRouterEnabled; import com.tencent.cloud.polaris.router.config.ConditionalOnPolarisRouterEnabled;
import com.tencent.cloud.polaris.router.config.LoadBalancerConfiguration; import com.tencent.cloud.polaris.router.config.LoadBalancerConfiguration;
@ -45,7 +44,7 @@ public class NacosDiscoveryAdapterAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
@ConditionalOnPolarisRouterEnabled @ConditionalOnPolarisRouterEnabled
@ConditionalOnClass(NacosServiceInstance.class) @ConditionalOnClass(name = "com.alibaba.cloud.nacos.NacosServiceInstance")
public InstanceTransformer instanceTransformer() { public InstanceTransformer instanceTransformer() {
return new NacosInstanceTransformer(); return new NacosInstanceTransformer();
} }

@ -18,7 +18,6 @@
package com.tencent.cloud.plugin.discovery.adapter.transformer; package com.tencent.cloud.plugin.discovery.adapter.transformer;
import com.alibaba.cloud.nacos.NacosServiceInstance;
import com.tencent.cloud.polaris.router.spi.InstanceTransformer; import com.tencent.cloud.polaris.router.spi.InstanceTransformer;
import com.tencent.polaris.api.pojo.DefaultInstance; import com.tencent.polaris.api.pojo.DefaultInstance;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
@ -34,17 +33,16 @@ public class NacosInstanceTransformer implements InstanceTransformer {
@Override @Override
public void transformCustom(DefaultInstance instance, ServiceInstance serviceInstance) { public void transformCustom(DefaultInstance instance, ServiceInstance serviceInstance) {
if (serviceInstance instanceof NacosServiceInstance) { if ("com.alibaba.cloud.nacos.NacosServiceInstance".equals(serviceInstance.getClass().getName())) {
NacosServiceInstance nacosServiceInstance = (NacosServiceInstance) serviceInstance; String nacosWeight = serviceInstance.getMetadata().get("nacos.weight");
String nacosWeight = nacosServiceInstance.getMetadata().get("nacos.weight");
instance.setWeight( instance.setWeight(
StringUtils.isBlank(nacosWeight) ? 100 : new Double(Double.parseDouble(nacosWeight) * 100).intValue() StringUtils.isBlank(nacosWeight) ? 100 : (int) Double.parseDouble(nacosWeight) * 100
); );
String nacosHealthy = nacosServiceInstance.getMetadata().get("nacos.healthy"); String nacosHealthy = serviceInstance.getMetadata().get("nacos.healthy");
instance.setHealthy( instance.setHealthy(
!StringUtils.isBlank(nacosHealthy) && Boolean.parseBoolean(nacosHealthy) !StringUtils.isBlank(nacosHealthy) && Boolean.parseBoolean(nacosHealthy)
); );
String nacosInstanceId = nacosServiceInstance.getMetadata().get("nacos.instanceId"); String nacosInstanceId = serviceInstance.getMetadata().get("nacos.instanceId");
instance.setId(nacosInstanceId); instance.setId(nacosInstanceId);
} }
} }

Loading…
Cancel
Save