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

1474 Commits

Author SHA1 Message Date
liuchunguang
0747557330 fix #1259 #1260 #753 checkStyle 2020-03-26 10:07:46 +08:00
liuchunguang
0485c6d06d fix #1259 #1260 #753 checkStyle 2020-03-26 09:33:28 +08:00
liuchunguang
b56464c5c7 fix #1259 #1260 #753 2020-03-25 18:16:13 +08:00
liuchunguang
e5188e63d9 Merge remote-tracking branch 'origin/master' 2020-03-25 17:52:16 +08:00
yuhuangbin
3e8f977a7e
Merge pull request #13 from alibaba/master
update
2020-03-25 13:28:16 +08:00
yuhuangbin
1b7ae80e1c
Merge pull request #1280 from fudali113/f-condition-with-config-health-indicator
[Optimize] Use @ConditionalOnEnabledHealthIndicator to conditional assembly
2020-03-25 10:22:57 +08:00
fudali113
a218e6f5ce feat: use ConditionalOnEnabledHealthIndicator condition with NacosConfigHealthIndicator & AcmHealthIndicator & RocketMQBinderHealthIndicator & SidecarHealthIndicator
[fix #1276] https://github.com/alibaba/spring-cloud-alibaba/issues/1276
2020-03-25 10:10:45 +08:00
Jim Fang
fd77b6f019
Merge pull request #1284 from mercyblitz/master
[Refactor] Renaming spring-cloud-starter-alibaba to be spring-cloud-alibaba-starters
2020-03-25 00:39:55 +08:00
mercyblitz
d57cbc2e4d Polish alibaba/spring-cloud-alibaba/#1283 : Renaming spring-cloud-starter-alibaba to be spring-cloud-alibaba-starters 2020-03-25 00:12:16 +08:00
yuhuangbin
1dad713074
Merge pull request #12 from alibaba/master
update
2020-03-24 16:36:58 +08:00
Jim Fang
f5c713e65e
update dingtalk qrcode 2020-03-24 16:28:24 +08:00
Jim Fang
4476995fe9
Merge pull request #1281 from mercyblitz/master
[Migration] Removing the commercial components from the code base
2020-03-24 15:46:44 +08:00
mercyblitz
2282d39df6 Polish alibaba/spring-cloud-alibaba/#1261 : Removing the commercial examples and adding starters into spring-cloud-alibaba-coverage module 2020-03-24 14:51:44 +08:00
mercyblitz
c3697145e3 Merge remote-tracking branch 'upstream/master' 2020-03-24 14:20:24 +08:00
yuhuangbin
a636666a20
Merge pull request #11 from alibaba/master
update
2020-03-20 15:38:03 +08:00
liuchunguang
2545e11c06 fix #1259 2020-03-20 15:01:28 +08:00
lcg72
6ccdfab3cc
Merge pull request #1 from alibaba/master
update
2020-03-19 09:56:33 -05:00
Mercy Ma
3c6a54c889
Merge pull request #1274 from wangzihaogithub/fix#753
[fix #753] https://github.com/alibaba/spring-cloud-alibaba/issues/753
2020-03-18 14:46:37 +08:00
Mercy Ma
e695fd5f37
Merge pull request #1237 from illlight/master
healthcheck switch config property
2020-03-18 12:24:35 +08:00
wangzihaogithub
a32d4f9767 [fix #753] https://github.com/alibaba/spring-cloud-alibaba/issues/753 2020-03-18 12:17:58 +08:00
wangzihaogithub
8c13863fb8 [fix #753] https://github.com/alibaba/spring-cloud-alibaba/issues/753 2020-03-18 12:11:21 +08:00
mercyblitz
45260742ba Polish alibaba/spring-cloud-alibaba/#1261 : Removing the commercial components from the code base 2020-03-17 10:32:45 +08:00
yuhuangbin
6095930326
Merge pull request #10 from alibaba/master
update
2020-03-16 11:24:14 +08:00
Mercy Ma
269d541c30
Merge pull request #1252 from yuhuangbin/based-on-Hoxton.SR3
[Feature] Upgrade some components based on Spring Cloud Hoxton.SR3
2020-03-16 10:56:34 +08:00
yuhuangbin
e8e49ff39b upgrade Seata and Spring Cloud Version 2020-03-12 22:49:58 +08:00
illlight
9c839c97af conditional healthcheck 2020-03-12 20:29:35 +08:00
yuhuangbin
1f11c09e98
Merge pull request #9 from alibaba/master
update
2020-03-12 11:25:11 +08:00
Mercy Ma
aec251469f
Merge pull request #1240 from theonefx/fix/temp01
remove force dependency code of spring-cloud in AliCloudContextAutoCo…
2020-03-11 15:39:02 +08:00
theonefx
23f7a60d0a rename inner config class 2020-03-11 15:22:49 +08:00
theonefx
c601c174b9 rename AutoConfiguration class name 2020-03-11 11:44:59 +08:00
Mercy Ma
506e1e6601
Merge pull request #1233 from yuhuangbin/nacos-enhance
Upgrade Nacos client version
2020-03-11 10:55:08 +08:00
theonefx
73495d2dcc remove force dependency code of spring-cloud in AliCloudContextAutoConfiguration 2020-03-09 11:15:45 +08:00
yuhuangbin
756c82ba1e upgrade nacos client version 2020-03-07 15:31:31 +08:00
yuhuangbin
0586f6a974
Merge pull request #8 from alibaba/master
update
2020-03-06 20:58:12 +08:00
Mercy Ma
b2d1e430c3
Merge pull request #1229 from mercyblitz/master
Polish alibaba/spring-cloud-alibaba/#1222 : Combining the code-based …
2020-03-06 15:36:37 +08:00
mercyblitz
1b749d47c1 Polish alibaba/spring-cloud-alibaba/#1222 : Resolve the examples issues 2020-03-06 15:15:48 +08:00
mercyblitz
93d5ce1054 Polish alibaba/spring-cloud-alibaba/#1222 : Resolve the relative path of pom.xml 2020-03-06 14:20:28 +08:00
mercyblitz
155ea9418f Polish alibaba/spring-cloud-alibaba/#1222 : Combining the code-based and starter modules 2020-03-06 13:40:22 +08:00
yuhuangbin
3b7739efc3
Update README-zh.md 2020-03-05 14:40:48 +08:00
yuhuangbin
5683f9d7a7
Update README.md 2020-03-05 14:39:41 +08:00
Jim Fang
5f10d99e57
Merge pull request #1217 from yuhuangbin/sentinel-zuul
fix Sentinel zuul NPE
2020-02-27 09:52:21 +08:00
yuhuangbin
becc2dff86 fix sentinel-zuul NPE 2020-02-26 18:13:07 +08:00
Jim Fang
f85fc60c1a
Merge pull request #1206 from pigxcloud/master
Modify the sentinelInterceptor default interception rule and backward…
2020-02-24 09:20:37 +08:00
Jim Fang
77d2ce8ef8
Merge pull request #1210 from echooymxq/master
Use the bounded elastic thread pool when subscribe.
2020-02-24 09:19:44 +08:00
yuhuangbin
40671aae98
Merge pull request #7 from alibaba/master
update
2020-02-23 21:34:50 +08:00
echooymxq
1beb1a72fa Use the bounded elastic thread pool when subscribe. 2020-02-23 16:38:28 +08:00
Jim Fang
05d56536c6
Merge pull request #1207 from xht555/bugfix
shutdown the taskScheduler when the NacosWatch bean is destroyed.
2020-02-19 00:39:52 +08:00
xht555
0d73a30e39 shutdown the taskScheduler when the NacosWatch bean is destroyed. 2020-02-18 22:28:26 +08:00
冷冷
675920264b edit test 2020-02-18 18:11:17 +08:00
冷冷
8911f253d4 Modify the sentinelInterceptor default interception rule and backward compatibility 2020-02-18 16:16:23 +08:00