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
|
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 |
TheoneFx
|
139b03e652
|
Merge pull request #1868 from yyaini112/master
sentinel示例，添加sentinel配置，实现sentinel示例功能，以及运行说明。
|
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 |
yangying
|
1ecf526b5c
|
sentinel示例，添加sentinel配置，实现sentinel示例功能，以及运行说明。
|
4 years ago |
zkzlx
|
5135916175
|
[enhance issue #1492 ]Improved nacos configuration parsing, based on PropertySourceLoader---check
|
5 years ago |
mercyblitz
|
a198133852
|
Update pom.xml
|
5 years ago |
fangjian0423
|
88b8319eda
|
Bumping versions to 2.2.1.BUILD-SNAPSHOT after release
|
5 years ago |
|
fangjian0423
|
c5e27237fb
|
Closes #1126, closes #1153, closes #1123, closes #1143; Update SNAPSHOT to 2.2.0.RELEASE.
|
5 years ago |
|
fangjian0423
|
de9b1be4be
|
pass checkstyle plugin
|
5 years ago |
|
fangjian0423
|
2435167e1e
|
format code with maven plugins
|
5 years ago |
|
fangjian0423
|
e8ee68998e
|
upgrade to Spring Cloud Hoxton, close #917
|
5 years ago |
赵禹光
|
34acf7034e
|
remove unused import statement
|
6 years ago |
冷冷
|
45dd5ca4c9
|
⬆️ Upgrading Version.2.1.1.BUILD-SNAPSHOT
|
6 years ago |
|
冷冷
|
5a1c2b5fef
|
✅ Adding tests. add sentinel feign example
|
6 years ago |