ans starter suport eureka/consule registry and add sms module

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java

@@ -21,12 +21,16 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.alicloud.ans.migrate.MigrateOnConditionMissingClass;
 import org.springframework.cloud.alicloud.ans.registry.AnsAutoServiceRegistration;
 import org.springframework.cloud.alicloud.ans.registry.AnsRegistration;
 import org.springframework.cloud.alicloud.ans.registry.AnsServiceRegistry;
+import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
 /**
@@ -34,6 +38,7 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 @EnableConfigurationProperties
+@Conditional(MigrateOnConditionMissingClass.class)
 @ConditionalOnClass(name = "org.springframework.boot.web.context.WebServerInitializedEvent")
 @ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
 @ConditionalOnAnsEnabled
@@ -49,8 +54,9 @@ public class AnsAutoConfiguration {
 	@Bean
 	@ConditionalOnBean(AutoServiceRegistrationProperties.class)
 	@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
-	public AnsRegistration ansRegistration() {
-		return new AnsRegistration();
+	public AnsRegistration ansRegistration(AnsProperties ansProperties,
+			ApplicationContext applicationContext) {
+		return new AnsRegistration(ansProperties, applicationContext);
 	}
 
 	@Bean
@@ -63,4 +69,5 @@ public class AnsAutoConfiguration {
 		return new AnsAutoServiceRegistration(registry, autoServiceRegistrationProperties,
 				registration);
 	}
+
 }

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClient.java

@@ -16,13 +16,12 @@
 
 package org.springframework.cloud.alicloud.ans;
 
-import java.util.*;
-
+import com.alibaba.ans.core.NamingService;
+import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 
-import com.alibaba.ans.core.NamingService;
-import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+import java.util.*;
 
 /**
  * @author xiaolongzuo
@@ -75,8 +74,9 @@ public class AnsDiscoveryClient implements DiscoveryClient {
 
 	@Override
 	public List<String> getServices() {
-
+		Set<String> publishers = NamingService.getPublishes();
 		Set<String> doms = NamingService.getDomsSubscribed();
+		doms.addAll(publishers);
 		List<String> result = new LinkedList<>();
 		for (String service : doms) {
 			result.add(service);

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java

@@ -19,15 +19,18 @@ package org.springframework.cloud.alicloud.ans;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.alicloud.ans.migrate.MigrateOnConditionMissingClass;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
 /**
  * @author xiaolongzuo
  */
 @Configuration
+@Conditional(MigrateOnConditionMissingClass.class)
 @ConditionalOnMissingBean(DiscoveryClient.class)
 @EnableConfigurationProperties
 @AutoConfigureBefore(SimpleDiscoveryClientAutoConfiguration.class)

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java

@@ -16,19 +16,18 @@
 
 package org.springframework.cloud.alicloud.ans.endpoint;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.alibaba.ans.core.NamingService;
