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

50 Commits

Author SHA1 Message Date
flystar32
34e6f75421 add ACM test case 2019-02-28 14:21:42 +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
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
pbting
92519a7a09
Merge branch 'master' into master 2019-02-22 20:55:30 +08:00
得少
3934115863 1、change the nacos system properties named 
2、upgrade nacos client dependency with 0.8.2
 2019-02-22 20:45:58 +08:00
gaoyunpeng
9dac4efd37 aggregate multi report 2019-02-21 16:03:57 +08:00
xiaolongzuo
03bd2c3c1d Add statistics for nacos discovery and test case 2019-02-21 15:09:20 +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
得少
24400635e2 update the log information print by conditional 2019-02-18 19:08:16 +08:00
得少
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
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
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
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
xiaolongzuo
65397e861c Fix code format error. 2019-01-22 16:49:12 +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
chenzhu.zxl
2de5362f4d Fix SchedulerX cycle ref error. 2019-01-17 16:52:03 +08:00
得少
ee2c696bdf ans starter suport eureka/consule registry and add sms module 2019-01-09 18:38:08 +08:00
Spencer Gibb
612e6913e6
Update to 0.2.2.BUILD-SNAPSHOT 2018-12-21 11:09:29 -05:00
Spencer Gibb
b28e82dc3c
Update SNAPSHOT to 0.2.1.RELEASE 2018-12-21 10:48:36 -05:00
fangjian0423
8af824dc2f sentinel commercialization feature 2018-12-19 22:54:25 +08:00
pbting
c300ffbbc6
Merge pull request #202 from pbting/master 
Prevent non-refreshing
 2018-12-19 21:17:42 +08:00
fangjian0423
bf40e5261d refactor sentinel datasource and support commercialized 2018-12-19 17:39:32 +08:00
pengbingting
df2f689bbd Nacos Parameter init listener by conditional on class 2018-12-19 16:22:32 +08:00
pengbingting
771c2c0f4c add NacosParameterInitListener to spring.factories 2018-12-18 20:22:39 +08:00
xiaolongzuo
528cd97c99 SchedulerX support springIOC. 2018-12-17 17:53:59 +08:00
xiaolongzuo
8717bd0987 Update SCX tests javadoc. 2018-12-14 17:45:21 +08:00
flystar32
772fdf707f update schedulerx version 2018-12-14 01:13:50 +08:00
chenzhu.zxl
4bf7c9c7c4 Add Sonatype Repository to AliCloud Context. 2018-12-13 21:22:06 +08:00
chenzhu.zxl
4fbc01405a Fix compile error. 2018-12-13 20:38:42 +08:00
chenzhu.zxl
2e0f737091 Fix schedulerx GroupId and ArtifactId error. 2018-12-13 14:45:51 +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
pbting
356ce112a9 code format 2018-12-04 10:37:57 +08:00
pbting
ba90952880 nacos starter 支持可自定义dataid配置以及Nacos 商业化和云上ACM 对接 2018-12-04 09:59:55 +08:00
Spencer Gibb
6e355cc807
Update to 0.2.1.BUILD-SNAPSHOT 2018-10-30 17:25:19 -04:00
Spencer Gibb
d2fd77c274
Update SNAPSHOT to 0.2.0.RELEASE 2018-10-30 17:11:50 -04:00
xiaolongzuo
384d55b2cf Fix configuration specification. 2018-10-30 20:52:07 +08:00
xiaolongzuo
9922e934ac Fix configuration specification. 2018-10-30 20:51:40 +08:00
xiaolongzuo
32e55ca78b Extract acm configuration to bootstrap phase. 2018-10-30 15:59:38 +08:00
xiaolongzuo
a95a323bc8 optimize spring-cloud-alicloud-context tests. 2018-10-30 14:53:29 +08:00
xiaolongzuo
f0e2e0732e optimize error message. 2018-10-30 11:17:18 +08:00
flystar32
7323880c01 fix get active profiles 2018-10-29 23:17:51 +08:00
chenzhu.zxl
e74d54604d fixes #71. 2018-10-29 18:09:23 +08:00
flystar32
bf7aec2fbc do some housekeeping 2018-10-29 15:48:19 +08:00
chenzhu.zxl
7126a8ce33 closes #63, closes #64, closes #65, closes #66. 2018-10-26 19:08:12 +08:00