Commit Graph

1274 Commits (cef87972d70c62329911880a31b83edb12c3c6f9)
 

Author SHA1 Message Date
fangjian0423 4003350d09 fix fescar typo & other typo 6 years ago
fangjian0423 098ec40641 polish #761 update rocketmq bus pkg name for Greenwich 6 years ago
format a94a2e8797
Merge pull request #779 from lovepoem/add_lib_to_fix_conpile_error
Fix the sample compile error
6 years ago
Xin Wang 7bd0adc99e update circleci url 6 years ago
冷冷 0e79b0ed31 Introducing new features. Sentinel Support RedisDataSource Dynamic Rule Configuration 6 years ago
ly 2b872b09e7 Merge branch 'master' into issues765 6 years ago
ly 7301700a90 Merge branch 'master' into issues765
# Conflicts:
#	spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java
6 years ago
ly 36d95809ed
Merge pull request #1 from alibaba/master
Merge code from upstream
6 years ago
ly 1e51661fc7 Merge code from upstream 6 years ago
ly 1de313079c Merge code from upstream 6 years ago
ly af09456b7d Merge code from upstream 6 years ago
format 5a1ab06497
Merge pull request #777 from slievrly/master_1
upgrade seata to 0.7.1 and update seata sample
6 years ago
slievrly 471a1228ff upgrade seata to 0.7.1 and update seata sample
Signed-off-by: slievrly <slievrly@163.com>
6 years ago
Rivers-Shall 3193311af9 fix #744 Add spring.cloud.alicloud.acm.enable to ACM module
Add spring.cloud.alicloud.acm.enable to ACM module by adding
`@ConditionalOnProperty` annotations on auto-configuration classes and
bootstrap-configuration classes
6 years ago
format 0f55fcc696
Merge pull request #775 from 734184341/master
View acm's health interface through the URL
6 years ago
zhh 8369b0de0f 暴露acm的health接口 6 years ago
wangxing 5bd17b8131 Merge branch 'master' of https://github.com/alibaba/spring-cloud-alibaba
# Conflicts:
#	spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java
#	spring-cloud-stream-binder-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java
6 years ago
format 59c72752eb
Merge pull request #774 from Rivers-Shall/fix-acm-local-example
Fix acm-local-example
6 years ago
Rivers-Shall bbc06485db Fix acm-local-example
Make the example app automatically refresh value from acm config server
by adding `@RefreshScope` annotation.
6 years ago
fangjian0423 0f92340ac0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README-zh.md
6 years ago
fangjian0423 3d0629e03b update dingding qrcode 6 years ago
fangjian0423 82443b9bda update dingding qrcode 6 years ago
fangjian0423 883c66f251 polish #761 update pkg name & maven coordinate for Greenwich 6 years ago
ly 5fd307f429 [Issues] 765 Support customized beat interval of Nacos client 6 years ago
ly 3860f5eabb [Issues] 765 Support customized beat interval of Nacos client 6 years ago
ly d332ae666b [Issues] 765 Support customized beat interval of Nacos client 6 years ago
fangjian0423 5cf28cb7a6 Merge remote-tracking branch 'upstream/master' 6 years ago
fangjian0423 5f1ba177b6 remove spring-cloud-alibaba-test module 6 years ago
format ef3574d57c
Merge pull request #748 from fangjian0423/master
package name & maven coordinates modification in Greenwich
6 years ago
fangjian0423 79a725f0c3 update nacos-client to 1.1.1 6 years ago
fangjian0423 5f549c553a #734 -> fix circleci build error 6 years ago
fangjian0423 97844ea378 #734 -> fix circleci build error 6 years ago
fangjian0423 5fda294788 #734 -> fix circleci build error 6 years ago
fangjian0423 fd9a8f8816 update maven coordinates & docs 6 years ago
fangjian0423 cfd2544ff0 #734 -> update maven coordinates 6 years ago
fangjian0423 cb77edf8e1 #734 -> update maven coordinates 6 years ago
fangjian0423 4ff61869c1 #734 -> update pkg name 6 years ago
fangjian0423 52ac888164 #734 -> update pkg name 6 years ago
fangjian0423 aa03ddbbe2 #734 -> update maven coordinates 6 years ago
fangjian0423 3998ea23f7 NacosRule code format 6 years ago
wangxing 443a43fe96 Use partition to implement rocketmq queue selection.
#667
6 years ago
format bbf7bdee52
Merge pull request #727 from flystar32/master
add modify Nacos instance status support
6 years ago
format bf4226e06e
Merge pull request #720 from eacdy/master
Add NacosRule support weight rule
6 years ago
flystar32 026f4c64bb add modify nacos instance status 6 years ago
周立 0140e274cf
FIX compile error 6 years ago
format 9d72732456
Merge pull request #721 from fangjian0423/master
Updates to spring cloud Greenwich.SR2
6 years ago
周立 c6e7b85137
fix NPE
fix NPE
6 years ago
fangjian0423 108a62a65c Updates to spring cloud Greenwich.SR2 6 years ago
里目 14818051ee A ribbon rule integrated with nacos cluster and respect nacos server's weight configuration. 6 years ago
xiaojing 95ce5835d2
Merge pull request #587 from kaiguoyuanshuai/patch-1
update description with version
6 years ago