Commit Graph

19 Commits (8e9398d24fd22e61faa7edcc26aa1e30c6d05cac)

Author SHA1 Message Date
mercyblitz 129be0db26 Merge remote-tracking branch 'upstream/master' 6 years ago
flystar32 5bb6073880 auto configure after AutoServiceRegistrationConfiguration.class 6 years ago
mercyblitz 2fdeeec3ff Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
#	spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
6 years ago
flystar32 2cfabd353a format code and change apache log to slf4j 6 years ago
mercyblitz a5e950186f Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java
#	spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java
#	spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/NacosDataSourceProperties.java
#	spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java
6 years ago
flystar32 e6a1ba09fb Fixes #331 6 years ago
flystar32 4a62526b2a Fixes #333 ,make @EnableDiscoveryClient Optional 6 years ago
Spencer Gibb a1ae7b50ed
Ignores broken test. 6 years ago
mercyblitz 59a969049d Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	pom.xml
#	spring-cloud-alibaba-dependencies/pom.xml
#	spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
6 years ago
flystar32 962abbb712 delete unused file 6 years ago
flystar32 523f039c95 add test case for ans module 6 years ago
pbting 328a473da2 remote set port action 6 years ago
得少 41020df6b9 code optimization 6 years ago
得少 bea88fb2c8 add constant for MigrateRefreshEventListener and AnsServerList 6 years ago
得少 b16ef5efea fix bug for ansServer id 6 years ago
得少 e163500980 Code optimization for ans starter 6 years ago
得少 ee2c696bdf ans starter suport eureka/consule registry and add sms module 6 years ago
flystar32 5873ac3c1a update example configuration 6 years ago
chenzhu.zxl 7126a8ce33 closes #63, closes #64, closes #65, closes #66. 6 years ago