Commit Graph

68 Commits (c1e8ad0b10aa14cf1d64c3a05044d7afec3b5fe2)

Author SHA1 Message Date
flystar32 4e357de08f format code 6 years ago
flystar32 d0fa69058b add conditional on nacos discovery enabled to Ribbon 6 years ago
flystar32 6e846f662f fix condition with 6 years ago
flystar32 482e4a101b add management.endpoints.web.base-path to metadata 6 years ago
flystar32 9860c5ac8e nacos discovery endpoint support spring.cloud.nacos.discovery.enabled , Polish #411 6 years ago
mercyblitz 892216ffd2 Polish : spring-cloud-incubator/spring-cloud-alibaba#377 : rename the metadata properties 6 years ago
flystar32 a0b7f92282 support EnableDiscoveryClient 6 years ago
xiaojing dbfc363c02
Merge pull request #394 from yunzheng1228/master
format code and fixed example's bug
6 years ago
yunzheng1228 c94eec5828 Change log level when the service attribute of nacos is empty. 6 years ago
WangTao c454294370
Update NacosDiscoveryProperties.java
在截取serverAddr时没有对serverAddr进行再次赋值。
6 years ago
yunzheng1228 a543be5f9f Format log naming 6 years ago
format 03f8defb09
Merge pull request #367 from zhendong590/master
aggregate multi report
6 years ago
gaoyunpeng 9dac4efd37 aggregate multi report 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 d7665170ec format code 6 years ago
format 9b84df9015
Merge pull request #358 from pbting/master
nacos discovery starter support connect to aliyun with master branch
6 years ago
gaoyunpeng 394485a12d replace cobertura to jacoco 6 years ago
flystar32 142c321fb0 Merge remote-tracking branch 'upstream/master' 6 years ago
format 5d721d1673
Merge pull request #346 from carlWangTao/patch-1
Update NacosDiscoveryProperties.java
6 years ago
flystar32 8d41c885c0 Fixes #352 6 years ago
pbting 90a7769180
Merge pull request #4 from spring-cloud-incubator/master
Synchronize code once
6 years ago
flystar32 7677507294 Polish #345 , fixes @AutoConfigureAfter(AutoServiceRegistrationAutoConfiguration.class) 6 years ago
flystar32 682d12f20e Merge branch 'master' of github.com:flystar32/spring-cloud-alibaba 6 years ago
flystar32 290350f6ec add import 6 years ago
flystar32 dfc9e34147 support heartbeat event 6 years ago
flystar32 c43a89951b support heartbeat event 6 years ago
flystar32 b0c17fd291 support heartbeat event 6 years ago
flystar32 c545885d1c support heartbeat event 6 years ago
carlWangTao 8d44c7ee01
Update NacosDiscoveryProperties.java
当配置属性cloud.nacos.discovery.server-addr以 '/' 结束会造成服务提供方无法注册到NacosServer
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 450f1e8269 modify example to verify . 6 years ago
flystar32 4a62526b2a Fixes #333 ,make @EnableDiscoveryClient Optional 6 years ago
justlive1 d3f98b66a4 fixed netInterface NullPointerException 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
mercyblitz 26a05cbefb Temporary commit 6 years ago
pbting 431b246507 add nacos config unit test 6 years ago
pbting 2fb9b52f1d
Merge pull request #278 from zhendong590/master
update cobertura settings for reduce build time
6 years ago
yanglbme 591dcdb966 update: use the diamond operator 6 years ago
gaoyunpeng 20eb325e59 update cobertura settings for reduce build time 6 years ago
mercyblitz 325d00d1b6 Polish spring-cloud-incubator/spring-cloud-alibaba#267 6 years ago
mercyblitz a6b9f6c5dc Polish spring-cloud-incubator/spring-cloud-alibaba#266 6 years ago
mercyblitz f34633ebf4 Polish spring-cloud-incubator/spring-cloud-alibaba#261 6 years ago
flystar32 36c20f5ab1 fixes some typo 6 years ago
flystar32 7525b92b9d add test case 6 years ago
flystar32 31d4bb5a36 use constructor parameters instead of autowired 6 years ago
Spencer Gibb 612e6913e6
Update to 0.2.2.BUILD-SNAPSHOT 6 years ago
Spencer Gibb b28e82dc3c
Update SNAPSHOT to 0.2.1.RELEASE 6 years ago
flystar32 eeba7e6aa6 update nacos discovery logic, support both health and enabled 6 years ago
pbting ba90952880 nacos starter 支持可自定义dataid配置以及Nacos 商业化和云上ACM 对接 6 years ago
Nepxion 9373e79aff fixes #87. 6 years ago