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

537 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
得少
e4cc98b90c update the log information 2019-02-18 15:10:50 +08:00
得少
997faff710 add nacos discovery starter support to connect to aliyun 2019-02-18 09:52:41 +08:00
pbting
90a7769180
Merge pull request #4 from spring-cloud-incubator/master 
Synchronize code once
 2019-02-15 13:48:34 +08:00
flystar32
7677507294 Polish #345 , fixes @AutoConfigureAfter(AutoServiceRegistrationAutoConfiguration.class) 2019-02-14 10:46:51 +08:00
xiaojing
d6334fbe87
Merge pull request #350 from xiaolongzuo/master 
Add test case for alicloud-context.
 2019-02-13 19:05:05 +08:00
xiaolongzuo
5c26eb90e0 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 2019-02-13 17:17:26 +08:00
xiaolongzuo
910068c91f Add test case. 2019-02-13 17:16:52 +08:00
Mercy Ma
e7b4a08f44
Merge pull request #339 from mercyblitz/master 
[Module] Dubbo Spring Cloud
 2019-02-01 22:42:48 +08:00
mercyblitz
ff6e68d522 Update Dubbo Spring Boot 0.2.1.RELEASE 2019-02-01 22:33:47 +08:00
mercyblitz
a5e950186f Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java
#	spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java
#	spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/NacosDataSourceProperties.java
#	spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java
 2019-02-01 22:08:21 +08:00
xiaojing
13097fd32c
Merge pull request #338 from fangjian0423/binder-dev 
remove sentinel commercialization logic &  optimize NacosDataSource
 2019-02-01 17:26:38 +08:00
fangjian0423
fd6d3a7717 remove sentinel commercialization logic & optimize NacosDataSource 2019-02-01 14:04:54 +08:00
format
78e5a0a380
Merge pull request #337 from flystar32/master 
Fixes #331
 2019-02-01 13:00:04 +08:00
flystar32
e6a1ba09fb Fixes #331 2019-02-01 12:48:43 +08:00
xiaojing
c5fa7068a4
Update README-zh.md 2019-02-01 11:28:10 +08:00
xiaojing
fe66f83da5
Update README-zh.md 2019-02-01 11:21:48 +08:00
xiaojing
744788fd62
Update Roadmap.md 2019-02-01 10:45:13 +08:00
xiaojing
2cb7123f00
Update Roadmap-zh.md 2019-02-01 10:43:49 +08:00
xiaojing
1d47d3859f
Update Roadmap-zh.md 2019-02-01 10:42:57 +08:00
xiaojing
41b3cb0968
Update Roadmap.md 2019-02-01 10:42:11 +08:00
xiaojing
494e7ea117
Update README.md 2019-02-01 10:41:16 +08:00
xiaojing
0dd3a1fb48
Update issue templates 2019-01-31 16:58:43 +08:00
xiaojing
6296bd8b5d
Update issue templates 2019-01-31 16:52:59 +08:00
format
a0612ec24c
Merge pull request #335 from flystar32/master 
Fixes #333, make @EnableDiscoveryClient Optional
 2019-01-31 15:20:01 +08:00
flystar32
450f1e8269 modify example to verify . 2019-01-31 15:02:30 +08:00
flystar32
4a62526b2a Fixes #333 ,make @EnableDiscoveryClient Optional 2019-01-31 14:57:30 +08:00
Spencer Gibb
a1ae7b50ed
Ignores broken test. 2019-01-30 16:25:59 -05:00
xiaojing
04908741bb
Update readme-zh.md 2019-01-30 17:57:26 +08:00
format
d01967b432
Merge pull request #330 from flystar32/master 
Add a new Module Spring Cloud Alibaba Fescar, Polish #303
 2019-01-30 17:41:32 +08:00
flystar32
ef8d204f95 rename 2019-01-30 16:39:17 +08:00
flystar32
30b6456558 resolve conflict 2019-01-30 13:43:08 +08:00
flystar32
a6a894a110 add module Fescar, Polish #303 2019-01-30 13:40:26 +08:00
xiaojing
efa89e6fea
Merge pull request #326 from xiaolongzuo/master 
Polish java doc.
 2019-01-30 10:48:35 +08:00
xiaolongzuo
0acd1b0a53 Polish java doc. 2019-01-29 16:24:59 +08:00
xiaolongzuo
d5d90d9c0a Polish java doc. 2019-01-29 16:10:06 +08:00
format
b3fffdda0e
Merge pull request #324 from flystar32/master 
update Nacos version to 0.8.0, support Nacos discovery namespace ,Polish #295, #317
 2019-01-29 14:30:23 +08:00
flystar32
990bf1bff7 update nacos version to 0.8.0 ,Polish #295, #317 2019-01-29 10:47:32 +08:00
xiaojing
2521246a5d
Create PULL_REQUEST_TEMPLATE.md 2019-01-29 10:25:59 +08:00
xiaojing
ac0cd78c10
Create CODE_OF_CONDUCT.md 2019-01-29 10:24:07 +08:00
xiaojing
e976844dc3
Create CODE_OF_CONDUCT.adoc 2019-01-29 10:19:57 +08:00
xiaojing
200b25d538
Update README.md 2019-01-29 10:13:39 +08:00
xiaojing
65ce68ebaa
Update README.md 2019-01-29 10:08:44 +08:00
xiaojing
1267c36ab7
Merge pull request #319 from justlive1/master 
fixed netInterface NullPointerException
 2019-01-28 14:06:16 +08:00
justlive1
d3f98b66a4 fixed netInterface NullPointerException 2019-01-25 15:33:03 +08:00
xiaojing
a301c63f21
Merge pull request #309 from xiaolongzuo/master 
Fix code format error.
 2019-01-23 20:18:22 +08:00
format
a30c1525da
Merge pull request #306 from flystar32/master 
Add ans module unit test
 2019-01-22 16:58:10 +08:00
Xiaolong Zuo
e541aef538
Merge pull request #291 from fangjian0423/master 
Add test case for sentinel datasource module
 2019-01-22 16:55:20 +08:00
xiaolongzuo
22d168e3fe Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 2019-01-22 16:50:19 +08:00
xiaolongzuo
65397e861c Fix code format error. 2019-01-22 16:49:12 +08:00
xiaojing
72276f2ab8
Merge pull request #302 from pig4cloud/master 
fix #276
 2019-01-22 16:45:22 +08:00