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
Chenwp
67b98c3a7a
use LinkedHashMap to ensure the order of configuration.
3 years ago
Chenwp
aeb1dfb2e7
yaml powerMock
3 years ago
Freeman Lau
e8ff4d8f4f
fix: Adjust unit test configuration
...
增大 timeWindow 值, 降低单测不过情况的概率
3 years ago
Freeman Lau
2f6e12d0a7
feature: Support dynamic refresh circuit breaker rules
...
支持断路器规则的动态刷新
3 years ago
Chenwp
f2fc814404
nacos configuration file support "---"
3 years ago
HuGuirong
796d18a941
Update documentation and code comment links
3 years ago
Freeman Lau
0a04d921a4
fix: change Feign client single method configuration key
...
Change key format, UserClient#methodName(Type,Type) -> user#methodName(Type,Type).
String before the '#', changed to Feign client name.
Fix code format.
3 years ago
Freeman Lau
1ce2501bc0
fix: comment and blank
3 years ago
Freeman Lau
2342f23bf3
feature: support configuration per Feign client
...
Note: it depends on spring cloud openfeign version in classpath.
If using spring-cloud-openfeign-core version >= 3.0.4, you can configure for per Feign client. Otherwise, you can only configure for per Feign client' single method.
Fix test.
3 years ago
Freeman Lau
eb59569d35
feature: support feign client custom configuration
...
There's a potential problem, if CircuitBreakerFactory was injected in spring's lifecycle, will possibly get the raw one(not customized). So, remove ReactiveSentinelCircuitBreakerAutoConfiguration and SentinelCircuitBreakerAutoConfiguration inner configuration class.
3 years ago
李志威
941bdad484
fix the checkstyle plugin error
...
```shell
[INFO] --- maven-checkstyle-plugin:3.0.0:check (checkstyle-validation) @ spring-cloud-starter-stream-rocketmq ---
[INFO] 开始检查……
[ERROR] /Users/lizhiwei/Git/github/spring-cloud-alibaba/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/main/java/com/alibaba/cloud/stream/binder/rocketmq/autoconfigurate/ExtendedBindingHandlerMappingsProviderConfiguration.java:59: 需要一个 Javadoc注释 @return 。 [JavadocMethod]
检查完成。
[INFO] ------------------------------------------------------------------------
```
3 years ago
HuGuirong
6d58917fa6
NacosDataSourceProperties support for contextPath configuration items
...
Closes gh-2327
3 years ago
余黄彬
ebe258364c
Merge pull request #2325 from Jack9610/master
...
fix issue#2323
3 years ago
wuchao
162941e880
fix issue#2323
3 years ago