2432d640d9
Merge pull request #2464 from Sorieee/2021.x_sorie_rocketmq_group
...
Support anonymous consumer group
3 years ago
9882d5727c
Using ConfigurationPropertiesRebinder when behavior is default
3 years ago
9c4dc69cce
Merge remote-tracking branch 'upstream/2021.x' into refresh_specific_configuration_properties
...
# Conflicts:
# spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json
3 years ago
db566f14a5
Update logging level path
3 years ago
bc78984df8
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
2fb0893eda
remove deprecated constructor
3 years ago
520907d63e
Nacos config use DeferredLogFactory
3 years ago
7211d05c90
Support print content
3 years ago
8d72682b07
Do not print content
3 years ago
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
146fd38c47
Support configure preference for single config
...
Add log info.
3 years ago
5f82af2271
add debug log
3 years ago
854c9ec196
add debug log
3 years ago
154775dd13
Fix NacosConfigEndpointTests instability issues
3 years ago
0cd03778fa
Write some tests for #2391
3 years ago
bd800de133
Fixs group must be configured for channel #2391
...
And delete rocketmq-comprehensive-example's consumer group configurations.
3 years ago
5d49b63200
Support config preference.
3 years ago
2f0ad20323
Optimize pom.
3 years ago
a7d3c7f76d
Merge pull request #2457 from Sorieee/2021.x.sorie_nacos_discovery_mock
...
Replace powermock with mockito in Nacos Discovery.
3 years ago
ec29e197e5
Migrate junit4 to junit5.
3 years ago
3bd3f52d90
Migrate junit4 to junit5.
3 years ago
2b8e919215
Improve MockNamingService: return emptyList rather than null
3 years ago
94871e20ec
Replace powermock with mockito in Nacos Discovery
3 years ago
ad69d6824b
Remove dubbo starter
3 years ago
dcfe35dbba
Remove sentinel-dubbo adapter
3 years ago
481da281aa
Merge pull request #2446 from alibaba/2.2.x
...
Merge some fix from 2.2.x to 2021.x
3 years ago
b01e29a989
Merge pull request #2147 from wuwen5/patch-1
...
Lower log level
3 years ago
e38900ba55
Merge pull request #2444 from ruansheng8/fix-npe
...
fix dubbo ServiceParameterResolver NPE
3 years ago
22862402d2
fix dubbo ServiceParameterResolver NPE
3 years ago
299726a8b8
Replace powermock with mockito in Nacos config
3 years ago
a1280bff9a
Add since tag.
3 years ago
4edecfc38e
Fix unit test may fail.
3 years ago
2aaef56dc4
Support refresh specific ConfigurationPropertiesBean.
3 years ago
a2d7366dc4
Merge remote-tracking branch 'upstream/2021.x' into refresh_specific_configuration_properties
...
# Conflicts:
# spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
3 years ago
e6eb4b653e
Change StringUtil package.
3 years ago
3199f44837
Change util package.
3 years ago
d2e88157dc
Add Nacos import check integration tests.
3 years ago
42ebeaac6a
Change test config.
3 years ago
8e4f1eb771
Update docs and add @since.
3 years ago
657c8aac72
Make SentinelCircuitBreakerConfiguration deprecated.
...
make BeanPostProcessor static
update docs
3 years ago
d6310b1fa0
Refactor Nacos config tests.
...
add NacosConfigDataMissingEnvironmentPostProcessor
optimize Nacos config pom
3 years ago
f45a9fb28f
Add listening configs log info.
3 years ago
a4c5839d3c
Adjust test config.
3 years ago
0ede54d0f4
Adjust test config.
3 years ago
98c6a3133d
Upgrade Seata to 1.4.2.
...
fix circular dependency.
optimize pom.
replace deprecated code.
3 years ago
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
5bd60891d3
Merge remote-tracking branch 'upstream/2022.x' into upgrade_nacos_1.4.3
3 years ago
9d09a6df64
Upgrade nacos to 1.4.3.
3 years ago
537c98345f
优化pom
3 years ago
1a7f900a9c
Merge 2.2.x to 2022.
...
fix conflict and checkstyle
3 years ago
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
2417181cf2
Revert comment.
3 years ago
3451906c2b
Merge 2.2.x to 2022.
3 years ago
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
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
67daf1f27e
Support refresh single ConfigurationPropertiesBean.
3 years ago
2cda113014
Merge pull request #2376 from galaxy-sea/customize_matedata
...
Modify the customize() method to facilitate subclass override
3 years ago
14a71dab27
Modify the customize() method to facilitate subclass override
3 years ago
5986556b6b
NacosServiceInstance.getInstanceId() is null
3 years ago
d36ee864fd
Fixed checkstyle.
3 years ago
0344862f62
Merge pull request #2360 from DanielLiu1123/nacos_fault_tolerance
...
Nacos failure tolerance
3 years ago
61c2c31cf7
Fixed checkstyle.
3 years ago
6f3a5d892a
Register NacosConfigManager instead of ConfigService.
...
Avoiding import *
Avoiding invoke `getUri` repeatedly
3 years ago
08f5438ab0
Set default to false.
...
Avoiding import *
3 years ago
5850798977
Add new configuration item.
...
Fixed equals and hash method.
Replaced StringUtils, Spring's isEmpty method is deprecated.
3 years ago
9a4a7d6f42
feature: Nacos failure tolerance.
...
增加 nacos 失败容错功能, 在查询失败时使用缓存值
3 years ago
96157efaf6
Optimize binding logic.
3 years ago
abe1f22345
Fix nacos common properties can't bind.
...
修复 nacos 通用属性无法绑定的问题
3 years ago
65e1eff7d6
Make bootstrap starter optional.
...
在 spring boot >= 2.4.0 版本应该由用户决定是使用 bootstrap 还是 import 方式导入外部配置
3 years ago
6779603fb4
Merge remote-tracking branch 'origin/2020.0.0' into support_spring_config_import
3 years ago
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
769bced209
Use NacosConfigManager to create ConfigService.
...
Modify whether is PROFILE_SPECIFIC logic.
Make NacosBootstrapper method public.
3 years ago
dec4c63b52
Refresh feign client rules only.
...
现在只刷新 feign client 熔断规则, 手动添加或者通过 dashboard 和数据源配置的规则不会受到影响
3 years ago
21e22e0696
ref: Remove ConfigServiceIndexes
...
重构代码
dataId 不可缺省, 通过参数覆盖默认配置
3 years ago
8958392914
Refactor configuration
...
重构配置方式, 不需要将 serverAddr 写在 import 里
保留以前版本的拉取配置逻辑, 保证能够平滑升级
3 years ago
5786ba51eb
Support spring.config.import
...
支持 import 方式
3 years ago
77b3d7922b
fix: Keep rules in dataSource
...
保留数据源中配置
3 years ago
b96b762001
Add unit test
...
添加相关单元测试
现在没有配置 dataId 时会默认使用 {application}-{profile}.{fileExtension}
3 years ago
695938280f
fix: Remove dummy method
3 years ago
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
67b98c3a7a
use LinkedHashMap to ensure the order of configuration.
3 years ago
aeb1dfb2e7
yaml powerMock
3 years ago
e8ff4d8f4f
fix: Adjust unit test configuration
...
增大 timeWindow 值, 降低单测不过情况的概率
3 years ago
2f6e12d0a7
feature: Support dynamic refresh circuit breaker rules
...
支持断路器规则的动态刷新
3 years ago
f2fc814404
nacos configuration file support "---"
3 years ago
796d18a941
Update documentation and code comment links
3 years ago
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
1ce2501bc0
fix: comment and blank
3 years ago
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
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
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
162941e880
fix issue#2323
3 years ago
3c3ba1b4a7
Merge pull request #2302 from steverao/rocketmq-2.2.7
...
Merge branch of rocketmq-2.2.7 to master
3 years ago
3edcc41099
fixup: issue#2300
...
Use the legacy bootstrap way in newer spring-cloud version
3 years ago
000e141404
Change NacosServiceManager injection mode to constructor injection
3 years ago
3e8380740c
Optimize the code of producer
3 years ago
afdee2807d
Merge remote-tracking branch 'upstream/master' into rocketmq
...
# Conflicts:
# pom.xml
# 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/properties/RocketMQBinderConfigurationProperties.java
# spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java
3 years ago
9cba216bfa
Optimize the consumption of Pull
3 years ago
989cf4268a
Merge pull request #2254 from Pengfei-Lu/gh-2253-fix
...
Fixes #2253 : ThreadPoolTaskScheduler instance in NacosWatch can't be shutdown.
3 years ago
bbf4977e7e
[rocketmq]fix variable judgment bug
3 years ago
03e16756cd
Fixes #2253 : ThreadPoolTaskScheduler instance in NacosWatch can't be shutdown.
3 years ago
a530705983
Merge pull request #2034 from panzhi33/master
...
升级rocketmq-spring-boot-starter版本，商业版消息轨迹无需手动配置轨迹topic
3 years ago
2fb1d06444
upgrade Nacos client version to 2.0.3
3 years ago
7755e19c07
Merge pull request #2208 from yuhuangbin/master
...
[Feature] SidecarHealthChecker add CustomerHandler
3 years ago
bc6c89f1bc
Merge branch 'rocketmq' of github.com:alibaba/spring-cloud-alibaba into rocketmq
3 years ago
745d173898
message converter
3 years ago
eed8bea07b
Merge pull request #1996 from RobberPhex/ramRoleName
...
添加RamRoleName支持
3 years ago
b35e7d7877
fixed Instrumentation
3 years ago
72e8a3bb36
Merge pull request #2103 from joeqiaoyao/rocketmq
...
feat: 配置添加unitName，支持同一应用连接多个集群
4 years ago
79f986b4c6
Merge branch 'master' into rocketmq
...
# Conflicts:
# spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq-new.adoc
4 years ago
568c64b1cf
document
4 years ago
8cddc0525f
SidecarHealthChecker customer
4 years ago
7d9751304e
enhance Nacos shutdown code
4 years ago
9eb5233dcb
update nacos-discovery default don't use NacosLoadBalancer
4 years ago
f0edd0f820
update nacos-dicovery.additional-spring-configuration-metadata.json
4 years ago
3c769a9ba7
remove ConditionalOnLoadBalancerNacosDefault.java
4 years ago
ca49df5ca4
add dependency of commons
4 years ago
914e86fa21
remove NoneLoadBalancerCacheManager.java
4 years ago
eea363bda4
update ServiceInstanceListSupplier.builder() don't use withCache()
4 years ago
4356f1be49
fix #2157
4 years ago
4d697bb294
fix #2157
4 years ago
e4d467f359
update loadbalancer.nacos.enabled -> spring.cloud.loadbalancer.nacos.enabled
4 years ago
fbc7f9d985
add NoneLoadBalancerCacheManager
4 years ago
cf13c1cfe8
format code
4 years ago
ae5f25f22d
add NacosLoadBalancer
4 years ago
b4adbb65cc
NacosWatch use a separate thread pool
4 years ago
df096fdfb5
Sentinel is called in a more secure way
4 years ago
9a11f79326
Lower log level
...
没有配置规则是很正常的，例如用户侧做了全局规则实现，这里频繁刷warn日志无法控制.
4 years ago
aa580ac3b6
throw exception directly when exception is not an BlockException in SentinelProtectInterceptor
4 years ago
ec1f65f99d
use aop to save and get FeignClientFactoryBean replace to applicationContext.getBean
4 years ago
c5949a5863
support ak/sk authentication when using serverAddr
4 years ago
d69f66cc3e
avoid defult router impact DubboMetadataService works
4 years ago
5f7ddab58e
avoid defult router impact DubboMetadataService works
4 years ago
374964d8dc
add router url when urls is not empty
4 years ago
3009b162a0
add a router to make sure that use revision when invoke DubboMetadataService
4 years ago
c448027f34
add spring-cloud-starter-bootstrap to compatible with spring boot bootstrap
4 years ago
fb9521b2e6
remove unused code;
...
make sure param not lost, so that different param calculate different revision.
4 years ago
e4f2f4150c
init DubboCloudRegistry when subscribe or unsubscribe
4 years ago
4786725e8e
修复当实例不在默认分组下时获取不到实例状态的BUG
4 years ago
139d793302
Merge pull request #2104 from yuhuangbin/master
...
[Feature] support for registration of quick failed configuration items
4 years ago
a2b2c2f8c1
Nacos Discovery supports registration for quick failed configurations
4 years ago
d55aea9d2b
Merge branch 'rocketmq' of github.com:alibaba/spring-cloud-alibaba into rocketmq
4 years ago
87d0939411
feat: 配置添加unitName，支持同一应用连接多个集群
4 years ago
df2bced6f2
optimize dubbo registry
4 years ago
479540c835
optimize dubbo registry
4 years ago
c3d393b09e
1. try执行后无catch 依然是return null
...
2. 变量后续没用到可定义到 try 内
3. 添加UP/DOWN 常量值
4 years ago
55b3336b6c
Merge pull request #1992 from DHBin/master
...
修复dubbo使用服务分组和分组聚合获取不到url
4 years ago
Freeman Lau
Freeman Lau
ruansheng
lixiaoshuang
sorie
Steve Rao
ruansheng
jumkey
zkzlx
galaxy
余黄彬
Chenwp
HuGuirong
李志威
wuchao
ZhangC
x_vivi@yeah.net
panzhi33
Alex Lu
Jim Fang
TheoneFx
XuDaojie
wuwen
joeqiaoyao
eden-yuan