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
463 Commits 11 Branches 30 Tags
Commit Graph

463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mengxiangrui003
94f3de3b36 Merge branch 'master' of https://github.com/spring-cloud-incubator/spring-cloud-alibaba 2018-12-12 21:49:42 +08:00
pbting
8bc31f6327
Merge pull request #165 from pbting/master 
add a new feature content of that support custom Data Id for Nacos Config
 2018-12-12 21:03:34 +08:00
pbting
a19a56b5e3 update the reference document 2018-12-12 18:01:41 +08:00
Xiaolong Zuo
6a536063cf
Merge pull request #164 from xiaolongzuo/master 
closes #162, fixes #138.
 2018-12-12 17:58:24 +08:00
pbting
357c00556a add a new feature of that support custom Data Id for Nacos Config 2018-12-12 17:58:20 +08:00
xiaolongzuo
1fc98ebe7c closes #162, fixes #138. Add spring-cloud-alicloud-schedulerX module, and fix ACM starter rely on actuator. 2018-12-12 17:56:16 +08:00
xiaojing
a2ed75676d
Merge pull request #157 from fangjian0423/master 
RocketMQ Binder support transactional message
 2018-12-12 17:08:48 +08:00
pbting
b1084d1d92
Merge pull request #6 from spring-cloud-incubator/master 
同步最新的代码
 2018-12-12 16:44:50 +08:00
fangjian0423
5643c952a8 update docs 2018-12-12 15:03:53 +08:00
fangjian0423
7d3a1b9adf add transaction message in rocketmq example 2018-12-12 15:00:11 +08:00
fangjian0423
6d3a26702a Polish #134 2018-12-12 14:52:40 +08:00
mengxiangrui003
11c45eb5ab Merge branch 'master' of https://github.com/spring-cloud-incubator/spring-cloud-alibaba 2018-12-11 21:15:18 +08:00
mengxiangrui003
8b7b7ad3cd add NacosConfigProperties PREFIX 2018-12-11 21:12:59 +08:00
mengxiangrui003
6c882db418 optimize nacos config client code 2018-12-11 21:05:37 +08:00
flystar32
c26da5643a Add spring-cloud-alibaba-nacos-config-server module, close #34 2018-12-11 20:02:43 +08:00
xiaojing
f76eafd38b
Merge pull request #152 from fangjian0423/master 
fix bugs about sentinel starter
 2018-12-11 19:15:02 +08:00
fangjian0423
098b103166 fixes #150 2018-12-11 17:11:22 +08:00
fangjian0423
62c0326090 fixes #151 2018-12-11 17:08:13 +08:00
Spencer Gibb
de0059359f
Fixes problems in documentation build. 
Adds documentation build to circleci
 2018-12-10 11:55:40 -05:00
flystar32
b389112c6b update example configuration 2018-12-10 16:31:16 +08:00
fangjian0423
f40381fc6c update docs 2018-12-06 20:17:07 +08:00
xiaojing
d874592e3f
Merge pull request #142 from fangjian0423/master 
Sentinel integration with feign and handle some issues
 2018-12-06 19:12:07 +08:00
fangjian0423
54dcd7eaec update sentinel docs 2018-12-06 16:11:42 +08:00
fangjian0423
ac2eee154d Add log configuration for Sentinel 2018-12-06 16:09:32 +08:00
fangjian0423
cd6f79b16b Polish #115 2018-12-06 16:02:18 +08:00
fangjian0423
0af67df3e3 using sentinel feign in nacos discovery example 2018-12-06 14:16:47 +08:00
fangjian0423
a560774966 Sentinel support feign and close #6 2018-12-06 11:50:48 +08:00
fangjian0423
b8f608eaa5 Merge remote-tracking branch 'upstream/master' 2018-12-06 11:44:41 +08:00
xiaojing
09aa04eaba
Merge pull request #140 from pbting/master 
add a title for end
 2018-12-05 21:03:18 +08:00
pbting
ff30e58da6 add a title for end 2018-12-05 21:01:52 +08:00
xiaojing
d55bc6fcfc
Merge pull request #139 from pbting/master 
a solution for custom configure dataid
 2018-12-05 20:58:27 +08:00
pbting
1cc2a20d18 update the format 2018-12-05 20:51:05 +08:00
pbting
90804663e5 update the format for document 2018-12-05 20:50:12 +08:00
pbting
4cae318da3 add a solution document fot nacos config shared configuration and custom dataids 2018-12-05 20:46:06 +08:00
xiaojing
5c86086e00
Update nacos-config.adoc 2018-12-05 15:24:33 +08:00
fangjian0423
53643b94ce fixes #9 2018-12-05 12:45:02 +08:00
xiaojing
0c8bd1b58a
Merge pull request #137 from pbting/master 
add nacos configuration metadata
 2018-12-05 10:27:23 +08:00
flystar32
eeba7e6aa6 update nacos discovery logic, support both health and enabled 2018-12-04 15:02:26 +08:00
pbting
86bd83af83 add nacos config configuration metadata 2018-12-04 14:29:01 +08:00
xiaojing
4f2eb7487d
Merge pull request #135 from pbting/master 
Nacos Config Support multi DataIds
 2018-12-04 10:51:18 +08:00
pbting
356ce112a9 code format 2018-12-04 10:37:57 +08:00
pbting
63fd351256 Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba 2018-12-04 10:02:52 +08:00
pbting
997c633601
Merge pull request #4 from spring-cloud-incubator/master 
同步一次外部代码
 2018-12-04 10:02:17 +08:00
pbting
5e5fb2a068 Merge branch 'master' of https://github.com/pbting/spring-cloud-alibaba 2018-12-04 10:00:14 +08:00
pbting
ba90952880 nacos starter 支持可自定义dataid配置以及Nacos 商业化和云上ACM 对接 2018-12-04 09:59:55 +08:00
fangjian0423
25aecfe1ad update docs 2018-11-30 16:47:19 +08:00
fangjian0423
c665e97fb1 remove unuseful logging 2018-11-30 16:46:59 +08:00
fangjian0423
9d59a0e2e5 add apache license for rocketmq binder 2018-11-29 14:30:36 +08:00
xiaojing
473b3da642
Merge pull request #127 from pbting/patch-2 
添加新的说明
 2018-11-29 11:04:57 +08:00
xiaojing
2d7f15c912
Merge branch 'master' into patch-2 2018-11-29 11:04:49 +08:00