Commit Graph

50 Commits (03309b8481afcc827832ddaf80cdf36af57324a6)

Author SHA1 Message Date
flystar32 34e6f75421 add ACM test case 6 years ago
xiaolongzuo 844d17b9f6 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 6 years ago
xiaolongzuo 71b2488131 Add scx and oss java doc. 6 years ago
format 03f8defb09
Merge pull request #367 from zhendong590/master
aggregate multi report
6 years ago
xiaolongzuo ca31245a8a Polish 6 years ago
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
6 years ago
pbting 92519a7a09
Merge branch 'master' into master 6 years ago
得少 3934115863 1、change the nacos system properties named
2、upgrade nacos client dependency with 0.8.2
6 years ago
gaoyunpeng 9dac4efd37 aggregate multi report 6 years ago
xiaolongzuo 03bd2c3c1d Add statistics for nacos discovery and test case 6 years ago
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
6 years ago
得少 24400635e2 update the log information print by conditional 6 years ago
得少 e4cc98b90c update the log information 6 years ago
得少 997faff710 add nacos discovery starter support to connect to aliyun 6 years ago
xiaolongzuo 5c26eb90e0 Merge branch 'master' of github.com:spring-cloud-incubator/spring-cloud-alibaba 6 years ago
xiaolongzuo 910068c91f Add test case. 6 years ago
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
6 years ago
xiaolongzuo 0acd1b0a53 Polish java doc. 6 years ago
xiaolongzuo d5d90d9c0a Polish java doc. 6 years ago
xiaolongzuo 65397e861c Fix code format error. 6 years ago
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
6 years ago
chenzhu.zxl 2de5362f4d Fix SchedulerX cycle ref error. 6 years ago
得少 ee2c696bdf ans starter suport eureka/consule registry and add sms module 6 years ago
Spencer Gibb 612e6913e6
Update to 0.2.2.BUILD-SNAPSHOT 6 years ago
Spencer Gibb b28e82dc3c
Update SNAPSHOT to 0.2.1.RELEASE 6 years ago
fangjian0423 8af824dc2f sentinel commercialization feature 6 years ago
pbting c300ffbbc6
Merge pull request #202 from pbting/master
Prevent non-refreshing
6 years ago
fangjian0423 bf40e5261d refactor sentinel datasource and support commercialized 6 years ago
pengbingting df2f689bbd Nacos Parameter init listener by conditional on class 6 years ago
pengbingting 771c2c0f4c add NacosParameterInitListener to spring.factories 6 years ago
xiaolongzuo 528cd97c99 SchedulerX support springIOC. 6 years ago
xiaolongzuo 8717bd0987 Update SCX tests javadoc. 6 years ago
flystar32 772fdf707f update schedulerx version 6 years ago
chenzhu.zxl 4bf7c9c7c4 Add Sonatype Repository to AliCloud Context. 6 years ago
chenzhu.zxl 4fbc01405a Fix compile error. 6 years ago
chenzhu.zxl 2e0f737091 Fix schedulerx GroupId and ArtifactId error. 6 years ago
xiaolongzuo 1fc98ebe7c closes #162, fixes #138. Add spring-cloud-alicloud-schedulerX module, and fix ACM starter rely on actuator. 6 years ago
pbting 356ce112a9 code format 6 years ago
pbting ba90952880 nacos starter 支持可自定义dataid配置以及Nacos 商业化和云上ACM 对接 6 years ago
Spencer Gibb 6e355cc807
Update to 0.2.1.BUILD-SNAPSHOT 6 years ago
Spencer Gibb d2fd77c274
Update SNAPSHOT to 0.2.0.RELEASE 6 years ago
xiaolongzuo 384d55b2cf Fix configuration specification. 6 years ago
xiaolongzuo 9922e934ac Fix configuration specification. 6 years ago
xiaolongzuo 32e55ca78b Extract acm configuration to bootstrap phase. 6 years ago
xiaolongzuo a95a323bc8 optimize spring-cloud-alicloud-context tests. 6 years ago
xiaolongzuo f0e2e0732e optimize error message. 6 years ago
flystar32 7323880c01 fix get active profiles 6 years ago
chenzhu.zxl e74d54604d fixes #71. 6 years ago
flystar32 bf7aec2fbc do some housekeeping 6 years ago
chenzhu.zxl 7126a8ce33 closes #63, closes #64, closes #65, closes #66. 6 years ago