Commit Graph

154 Commits (62ff55cd16c05156fc57d701f57f8863c36685c3)

Author SHA1 Message Date
ruansheng 2ca7b25834 Remove dubbo examples and doc 3 years ago
chengpu.rzh 2531b68cc0 Modified Contributor info 3 years ago
chengpu.rzh 85da43b3f1 Fix wrong branch info 3 years ago
chengpu.rzh 93e38655f2 Add steering and committer member info 3 years ago
chengpu.rzh 41642d8c81 Add steering member and committer info 3 years ago
Freeman Lau ae81d23dc4 Fix docs. 3 years ago
Freeman Lau 6de2d6dfd2 Add sca-upgrade-guide.adoc 3 years ago
Freeman Lau 8e4f1eb771 Update docs and add @since. 3 years ago
Freeman Lau ed6a9949db Degrade Nacos 1.4.2 3 years ago
Freeman Lau 6cbe62b173
Update sca-upgrade-guide.adoc 3 years ago
Freeman Lau 3385bdbeec Add docs. 3 years ago
ovasty 2a9329977f
Update rocketmq.adoc
fix misspelling words
3 years ago
Freeman Lau 28ff3ee179 Merge remote-tracking branch 'upstream/2022.x' into merge_2.2.x_2022 3 years ago
onewe ec75c32f61
[issue#2397] Change the endpoint id to nacosdiscovery 3 years ago
onewe 236b5e8427
[issue#2397]Chnage the endpoint id to nacosdiscovery 3 years ago
Freeman Lau 3451906c2b Merge 2.2.x to 2022. 3 years ago
Freeman Lau 42f03eb1c8 Merge remote-tracking branch 'upstream/2.2.x' into merge_2.2.x_2022
# Conflicts:
#	README-zh.md
#	pom.xml
#	spring-cloud-alibaba-dependencies/pom.xml
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-discovery.adoc
#	spring-cloud-alibaba-docs/src/main/asciidoc/nacos-discovery.adoc
#	spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/client/NacosPropertySource.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/resources/META-INF/spring.factories
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/test/java/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientPropertyOverrideTests.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-sentinel/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeign.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java
3 years ago
Steve Rao ebb130091e
Update sidecar.adoc 3 years ago
HuGuirong 796d18a941 Update documentation and code comment links 3 years ago
zkzlx afdee2807d Merge remote-tracking branch 'upstream/master' into rocketmq
# Conflicts:
#	pom.xml
#	spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java
3 years ago
zkzlx a530705983
Merge pull request #2034 from panzhi33/master
升级rocketmq-spring-boot-starter版本,商业版消息轨迹无需手动配置轨迹topic
3 years ago
余黄彬 74462793e6
Update nacos-config.adoc 3 years ago
zkzlx c6147dc618 document 4 years ago
zkzlx 5d745f81c0 document 4 years ago
XuDaojie 9eb5233dcb update nacos-discovery default don't use NacosLoadBalancer 4 years ago
XuDaojie 3c769a9ba7 remove ConditionalOnLoadBalancerNacosDefault.java 4 years ago
XuDaojie 7825cb0ceb update nacos-discovery.adoc 4 years ago
XuDaojie e4d467f359 update loadbalancer.nacos.enabled -> spring.cloud.loadbalancer.nacos.enabled 4 years ago
XuDaojie 2f53fcbfce update nacos-discovery.adoc 4 years ago
TheoneFx da26be5bdf
Merge pull request #2082 from captainkun/master
fix word "namespae" -> "namespace"
4 years ago
杨鹏 66bdd10ac9 add Wiki 文档“配置的优先级”存在容易混淆的表述 #1874 4 years ago
qukun 39d6a3e1ae fix word "namespae" -> "namespace" 4 years ago
panzhi33 e3c791179b 升级rocketmq-spring-boot-starter版本,商业版消息轨迹无需手动配置轨迹topic 4 years ago
eden-yuan a869ef7ed6 fix adoc 4 years ago
theonefx ed9d659d64 remote all hystrix,zuul,ribbon 4 years ago
theonefx 248cd7696b upgrade version to 2.2.4.RELEASE 4 years ago
zongyl bcc262db15 update docs 4 years ago
mercyblitz b4abf6db15 Update the version to be 2.2.3.RELEASE 4 years ago
mercyblitz 35c4eac150 Upgrade the version to be 2.2.2.RELEASE 4 years ago
Ahian Zhang 5bd3400e36
docs: update nacos-config.adoc 5 years ago
Yin Qifang 1ced8d231b
修正错别字
”去 name“应该是”取 name“
5 years ago
mercyblitz a198133852 Update pom.xml 5 years ago
mercyblitz 93d5ce1054 Polish alibaba/spring-cloud-alibaba/#1222 : Resolve the relative path of pom.xml 5 years ago
fangjian0423 88b8319eda Bumping versions to 2.2.1.BUILD-SNAPSHOT after release 5 years ago
fangjian0423 c5e27237fb Closes #1126, closes #1153, closes #1123, closes #1143; Update SNAPSHOT to 2.2.0.RELEASE. 5 years ago
fangjian0423 fe74824d3d update docs 5 years ago
itmuch 670967a41c add module Spring Cloud Alibaba Sidecar 5 years ago
format 6e885c8ebf
Merge pull request #914 from eacdy/master
Modify magic string to constant.
5 years ago
fangjian0423 181116a738 add Spring Cloud CircuitBreaker Sentinel docs 5 years ago
fangjian0423 e8ee68998e upgrade to Spring Cloud Hoxton, close #917 5 years ago