1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00

sync & commit in edgware

This commit is contained in:
fangjian0423
2019-10-30 17:46:19 +08:00
parent 6cfb700ed5
commit cdca82393a
279 changed files with 3574 additions and 1663 deletions

View File

@@ -16,6 +16,11 @@
package com.alibaba.alicloud.ans;
import com.alibaba.alicloud.ans.registry.AnsAutoServiceRegistration;
import com.alibaba.alicloud.ans.registry.AnsRegistration;
import com.alibaba.alicloud.ans.registry.AnsServiceRegistry;
import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -28,11 +33,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.alibaba.alicloud.ans.registry.AnsAutoServiceRegistration;
import com.alibaba.alicloud.ans.registry.AnsRegistration;
import com.alibaba.alicloud.ans.registry.AnsServiceRegistry;
import com.alibaba.alicloud.context.ans.AnsProperties;
/**
* @author xiaolongzuo
*/

View File

@@ -23,13 +23,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import com.alibaba.alicloud.ans.registry.AnsRegistration;
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;
/**
* @author xiaolongzuo
* @author pbting

View File

@@ -16,6 +16,8 @@
package com.alibaba.alicloud.ans;
import com.alibaba.alicloud.ans.registry.AnsRegistration;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -24,8 +26,6 @@ import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAu
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.alibaba.alicloud.ans.registry.AnsRegistration;
/**
* @author xiaolongzuo
* @author pbting

View File

@@ -21,14 +21,15 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
import com.alibaba.alicloud.context.ans.AnsProperties;
import com.alibaba.ans.core.NamingService;
import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
/**
* @author xiaolongzuo
* @author pbting

View File

@@ -16,13 +16,13 @@
package com.alibaba.alicloud.ans.endpoint;
import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.context.annotation.Bean;
import com.alibaba.alicloud.context.ans.AnsProperties;
/**
* @author xiaolongzuo
*/

View File

@@ -18,6 +18,7 @@ package com.alibaba.alicloud.ans.registry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.client.serviceregistry.AbstractAutoServiceRegistration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;

View File

@@ -21,6 +21,8 @@ import java.util.Map;
import javax.annotation.PostConstruct;
import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.ManagementServerPortUtils;
@@ -29,8 +31,6 @@ import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
import org.springframework.util.StringUtils;
import com.alibaba.alicloud.context.ans.AnsProperties;
/**
* @author xiaolongzuo
*/

View File

@@ -20,13 +20,14 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
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.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;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
/**
* @author xiaolongzuo

View File

@@ -16,13 +16,13 @@
package com.alibaba.alicloud.ans.ribbon;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.ServerList;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.ServerList;
/**
* @author xiaolongzuo
* @author pbting

View File

@@ -16,6 +16,8 @@
package com.alibaba.alicloud.ans.ribbon;
import com.alibaba.alicloud.ans.ConditionalOnAnsEnabled;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -24,8 +26,6 @@ import org.springframework.cloud.netflix.ribbon.RibbonClients;
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
import org.springframework.context.annotation.Configuration;
import com.alibaba.alicloud.ans.ConditionalOnAnsEnabled;
/**
* @author xiaolongzuo
*/