+import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 
-import com.alibaba.ans.core.NamingService;
-import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * @author xiaolongzuo
@@ -36,7 +35,7 @@ import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
 @Endpoint(id = "ans")
 public class AnsEndpoint {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(AnsEndpoint.class);
+	private static final Log log = LogFactory.getLog(AnsEndpoint.class);
 
 	private AnsProperties ansProperties;
 
@@ -50,7 +49,7 @@ public class AnsEndpoint {
 	@ReadOperation
 	public Map<String, Object> invoke() {
 		Map<String, Object> ansEndpoint = new HashMap<>();
-		LOGGER.info("ANS endpoint invoke, ansProperties is {}", ansProperties);
+		log.info("ANS endpoint invoke, ansProperties is " + ansProperties);
 		ansEndpoint.put("ansProperties", ansProperties);
 
 		Map<String, Object> subscribes = new HashMap<>();
@@ -65,7 +64,7 @@ public class AnsEndpoint {
 			}
 		}
 		ansEndpoint.put("subscribes", subscribes);
-		LOGGER.info("ANS endpoint invoke, subscribes is {}", subscribes);
+		log.info("ANS endpoint invoke, subscribes is " + subscribes);
 		return ansEndpoint;
 	}
 

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpoint.java

@@ -0,0 +1,31 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
+import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+@Endpoint(id = "migrate")
+public class MigrateEndpoint {
+
+	private static final Log log = LogFactory.getLog(MigrateEndpoint.class);
+
+	public MigrateEndpoint() {
+	}
+
+	/**
+	 * @return ans endpoint
+	 */
+	@ReadOperation
+	public Map<String, ConcurrentMap<String, ServerWrapper>> invoke() {
+
+		Map<String, ConcurrentMap<String, ServerWrapper>> result = ServerListInvocationHandler
+				.getServerRegistry();
+
+		log.info("migrate server list :" + result);
+		return result;
+	}
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateEndpointAutoConfiguration.java

@@ -0,0 +1,18 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+
+@ConditionalOnWebApplication
+
+@ConditionalOnClass(name = "org.springframework.boot.actuate.endpoint.annotation.Endpoint")
+@Conditional(MigrateOnConditionClass.class)
+public class MigrateEndpointAutoConfiguration {
+
+	@Bean
+	public MigrateEndpoint ansEndpoint() {
+		return new MigrateEndpoint();
+	}
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnCondition.java

@@ -0,0 +1,49 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import org.springframework.beans.factory.BeanClassLoaderAware;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+import org.springframework.util.ClassUtils;
+
+/**
+ * @author pbting
+ */
+public abstract class MigrateOnCondition implements Condition, BeanClassLoaderAware {
+
+	final String[] conditionOnClass = new String[] {
+			"org.springframework.cloud.consul.serviceregistry.ConsulAutoServiceRegistration",
+			"org.springframework.cloud.netflix.eureka.serviceregistry.EurekaAutoServiceRegistration" };
+
+	ClassLoader classLoader;
+
+	@Override
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.classLoader = classLoader;
+	}
+
+	@Override
+	public abstract boolean matches(ConditionContext context,
+			AnnotatedTypeMetadata metadata);
+
+	boolean isPresent(String className, ClassLoader classLoader) {
+		if (classLoader == null) {
+			classLoader = ClassUtils.getDefaultClassLoader();
+		}
+
+		try {
+			forName(className, classLoader);
+			return true;
+		}
+		catch (Throwable var3) {
+			return false;
+		}
+	}
+
+	Class<?> forName(String className, ClassLoader classLoader)
+			throws ClassNotFoundException {
+		return classLoader != null ? classLoader.loadClass(className)
+				: Class.forName(className);
+	}
+
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionClass.java

@@ -0,0 +1,22 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+/**
+ * @author pbting
+ */
+public class MigrateOnConditionClass extends MigrateOnCondition {
+
+	protected static final Log log = LogFactory.getLog(MigrateOnConditionClass.class);
+
+	@Override
+	public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+		boolean result = isPresent(conditionOnClass[0], classLoader)
+				|| isPresent(conditionOnClass[1], classLoader);
+		log.info("the result of MigrateOnConditionClass is :" + result);
+		return result;
+	}
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateOnConditionMissingClass.java

@@ -0,0 +1,23 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+/**
+ * @author pbting
+ */
+public class MigrateOnConditionMissingClass extends MigrateOnConditionClass {
+
+	protected static final Log log = LogFactory
+			.getLog(MigrateOnConditionMissingClass.class);
+
+	@Override
+	public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+		boolean result = !super.matches(context, metadata);
+		log.info("the result of MigrateOnConditionMissingClass is :" + result);
+		return result;
+	}
+
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateProxyManager.java

@@ -0,0 +1,94 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.aopalliance.aop.Advice;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.aop.AfterReturningAdvice;
+import org.springframework.aop.framework.ProxyFactory;
+
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
+
+/**
+ * @author pbting
+ */
+final class MigrateProxyManager {
+
+	private final static Log log = LogFactory.getLog(MigrateProxyManager.class);
+	private final static AtomicBoolean IS_PROXY = new AtomicBoolean(true);
+
+	private final static Set<String> SERVICES_ID = new ConcurrentSkipListSet<>();
+
+	private static Object springProxyFactory(Object target, ClassLoader classLoader,
+			List<Advice> adviceList, Class... interfaces) {
+		final ProxyFactory proxyFactory = new ProxyFactory(interfaces);
+		proxyFactory.setTarget(target);
+		adviceList.forEach(advice -> proxyFactory.addAdvice(advice));
+		return proxyFactory.getProxy(classLoader);
+	}
+
+	static Object newServerListProxy(Object bean, ClassLoader classLoader,
+			IClientConfig clientConfig) {
+		bean = springProxyFactory(bean, classLoader,
+				Arrays.asList(new ServerListInvocationHandler(clientConfig)),
+				new Class[] { ServerList.class });
+		log.info("[service id]" + clientConfig.getClientName()
+				+ " new a ServerList proxy instance for spring cloud netflix to spring cloud alibaba ");
+		collectServiceId(clientConfig.getClientName());
+		return bean;
+	}
+
+	static Object newLoadBalancerProxy(Object bean, ClassLoader classLoader,
+			IClientConfig clientConfig) {
+
+		bean = springProxyFactory(bean, classLoader,
+				Arrays.asList(new AfterReturningAdvice() {
+					@Override
+					public void afterReturning(Object returnValue, Method method,
+							Object[] args, Object target) {
+						String methodName = method.getName();
+						if ("chooseServer".equals(methodName)) {
+							String serviceId = clientConfig.getClientName();
+							Server server = (Server) returnValue;
+							ServerListInvocationHandler.incrementCallService(serviceId,
+									server);
+						}
+					}
+				}), new Class[] { ILoadBalancer.class });
+		log.info("[service id]" + clientConfig.getClientName()
+				+ " new a ILoadBalancer proxy instance for spring cloud netflix to spring cloud alibaba ");
+		return bean;
+	}
+
+	static void migrateProxyClose() {
+		IS_PROXY.set(false);
+	}
+
+	static void migrateProxyUp() {
+		IS_PROXY.set(true);
+	}
+
+	static boolean isMigrateProxy() {
+
+		return IS_PROXY.get();
+	}
+
+	static void collectServiceId(String serviceId) {
+		SERVICES_ID.add(serviceId);
+	}
+
+	static Set<String> getServicesId() {
+
+		return Collections.unmodifiableSet(SERVICES_ID);
+	}
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRefreshEventListener.java

@@ -0,0 +1,75 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import com.netflix.loadbalancer.ILoadBalancer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.context.named.NamedContextFactory;
+import org.springframework.cloud.endpoint.event.RefreshEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author pbting
+ */
+@Component
+public class MigrateRefreshEventListener implements ApplicationListener<RefreshEvent> {
+
+	private final static String MIGRATE_SWITCH = "sca.migrate.ans.switch";
+
+	private volatile String lastScaMigrateAnsSwitchValue = "true";
+
+	@Autowired
+	private Environment environment;
+
+	@Autowired
+	private NamedContextFactory namedContextFactory;
+
+	public MigrateRefreshEventListener() {
+	}
+
+	@PostConstruct
+	public void initTimerCheck() {
+		Executors.newSingleThreadScheduledExecutor().scheduleWithFixedDelay(
+				() -> onApplicationEvent(null), 1, 1, TimeUnit.SECONDS);
+	}
+
+	@Override
+	public void onApplicationEvent(RefreshEvent event) {
+		String value = environment.getProperty(MIGRATE_SWITCH, "true");
+		// check 1: check the value
+		if (value.equals(lastScaMigrateAnsSwitchValue)) {
+			return;
+		}
+
+		updateLastScaMigrateAnsResetValue(value);
+
+		// step 1: migrate up
+		if ("true".equals(value)) {
+			MigrateProxyManager.migrateProxyUp();
+			serviceIdContextInit();
+			return;
+		}
+
+		// step 2: migrate close
+		if ("false".equals(value)) {
+			MigrateProxyManager.migrateProxyClose();
+			serviceIdContextInit();
+			return;
+		}
+	}
+
+	private void serviceIdContextInit() {
+		namedContextFactory.destroy();
+		// initializer each spring context for service id
+		MigrateProxyManager.getServicesId().forEach(serviceId -> namedContextFactory
+				.getInstance(serviceId, ILoadBalancer.class));
+	}
+
+	private synchronized void updateLastScaMigrateAnsResetValue(String value) {
+		this.lastScaMigrateAnsSwitchValue = value;
+	}
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateRibbonBeanPostProcessor.java

@@ -0,0 +1,53 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanClassLoaderAware;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.ServerList;
+
+public class MigrateRibbonBeanPostProcessor
+		implements BeanPostProcessor, BeanClassLoaderAware {
+
+	protected static final Log log = LogFactory.getLog(MigrateOnCondition.class);
+
+	private ClassLoader classLoader;
+	private IClientConfig clientConfig;
+
+	public MigrateRibbonBeanPostProcessor(IClientConfig clientConfig) {
+		this.clientConfig = clientConfig;
+	}
+
+	@Override
+	public Object postProcessAfterInitialization(Object bean, String beanName)
+			throws BeansException {
+
+		// step 1 : check the bean whether proxy or not
+		if (!MigrateProxyManager.isMigrateProxy()) {
+			log.info("Migrate proxy is Close.");
+			return bean;
+		}
+
+		// step 2 : proxy the designated bean
+		if (bean instanceof ServerList) {
+			bean = MigrateProxyManager.newServerListProxy(bean, classLoader,
+					clientConfig);
+		}
+
+		if (bean instanceof ILoadBalancer) {
+			bean = MigrateProxyManager.newLoadBalancerProxy(bean, classLoader,
+					clientConfig);
+		}
+		return bean;
+	}
+
+	@Override
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.classLoader = classLoader;
+	}
+
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrateServiceRegistry.java

@@ -0,0 +1,51 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.boot.web.context.WebServerInitializedEvent;
+import org.springframework.cloud.alicloud.ans.registry.AnsRegistration;
+import org.springframework.cloud.alicloud.ans.registry.AnsServiceRegistry;
+import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * @author pbting
+ */
+@Component
+public class MigrateServiceRegistry {
+
+	private static final Log log = LogFactory.getLog(MigrateServiceRegistry.class);
+
+	private AtomicBoolean running = new AtomicBoolean(false);
+
+	private ServiceRegistry serviceRegistry;
+	private AnsRegistration ansRegistration;
+
+	public MigrateServiceRegistry(AnsProperties ansProperties,
+			ApplicationContext context) {
+		this.ansRegistration = new AnsRegistration(ansProperties, context);
+		this.ansRegistration.init();
+		this.serviceRegistry = new AnsServiceRegistry();
+	}
+
+	@EventListener(WebServerInitializedEvent.class)
+	public void onApplicationEvent(WebServerInitializedEvent event) {
+		int serverPort = event.getWebServer().getPort();
+		this.ansRegistration.setPort(serverPort);
+		log.info("[ Migrate ] change the port to " + serverPort);
+		if (!this.running.get()) {
+			long s = System.currentTimeMillis();
+			log.info("[Migrate] start to registry server to ANS");
+			this.serviceRegistry.register(this.ansRegistration);
+			log.info("[migrate] end to registry server to ANS cost time with "
+					+ (System.currentTimeMillis() - s) + " ms.");
+			this.running.set(true);
+		}
+	}
+
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/MigrationAutoconfiguration.java

@@ -0,0 +1,25 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.alicloud.ans.ConditionalOnAnsEnabled;
+import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties
+@Conditional(MigrateOnConditionClass.class)
+@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
+@ConditionalOnAnsEnabled
+public class MigrationAutoconfiguration {
+
+	@Bean
+	public MigrateServiceRegistry migrationManger(AnsProperties ansProperties,
+			ApplicationContext applicationContext) {
+
+		return new MigrateServiceRegistry(ansProperties, applicationContext);
+	}
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/ServerListInvocationHandler.java

@@ -0,0 +1,143 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.Server;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.cloud.alicloud.ans.ribbon.AnsServer;
+import org.springframework.cloud.alicloud.ans.ribbon.AnsServerList;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * 
+ */
+class ServerListInvocationHandler implements MethodInterceptor {
+
+	private final static Log log = LogFactory.getLog(ServerListInvocationHandler.class);
+
+	private final static ConcurrentMap<String, ConcurrentMap<String, ServerWrapper>> CALL_SERVICE_COUNT = new ConcurrentHashMap<>();
+	private final static Set<String> INTERCEPTOR_METHOD_NAME = new ConcurrentSkipListSet();
+
+	private IClientConfig clientConfig;
+	private AnsServerList ansServerList;
+	private AtomicBoolean isFirst = new AtomicBoolean(false);
+
+	static {
+		INTERCEPTOR_METHOD_NAME.add("getInitialListOfServers");
+		INTERCEPTOR_METHOD_NAME.add("getUpdatedListOfServers");
+	}
+
+	ServerListInvocationHandler(IClientConfig clientConfig) {
+		this.clientConfig = clientConfig;
+		this.ansServerList = new AnsServerList(clientConfig.getClientName());
+	}
+
+	@Override
+	public Object invoke(MethodInvocation invocation) throws Throwable {
+		String methodName = invocation.getMethod().getName();
+		// step 1: check the method is not interceptor
+		if (!INTERCEPTOR_METHOD_NAME.contains(methodName)) {
+			return invocation.proceed();
+		}
+
+		// step 2: interceptor the method
+		List<Server> serverList = (List<Server>) invocation.proceed();
+		long s = System.currentTimeMillis();
+		log.info("[ START ] merage server list for " + clientConfig.getClientName());
+		serverList = mergeAnsServerList(serverList);
+		log.info("[ END ] merage server list for " + clientConfig.getClientName()
+				+ ", cost time " + (System.currentTimeMillis() - s) + " ms .");
+		return serverList;
+	}
+
+	/**
+	 * 后台线程 和 Eureka 两个注册中心进行 Merage 的时候，List 表中始终保持是有效的 Server. 即不考虑 ANS 客户端本地容灾的情况
+	 */
+	private List<Server> mergeAnsServerList(final List<Server> source) {
+		if (isFirst.compareAndSet(false, true)) {
+			return source;
+		}
+
+		// step 1: get all of server list and filter the alive
+		List<AnsServer> ansServerList = filterAliveAnsServer(
+				this.ansServerList.getInitialListOfServers());
+
+		if (ansServerList.isEmpty()) {
+			return source;
+		}
+
+		log.info("[" + this.clientConfig.getClientName() + "] Get Server List from ANS:"
+				+ ansServerList + "; loadbalancer server list override before:" + source);
+
+		// step 2:remove servers of that have in load balancer list
+		final Iterator<Server> serverIterator = source.iterator();
+		while (serverIterator.hasNext()) {
+			final Server server = serverIterator.next();
+			ansServerList.forEach(ansServer -> {
+				if (server.getHostPort()
+						.equals(ansServer.getHealthService().toInetAddr())) {
+					// fix bug: mast be set the zone, update server list,will filter
+					// by: ZoneAffinityPredicate
+					ansServer.setZone(server.getZone());
+					ansServer.setSchemea(server.getScheme());
+					ansServer.setId(server.getId());
+					ansServer.setReadyToServe(true);
+					serverIterator.remove();
+					log.info("Source Server is remove " + server.getHostPort()
+							+ ", and from ANS Server is override："
+							+ ansServer.toString());
+				}
+			});
+		}
+
+		ansServerList.forEach(ansServer -> source.add(ansServer));
+		log.info("[" + this.clientConfig.getClientName() + "] "
+				+ "; loadbalancer server list override after:" + source);
+		// override
+		return source;
+	}
+
+	private List<AnsServer> filterAliveAnsServer(List<AnsServer> sourceServerList) {
+		final List<AnsServer> resultServerList = new LinkedList<>();
+		sourceServerList.forEach(ansServer -> {
+			boolean isAlive = ansServer.isAlive(3);
+			if (isAlive) {
+				resultServerList.add(ansServer);
+			}
+			log.warn(ansServer.toString() + " isAlive :" + isAlive);
+		});
+		return resultServerList;
+	}
+
+	static Map<String, ConcurrentMap<String, ServerWrapper>> getServerRegistry() {
+
+		return Collections.unmodifiableMap(CALL_SERVICE_COUNT);
+	}
+
+	static void incrementCallService(String serviceId, Server server) {
+		ConcurrentMap<String, ServerWrapper> concurrentHashMap = CALL_SERVICE_COUNT
+				.putIfAbsent(serviceId, new ConcurrentHashMap<>());
+
+		if (concurrentHashMap == null) {
+			concurrentHashMap = CALL_SERVICE_COUNT.get(serviceId);
+		}
+
+		String ipPort = server.getHostPort();
+		ServerWrapper serverWraper = concurrentHashMap.putIfAbsent(ipPort,
+				new ServerWrapper(server, new AtomicLong()));
+
+		if (serverWraper == null) {
+			serverWraper = concurrentHashMap.get(ipPort);
+		}
+		serverWraper.setServer(server);
+		serverWraper.getCallCount().incrementAndGet();
+	}
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/migrate/ServerWrapper.java

@@ -0,0 +1,35 @@
+package org.springframework.cloud.alicloud.ans.migrate;
+
+import com.netflix.loadbalancer.Server;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+public class ServerWrapper {
+
+	private Server server;
+	private AtomicLong callCount;
+
+	public ServerWrapper() {
+	}
+
+	public ServerWrapper(Server server, AtomicLong callCount) {
+		this.server = server;
+		this.callCount = callCount;
+	}
+
+	public Server getServer() {
+		return server;
+	}
+
+	public void setServer(Server server) {
+		this.server = server;
+	}
+
+	public AtomicLong getCallCount() {
+		return callCount;
+	}
+
+	public void setCallCount(AtomicLong callCount) {
+		this.callCount = callCount;
+	}
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java

@@ -16,8 +16,8 @@
 
 package org.springframework.cloud.alicloud.ans.registry;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
@@ -30,8 +30,7 @@ import org.springframework.util.StringUtils;
  */
 public class AnsAutoServiceRegistration
 		extends AbstractAutoServiceRegistration<AnsRegistration> {
-	private static final Logger LOGGER = LoggerFactory
-			.getLogger(AnsAutoServiceRegistration.class);
+	private static final Log log = LogFactory.getLog(AnsAutoServiceRegistration.class);
 
 	@Autowired
 	private AnsRegistration registration;
@@ -59,13 +58,13 @@ public class AnsAutoServiceRegistration
 
 	@Override
 	protected AnsRegistration getManagementRegistration() {
-		return null;
+		return registration;
 	}
 
 	@Override
 	protected void register() {
 		if (!this.registration.getAnsProperties().isRegisterEnabled()) {
-			LOGGER.debug("Registration disabled.");
+			log.debug("Registration disabled.");
 			return;
 		}
 		if (this.registration.getPort() < 0) {

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsRegistration.java

@@ -16,12 +16,6 @@
 
 package org.springframework.cloud.alicloud.ans.registry;
 
-import java.net.URI;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
@@ -31,6 +25,10 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.PostConstruct;
+import java.net.URI;
+import java.util.Map;
+
 /**
  * @author xiaolongzuo
  */
@@ -40,12 +38,14 @@ public class AnsRegistration implements Registration, ServiceInstance {
 	private static final String MANAGEMENT_CONTEXT_PATH = "management.context-path";
 	private static final String MANAGEMENT_ADDRESS = "management.address";
 
-	@Autowired
 	private AnsProperties ansProperties;
-
-	@Autowired
 	private ApplicationContext context;
 
+	public AnsRegistration(AnsProperties ansProperties, ApplicationContext context) {
+		this.ansProperties = ansProperties;
+		this.context = context;
+	}
+
 	@PostConstruct
 	public void init() {
 
@@ -64,6 +64,11 @@ public class AnsRegistration implements Registration, ServiceInstance {
 				metadata.put(MANAGEMENT_ADDRESS, address);
 			}
 		}
+
+		String serverPort = env.getProperty("server.port");
+		if (null != serverPort) {
+			this.setPort(Integer.valueOf(serverPort));
+		}
 	}
 
 	@Override

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java

@@ -16,24 +16,23 @@
 
 package org.springframework.cloud.alicloud.ans.registry;
 
+import com.alibaba.ans.core.NamingService;
+import com.alibaba.ans.shaded.com.taobao.vipserver.client.ipms.NodeReactor;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
-
-import com.alibaba.ans.core.NamingService;
-import com.alibaba.ans.shaded.com.taobao.vipserver.client.ipms.NodeReactor;
-
 /**
  * @author xiaolongzuo
  */
 public class AnsServiceRegistry implements ServiceRegistry<AnsRegistration> {
 
-	private static Logger logger = LoggerFactory.getLogger(AnsServiceRegistry.class);
+	private static Log log = LogFactory.getLog(AnsServiceRegistry.class);
 
 	private static final String SEPARATOR = ",";
 
@@ -41,11 +40,11 @@ public class AnsServiceRegistry implements ServiceRegistry<AnsRegistration> {
 	public void register(AnsRegistration registration) {
 
 		if (!registration.isRegisterEnabled()) {
-			logger.info("Registration is disabled...");
+			log.info("Registration is disabled...");
 			return;
 		}
 		if (StringUtils.isEmpty(registration.getServiceId())) {
-			logger.info("No service to register for client...");
+			log.info("No service to register for client...");
 			return;
 		}
 
@@ -63,13 +62,14 @@ public class AnsServiceRegistry implements ServiceRegistry<AnsRegistration> {
 				NamingService.regDom(dom, registration.getHost(), registration.getPort(),
 						registration.getRegisterWeight(dom), registration.getCluster(),
 						tags);
-				logger.info("INFO_ANS_REGISTER, {} {}:{} register finished", dom,
-						registration.getAnsProperties().getClientIp(),
-						registration.getAnsProperties().getClientPort());
+				log.info("INFO_ANS_REGISTER, " + dom + " "
+						+ registration.getAnsProperties().getClientIp() + ":"
+						+ registration.getAnsProperties().getClientPort()
+						+ " register finished");
 			}
 			catch (Exception e) {
-				logger.error("ERR_ANS_REGISTER, {} register failed...{},", dom,
-						registration.toString(), e);
+				log.error("ERR_ANS_REGISTER, " + dom + " register failed..."
+						+ registration.toString() + ",", e);
 			}
 		}
 	}
@@ -77,10 +77,10 @@ public class AnsServiceRegistry implements ServiceRegistry<AnsRegistration> {
 	@Override
 	public void deregister(AnsRegistration registration) {
 
-		logger.info("De-registering from ANSServer now...");
+		log.info("De-registering from ANSServer now...");
 
 		if (StringUtils.isEmpty(registration.getServiceId())) {
-			logger.info("No dom to de-register for client...");
+			log.info("No dom to de-register for client...");
 			return;
 		}
 
@@ -89,11 +89,11 @@ public class AnsServiceRegistry implements ServiceRegistry<AnsRegistration> {
 					registration.getPort(), registration.getCluster());
 		}
 		catch (Exception e) {
-			logger.error("ERR_ANS_DEREGISTER, de-register failed...{},",
-					registration.toString(), e);
+			log.error("ERR_ANS_DEREGISTER, de-register failed..."
+					+ registration.toString() + ",", e);
 		}
 
-		logger.info("De-registration finished.");
+		log.info("De-registration finished.");
 	}
 
 	@Override

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java

@@ -17,7 +17,9 @@
 package org.springframework.cloud.alicloud.ans.ribbon;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.alicloud.ans.migrate.MigrateOnConditionMissingClass;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 
 import com.netflix.client.config.IClientConfig;
@@ -27,11 +29,12 @@ import com.netflix.loadbalancer.ServerList;
  * @author xiaolongzuo
  */
 @Configuration
+@Conditional(MigrateOnConditionMissingClass.class)
 public class AnsRibbonClientConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	public ServerList<?> ribbonServerList(IClientConfig config) {
+	public ServerList<?> ansRibbonServerList(IClientConfig config) {
 		AnsServerList serverList = new AnsServerList(config.getClientName());
 		return serverList;
 	}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServer.java

@@ -16,12 +16,16 @@
 
 package org.springframework.cloud.alicloud.ans.ribbon;
 
-import java.util.Collections;
-import java.util.Map;
-
 import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
 import com.netflix.loadbalancer.Server;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 /**
  * @author xiaolongzuo
  */
@@ -34,7 +38,8 @@ public class AnsServer extends Server {
 	public AnsServer(final Host host, final String dom) {
 		super(host.getIp(), host.getPort());
 		this.host = host;
-		this.metadata = Collections.emptyMap();
+		this.metadata = new HashMap();
+		this.metadata.put("source", "ANS");
 		metaInfo = new MetaInfo() {
 			@Override
 			public String getAppName() {
@@ -48,16 +53,44 @@ public class AnsServer extends Server {
 
 			@Override
 			public String getServiceIdForDiscovery() {
-				return null;
+				return dom;
 			}
 
 			@Override
 			public String getInstanceId() {
-				return null;
+				return AnsServer.this.host.getIp() + ":" + dom + ":"
+						+ AnsServer.this.host.getPort();
 			}
 		};
 	}
 
+	@Override
+	public boolean isAlive() {
+
+		return true;
+	}
+
+	/**
+	 * 
+	 * @param timeOut Unit: Seconds
+	 * @return
+	 */
+	public boolean isAlive(long timeOut) {
+		try {
+			String hostName = this.host.getHostname();
+			hostName = hostName != null && hostName.trim().length() > 0 ? hostName
+					: this.host.getIp();
+			Socket socket = new Socket();
+			socket.connect(new InetSocketAddress(hostName, this.host.getPort()),
+					(int) TimeUnit.SECONDS.toMillis(timeOut));
+			socket.close();
+			return true;
+		}
+		catch (IOException e) {
+			return false;
+		}
+	}
+
 	@Override
 	public MetaInfo getMetaInfo() {
 		return metaInfo;
@@ -71,4 +104,9 @@ public class AnsServer extends Server {
 		return metadata;
 	}
 
+	@Override
+	public String toString() {
+		return "AnsServer{" + "metaInfo=" + metaInfo + ", host=" + host + ", metadata="
+				+ metadata + '}';
+	}
 }

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java

@@ -60,10 +60,12 @@ public class AnsServerList extends AbstractServerList<AnsServer> {
 		List<AnsServer> result = new ArrayList<AnsServer>(hosts.size());
 		for (Host host : hosts) {
 			if (host.isValid()) {
-				result.add(hostToServer(host));
+				AnsServer ansServer = hostToServer(host);
+				if (ansServer.isAlive(3)) {
+					result.add(ansServer);
+				}
 			}
 		}
-
 		return result;
 	}
 

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/MigrateRibbonCofiguration.java

@@ -0,0 +1,20 @@
+package org.springframework.cloud.alicloud.ans.ribbon;
+
+import org.springframework.cloud.alicloud.ans.migrate.MigrateRibbonBeanPostProcessor;
+import org.springframework.cloud.alicloud.ans.migrate.MigrateOnConditionClass;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+import com.netflix.client.config.IClientConfig;
+
+@Configuration
+@Conditional(MigrateOnConditionClass.class)
+public class MigrateRibbonCofiguration {
+
+	@Bean
+	public MigrateRibbonBeanPostProcessor migrateBeanPostProcessor(IClientConfig clientConfig) {
+
+		return new MigrateRibbonBeanPostProcessor(clientConfig);
+	}
+}

spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java

@@ -34,6 +34,7 @@ import org.springframework.context.annotation.Configuration;
 @ConditionalOnBean(SpringClientFactory.class)
 @ConditionalOnRibbonAns
 @AutoConfigureAfter(RibbonAutoConfiguration.class)
-@RibbonClients(defaultConfiguration = AnsRibbonClientConfiguration.class)
+@RibbonClients(defaultConfiguration = { AnsRibbonClientConfiguration.class,
+		MigrateRibbonCofiguration.class })
 public class RibbonAnsAutoConfiguration {
 }

spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories

@@ -1,6 +1,10 @@
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
   org.springframework.cloud.alicloud.ans.endpoint.AnsEndpointAutoConfiguration,\
   org.springframework.cloud.alicloud.ans.ribbon.RibbonAnsAutoConfiguration,\
-  org.springframework.cloud.alicloud.ans.AnsAutoConfiguration
+  org.springframework.cloud.alicloud.ans.AnsAutoConfiguration,\
+  org.springframework.cloud.alicloud.ans.migrate.MigrateEndpointAutoConfiguration,\
+  org.springframework.cloud.alicloud.ans.migrate.MigrationAutoconfiguration
 org.springframework.cloud.client.discovery.EnableDiscoveryClient=\
   org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration
+org.springframework.context.ApplicationListener=\
+  org.springframework.cloud.alicloud.ans.migrate.MigrateRefreshEventListener