Commit Graph

139 Commits (03309b8481afcc827832ddaf80cdf36af57324a6)

Author SHA1 Message Date
fangjian0423 53c4a6adf6 refactor & upgrade rocketmq-client version 6 years ago
fangjian0423 474132db42 Merge remote-tracking branch 'upstream/master' into binder-dev 6 years ago
Mercy Ma 9c5d9229e5
Merge pull request #413 from mercyblitz/master
Polish : spring-cloud-incubator/spring-cloud-alibaba#409 : Register t…
6 years ago
mercyblitz 10f06bec1e Polish : spring-cloud-incubator/spring-cloud-alibaba#409 : Register the Dubbo REST services as Spring Cloud services in non-web environment 6 years ago
Mercy Ma 7c3222f235
Merge pull request #408 from mercyblitz/master
Add DubboRegistryServiceIdHandler Bean to customize Service Id
6 years ago
mercyblitz e48863640a Polish : spring-cloud-incubator/spring-cloud-alibaba#377 : Refactor 6 years ago
Mercy Ma c6a31dac63
Merge pull request #406 from mercyblitz/master
Use Apache Dubbo 2.7.x as Spring Cloud Infrastructure #377
6 years ago
Xiaolong Zuo 45c4c5baf5
Merge pull request #405 from fangjian0423/master
Update docs & add spring cloud gateway bom
6 years ago
flystar32 b50cd9266f update nacos and fescar version and format some testcase 6 years ago
mercyblitz 514fef53f5 Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#377 : Resolve version issue 6 years ago
mercyblitz fa1aa272b1 Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#377 : Use Apache Dubbo 2.7.x as Spring Cloud Infrastructure 6 years ago
fangjian0423 501d08d1e5 add spring cloud gateway bom 6 years ago
fangjian0423 0e4de15632 update sms example 6 years ago
fangjian0423 9934f5bc60 resolve conflict 6 years ago
xiaojing dbfc363c02
Merge pull request #394 from yunzheng1228/master
format code and fixed example's bug
6 years ago
yunzheng1228 df8f703460 Fixed nacos-example's bug, Change the attribute value of spring.application.name from 'sca-nacos-config' to 'nacos-config-example' 6 years ago
fangjian0423 7cc3b02917 update rocketmq examples 6 years ago
fangjian0423 509d4819b3 Merge remote-tracking branch 'upstream/master' into binder-dev 6 years ago
format 986e529043
Merge pull request #390 from mostcool/master
optimized spring-cloud-alicloud-sms pom.xml
6 years ago
gaokai ef00e96b5c 包含sms-example模块 6 years ago
mercyblitz f98b74ad45 Merge remote-tracking branch 'upstream/master' 6 years ago
mercyblitz f719e16d38 Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : Supports all Spring Cloud Registries and default is Nacos 6 years ago
mercyblitz ab1ecca6ab Polish : /spring-cloud-incubator/spring-cloud-alibaba#387 : Dubbo Spring Cloud Samples 6 years ago
xiaojing cac7574396
Merge pull request #384 from Harris2012/patch-1
use EnableDiscoveryClient
6 years ago
mercyblitz 21f3451f7b Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#387 : Add Dubbo Spring Cloud Samples 6 years ago
mercyblitz b3c26c509e Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : supports Spring Cloud Netflix Eureka and Spring Cloud Zookeeper 6 years ago
xiaolongzuo 844d17b9f6 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 6 years ago
fangjian0423 84bb53f706 Merge remote-tracking branch 'upstream/master' into binder-dev 6 years ago
format 03f8defb09
Merge pull request #367 from zhendong590/master
aggregate multi report
6 years ago
fangjian0423 e537eb55de resolve conflict 6 years ago
xiaolongzuo 2a83f3e84e Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
# Conflicts:
#	spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
#	spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java
6 years ago
xiaolongzuo fa5b57f3db Polish test cases for schedulerx 6 years ago
fangjian0423 ac11a3a752 refactor sms module 6 years ago
Harris Zhang 10206af82b
use EnableDiscoveryClient 6 years ago
pbting 92519a7a09
Merge branch 'master' into master 6 years ago
gaoyunpeng 2db3677f20 fix #369 remove superfluous settings in fescar example 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
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
format 9b84df9015
Merge pull request #358 from pbting/master
nacos discovery starter support connect to aliyun with master branch
6 years ago
mercyblitz fc8d8e3628 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 1) 6 years ago
gaoyunpeng 394485a12d replace cobertura to jacoco 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
fangjian0423 9f797f586e update rocketmq binder demo 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
xiaojing 04908741bb
Update readme-zh.md 6 years ago
flystar32 30b6456558 resolve conflict 6 years ago