Commit Graph

2288 Commits (69945d7e71e7192c9f03ee945f9b3bb010355348)
 

Author SHA1 Message Date
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
iaiti 8af1ed84b7
Update readme-zh.md
github网站处于https链接,资源为http被禁止跳转下载,更改为https资源下载
3 years ago
Freeman Lau 3c67351907 Refactor deprecated code.
1. Spring 的 StringUtils#isEmpty 已经过时, 使用 spring-cloud-alibaba-commons 下的 StringUtils 替换, 如果同时还使用了
Spring StringUtils 的其他方法, 那么将使用 StringUtils#hasLength 取反替换

2. 移除类 NacosRefreshProperties

3. 优化pom, 删除重复依赖

4. 尽可能地优化 deprecated class and method

优化过后将完全消除打包构建时黄色警告⚠️
3 years ago
Roger3581321 bd2bf13aaa
Updating readme.md 3 years ago
Steve Rao ebb130091e
Update sidecar.adoc 3 years ago
Freeman Lau 67daf1f27e Support refresh single ConfigurationPropertiesBean. 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
zkzlx 2cda113014
Merge pull request #2376 from galaxy-sea/customize_matedata
Modify the customize() method to facilitate subclass override
3 years ago
galaxy 14a71dab27 Modify the customize() method to facilitate subclass override 3 years ago
Steve Rao 52cdd08685
Merge pull request #2373 from alibaba/dependabot/maven/org.apache.dubbo-dubbo-2.7.15
Bump dubbo from 2.7.8 to 2.7.15
3 years ago
Steve Rao f95b0d7ccf
Merge pull request #2375 from galaxy-sea/ServiceInstance
NacosServiceInstance.getInstanceId() is null
3 years ago
Steve Rao 948135530a
Merge pull request #2370 from alibaba/dependabot/maven/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/org.apache.zookeeper-zookeeper-3.4.14
Bump zookeeper from 3.4.12 to 3.4.14 in /spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample
3 years ago
Steve Rao 77bcd2331a
Merge pull request #2367 from alibaba/dependabot/maven/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/org.apache.zookeeper-zookeeper-3.4.14
Bump zookeeper from 3.4.12 to 3.4.14 in /spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample
3 years ago
Steve Rao 42c90696c3
Merge pull request #2368 from alibaba/dependabot/maven/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/org.apache.zookeeper-zookeeper-3.4.14
Bump zookeeper from 3.4.12 to 3.4.14 in /spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample
3 years ago
Steve Rao dacfa15567
Merge pull request #2371 from alibaba/dependabot/maven/spring-cloud-alibaba-examples/seata-example/storage-service/mysql-mysql-connector-java-8.0.16
Bump mysql-connector-java from 5.1.31 to 8.0.16 in /spring-cloud-alibaba-examples/seata-example/storage-service
3 years ago
Steve Rao 38bcc8fedf
Merge pull request #2369 from alibaba/dependabot/maven/spring-cloud-alibaba-examples/seata-example/order-service/mysql-mysql-connector-java-8.0.16
Bump mysql-connector-java from 5.1.31 to 8.0.16 in /spring-cloud-alibaba-examples/seata-example/order-service
3 years ago
Steve Rao 30d3536d9b
Merge pull request #2372 from alibaba/dependabot/maven/spring-cloud-alibaba-examples/seata-example/account-service/mysql-mysql-connector-java-8.0.16
Bump mysql-connector-java from 5.1.31 to 8.0.16 in /spring-cloud-alibaba-examples/seata-example/account-service
3 years ago
Freeman Lau 42bdb9844d Add rocketmq example 3 years ago
galaxy 5986556b6b NacosServiceInstance.getInstanceId() is null 3 years ago
dependabot[bot] 36cc1e95ab
Bump dubbo from 2.7.8 to 2.7.15
Bumps [dubbo](https://github.com/apache/dubbo) from 2.7.8 to 2.7.15.
- [Release notes](https://github.com/apache/dubbo/releases)
- [Changelog](https://github.com/apache/dubbo/blob/3.0/CHANGES.md)
- [Commits](https://github.com/apache/dubbo/compare/dubbo-2.7.8...dubbo-2.7.15)

---
updated-dependencies:
- dependency-name: org.apache.dubbo:dubbo
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
dependabot[bot] bb3064eee1
Bump mysql-connector-java
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.31 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.31...8.0.16)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
dependabot[bot] d75f72a3f6
Bump mysql-connector-java
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.31 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.31...8.0.16)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
dependabot[bot] edfbb15311
Bump zookeeper
Bumps zookeeper from 3.4.12 to 3.4.14.

---
updated-dependencies:
- dependency-name: org.apache.zookeeper:zookeeper
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
dependabot[bot] f75e635176
Bump mysql-connector-java
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.31 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.31...8.0.16)

---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
dependabot[bot] 22536397b7
Bump zookeeper
Bumps zookeeper from 3.4.12 to 3.4.14.

---
updated-dependencies:
- dependency-name: org.apache.zookeeper:zookeeper
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
dependabot[bot] 273e848680
Bump zookeeper
Bumps zookeeper from 3.4.12 to 3.4.14.

---
updated-dependencies:
- dependency-name: org.apache.zookeeper:zookeeper
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
3 years ago
Steve Rao 8719706e46
Merge pull request #2364 from DanielLiu1123/fix_checkstyle
Fixed checkstyle
3 years ago
Freeman Lau d36ee864fd Fixed checkstyle. 3 years ago
Steve Rao 0344862f62
Merge pull request #2360 from DanielLiu1123/nacos_fault_tolerance
Nacos failure tolerance
3 years ago
余黄彬 14ecf7870b
Merge pull request #2349 from DanielLiu1123/support_spring_config_import
Support spring.config.import
3 years ago
Freeman Lau 61c2c31cf7 Fixed checkstyle. 3 years ago
Freeman Lau 6f3a5d892a Register NacosConfigManager instead of ConfigService.
Avoiding import *
Avoiding invoke `getUri` repeatedly
3 years ago
Freeman Lau 08f5438ab0 Set default to false.
Avoiding import *
3 years ago
Freeman Lau 5850798977 Add new configuration item.
Fixed equals and hash method.
Replaced StringUtils, Spring's isEmpty method is deprecated.
3 years ago
Freeman Lau 9a4a7d6f42 feature: Nacos failure tolerance.
增加 nacos 失败容错功能, 在查询失败时使用缓存值
3 years ago
Freeman Lau 96157efaf6 Optimize binding logic. 3 years ago
Freeman Lau abe1f22345 Fix nacos common properties can't bind.
修复 nacos 通用属性无法绑定的问题
3 years ago
余黄彬 f4397fb438
Merge pull request #2347 from alibaba/dependabot/maven/org.apache.dubbo-dubbo-2.7.15
Bump dubbo from 2.7.13 to 2.7.15
3 years ago
Freeman Lau 65e1eff7d6 Make bootstrap starter optional.
在 spring boot >= 2.4.0 版本应该由用户决定是使用 bootstrap 还是 import 方式导入外部配置
3 years ago
Freeman Lau 6779603fb4 Merge remote-tracking branch 'origin/2020.0.0' into support_spring_config_import 3 years ago
Steve Rao 60f7fd87a3
Merge pull request #2342 from DanielLiu1123/feature_support_feign_custom_configuration
Support Feign client custom configuration
3 years ago
Freeman Lau e3ce3ee92d Downgrade boot version.
Temporarily remove the extension class and add it when the boot version is greater than 2.4.5.
3 years ago
Freeman Lau 769bced209 Use NacosConfigManager to create ConfigService.
Modify whether is PROFILE_SPECIFIC logic.
Make NacosBootstrapper method public.
3 years ago
Freeman Lau dec4c63b52 Refresh feign client rules only.
现在只刷新 feign client 熔断规则, 手动添加或者通过 dashboard 和数据源配置的规则不会受到影响
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 5786ba51eb Support spring.config.import
支持 import 方式
3 years ago
Freeman Lau 77b3d7922b fix: Keep rules in dataSource
保留数据源中配置
3 years ago
Freeman Lau 06b2c25717 Merge remote-tracking branch 'origin/2020.0.0' into feature_support_feign_custom_configuration 3 years ago