Commit Graph

671 Commits (fc14f658a793eea6ea7b9c29079637b5f919f003)
 

Author SHA1 Message Date
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
Xiaolong Zuo e8aaa3e948
Merge pull request #373 from tigerMoon/feature-spring-cloud-alibaba-sentinel-zuul
Feature spring cloud alibaba sentinel zuul
6 years ago
fangjian0423 ac11a3a752 refactor sms module 6 years ago
fangjian0423 7fe95726ee Sentinel Endpoint add appName 6 years ago
Harris Zhang 10206af82b
use EnableDiscoveryClient 6 years ago
pbting 92519a7a09
Merge branch 'master' into master 6 years ago
得少 3934115863 1、change the nacos system properties named
2、upgrade nacos client dependency with 0.8.2
6 years ago
tiger ffb71e3eaf change listener to use SmartInitializingSingleton 6 years ago
flystar32 c6d863994d update reference doc 6 years ago
Mercy Ma 45060be7ec
Merge pull request #368 from mercyblitz/master
Dubbo Spring Cloud
6 years ago
mercyblitz 6daba36e35 Fix the issues of test cases 6 years ago
mercyblitz 0337f0fa6c Polish spring-cloud-incubator/spring-cloud-alibaba#378 : Optimize The dependencies for Dubbo Spring Cloud 6 years ago
mercyblitz 129be0db26 Merge remote-tracking branch 'upstream/master' 6 years ago
mercyblitz c6d52409f3 Polish spring-cloud-incubator/spring-cloud-alibaba#379 : Add Dubbo Spring Cloud Starter 6 years ago
mercyblitz 47733ea41f Polish spring-cloud-incubator/spring-cloud-alibaba#378 : Optimize The dependencies for Dubbo Spring Cloud 6 years ago
mercyblitz 3f6904f5ff Polish spring-cloud-incubator/spring-cloud-alibaba#376 : Reactor 6 years ago
mercyblitz 918e052cd6 Polish spring-cloud-incubator/spring-cloud-alibaba#376 : Dubbo Metadata Configuration replaces Nacos 's implementation 6 years ago
mercyblitz 80252f8278 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Reactor 6 years ago
mercyblitz a150a0cec6 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Add @PathVariable support 6 years ago
tiger ac25e4a9dc add sentinel-zuul-adapter dependency 6 years ago
gaoyunpeng d76198a18d resolve conflicts 6 years ago
gaoyunpeng 880a894786 there is not need deploy to maven so add settings for it 6 years ago
gaoyunpeng 852e287481 rename coverage module name 6 years ago
gaoyunpeng 2db3677f20 fix #369 remove superfluous settings in fescar example 6 years ago
gaoyunpeng 9dac4efd37 aggregate multi report 6 years ago
tiger 19af007931 update spring cloud version 6 years ago
flystar32 5bb6073880 auto configure after AutoServiceRegistrationConfiguration.class 6 years ago
tiger 356f07a509 remove version and format code 6 years ago
tiger 3afd0177e5 Merge branch 'master' into feature-spring-cloud-alibaba-sentinel-zuul
# Conflicts:
#	pom.xml
6 years ago
tiger 1c759ec8d5 add spring-cloud-alibaba-sentinel-zuul module 6 years ago
xiaolongzuo 03bd2c3c1d Add statistics for nacos discovery and test case 6 years ago
mercyblitz 969dece586 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
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
mercyblitz 3e39f03380 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Reactor to unify parameters resolving 6 years ago
flystar32 2cfabd353a format code and change apache log to slf4j 6 years ago
flystar32 f96869e1d2 format code and change logger to log 6 years ago
Xiaolong Zuo e6c7b10b79
Merge pull request #365 from fangjian0423/master
upgrade sentinel version & update docs & refactor log
6 years ago
mercyblitz 5becc06535 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Update test cases 6 years ago
gaoyunpeng 46e5cb8acb aggregate multi report 6 years ago
yunzheng1228 33e7cd6930 Adding yunzheng to developers 6 years ago
fangjian0423 ca249d213e upgrade sentinel version to 1.4.2 6 years ago
fangjian0423 0e8933e1f8 update sentinel docs & refactor 6 years ago
mercyblitz a49f6622d7 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Performance optimization 6 years ago
mercyblitz 2f5ac6b7ad Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Add The resolvers of Dubbo Generic Method parameters. 6 years ago
Xiaolong Zuo 6080f09794
Merge pull request #364 from fangjian0423/master
Updates to spring cloud greenwich
6 years ago
flystar32 d7665170ec format code 6 years ago
mercyblitz c0430abcae Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Reactor 6 years ago
mercyblitz d05c437d89 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : Bug fixes 6 years ago
mercyblitz 4b1c3c6454 Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 2) 6 years ago