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

667 Commits

Author SHA1 Message Date
fangjian0423
3d919f0a80 update docs 2019-03-05 20:48:47 +08:00
format
3b3c60fbc7
Merge pull request #398 from fangjian0423/master
Refactor something about SMS & Sentinel
2019-03-05 19:27:26 +08:00
Xiaolong Zuo
9c2229bddb
Merge pull request #402 from zhendong590/master
remove sms,schedulerx,oss modules in coverage
2019-03-05 15:44:15 +08:00
gaoyunpeng
ee4dd40c04 remove sms,schedulerx,oss modules in coverage 2019-03-05 15:30:32 +08:00
fangjian0423
72bf5a1453 remove useless log 2019-03-05 11:24:58 +08:00
fangjian0423
bfcabfd068 add switch to instance CommonFilter in SentinelProperties 2019-03-04 20:48:54 +08:00
fangjian0423
f126d57cc8 modify sentinel zuul prefix configuration properties 2019-03-04 20:48:22 +08:00
fangjian0423
3049f727de sentinel zuul rename package name 2019-03-04 16:52:38 +08:00
fangjian0423
80d27a1824 sentinel zuul refactor 2019-03-04 16:46:05 +08:00
fangjian0423
0e4de15632 update sms example 2019-03-04 15:38:57 +08:00
fangjian0423
5e9cfaba0e refactor sms log 2019-03-04 15:38:01 +08:00
fangjian0423
14d505b53d update sms docs & remove useless dependency 2019-03-02 17:00:03 +08:00
fangjian0423
6cc5ecb137 Merge remote-tracking branch 'upstream/master' 2019-03-01 17:28:15 +08:00
flystar32
bc0127751e add nacos config test case 2019-03-01 15:34:33 +08:00
format
9c305da38a
Merge pull request #396 from zhendong590/master
there is no need calculate nacos-config-server module
2019-03-01 15:07:39 +08:00
flystar32
a0b7f92282 support EnableDiscoveryClient 2019-03-01 11:17:46 +08:00
fangjian0423
9934f5bc60 resolve conflict 2019-02-28 19:20:53 +08:00
gaoyunpeng
7a09e1edf1 there is no need calculate nacos-config-server module 2019-02-28 17:34:50 +08:00
flystar32
11db5e8728 add test case of ANS 2019-02-28 17:11:04 +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
yunzheng1228
923a2b590d When the service attribute is empty, modify the log level of ANS to warn. 2019-02-28 15:43:27 +08:00
flystar32
cd02c50151 add more test case 2019-02-28 15:36:14 +08:00
flystar32
34e6f75421 add ACM test case 2019-02-28 14:21:42 +08:00
yunzheng1228
c94eec5828 Change log level when the service attribute of nacos is empty. 2019-02-28 14:18:26 +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
Mercy Ma
0f0fb62c72
Merge pull request #389 from mercyblitz/master
[Update] Dubbo Spring Cloud
2019-02-27 13:45:13 +08:00
gaokai
ef00e96b5c 包含sms-example模块 2019-02-27 10:36:19 +08:00
gaokai
bf73f83a11 删除重复依赖 2019-02-27 10:35:55 +08:00
gaokai
eef764a020 删除重复属性 2019-02-27 10:35:45 +08:00
flystar32
a0092470e5 add test case 2019-02-26 20:09:11 +08:00
format
901f9a7def
Merge pull request #388 from carlWangTao/patch-2
Update NacosDiscoveryProperties.java
2019-02-26 18:38:59 +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
mercyblitz
8e9398d24f Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 : supports Spring Cloud Consul 2019-02-26 16:24:55 +08:00
xiaojing
cac7574396
Merge pull request #384 from Harris2012/patch-1
use EnableDiscoveryClient
2019-02-26 16:11:34 +08:00
WangTao
c454294370
Update NacosDiscoveryProperties.java
在截取serverAddr时没有对serverAddr进行再次赋值。
2019-02-26 15:49:26 +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
xiaojing
5da1fbb6c1
Merge pull request #372 from xiaolongzuo/master
Add statistics for nacos discovery and test case
2019-02-26 11:16:06 +08:00
xiaolongzuo
844d17b9f6 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 2019-02-26 10:54:27 +08:00
xiaolongzuo
71b2488131 Add scx and oss java doc. 2019-02-26 10:49:42 +08:00
yunzheng1228
a543be5f9f Format log naming 2019-02-25 16:44:08 +08:00
format
03f8defb09
Merge pull request #367 from zhendong590/master
aggregate multi report
2019-02-25 16:28:06 +08:00
xiaolongzuo
ca31245a8a Polish 2019-02-25 15:00:11 +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
Xiaolong Zuo
e8aaa3e948
Merge pull request #373 from tigerMoon/feature-spring-cloud-alibaba-sentinel-zuul
Feature spring cloud alibaba sentinel zuul
2019-02-25 11:37:03 +08:00
fangjian0423
ac11a3a752 refactor sms module 2019-02-24 20:28:20 +08:00