Commit Graph

82 Commits (2e4a84fbe9ea1b489b515474d7b4a76f69080d91)

Author SHA1 Message Date
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
XuDaojie cf13c1cfe8 format code 4 years ago
XuDaojie 35a67497c0 update nacos-discovery-consumer-sclb-example 4 years ago
Roger3581321 b78239253b Merge branch 'alibaba:master' into master 4 years ago
yuhuangbin a2b2c2f8c1 Nacos Discovery supports registration for quick failed configurations 4 years ago
Roger3581321 495f2bec2e Merge branch 'alibaba:master' into master 4 years ago
theonefx ed9d659d64 remote all hystrix,zuul,ribbon 4 years ago
theonefx f8a6a4f753 add lost dependency of sc 2020 4 years ago
theonefx e7521c02c9 2020 build done, unit test failed 4 years ago
theonefx 1492ad5693 upgrade spring cloud version to 2020.0.1 4 years ago
派哒 c3db7fdc91 修改了两个错误的URL 4 years ago
Roger3581321 25689b800e
Add one missing configuration item
Since there is an important, yet missing option spring.cloud.nacos.discovery.enabled, I have added its description by following  the "More configuration items" format.
4 years ago
roger 3e5d5a98e1 explicitly add nacos service discovery option, handle divide zero error case 4 years ago
J-Cod3r 1e74332a0a update nacos-discovery-example readme 5 years ago
yuhuangbin 8a68526da7 fix issue#1456 5 years ago
mercyblitz a198133852 Update pom.xml 5 years ago
yuhuangbin 756c82ba1e upgrade nacos client version 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 b1af3e2b87 update example configurations 5 years ago
fangjian0423 86640fc353 update example configurations 5 years ago
fangjian0423 57e3059d8d update examples 5 years ago
fangjian0423 00d449ba23 pass code check 5 years ago
fangjian0423 b70129c17f add reactive discovery example 5 years ago
fangjian0423 a9e519265a add s-c-loadbalancer example 5 years ago
chuntaojun 492b8d3b20 refactor(nacos): Roll back to the original solution to solve the problem of compatibility 5 years ago
echooymxq 1bc20774c5 Optimize example module name 5 years ago
fangjian0423 2435167e1e format code with maven plugins 5 years ago
fangjian0423 e8ee68998e upgrade to Spring Cloud Hoxton, close #917 6 years ago
chuntaojun e4d85b6c7e style(nacos): Standard code style. 6 years ago
format 5b07a560be
Merge pull request #876 from zhaoyuguang/zhaoyuguang/dev_3
Use Spring advanced API make design more clearer
6 years ago
赵禹光 189837ed12 remain annotations clearer 6 years ago
赵禹光 3eb75988e3 example annotations clearer 6 years ago
Rivers-Shall 57ec776c7b Modify `nacos-discovery-example` to test UrlCleaner of
`SentinelResttemplate`
6 years ago
fangjian0423 9cf5624a86 Bumping versions to 2.1.1.BUILD-SNAPSHOT after release 6 years ago
fangjian0423 c8f9465fdc Update SNAPSHOT to 2.1.0.RELEASE 6 years ago
fangjian0423 3427a7345d update sentinel demo 6 years ago
fangjian0423 9557879f44 update sentinel demo 6 years ago
fangjian0423 145c14058b update sentinel examples 6 years ago
fangjian0423 883c66f251 polish #761 update pkg name & maven coordinate for Greenwich 6 years ago
Jevon Yang f4f407b84c example for issue #714 to validate the pr 6 years ago
buildmaster 632fb10ebe Bumping versions to 0.9.1.BUILD-SNAPSHOT after release 6 years ago
buildmaster 9c7f866c77 Going back to snapshots 6 years ago
buildmaster 3ea4843681 Update SNAPSHOT to 0.9.0.RELEASE 6 years ago
fangjian0423 d6f8a7801d change version from 2.1.0.BUILD-SNAPSHOT to 0.9.0.BUILD-SNAPSHOT 6 years ago
xiaojing 017044e123
update readme 6 years ago
xiaojing 0c1e6e13cf
update readme 6 years ago
fangjian0423 1cd4efdd1f Merge remote-tracking branch 'upstream/master' 6 years ago
flystar32 97a77d5c2b change version from 0.2.2.BUILD-SNAPSHOT to 2.1.0.BUILD-SNAPSHOT 6 years ago