Commit Graph

318 Commits (e38900ba55e822d2727e23a4485c6024582778c5)

Author SHA1 Message Date
Steve Rao e38900ba55
Merge pull request #2444 from ruansheng8/fix-npe
fix dubbo ServiceParameterResolver NPE
3 years ago
ruansheng 22862402d2 fix dubbo ServiceParameterResolver NPE 3 years ago
sorie 299726a8b8 Replace powermock with mockito in Nacos config 3 years ago
Freeman Lau 4edecfc38e Fix unit test may fail. 3 years ago
Freeman Lau e6eb4b653e Change StringUtil package. 3 years ago
Freeman Lau 3199f44837 Change util package. 3 years ago
Freeman Lau d2e88157dc Add Nacos import check integration tests. 3 years ago
Freeman Lau 42ebeaac6a Change test config. 3 years ago
Freeman Lau 8e4f1eb771 Update docs and add @since. 3 years ago
Freeman Lau 657c8aac72 Make SentinelCircuitBreakerConfiguration deprecated.
make BeanPostProcessor static
update docs
3 years ago
Freeman Lau d6310b1fa0 Refactor Nacos config tests.
add NacosConfigDataMissingEnvironmentPostProcessor
optimize Nacos config pom
3 years ago
Freeman Lau f45a9fb28f Add listening configs log info. 3 years ago
Freeman Lau a4c5839d3c Adjust test config. 3 years ago
Freeman Lau 0ede54d0f4 Adjust test config. 3 years ago
Freeman Lau 98c6a3133d Upgrade Seata to 1.4.2.
fix circular dependency.
optimize pom.
replace deprecated code.
3 years ago
Freeman Lau 842ea176c0 Upgrade RocketMQ to 4.9.2.
fix when 'spring-boot-starter-actuator' doesn't exist, throw ClassNotFount.
add example.
optimize pom.
3 years ago
Freeman Lau 5bd60891d3 Merge remote-tracking branch 'upstream/2022.x' into upgrade_nacos_1.4.3 3 years ago
Freeman Lau 9d09a6df64 Upgrade nacos to 1.4.3. 3 years ago
jumkey 537c98345f 优化pom 3 years ago
Freeman Lau 1a7f900a9c Merge 2.2.x to 2022.
fix conflict and checkstyle
3 years ago
Freeman Lau 22008adf25 Merge remote-tracking branch 'upstream/2022.x' into merge_2.2.x_2022
# Conflicts:
#	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/integration/RocketMQMessageHandler.java
#	spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java
3 years ago
Freeman Lau 2417181cf2 Revert comment. 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
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
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
galaxy 5986556b6b NacosServiceInstance.getInstanceId() is null 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
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
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
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 b96b762001 Add unit test
添加相关单元测试
现在没有配置 dataId 时会默认使用 {application}-{profile}.{fileExtension}
3 years ago
Freeman Lau 695938280f fix: Remove dummy method 3 years ago
Freeman Lau 83873e5fbe feature: support spring.config.import
支持 spring boot >= 2.4.0 通过 spring.config.import
 方式引入 nacos 配置
3 years ago
余黄彬 e5149643d8
Merge pull request #2346 from helloichen/feature/issue2328_nacos
[Enhancement] Support for obtaining configuration data with delimiters from Nacos
3 years ago