study/Spring-Cloud-Alibaba
1
0
Fork 0
mirror of https://gitee.com/mirrors/Spring-Cloud-Alibaba.git synced 2021-06-26 13:25:11 +08:00
Code Issues Releases Wiki Activity
1,022 Commits 11 Branches 30 Tags
Commit Graph

1022 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fangjian0423
9f8e6b2f5f fix #782 2019-07-26 12:40:24 +08:00
format
36a4cc9c08
Merge pull request #766 from ly641921791/issues765 
Fixes #765 Support customized beat interval of Nacos client
 2019-07-25 16:50:10 +08:00
fangjian0423
4003350d09 fix fescar typo & other typo 2019-07-24 22:20:19 +08:00
fangjian0423
098ec40641 polish #761 update rocketmq bus pkg name for Greenwich 2019-07-24 22:19:42 +08:00
format
a94a2e8797
Merge pull request #779 from lovepoem/add_lib_to_fix_conpile_error 
Fix the sample compile error
 2019-07-24 11:20:58 +08:00
Xin Wang
7bd0adc99e update circleci url 2019-07-24 11:00:49 +08:00
ly
2b872b09e7 Merge branch 'master' into issues765 2019-07-23 23:17:19 +08:00
ly
7301700a90 Merge branch 'master' into issues765 
# Conflicts:
#	spring-cloud-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosRegistration.java
 2019-07-23 23:11:23 +08:00
ly
36d95809ed
Merge pull request #1 from alibaba/master 
Merge code from upstream
 2019-07-23 22:19:31 +08:00
ly
1e51661fc7 Merge code from upstream 2019-07-23 22:18:35 +08:00
ly
1de313079c Merge code from upstream 2019-07-23 21:40:11 +08:00
ly
af09456b7d Merge code from upstream 2019-07-23 21:34:04 +08:00
format
5a1ab06497
Merge pull request #777 from slievrly/master_1 
upgrade seata to 0.7.1 and update seata sample
 2019-07-23 21:23:44 +08:00
slievrly
471a1228ff upgrade seata to 0.7.1 and update seata sample 
Signed-off-by: slievrly <slievrly@163.com>
 2019-07-23 20:34:33 +08:00
format
0f55fcc696
Merge pull request #775 from 734184341/master 
View acm's health interface through the URL
 2019-07-23 18:44:28 +08:00
zhh
8369b0de0f 暴露acm的health接口 2019-07-23 17:13:06 +08:00
format
59c72752eb
Merge pull request #774 from Rivers-Shall/fix-acm-local-example 
Fix acm-local-example
 2019-07-23 16:45:15 +08:00
Rivers-Shall
bbc06485db Fix acm-local-example 
Make the example app automatically refresh value from acm config server
by adding `@RefreshScope` annotation.
 2019-07-23 16:25:54 +08:00
fangjian0423
0f92340ac0 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	README-zh.md
 2019-07-23 11:20:19 +08:00
fangjian0423
3d0629e03b update dingding qrcode 2019-07-23 11:20:05 +08:00
fangjian0423
82443b9bda update dingding qrcode 2019-07-23 11:17:28 +08:00
fangjian0423
883c66f251 polish #761 update pkg name & maven coordinate for Greenwich 2019-07-23 11:03:08 +08:00
ly
5fd307f429 [Issues] 765 Support customized beat interval of Nacos client 2019-07-18 23:18:23 +08:00
ly
3860f5eabb [Issues] 765 Support customized beat interval of Nacos client 2019-07-18 22:52:26 +08:00
ly
d332ae666b [Issues] 765 Support customized beat interval of Nacos client 2019-07-18 22:28:46 +08:00
fangjian0423
5cf28cb7a6 Merge remote-tracking branch 'upstream/master' 2019-07-12 19:30:34 +08:00
fangjian0423
5f1ba177b6 remove spring-cloud-alibaba-test module 2019-07-12 19:29:26 +08:00
format
ef3574d57c
Merge pull request #748 from fangjian0423/master 
package name & maven coordinates modification in Greenwich
 2019-07-11 15:42:59 +08:00
fangjian0423
79a725f0c3 update nacos-client to 1.1.1 2019-07-11 15:26:03 +08:00
fangjian0423
5f549c553a #734 -> fix circleci build error 2019-07-10 19:03:29 +08:00
fangjian0423
97844ea378 #734 -> fix circleci build error 2019-07-10 18:48:44 +08:00
fangjian0423
5fda294788 #734 -> fix circleci build error 2019-07-10 17:53:54 +08:00
fangjian0423
fd9a8f8816 update maven coordinates & docs 2019-07-10 17:15:26 +08:00
fangjian0423
cfd2544ff0 #734 -> update maven coordinates 2019-07-10 10:57:56 +08:00
fangjian0423
cb77edf8e1 #734 -> update maven coordinates 2019-07-10 10:44:08 +08:00
fangjian0423
4ff61869c1 #734 -> update pkg name 2019-07-09 18:08:36 +08:00
fangjian0423
52ac888164 #734 -> update pkg name 2019-07-08 22:42:12 +08:00
fangjian0423
aa03ddbbe2 #734 -> update maven coordinates 2019-07-08 11:38:30 +08:00
fangjian0423
3998ea23f7 NacosRule code format 2019-07-03 16:55:16 +08:00
format
bbf7bdee52
Merge pull request #727 from flystar32/master 
add modify Nacos instance status support
 2019-07-02 14:13:47 +08:00
format
bf4226e06e
Merge pull request #720 from eacdy/master 
Add NacosRule support weight rule
 2019-07-01 16:55:35 +08:00
flystar32
026f4c64bb add modify nacos instance status 2019-07-01 16:44:33 +08:00
周立
0140e274cf
FIX compile error 2019-06-27 16:03:29 +08:00
format
9d72732456
Merge pull request #721 from fangjian0423/master 
Updates to spring cloud Greenwich.SR2
 2019-06-27 14:50:39 +08:00
周立
c6e7b85137
fix NPE 
fix NPE
 2019-06-27 10:15:47 +08:00
fangjian0423
108a62a65c Updates to spring cloud Greenwich.SR2 2019-06-26 20:53:15 +08:00
里目
14818051ee A ribbon rule integrated with nacos cluster and respect nacos server's weight configuration. 2019-06-26 19:47:37 +08:00
xiaojing
95ce5835d2
Merge pull request #587 from kaiguoyuanshuai/patch-1 
update description with version
 2019-06-26 19:29:23 +08:00
format
334cc9e7fd
Merge pull request #714 from JevonYang/master 
Configuration for looking up config-server URL via nacos discovery
 2019-06-25 14:33:57 +08:00
fangjian0423
5358b2c1a8 fix #716, the conflicts of SlotChainBuilder SPI 2019-06-24 16:18:17 +08:00