Xiaolong Zuo
|
45c4c5baf5
|
Merge pull request #405 from fangjian0423/master
Update docs & add spring cloud gateway bom
|
2019-03-07 10:36:01 +08:00 |
|
flystar32
|
b50cd9266f
|
update nacos and fescar version and format some testcase
|
2019-03-07 10:17:30 +08:00 |
|
mercyblitz
|
514fef53f5
|
Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#377 : Resolve version issue
|
2019-03-06 23:22:23 +08:00 |
|
mercyblitz
|
fa1aa272b1
|
Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#377 : Use Apache Dubbo 2.7.x as Spring Cloud Infrastructure
|
2019-03-06 23:13:43 +08:00 |
|
fangjian0423
|
501d08d1e5
|
add spring cloud gateway bom
|
2019-03-06 10:59:04 +08:00 |
|
fangjian0423
|
0e4de15632
|
update sms example
|
2019-03-04 15:38:57 +08:00 |
|
fangjian0423
|
9934f5bc60
|
resolve conflict
|
2019-02-28 19:20:53 +08:00 |
|
xiaojing
|
dbfc363c02
|
Merge pull request #394 from yunzheng1228/master
format code and fixed example's bug
|
2019-02-28 16:20:35 +08:00 |
|
yunzheng1228
|
df8f703460
|
Fixed nacos-example's bug, Change the attribute value of spring.application.name from 'sca-nacos-config' to 'nacos-config-example'
|
2019-02-28 15:51:42 +08:00 |
|
fangjian0423
|
7cc3b02917
|
update rocketmq examples
|
2019-02-28 15:31:28 +08:00 |
|
fangjian0423
|
509d4819b3
|
Merge remote-tracking branch 'upstream/master' into binder-dev
|
2019-02-28 15:23:39 +08:00 |
|
format
|
986e529043
|
Merge pull request #390 from mostcool/master
optimized spring-cloud-alicloud-sms pom.xml
|
2019-02-27 19:12:20 +08:00 |
|
gaokai
|
ef00e96b5c
|
包含sms-example模块
|
2019-02-27 10:36:19 +08:00 |
|
mercyblitz
|
f98b74ad45
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-26 16:55:57 +08:00 |
|
mercyblitz
|
f719e16d38
|
Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : Supports all Spring Cloud Registries and default is Nacos
|
2019-02-26 16:54:36 +08:00 |
|
mercyblitz
|
ab1ecca6ab
|
Polish : /spring-cloud-incubator/spring-cloud-alibaba#387 : Dubbo Spring Cloud Samples
|
2019-02-26 16:25:41 +08:00 |
|
xiaojing
|
cac7574396
|
Merge pull request #384 from Harris2012/patch-1
use EnableDiscoveryClient
|
2019-02-26 16:11:34 +08:00 |
|
mercyblitz
|
21f3451f7b
|
Polish : spring-cloud-incubator/spring-cloud-alibaba/issues#387 : Add Dubbo Spring Cloud Samples
|
2019-02-26 14:52:47 +08:00 |
|
mercyblitz
|
b3c26c509e
|
Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : supports Spring Cloud Netflix Eureka and Spring Cloud Zookeeper
|
2019-02-26 14:50:26 +08:00 |
|
xiaolongzuo
|
844d17b9f6
|
Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
|
2019-02-26 10:54:27 +08:00 |
|
fangjian0423
|
84bb53f706
|
Merge remote-tracking branch 'upstream/master' into binder-dev
|
2019-02-25 16:28:30 +08:00 |
|
format
|
03f8defb09
|
Merge pull request #367 from zhendong590/master
aggregate multi report
|
2019-02-25 16:28:06 +08:00 |
|
fangjian0423
|
e537eb55de
|
resolve conflict
|
2019-02-25 15:31:03 +08:00 |
|
xiaolongzuo
|
2a83f3e84e
|
Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba
# Conflicts:
# spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
# spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java
|
2019-02-25 14:38:47 +08:00 |
|
xiaolongzuo
|
fa5b57f3db
|
Polish test cases for schedulerx
|
2019-02-25 14:35:39 +08:00 |
|
fangjian0423
|
ac11a3a752
|
refactor sms module
|
2019-02-24 20:28:20 +08:00 |
|
Harris Zhang
|
10206af82b
|
use EnableDiscoveryClient
|
2019-02-24 11:16:56 +08:00 |
|
pbting
|
92519a7a09
|
Merge branch 'master' into master
|
2019-02-22 20:55:30 +08:00 |
|
gaoyunpeng
|
2db3677f20
|
fix #369 remove superfluous settings in fescar example
|
2019-02-21 16:03:57 +08:00 |
|
mercyblitz
|
2fdeeec3ff
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
# spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
|
2019-02-21 14:49:26 +08:00 |
|
pbting
|
95060a19b1
|
Update pom.xml
remove alicloud context maven dependency
|
2019-02-19 16:55:59 +08:00 |
|
pbting
|
c8f1697c3d
|
Update pom.xml
remove alicloud context
|
2019-02-19 16:55:16 +08:00 |
|
得少
|
f777bc3006
|
remove alicloud context dependency
|
2019-02-19 16:53:37 +08:00 |
|
format
|
9b84df9015
|
Merge pull request #358 from pbting/master
nacos discovery starter support connect to aliyun with master branch
|
2019-02-19 16:41:44 +08:00 |
|
mercyblitz
|
fc8d8e3628
|
Polish spring-cloud-incubator/spring-cloud-alibaba#348 : @DubboTransported supports RestTemplate (part 1)
|
2019-02-19 15:05:25 +08:00 |
|
gaoyunpeng
|
394485a12d
|
replace cobertura to jacoco
|
2019-02-18 20:05:08 +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 |
|
fangjian0423
|
9f797f586e
|
update rocketmq binder demo
|
2019-02-02 13:44:33 +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 |
|
flystar32
|
450f1e8269
|
modify example to verify .
|
2019-01-31 15:02:30 +08:00 |
|
xiaojing
|
04908741bb
|
Update readme-zh.md
|
2019-01-30 17:57:26 +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 |
|
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 |
|
mercyblitz
|
744e33229a
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# pom.xml
# spring-cloud-alibaba-dependencies/pom.xml
# spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
|
2019-01-22 15:16:21 +08:00 |
|
mercyblitz
|
59a969049d
|
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# pom.xml
# spring-cloud-alibaba-dependencies/pom.xml
# spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml
|
2019-01-22 14:51:54 +08:00 |
|
mercyblitz
|
054e95dd45
|
Revert nacos-discovery-consumer-example
|
2019-01-22 14:45:39 +08:00 |
|
冷冷
|
fc72c76a9d
|
fix #276
|
2019-01-21 12:36:56 +08:00 |
|
冷冷
|
aae2c1676b
|
fix #274 add example. how to use spring cloud gateway with nacos
|
2019-01-19 13:01:10 +08:00 |
|