1
0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Commit Graph

154 Commits

Author SHA1 Message Date
Xiaolong Zuo ade6a86af4 Merge pull request #195 from xiaolongzuo/1.x
Add SchedulerX readme doc.
2018-12-18 17:57:21 +08:00
fangjian0423 a3fef5d955 Optimize Sentinel RestTemplate url resource for 1.x branch 2018-12-18 17:45:10 +08:00
format 7b02f93f20 Merge pull request #193 from pbting/1.x
sentinel support custom block response by SentinelClientHttpResponse for 1.x branch
2018-12-18 17:42:29 +08:00
pengbingting 525e05389a code format 2018-12-18 15:32:25 +08:00
pengbingting 28f39b67c1 code format 2018-12-18 15:31:55 +08:00
pengbingting 849b224fad sentinel support custom block response by sentinelClientHttpResponse 2018-12-18 15:24:55 +08:00
xiaolongzuo 156ff62ad6 Add SchedulerX readme doc. 2018-12-18 14:54:13 +08:00
Xiaolong Zuo 74b48a6307 Merge pull request #189 from xiaolongzuo/1.x
SchedulerX support springIOC.
2018-12-18 14:30:16 +08:00
xiaolongzuo 8eb1bd4493 SchedulerX support springIOC. 2018-12-17 22:39:04 +08:00
fangjian0423 8c661d051a Optimize usage of Sentinel RestTemplate 2018-12-17 22:35:26 +08:00
flystar32 cb7e7f1422 update nacos and alicloud-context version 2018-12-17 17:54:16 +08:00
flystar32 97e500609e update 1.x branch code from master 2018-12-17 16:32:18 +08:00
xiaojing 8dff53a1f5 update ans version to 1.0.1 2018-12-17 15:40:18 +08:00
fangjian0423 d27c449638 Merge remote-tracking branch 'upstream/1.x' into 1.x 2018-12-17 12:28:17 +08:00
fangjian0423 c410204fd0 upgrade sentinel version to 1.4.0 for 1.x branch 2018-12-17 12:27:59 +08:00
xiaojing 714842500c Merge pull request #153 from flystar32/1.x
add spring cloud bus rocketmq for 1.x
2018-12-16 13:08:11 +08:00
xiaojing 6229b28f06 Merge branch '1.x' into 1.x 2018-12-16 13:04:43 +08:00
Xiaolong Zuo f022fa3c01 Merge pull request #182 from xiaolongzuo/1.x
Add SchedulerX module for branch 1.x.
2018-12-14 18:39:47 +08:00
xiaolongzuo cfd00ee5ac Merge branch '1.x' of github.com:spring-cloud-incubator/spring-cloud-alibaba into 1.x 2018-12-14 18:35:09 +08:00
xiaolongzuo 2c06acc996 Add SchedulerX module for branch 1.x. 2018-12-14 18:34:43 +08:00
fangjian0423 2bb73f4524 check ParamFlowRule 2018-12-14 18:14:32 +08:00
xiaojing 8e0239dae1 Merge pull request #158 from fangjian0423/1.x
sync code about rocketmq and sentinel for 1.x branch
2018-12-12 17:08:13 +08:00
fangjian0423 b0238ac88d rocketmq binder update example for 1.x branch 2018-12-12 16:10:19 +08:00
fangjian0423 8f24bd979b rocketmq binder support transactional message and update example, docs for 1.x branch 2018-12-12 16:09:14 +08:00
fangjian0423 8f1b45b2e6 sentinel add docs and bug fix for 1.x branch 2018-12-12 16:04:56 +08:00
flystar32 56c61c8a68 add spring cloud bus rocketmq for 1.x 2018-12-11 19:16:34 +08:00
flystar32 d9abffd110 update readme 2018-12-10 17:13:38 +08:00
flystar32 06ac82a9ee update example configuration 2018-12-10 16:33:31 +08:00
xiaojing fc9d016d0e Merge pull request #143 from fangjian0423/1.x
Sentinel upgrade for 1.x branch
2018-12-06 19:10:39 +08:00
fangjian0423 4334798729 code format 2018-12-06 17:27:51 +08:00
fangjian0423 5ee251ab97 sentinel starter support paramflowrule 2018-12-06 17:26:47 +08:00
fangjian0423 29998b3e60 Add log configuration for Sentinel 2018-12-06 17:14:18 +08:00
fangjian0423 be2f52c880 using sentinel feign in nacos discovery example 2018-12-06 17:11:50 +08:00
fangjian0423 6104799a36 Sentinel support feign 2018-12-06 17:11:20 +08:00
fangjian0423 fb9e0f51f4 SentinelProtect rename to SentinelRestTemplate 2018-12-06 16:45:47 +08:00
xiaojing e812515250 Merge pull request #136 from pbting/1.x
nacos config support custom config dataid and group
2018-12-05 10:24:42 +08:00
flystar32 bee06af41c update nacos discovery logic, support both health and enabled 2018-12-04 15:07:01 +08:00
pbting 4e76fbe773 modify the metadata of type and defaultValue for spring cloud cloud nacos config 2018-12-04 14:30:58 +08:00
pbting 46570f8ce3 nacos config support custom config dataid and group 2018-12-04 14:12:54 +08:00
xiaojing 51e9ae552a Merge pull request #129 from fangjian0423/1.x
Refactor binder and update examples for 1.x branch
2018-11-29 14:14:14 +08:00
fangjian0423 e21d79b5d7 update rocketmq example readme 2018-11-29 14:05:28 +08:00
fangjian0423 ba9bbd6ab6 magic value refactor for 1.x 2018-11-29 11:23:04 +08:00
fangjian0423 08b1c3ab45 Merge remote-tracking branch 'upstream/1.x' into 1.x 2018-11-29 11:18:15 +08:00
fangjian0423 3e2564bdec update rocketmq exmaple for 1.x branch 2018-11-29 11:17:41 +08:00
fangjian0423 2c7ab714fb make metrics-core as provided dependency and refactor for 1.x branch 2018-11-29 11:17:08 +08:00
flystar32 53e4e18ab2 update nacos version to 0.5.0 , close #113 2018-11-27 14:31:45 +08:00
xiaojing e59d921aea Merge pull request #123 from fangjian0423/1.x
refactor sentinel datasource and add rocketmq binder for 1.x branch
2018-11-27 13:36:07 +08:00
fangjian0423 71f4295170 Merge remote-tracking branch 'upstream/1.x' into 1.x 2018-11-27 11:38:40 +08:00
fangjian0423 017b528e3a fix typo 2018-11-27 11:37:41 +08:00
fangjian0423 d0aa5dabbb add rocketmq binder example 2018-11-27 11:36:58 +08:00