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
|
35a67497c0
|
update nacos-discovery-consumer-sclb-example
|
4 years ago |
roger
|
3e5d5a98e1
|
explicitly add nacos service discovery option, handle divide zero error case
|
4 years ago |
yuhuangbin
|
8a68526da7
|
fix issue#1456
|
5 years ago |
|
yuhuangbin
|
756c82ba1e
|
upgrade nacos client version
|
5 years ago |
fangjian0423
|
b1af3e2b87
|
update example configurations
|
5 years ago |
|
fangjian0423
|
86640fc353
|
update example configurations
|
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 |
|
fangjian0423
|
2435167e1e
|
format code with maven plugins
|
6 years ago |
赵禹光
|
3eb75988e3
|
example annotations clearer
|
6 years ago |
|
fangjian0423
|
883c66f251
|
polish #761 update pkg name & maven coordinate for Greenwich
|
6 years ago |
|
fangjian0423
|
ec98a2db01
|
code format
|
6 years ago |
|
fangjian0423
|
5995687dd5
|
update sentinel examples
|
6 years ago |
Harris Zhang
|
10206af82b
|
use EnableDiscoveryClient
|
6 years ago |
flystar32
|
450f1e8269
|
modify example to verify .
|
6 years ago |
|
fangjian0423
|
0af67df3e3
|
using sentinel feign in nacos discovery example
|
6 years ago |
|
flystar32
|
e4d9f98313
|
update nacos version to 0.2.1-RC and format code
|
7 years ago |
|
flystar32
|
43d47ae71f
|
add module nacos-config and nacos-discovery
|
7 years ago |