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

1551 Commits

Author SHA1 Message Date
Jim Fang
8e63a01e2f
Merge pull request #1176 from yuhuangbin/seata-feign-loadbalancer
[optimize] Seata feign loadbalancer
2020-01-20 15:49:26 +08:00
Jim Fang
7b505b6cb2
Merge pull request #1177 from yuhuangbin/acm-enhance
[optimize] Acm enhance base Spring Cloud Common 2.2.1
2020-01-20 15:08:38 +08:00
yuhuangbin
acf7001d9f enhance ACM module base spring-cloud-common 2.2.1 2020-01-20 14:42:53 +08:00
yuhuangbin
26741dc799 fix nacos load data 2020-01-16 16:34:49 +08:00
yuhuangbin
ab06f3232c seata feignloadbalancer enhance 2020-01-15 22:08:52 +08:00
yuhuangbin
648944df09
Merge pull request #6 from alibaba/master
update
2020-01-15 18:24:48 +08:00
Jim Fang
5f8d8cc043
Merge pull request #1154 from slievrly/springboot
adapter: use seata-spring-boot-starter's autoConfiguration instead of spring-cloud-alibaba-seata-starter's autoConfiguration
2020-01-15 17:52:43 +08:00
yuhuangbin
8a29377782
Merge pull request #5 from alibaba/master
upgrade to Hoxton.SR1
2020-01-15 16:48:43 +08:00
fangjian0423
c94c84d110 upgrade to Hoxton.SR1 2020-01-15 16:45:36 +08:00
yuhuangbin
0973be9750
Merge pull request #4 from alibaba/master
upgrade to Hoxton.SR1
2020-01-15 16:41:07 +08:00
fangjian0423
7bc57cbfdf upgrade to Hoxton.SR1 2020-01-15 16:28:34 +08:00
yuhuangbin
322c7db4a5
Merge pull request #3 from alibaba/master
update
2020-01-15 15:42:59 +08:00
fangjian0423
9a5518d302 update nacos config example 2020-01-15 15:30:41 +08:00
Jim Fang
23c3dd69ab
Merge pull request #1167 from yuhuangbin/nacos-loaddata
[Bugfix] Resolve the type erase caused by loading Nacos data
2020-01-15 15:16:15 +08:00
Jim Fang
f789803cac
Merge pull request #1171 from yuhuangbin/sentinel-enhance
[Upgrade] Upgrade Sentinel and Enhance
2020-01-14 17:00:57 +08:00
fangjian0423
00d449ba23 pass code check 2020-01-14 16:54:01 +08:00
slievrly
d040d6a3b7 throw exception
Signed-off-by: slievrly <slievrly@163.com>
2020-01-14 15:32:40 +08:00
fangjian0423
ddceb5f312 add spring cloud sentinel circuitbreaker demo 2020-01-14 15:06:26 +08:00
yuhuangbin
b0273fb1c8 upgrade sentinel version and enhance 2020-01-14 13:02:32 +08:00
fangjian0423
b70129c17f add reactive discovery example 2020-01-13 20:14:23 +08:00
fangjian0423
a9e519265a add s-c-loadbalancer example 2020-01-13 11:28:23 +08:00
yuhuangbin
f7455bcf88 add Json parser test cast 2020-01-13 10:44:15 +08:00
yuhuangbin
0b50a47a02 enhance load config data from Nacos 2020-01-10 20:11:26 +08:00
yuhuangbin
9b45147d4e
Merge pull request #2 from alibaba/master
update
2020-01-08 11:38:47 +08:00
Jim Fang
2a18ddb0be
Merge pull request #1136 from zkzlx/config-eh
[issue #982 & issue #978]enhance nacos config
2020-01-07 15:58:29 +08:00
zkzlx
c348421970 [issue #982 & issue #978]enhance nacos config - code review 2020-01-07 12:52:08 +08:00
Jim Fang
d28a36d149
Merge pull request #1112 from JunRzz/master
Suport Ribbon ConfigurationBasedServerList
2020-01-06 17:50:36 +08:00
yuhuangbin
c7f1d02e21
Merge pull request #1 from alibaba/master
update
2020-01-06 14:26:33 +08:00
format
d675d7d47f
Merge pull request #1149 from yuhuangbin/RocketMq-properties
Change the class type of RocketMQ nameServer
2020-01-06 10:46:45 +08:00
yuhuangbin
fed46416be fix 2020-01-05 13:21:21 +08:00
mercyblitz
52ce4b53a7 Merge remote-tracking branch 'upstream/master' 2020-01-02 10:18:16 +08:00
slievrly
f36c94d3ed fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
2020-01-01 14:29:54 +08:00
slievrly
fbd72a6000 fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
2020-01-01 12:41:28 +08:00
slievrly
4ac2622753 fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
2020-01-01 12:39:49 +08:00
slievrly
c644a2c1ec fix ci
Signed-off-by: slievrly <slievrly@163.com>
2020-01-01 11:28:30 +08:00
slievrly
c216cad31c fix properties
Signed-off-by: slievrly <slievrly@163.com>
2020-01-01 11:07:03 +08:00
slievrly
7b79b6a11b Merge remote-tracking branch 'upstream/master' into springboot
Signed-off-by: slievrly <slievrly@163.com>

# Conflicts:
#	spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java
2019-12-31 18:45:14 +08:00
slievrly
34d8267068 adapter: use seata-spring-boot-starter's autoConfiguration instead of spring-cloud-alibaba-seata-starter's autoConfiguration
Signed-off-by: slievrly <slievrly@163.com>
2019-12-31 18:40:14 +08:00
yuhuangbin
1368a1aa84 Change the class type of nameServer 2019-12-30 15:42:34 +08:00
format
aba89ed5ba
Merge pull request #1100 from pigxcloud/master
replace code properties that have expired
2019-12-30 11:19:44 +08:00
format
c3d76b391f
Merge pull request #1115 from echooymxq/performance_#1090
Use 'proxyBeanMethods = false' where possible.
2019-12-30 11:18:00 +08:00
fangjian0423
a27d0e2c71 optimize dubbo dependency and code style 2019-12-29 02:05:23 +08:00
zkzlx
85ddda03ff [issue #982 & issue #978]enhance nacos config 2019-12-18 15:16:42 +08:00
fangjian0423
54d97a37b4 optimize pom 2019-12-17 11:00:34 +08:00
mercyblitz
0def289574 Merge remote-tracking branch 'upstream/master' 2019-12-16 09:56:56 +08:00
Mercy Ma
1d99e35977
Merge pull request #1124 from yuhuangbin/nacos-branch
support more config for Nacos
2019-12-11 16:20:48 +08:00
Mercy Ma
1afc7cbbc1
Merge pull request #1098 from slievrly/cglib
bugfix: SeataBeanPostProcessor can't use cglib proxy
2019-12-11 16:19:36 +08:00
yuhuangbin
792d008863 Support more config for Nacos 2019-12-11 14:17:08 +08:00
yuhuangbin
829dc23550
Merge pull request #2 from alibaba/master
update
2019-12-11 11:27:24 +08:00
Mercy Ma
3f8e6d69bf
Merge pull request #1104 from yuhuangbin/seata-feign
Support seata feign loadbalancer
2019-12-11 11:11:25 +08:00