Commit Graph

852 Commits (5716f3a4f1080558de8c7b668420953daf336f5c)
 

Author SHA1 Message Date
fangjian0423 5b2d068f7d Polish
fangjian0423 509d4819b3 Merge remote-tracking branch 'upstream/master' into binder-dev
flystar32 34e6f75421 add ACM test case
yunzheng1228 c94eec5828 Change log level when the service attribute of nacos is empty.
format 986e529043
Merge pull request from mostcool/master
optimized spring-cloud-alicloud-sms pom.xml
Mercy Ma 0f0fb62c72
Merge pull request from mercyblitz/master
[Update] Dubbo Spring Cloud
gaokai ef00e96b5c 包含sms-example模块
gaokai bf73f83a11 删除重复依赖
gaokai eef764a020 删除重复属性
flystar32 a0092470e5 add test case
format 901f9a7def
Merge pull request from carlWangTao/patch-2
Update NacosDiscoveryProperties.java
mercyblitz f98b74ad45 Merge remote-tracking branch 'upstream/master'
mercyblitz f719e16d38 Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : Supports all Spring Cloud Registries and default is Nacos
mercyblitz ab1ecca6ab Polish : /spring-cloud-incubator/spring-cloud-alibaba#387 : Dubbo Spring Cloud Samples
mercyblitz 8e9398d24f Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : supports Spring Cloud Consul
xiaojing cac7574396
Merge pull request from Harris2012/patch-1
use EnableDiscoveryClient
WangTao c454294370
Update NacosDiscoveryProperties.java
在截取serverAddr时没有对serverAddr进行再次赋值。
mercyblitz 21f3451f7b Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#387 : Add Dubbo Spring Cloud Samples
mercyblitz b3c26c509e Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : supports Spring Cloud Netflix Eureka and Spring Cloud Zookeeper
xiaojing 5da1fbb6c1
Merge pull request from xiaolongzuo/master
Add statistics for nacos discovery and test case
xiaolongzuo 844d17b9f6 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
xiaolongzuo 71b2488131 Add scx and oss java doc.
yunzheng1228 a543be5f9f Format log naming
fangjian0423 84bb53f706 Merge remote-tracking branch 'upstream/master' into binder-dev
format 03f8defb09
Merge pull request from zhendong590/master
aggregate multi report
fangjian0423 83d0220c73 Merge remote-tracking branch 'upstream/master' into binder-dev
fangjian0423 e537eb55de resolve conflict
xiaolongzuo ca31245a8a Polish
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
xiaolongzuo fa5b57f3db Polish test cases for schedulerx
Xiaolong Zuo e8aaa3e948
Merge pull request from tigerMoon/feature-spring-cloud-alibaba-sentinel-zuul
Feature spring cloud alibaba sentinel zuul
fangjian0423 ac11a3a752 refactor sms module
fangjian0423 7fe95726ee Sentinel Endpoint add appName
Harris Zhang 10206af82b
use EnableDiscoveryClient
pbting 92519a7a09
Merge branch 'master' into master
得少 3934115863 1、change the nacos system properties named
2、upgrade nacos client dependency with 0.8.2
tiger ffb71e3eaf change listener to use SmartInitializingSingleton
flystar32 c6d863994d update reference doc
Mercy Ma 45060be7ec
Merge pull request from mercyblitz/master
Dubbo Spring Cloud
mercyblitz 6daba36e35 Fix the issues of test cases
mercyblitz 0337f0fa6c Polish : Optimize The dependencies for Dubbo Spring Cloud
mercyblitz 129be0db26 Merge remote-tracking branch 'upstream/master'
mercyblitz c6d52409f3 Polish : Add Dubbo Spring Cloud Starter
mercyblitz 47733ea41f Polish : Optimize The dependencies for Dubbo Spring Cloud
mercyblitz 3f6904f5ff Polish : Reactor
mercyblitz 918e052cd6 Polish : Dubbo Metadata Configuration replaces Nacos 's implementation
mercyblitz 80252f8278 Polish : Reactor
mercyblitz a150a0cec6 Polish : Add @PathVariable support
tiger ac25e4a9dc add sentinel-zuul-adapter dependency
gaoyunpeng d76198a18d resolve conflicts