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

320 Commits

Author SHA1 Message Date
fangjian0423
93defa99e2 upgrade sentinel version to 1.4.2 2019-02-21 10:35:30 +08:00
flystar32
a03ce9fea8 add test case and nacos watch 2019-02-20 19:02:17 +08:00
fangjian0423
fe13a96fe4 Merge remote-tracking branch 'upstream/1.x' into 1.x 2019-02-20 17:08:48 +08:00
fangjian0423
9168e60da4 refactor sentinel log 2019-02-20 17:08:20 +08:00
Xiaolong Zuo
5d69156395
Merge pull request #361 from fangjian0423/1.x
sync sentinel to 1.x branch
2019-02-20 15:55:06 +08:00
fangjian0423
eeedf90d86 sentinel 1.x add jsr and update version of validation-api 2019-02-19 20:52:28 +08:00
fangjian0423
f339f30b7b Merge remote-tracking branch 'upstream/1.x' into 1.x 2019-02-19 20:51:46 +08:00
pbting
edf04a5c42
Update pom.xml
remove spring-cloud-alicloud-context maven dependency
2019-02-19 16:57:38 +08:00
pbting
0581a923fe
Update pom.xml
remove spring-cloud-alicloud-context maven dependency
2019-02-19 16:57:05 +08:00
flystar32
4fe795166b support spring.cloud.nacos.config.enabled 2019-02-19 16:31:17 +08:00
fangjian0423
56336b40c5 sync rocketmq binder to 1.x branch 2019-02-19 15:36:44 +08:00
fangjian0423
b0ed3d8642 sync sentinel to 1.x branch 2019-02-18 21:07:14 +08:00
format
5a5ff5c444
Merge pull request #359 from pbting/1.x
nacos discovery starter support connect to aliyun  with 1.x branch
2019-02-18 20:01:17 +08:00
得少
97939b8098 update the log information print by conditional 2019-02-18 19:10:15 +08:00
得少
2ded49f5a8 update the log information 2019-02-18 15:08:05 +08:00
得少
92d559c7fb nacos discovery support register service to ANS 2019-02-18 12:49:31 +08:00
pbting
3ac295747b
Merge pull request #5 from spring-cloud-incubator/1.x
Synchronize code once with 1.x branch
2019-02-18 10:26:09 +08:00
xiaojing
a6a9054675
Merge pull request #351 from xiaolongzuo/1.x
Add test case for alicloud-context
2019-02-18 10:18:41 +08:00
xiaolongzuo
d76de4b5a6 Add test case.
# Conflicts:
#	spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsConfigProperties.java
#	spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsConfigRegistration.java
#	spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsPropertiesTests.java
#	spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/oss/OssAutoConfigurationTests.java
#	spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/AbstractSmsService.java
#	spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsInitializerEventListener.java
#	spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/config/SmsAutoConfiguration.java
2019-02-14 17:41:58 +08:00
xiaolongzuo
874e464477 Add test case.
# Conflicts:
#	spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsConfigProperties.java
#	spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsConfigRegistration.java
#	spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsPropertiesTests.java
#	spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/oss/OssAutoConfigurationTests.java
#	spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/AbstractSmsService.java
#	spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsInitializerEventListener.java
#	spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/config/SmsAutoConfiguration.java
2019-02-14 17:41:40 +08:00
flystar32
cff40ee99f add module fescar 2019-02-13 19:49:05 +08:00
xiaojing
6b0510bae8
Merge pull request #327 from xiaolongzuo/1.x
Fix code format error and polish java doc.
2019-01-30 10:52:03 +08:00
xiaolongzuo
4c1e741b71 Fix dependency error. 2019-01-29 16:31:40 +08:00
xiaolongzuo
0729c3fc8f Polish java doc. 2019-01-29 16:25:38 +08:00
xiaolongzuo
920a52b2f3 Polish java doc. 2019-01-29 16:11:19 +08:00
xiaolongzuo
a355443cb4 Fix code format error.
# Conflicts:
#	spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java
#	spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java
#	spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
2019-01-22 17:38:07 +08:00
xiaojing
e0c9ba3965
Merge pull request #293 from xiaolongzuo/1.x
Fix SchedulerX cycle ref error.
2019-01-18 10:58:00 +08:00
chenzhu.zxl
65b6b52407 Fix SchedulerX cycle ref error. 2019-01-17 20:27:43 +08:00
xiaojing
603b07e1f9
Merge pull request #284 from pbting/1.x
remove set port action in AnsRegistration
2019-01-17 10:44:02 +08:00
pbting
8641f14957 remote set port action in AnsRegistration 2019-01-16 20:02:59 +08:00
format
8d0a647c3c
Merge pull request #257 from pbting/1.x
ans starter support Eureka/Consul register and add sms module
2019-01-14 21:09:58 +08:00
得少
730db06984 code optimization 2019-01-10 22:13:50 +08:00
得少
fdffba7fd6 update migrate endpoint condition class 2019-01-10 16:23:10 +08:00
得少
d093c2a6f6 add version for env-extension 2019-01-10 15:22:26 +08:00
得少
cb537e1182 env extension modify the parent pom dependency 2019-01-10 15:13:22 +08:00
得少
d428d49aed pom add sms module 2019-01-10 15:04:07 +08:00
得少
5ff4f40379 ans for management support 1.x 2019-01-10 14:03:19 +08:00
得少
840b35331b Code optimization for ans starter 2019-01-10 13:14:53 +08:00
得少
c7663abffe add spring enviroment extension module 2019-01-09 20:56:55 +08:00
得少
90b21480d7 ans starter suport eureka/consule registry and add sms module 2019-01-09 18:43:23 +08:00
format
d7fea8dfc3
Merge pull request #243 from xiaolongzuo/1.x
Upgrade alicloud-context version.
2019-01-07 16:12:31 +08:00
xiaolongzuo
fc80cf2d10 Merge branch '1.x' of github.com:spring-cloud-incubator/spring-cloud-alibaba into 1.x 2019-01-07 15:47:27 +08:00
xiaolongzuo
472bc9a4be Upgrade alicloud-context version. 2019-01-07 15:47:06 +08:00
Xiaolong Zuo
26225e08fa
Merge pull request #225 from zhendong590/1.X
Fix Incorrect letter
2018-12-28 15:41:05 +08:00
gaoyunpeng
ba73686566 git commit -m "Fix Incorrect letter , fixes #147 for branch 1.x" 2018-12-28 15:31:37 +08:00
Spencer Gibb
b6469f9b91
Update to 0.1.2.BUILD-SNAPSHOT 2018-12-21 12:46:39 -05:00
fangjian0423
fbe26a274b Merge remote-tracking branch 'upstream/1.x' into 1.x v0.1.1.RELEASE 2018-12-20 21:45:54 +08:00
fangjian0423
c1a176e741 update default sentinel api port 2018-12-20 21:45:33 +08:00
Xiaolong Zuo
34496b945c
Merge pull request #208 from xiaolongzuo/1.x
Fix ACM group.
2018-12-20 17:51:10 +08:00
xiaolongzuo
4cf85aa40e Fix ACM group. 2018-12-20 17:49:35 +08:00