Commit Graph

141 Commits (6f04a247fdc0789c9a635122e9738fd10941d45b)

Author SHA1 Message Date
十三 0236083d9d Update readme.md 3 years ago
十三 9d64127707
Update readme-zh.md 3 years ago
chengpu.rzh f5b7c131af Modified nacos config readme.md 3 years ago
Freeman Lau db566f14a5 Update logging level path 3 years ago
Freeman Lau 7211d05c90 Support print content 3 years ago
Freeman Lau 204b9a7032 Merge remote-tracking branch 'upstream/2021.x' into fix_2455
# Conflicts:
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/configdata/NacosConfigDataLoader.java
3 years ago
Freeman Lau 146fd38c47 Support configure preference for single config
Add log info.
3 years ago
ruansheng d2c427369e Fix multiple meaning of example 3 years ago
Freeman Lau e02ef61969 Add config preference example 3 years ago
chengpu.rzh c4c167b593 Print nacos config log switch 3 years ago
Steve Rao 63cb2df88e
Merge pull request #2429 from alibaba/2.2.x
2.2.x
3 years ago
Freeman Lau b88690a1d6 Add tests module. 3 years ago
Freeman Lau 8e4f1eb771 Update docs and add @since. 3 years ago
Freeman Lau f45a9fb28f Add listening configs log info. 3 years ago
Freeman Lau ed6a9949db Degrade Nacos 1.4.2 3 years ago
Freeman Lau a9e4e1c443 Update docs. 3 years ago
Freeman Lau a2ff00765d Upgrade spring boot 2.6.3.
upgrade spring cloud 2021.0.1
add GitHub CI script
update nacos image
3 years ago
Freeman Lau 9d09a6df64 Upgrade nacos to 1.4.3. 3 years ago
Freeman Lau 28ff3ee179 Merge remote-tracking branch 'upstream/2022.x' into merge_2.2.x_2022 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
Roger3581321 bd2bf13aaa
Updating readme.md 3 years ago
Roger3581321 1b6258a2a1
Updating readme-zh.md 3 years ago
zkzlx e19a71c4e7
Merge pull request #1769 from Roger3581321/master
minior improvements for nacos doc, examples code
3 years ago
Freeman Lau 61c2c31cf7 Fixed checkstyle. 3 years ago
Freeman Lau 21e22e0696 ref: Remove ConfigServiceIndexes
重构代码
dataId 不可缺省, 通过参数覆盖默认配置
3 years ago
Freeman Lau 8958392914 Refactor configuration
重构配置方式, 不需要将 serverAddr 写在 import 里
保留以前版本的拉取配置逻辑, 保证能够平滑升级
3 years ago
Freeman Lau 83873e5fbe feature: support spring.config.import
支持 spring boot >= 2.4.0 通过 spring.config.import
 方式引入 nacos 配置
3 years ago
chengpu.rzh 1a146c726e Fixed the errors in nacos-config-demo 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
tangyuewei eaab60ebdb 去掉了一些空格,更符合规范 4 years ago
theonefx ed9d659d64 remote all hystrix,zuul,ribbon 4 years ago
theonefx 45fae73e9f support springboot1 and springboot2 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
派哒 ca9048b251 Merge remote-tracking branch 'upstream/master' 4 years ago
zkzlx 5db4161acf updated nacos example 4 years ago
派哒 c3db7fdc91 修改了两个错误的URL 4 years ago
zkzlx e26ef50af4 [pr #1531]build 4 years ago
zkzlx 359b3ea522 Merge remote-tracking branch 'origin/master' into config
# Conflicts:
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java
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
Roger3581321 a42bd2e3a9
explicitly use standalone mode in windows
explicitly use standalone mode otherwise cluster mode in windows batch environment
4 years ago
孙继峰 ad36fd2e95
修正文档 5 years ago
zkzlx 5135916175 [enhance issue #1492 ]Improved nacos configuration parsing, based on PropertySourceLoader---check 5 years ago