github-forks
/
spring-cloud-alibaba
mirror of https://github.com/alibaba/spring-cloud-alibaba.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
2,444 Commits
14 Branches
55 Tags
70 MiB
Commit Graph

236 Commits (0d7dfc9d3a8b6c1a21687a616a40c454974c2a30)

Author SHA1 Message Date
fangjian0423 509d4819b3 Merge remote-tracking branch 'upstream/master' into binder-dev
gaokai eef764a020 删除重复属性
fangjian0423 83d0220c73 Merge remote-tracking branch 'upstream/master' into binder-dev
fangjian0423 e537eb55de resolve conflict
Xiaolong Zuo e8aaa3e948
Merge pull request from tigerMoon/feature-spring-cloud-alibaba-sentinel-zuul 
Feature spring cloud alibaba sentinel zuul
pbting 92519a7a09
Merge branch 'master' into master
得少 3934115863 1、change the nacos system properties named 
2、upgrade nacos client dependency with 0.8.2
mercyblitz 0337f0fa6c Polish : Optimize The dependencies for Dubbo Spring Cloud
mercyblitz 47733ea41f Polish : Optimize The dependencies for Dubbo Spring Cloud
tiger ac25e4a9dc add sentinel-zuul-adapter dependency
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
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
fangjian0423 ca249d213e upgrade sentinel version to 1.4.2
fangjian0423 1dc80d7a6f Updates to spring cloud greenwich
format 9b84df9015
Merge pull request from pbting/master 
nacos discovery starter support connect to aliyun with master branch
mercyblitz fc8d8e3628 Polish : @DubboTransported supports RestTemplate (part 1)
gaoyunpeng 394485a12d replace cobertura to jacoco
得少 997faff710 add nacos discovery starter support to connect to aliyun
fangjian0423 62ad2836a1 Polish
mercyblitz ff6e68d522 Update Dubbo Spring Boot 0.2.1.RELEASE
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
flystar32 30b6456558 resolve conflict
flystar32 a6a894a110 add module Fescar, Polish
flystar32 990bf1bff7 update nacos version to 0.8.0 ,Polish ,
mercyblitz 744e33229a 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
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
chenzhu.zxl 2de5362f4d Fix SchedulerX cycle ref error.
fangjian0423 b39fb80a53 upgrade sentinel version to 1.4.1 and remove NacosDataSourceWithAuthorization
gaoyunpeng 20eb325e59 update cobertura settings for reduce build time
mercyblitz 571d0eca15 Polish
得少 ee2c696bdf ans starter suport eureka/consule registry and add sms module
xiaolongzuo a756948248 Upgrade alicloud-context version.
Spencer Gibb 612e6913e6
Update to 0.2.2.BUILD-SNAPSHOT
Spencer Gibb b28e82dc3c
Update SNAPSHOT to 0.2.1.RELEASE
flystar32 b6a7bf0ee6 update nacos version
pengbingting 92f728176a sentinel support custom block response by sentinelClientHttpResponse
flystar32 4a1cd617e2 update nacos and alicloud-context version
fangjian0423 564acbb2a8 upgrade sentinel version to 1.4.0
flystar32 51b0766f11 update ans version to 1.0.1
flystar32 772fdf707f update schedulerx version
chenzhu.zxl 4bf7c9c7c4 Add Sonatype Repository to AliCloud Context.
chenzhu.zxl a4e4192d33 Force update Sonatype Repository snapshots.
chenzhu.zxl 7cf8fcefc0 Add Sonatype Repository.
chenzhu.zxl 4fbc01405a Fix compile error.
chenzhu.zxl 120cb4f096 Fix compile error.
chenzhu.zxl f1bd3fd2c2 Add SchedulerX modules.
chenzhu.zxl 2bcdbb0eb5 Fix schedulerx version error.
chenzhu.zxl 96856af7a1 Fix schedulerx version error.
xiaolongzuo 1fc98ebe7c closes , fixes . Add spring-cloud-alicloud-schedulerX module, and fix ACM starter rely on actuator.
flystar32 c26da5643a Add spring-cloud-alibaba-nacos-config-server module, close
fangjian0423 cd6f79b16b Polish
format 47b1f05e86
Merge pull request from mercyblitz/master 
[Feature] Add Spring Cloud Bus module for Apache RocketMQ
flystar32 c6d955f589 update nacos version to 0.5.0 , close
mercyblitz b75b19b58c Polish Spring Cloud Bus
mercybltz 0ad0014cbf Polish spring-cloud-starter-bus-rocketmq
fangjian0423 2596f014f7 add rocketmq starter and fix some small problems
fangjian0423 d88e27e45c fix conflict
xiaojing 0990a9bddd
Merge pull request from pbting/master 
添加 Nacos Discovery 到 Reference 目录列表
小马哥 5fed9125a1
Merge branch 'master' into master
pbting 25a90a545e 更改Nacos 客户端的依赖的版本
fangjian0423 d3d9de02a1 add rocketmq binder
Spencer Gibb 6e355cc807
Update to 0.2.1.BUILD-SNAPSHOT
Spencer Gibb d2fd77c274
Update SNAPSHOT to 0.2.0.RELEASE
Spencer Gibb f2f9f5f5bd
Updates to latest spring cloud dependencies
flystar32 742a039ccd update sentinel version to 1.3.0-GA
flystar32 3afa47f87c update nacos version to 0.3.0
chenzhu.zxl 7126a8ce33 closes , closes , closes , closes .
xiaojing 252b33f562
Merge pull request from fangjian0423/master 
Polish . Add a new module spring-cloud-alibaba-sentinel-datasource.
flystar32 e00d83ca67 update version of spring-cloud-commons, spring-cloud-build and spring-cloud-dependencied-parent
fangjian0423 ff2c390673 Merge remote-tracking branch 'upstream/master'
fangjian0423 1d15cdaee5 Polish . Add a new module spring-cloud-alibaba-sentinel-datasource separate from spring-cloud-alibaba-sentinel.
Spencer Gibb ece4531833
Updates to snapshot versions
亦盏 680a5eef01 update nacos version to 0.3.0-RC1
flystar32 7fdd8fa3e2 update sentinel version to 0.2.0
flystar32 52a0c6f9de update version to 0.2.0
mercyblitz 52ced1a956 Polish : Initialize spring-cloud-alibaba-nacos-config-server module
flystar32 8a0c087415 update nacos version to 0.2.1
fangjian0423 8702fe00ae refactor storage module: rename storage to oss
flystar32 b0011bf328 rename alibaba storage to alicloud storage
flystar32 e4d9f98313 update nacos version to 0.2.1-RC and format code
flystar32 43d47ae71f add module nacos-config and nacos-discovery
flystar32 ccc34d2faf refactor directory tree
fangjian0423 7329fb5959 add storage starter
fangjian0423 d1fd1f0e2f sentinel-starter support datasource & refactor some classes
fangjian0423 8142f3f4d7 sentinel upgrade to 0.1.1 and add annotation support in RestTemplate with sentinel
flystar32 0ce2df89ab hello, spring cloud alibaba