320 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
fangjian0423	7e2b312fdd	fix bug about sentinel commercialization for 1.x branch	2018-12-19 23:46:12 +08:00
flystar32	c6fd82cb45	update nacos version	2018-12-19 22:35:13 +08:00
flystar32	b263e6f998	fix test case	2018-12-19 22:08:29 +08:00
fangjian0423	fa1c5f614f	Merge remote-tracking branch 'upstream/1.x' into 1.x	2018-12-19 22:00:16 +08:00
fangjian0423	bfd855f52e	sentinel commercialization feature for 1.x branch	2018-12-19 21:59:40 +08:00
pbting	3304d07a72	Merge pull request #203 from pbting/1.x ... Prevent non-refreshing	2018-12-19 21:22:42 +08:00
fangjian0423	3d99170369	refactor sentinel datasource and support commercialized for 1.x branch	2018-12-19 20:59:10 +08:00
pengbingting	50af7e2d32	update the field value and Optimizing Code Design for NacosContextRefresher	2018-12-19 20:35:00 +08:00
pengbingting	100a39da69	Prevent non-refreshing configurations from retrieving the latest configuration values when refreshing	2018-12-19 20:33:04 +08:00
pbting	6ab6cee307	Merge pull request #1 from spring-cloud-incubator/1.x ... 合并一次1.x 代码	2018-12-19 15:14:05 +08:00
pbting	50a4cccad4	Merge pull request #199 from pbting/1.x ... 更改获取所有NacosPropertySource的方式	2018-12-19 15:12:10 +08:00
pengbingting	88026bf7cd	Nacos Config 代码变动： ... 1、更改获取所有NacosPropertySource的方式	2018-12-19 15:09:56 +08:00
flystar32	04ff0dc067	update ACM listener logic and publish a refresh event instead of invoke refresh method	2018-12-19 15:03:00 +08:00
fangjian0423	5268c7fcaa	Merge remote-tracking branch 'upstream/1.x' into 1.x	2018-12-18 22:38:40 +08:00
fangjian0423	12a24b3a62	calculate exception ratio in Sentinel RestTemplate and fix bug about hostresource is same with hostresourcewithpath	2018-12-18 22:38:09 +08:00
flystar32	e919a71a57	update docs	2018-12-18 20:17:50 +08:00
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