Commit Graph

421 Commits (fe3c1a822d0c4a33ce6ef336199aaf986580bfa6)

Author SHA1 Message Date
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 28ff3ee179 Merge remote-tracking branch 'upstream/2022.x' into merge_2.2.x_2022 3 years ago
Freeman Lau fd3a22c47e Merge remote-tracking branch 'orgin/fix_deprecate_code' into fix_deprecate_code 3 years ago
Freeman Lau b2220ec302 Merge remote-tracking branch 'upstream/2.2.x' into merge_2.2.x_2022 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
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
zkzlx e19a71c4e7
Merge pull request #1769 from Roger3581321/master
minior improvements for nacos doc, examples code
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
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
Freeman Lau 61c2c31cf7 Fixed checkstyle. 3 years ago
Freeman Lau 6779603fb4 Merge remote-tracking branch 'origin/2020.0.0' into support_spring_config_import 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 83873e5fbe feature: support spring.config.import
支持 spring boot >= 2.4.0 通过 spring.config.import
 方式引入 nacos 配置
3 years ago
Freeman Lau 2f6e12d0a7 feature: Support dynamic refresh circuit breaker rules
支持断路器规则的动态刷新
3 years ago
Freeman Lau 597a2884f8 feature: Add example for Feign with Sentinel circuit breaker 3 years ago
zkzlx 3c3ba1b4a7
Merge pull request #2302 from steverao/rocketmq-2.2.7
Merge branch of rocketmq-2.2.7 to master
3 years ago
chengpu.rzh 1a146c726e Fixed the errors in nacos-config-demo 3 years ago
zkzlx 79f986b4c6 Merge branch 'master' into rocketmq
# Conflicts:
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq-new.adoc
4 years ago
zkzlx 568c64b1cf document 4 years ago
XuDaojie cf13c1cfe8 format code 4 years ago
XuDaojie 35a67497c0 update nacos-discovery-consumer-sclb-example 4 years ago
theonefx e4f2f4150c init DubboCloudRegistry when subscribe or unsubscribe 4 years ago
Roger3581321 b78239253b Merge branch 'alibaba:master' into master 4 years ago
yuhuangbin a2b2c2f8c1 Nacos Discovery supports registration for quick failed configurations 4 years ago
zkzlx d55aea9d2b Merge branch 'rocketmq' of github.com:alibaba/spring-cloud-alibaba into rocketmq 4 years ago
TheoneFx 28d2100f5c
Merge pull request #2015 from tangyuewei/master
Some spaces are removed, which is more in line with the specification
4 years ago
Roger3581321 495f2bec2e Merge branch 'alibaba:master' into master 4 years ago
zkzlx d17a38d495 Merge branch 'master' of github.com:alibaba/spring-cloud-alibaba into rocketmq 4 years ago
Spike 3ee8d4bf56 事务消息指定方式变更为producerType=Trans 4 years ago
tangyuewei d653a14476 升级案例注解 4 years ago
tangyuewei eaab60ebdb 去掉了一些空格,更符合规范 4 years ago
TheoneFx 139b03e652
Merge pull request #1868 from yyaini112/master
sentinel示例,添加sentinel配置,实现sentinel示例功能,以及运行说明。
4 years ago
zkzlx 9379d18ace Code style 4 years ago
zkzlx 6d7c47a366 Code refactoring and some new feature support - delete some invalid files. 4 years ago
theonefx ed9d659d64 remote all hystrix,zuul,ribbon 4 years ago
TheoneFx 02205e7dea
Merge pull request #1973 from theonefx/master
Use spring.cloud.version instead of the version number of each component
4 years ago
theonefx 45fae73e9f support springboot1 and springboot2 4 years ago