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

1719 Commits

Author SHA1 Message Date
mercyblitz
f34a8a13c6 Polish alibaba/spring-cloud-alibaba#1665 : [Sample] Upgrading the Dubbo Sample 2020-08-25 16:50:53 +08:00
余黄彬
3b62ef00b3
Merge pull request #28 from alibaba/master
update
2020-08-25 16:23:48 +08:00
mercyblitz
c0bcd52381 Polish alibaba/spring-cloud-alibaba#1661 : [Feature] Introducing Dubbo Gateway 2020-08-25 16:22:12 +08:00
Mercy Ma
52e6147b10
Merge pull request #1650 from slievrly/master_0820
[Seata]: upgrade seata version to 1.3.0
2020-08-21 16:00:14 +08:00
slievrly
c4f5c7d2b2 [Seata]: upgrade seata version to 1.3.0
Signed-off-by: slievrly <slievrly@163.com>
2020-08-20 11:52:53 +08:00
余黄彬
65a902392a
Update README.md 2020-08-19 10:53:20 +08:00
余黄彬
bace42b048
Update README-zh.md 2020-08-19 10:49:57 +08:00
余黄彬
584486c796
Merge pull request #1646 from SunJiFengPlus/master
fixed Nacos-config Doc.
2020-08-19 08:52:40 +08:00
孙继峰
ad36fd2e95
修正文档 2020-08-17 20:00:07 +08:00
余黄彬
3c2aaba3de
Merge pull request #27 from alibaba/master
update
2020-08-13 19:31:46 +08:00
Mercy Ma
99d432cb49
Merge pull request #1638 from mercyblitz/master
[Nacos] Adding the destroy lifecycle callback for NamingService
2020-08-13 17:18:16 +08:00
余黄彬
a50adb9b33
Merge pull request #26 from alibaba/master
update
2020-08-13 16:41:31 +08:00
mercyblitz
5da87d756d Polish alibaba/spring-cloud-alibaba#1453 : [Nacos] Adding the destroy lifecycle callback for NamingService 2020-08-13 16:24:01 +08:00
mercyblitz
43eaadd30a Merge remote-tracking branch 'upstream/master' 2020-08-13 15:45:06 +08:00
mercyblitz
c26ac6fe0f Polish alibaba/spring-cloud-alibaba#1453 : [Nacos] Adding the destroy lifecycle callback for NamingService 2020-08-13 15:37:14 +08:00
K
ba2d96edcd
Merge pull request #3 from alibaba/master
sync
2020-08-11 16:23:55 +08:00
Mercy Ma
8e88a26f3d
Merge pull request #1631 from mercyblitz/master
[Infrastructure] Upgrading the dependencies of nacos
2020-08-11 16:18:23 +08:00
mercyblitz
62def5876a Polish alibaba/spring-cloud-alibaba#1628 : [Infrastructure] Upgrading the dependencies of Nacos 2020-08-11 16:09:43 +08:00
mercyblitz
824daf5bb6 Polish alibaba/spring-cloud-alibaba#1628 : [Infrastructure] Upgrading the dependencies of Nacos 2020-08-11 15:55:26 +08:00
K
1e301b2168
Merge pull request #2 from alibaba/master
sync
2020-08-11 15:29:02 +08:00
mercyblitz
e838f471a4 Polish alibaba/spring-cloud-alibaba#1628 : [Infrastructure] Upgrading the dependencies of Nacos 2020-08-11 15:18:59 +08:00
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
zkzlx
1710d827fb [pr #1531]Improved nacos configuration parsing 2020-08-03 14:22:15 +08:00
K
5066b92378
Merge pull request #1 from alibaba/master
sync codes
2020-07-27 17:43:28 +08:00
余黄彬
91582c732d
Merge pull request #25 from alibaba/master
update
2020-07-27 14:50:13 +08:00
如梦技术
20f0e57714 add NacosRegistrationCustomizer.java 2020-07-26 22:49:10 +08:00
如梦技术
588f72a933 add NacosRegistrationCustomizer.java 2020-07-26 22:30:35 +08:00
余黄彬
f9f3bd8a54
Merge pull request #1488 from zkzlx/nacos-register
[enhance issue #1478 ]支持注册非活动节点
2020-07-24 18:58:36 +08:00
祁晓波
443605b5ea
Merge pull request #2 from qixiaobo/patch-3
Update SentinelHealthIndicatorTests.java
2020-07-16 13:04:10 +08:00
祁晓波
eb09c52db5
Update SentinelHealthIndicatorTests.java
update down status to unknown
2020-07-16 12:56:58 +08:00
祁晓波
01ddc49f20
Merge pull request #1 from qixiaobo/patch-3
update SentinelHealthIndicatorTests
2020-07-16 12:42:18 +08:00
祁晓波
2d6aead7eb
update SentinelHealthIndicatorTests 2020-07-15 23:49:50 +08:00
祁晓波
7921da5ee6
to avoid k8s readinessProbe remove the pod
For sentinel , we just no need remove the pod just because of the dashboard unreachable.
2020-07-15 21:26:54 +08:00
余黄彬
a8ac85beb9
Merge pull request #24 from alibaba/master
update
2020-07-15 17:13:54 +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