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

1525 Commits

Author SHA1 Message Date
Mercy Ma
ad43541a4b
Merge pull request #1630 from mercyblitz/master
Dubbo Update
2020-08-11 15:08:19 +08:00
mercyblitz
098919807b Polish alibaba/spring-cloud-alibaba#1611 : When openfeign and dubbo coexist, DubboServiceAutoConfiguration.primaryPropertyResolver configuration causes openfeign call to fail #728 2020-08-10 16:07:44 +08:00
mercyblitz
1a368ee6f8 Polish alibaba/spring-cloud-alibaba#1624 : [Infrastructure] Upgrading Alibaba's Spring Context Support to 1.0.9 2020-08-10 16:04:01 +08:00
mercyblitz
915db3adec Polish alibaba/spring-cloud-alibaba#1624 : Upgrading the Dubbo Spring Boot to be 2.7.8 2020-08-10 16:02:28 +08:00
余黄彬
0cf1370e3e
Merge pull request #1622 from ChixianGen/spring-cloud-alibaba-cxg
'修复字段masterId判断bug'
2020-08-10 13:17:37 +08:00
xsjk_chixiangen
4fd7df8d95 '修复字段masterId判断bug' 2020-08-10 10:38:54 +08:00
余黄彬
899b7b4fe0
Merge pull request #1614 from jjyyjjyy/master
Fix typo in NacosWatch
2020-08-07 10:37:45 +08:00
余黄彬
ecd8fb7590
Merge pull request #1618 from AhianZhang/patch-1
docs: update nacos-config.adoc
2020-08-07 09:20:42 +08:00
余黄彬
16cc97a897
Merge pull request #1483 from zkzlx/fix-1418
[issue #1418 ]shareIds和拉取nacos的顺序不对
2020-08-07 09:19:47 +08:00
Ahian Zhang
5bd3400e36
docs: update nacos-config.adoc 2020-08-06 16:11:28 +08:00
jy
cf4fdaa3c8 Fix typo in NacosWatch 2020-08-03 17:52:34 +08:00
余黄彬
f9f3bd8a54
Merge pull request #1488 from zkzlx/nacos-register
[enhance issue #1478 ]支持注册非活动节点
2020-07-24 18:58:36 +08:00
Jim Fang
f6fb6890b9
Merge pull request #1481 from nine-third-repo/master
[Optimize]: NacosRule support group
2020-07-13 11:54:22 +08:00
zkzlx
940420b0bf [enhance issue #1478 ]支持注册非活动节点-merge 2020-07-09 10:49:51 +08:00
zkzlx
f2f58b90a0 Merge remote-tracking branch 'upstream/master' into nacos-register
# Conflicts:
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java
2020-07-09 10:47:25 +08:00
Mercy Ma
bc657f6677
Merge pull request #1511 from J-Cod3r/master
fix nacos-discovery-example readme doc
2020-07-09 10:39:36 +08:00
Mercy Ma
04c0680e33
Merge pull request #1484 from yinqifang/master
修正错别字
2020-07-09 10:39:23 +08:00
Mercy Ma
5de5d9d386
Merge pull request #1546 from yuhuangbin/master
[Enhancement] spring-cloud-starter-alibaba-sentinel dependency
2020-07-09 10:33:10 +08:00
Mercy Ma
93cb226850
Merge pull request #1536 from guerlab/master
[issue #1535 ]fix NacosServiceDiscovery.hostToServiceInstance  method potential NullPointerException
2020-07-09 10:30:01 +08:00
yuhuangbin
5078f355ca fix dependency 2020-06-28 10:03:36 +08:00
guerlab
7667a05aef
fix NacosServiceDiscovery NullPointerException 2020-06-19 11:25:57 +08:00
guerlab
3af1b5c51c
fix potential NullPointerException 2020-06-18 23:16:27 +08:00
余黄彬
bfbb680f6b
Merge pull request #23 from alibaba/master
update
2020-06-16 20:35:30 +08:00
J-Cod3r
1e74332a0a update nacos-discovery-example readme 2020-06-07 12:26:32 +00:00
抱紧我的小鲤鱼
aaccfbf929
Merge pull request #1 from alibaba/master
update
2020-06-05 22:25:29 +08:00
Mercy Ma
7b42a9a31e
Merge pull request #1503 from delicious-zen/master
Update RocketMQMessageChannelBinder.java
2020-06-04 11:00:15 +08:00
delicious
ec06f97aa0
Update RocketMQMessageChannelBinder.java
use   AbstractMessageChannel.getInterceptors() to replace  ChannelInterceptorAware.getChannelInterceptors()
2020-06-02 20:12:04 +08:00
zkzlx
0a89ad61e1 [enhance issue #1478 ]支持注册非活动节点 2020-05-27 17:13:59 +08:00
Yin Qifang
1ced8d231b
修正错别字
”去 name“应该是”取 name“
2020-05-26 17:19:28 +08:00
zkzlx
3984336a14 [issue #1418 ]shareIds和拉取nacos的顺序不对 2020-05-26 14:51:17 +08:00
抱紧我的小鲤鱼
eff43225d6
fix(nacos): support group
add search instance by group
2020-05-26 11:22:54 +08:00
余黄彬
6411a24719
Merge pull request #22 from alibaba/master
update
2020-05-20 17:38:52 +08:00
Mercy Ma
213bf2a912
Merge pull request #1457 from yuhuangbin/nacos-1.3.0
Nacos Client Instance field enabled Initialize
2020-05-18 16:53:40 +08:00
yuhuangbin
8a68526da7 fix issue#1456 2020-05-17 12:50:03 +08:00
yuhuangbin
9737f0dfbb Merge branch 'master' of https://github.com/yuhuangbin/spring-cloud-alibaba 2020-05-17 09:26:04 +08:00
余黄彬
2a643c82bf
Merge pull request #21 from alibaba/master
update
2020-05-17 09:25:37 +08:00
Mercy Ma
83800b23b6
Merge pull request #1452 from eshun/master
多注册中心动态切换serverAddr配置还是保留旧注册中心地址
2020-05-15 14:33:14 +08:00
eshun
1a163b1b85 服务注册切换 2020-05-15 09:31:24 +08:00
Mercy Ma
28c9e630cb
Merge pull request #1394 from yuhuangbin/master
upgrade seata version to 1.2.0
2020-05-14 16:26:48 +08:00
Mercy Ma
a88bd7008e
Merge pull request #1446 from jwf1173/dubbo-registry-bugfixed
Fix dubbo service call error when dubbo.protocol.port is not specified
2020-05-14 16:25:45 +08:00
jwf1173
5d462252f5 修复未指定dubbo.protocol.port时,dubbo服务调用报错问题 2020-05-11 11:04:33 +08:00
Mercy Ma
a1c140ba8a
Merge pull request #1428 from CodingSinger/FIX_REGISTRY
fix the issue SpringCloudRegistryFactory always create registry instance
2020-05-08 18:24:06 +08:00
Mercy Ma
cb9b61f2b8
Merge pull request #1436 from yuhuangbin/nacosConfig-enhance
NacosDataPropertiesParser enhance
2020-05-08 18:23:15 +08:00
Mercy Ma
2e934f09e9
Merge pull request #1398 from yuhuangbin/sidecar-enhance
sidecar enhance
2020-05-08 16:20:32 +08:00
Mercy Ma
c7ea46301f
Merge pull request #1354 from yuhuangbin/sentinel-nacos
Sentinel Nacos Data Source Certification
2020-05-08 16:16:22 +08:00
yuhuangbin
2373f71005 NacosDataPropertiesParser enhance 2020-05-08 16:02:27 +08:00
余黄彬
3ecae6f35d
Merge pull request #20 from alibaba/master
update
2020-05-08 15:57:10 +08:00
Mercy Ma
593433502d
Merge pull request #1433 from yuhuangbin/sentinel-1.7.2
Upgrade Sentinel version to 1.7.2
2020-05-08 15:12:04 +08:00
yuhuangbin
9831e9b69b upgrade sentinel version to 1.7.2 2020-05-08 14:11:27 +08:00
Ooo0oO0o0oO
d11a922cf2 format import 2020-05-08 11:31:13 +08:00