Commit Graph

671 Commits (fc14f658a793eea6ea7b9c29079637b5f919f003)
 

Author SHA1 Message Date
fangjian0423 1dc80d7a6f Updates to spring cloud greenwich 6 years ago
pbting 95060a19b1
Update pom.xml
remove alicloud context maven dependency
6 years ago
pbting c8f1697c3d
Update pom.xml
remove alicloud context
6 years ago
得少 f777bc3006 remove alicloud context dependency 6 years ago
fangjian0423 94a3bc2cc2 Merge remote-tracking branch 'upstream/master' 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
flystar32 49cfaff25a change log from apache common to slf4j 6 years ago
flystar32 27d5e01bac change log to slf4j 6 years ago
flystar32 c1b7a3756a set default value of nacos config enabled to true 6 years ago
flystar32 9c04b327a1 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 6 years ago
flystar32 26df5b7926 Fixes #363, #347 6 years ago
fangjian0423 f136ad1aab Merge remote-tracking branch 'upstream/master' 6 years ago
xiaojing 9dee1a7f74
Merge pull request #362 from zhendong590/master
replace cobertura to jacoco
6 years ago
fangjian0423 2d91206357 Merge remote-tracking branch 'upstream/master' 6 years ago
mercyblitz 0b31eccbf0 Merge remote-tracking branch 'upstream/master' 6 years ago
mercyblitz 5099ed782c Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 1) 6 years ago
mercyblitz fc8d8e3628 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 1) 6 years ago
gaoyunpeng 87bfb3734a ignore failure testcase 6 years ago
gaoyunpeng 394485a12d replace cobertura to jacoco 6 years ago
得少 24400635e2 update the log information print by conditional 6 years ago
xiaojing 1a23c76689
Merge pull request #349 from flystar32/master
Nacos discovery support heart beat event
6 years ago
flystar32 142c321fb0 Merge remote-tracking branch 'upstream/master' 6 years ago
得少 e4cc98b90c update the log information 6 years ago
fangjian0423 29cfe3537f 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
得少 997faff710 add nacos discovery starter support to connect to aliyun 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
xiaojing d6334fbe87
Merge pull request #350 from xiaolongzuo/master
Add test case for alicloud-context.
6 years ago
xiaolongzuo 5c26eb90e0 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 6 years ago
xiaolongzuo 910068c91f Add test case. 6 years ago
flystar32 682d12f20e Merge branch 'master' of github.com:flystar32/spring-cloud-alibaba 6 years ago
mercyblitz 0a4cd85255 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : [Feature] Add @DubboTransported Annotation 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
Mercy Ma e7b4a08f44
Merge pull request #339 from mercyblitz/master
[Module] Dubbo Spring Cloud
6 years ago
mercyblitz ff6e68d522 Update Dubbo Spring Boot 0.2.1.RELEASE 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
xiaojing 13097fd32c
Merge pull request #338 from fangjian0423/binder-dev
remove sentinel commercialization logic &  optimize NacosDataSource
6 years ago
fangjian0423 fd6d3a7717 remove sentinel commercialization logic & optimize NacosDataSource 6 years ago
format 78e5a0a380
Merge pull request #337 from flystar32/master
Fixes #331
6 years ago
flystar32 e6a1ba09fb Fixes #331 6 years ago
xiaojing c5fa7068a4
Update README-zh.md 6 years ago
xiaojing fe66f83da5
Update README-zh.md 6 years ago
xiaojing 744788fd62
Update Roadmap.md 6 years ago