Commit Graph

537 Commits (b4fcc7c6f28ee452723d27221f56fb56ce60f66a)

Author SHA1 Message Date
Freeman Lau b88690a1d6 Add tests module. 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 f45a9fb28f Add listening configs log info. 3 years ago
Freeman Lau ed6a9949db Degrade Nacos 1.4.2 3 years ago
Freeman Lau a9e4e1c443 Update docs. 3 years ago
Freeman Lau a2ff00765d Upgrade spring boot 2.6.3.
upgrade spring cloud 2021.0.1
add GitHub CI script
update nacos image
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 35e0d7a1a7 Merge branch 'update_rocketmq_example' into upgrade_rocketmq_4.9.2 3 years ago
Freeman Lau 86b553f644 Upgrade Sentinel to 1.8.3. 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 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 dd88776615
Merge pull request #2382 from Roger3581321/patch-3
Updating readme-zh.md
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
Roger3581321 1b6258a2a1
Updating readme-zh.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
Freeman Lau 42bdb9844d Add rocketmq example 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
theonefx f8a6a4f753 add lost dependency of sc 2020 4 years ago
theonefx e7521c02c9 2020 build done, unit test failed 4 years ago
theonefx 29091948e9 remove zuul example 4 years ago
theonefx 1492ad5693 upgrade spring cloud version to 2020.0.1 4 years ago
theonefx d9727bb31f Use spring.cloud.version instead of the version number of each component 4 years ago
theonefx ee1e5d36ef Use spring.cloud.version instead of the version number of each component 4 years ago
TheoneFx 41e65294f5
Merge pull request #1919 from ppzzyy11/master
修改了两个错误的URL
4 years ago
派哒 ca9048b251 Merge remote-tracking branch 'upstream/master' 4 years ago
theonefx 8542756d90 dubbo endpoint 4 years ago
zkzlx 5db4161acf updated nacos example 4 years ago
zkzlx e7fedb9d6f Merge branch 'master' of github.com:alibaba/spring-cloud-alibaba 4 years ago
theonefx 38de8b0e47 remove all apache.commons 4 years ago
theonefx a758b45661 push temporary 4 years ago
theonefx a20c665497 update nacos client version 2 1.4.1 4 years ago
派哒 c3db7fdc91 修改了两个错误的URL 4 years ago
zkzlx 79bab3b269 test 4 years ago
TheoneFx 4dd45a4709
Merge pull request #1531 from zkzlx/config
[fix & enhance issue #1492 #1506 #1257 #1578 ]Improved nacos configuration parsing,
4 years ago
yangying 1ecf526b5c sentinel示例,添加sentinel配置,实现sentinel示例功能,以及运行说明。 4 years ago
eden-yuan c19bd51584 不应该使用类实例访问静态成员\不应该直接使用不确定的值调用equals容易空指针\final static应该使用大写命名并且使用下划线 4 years ago
zkzlx e26ef50af4 [pr #1531]build 4 years ago
zkzlx 359b3ea522 Merge remote-tracking branch 'origin/master' into config
# Conflicts:
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java
4 years ago
Jim Fang 956acad43e
Merge pull request #1772 from Roger3581321/patch-1
Add one missing configuration item
4 years ago
Jim Fang 7316db75be
Merge pull request #1771 from Flyfoxs/patch-1
update Seata example
4 years ago
zhongguangxi 1934c4760d maven project name change 4 years ago
Roger3581321 25689b800e
Add one missing configuration item
Since there is an important, yet missing option spring.cloud.nacos.discovery.enabled, I have added its description by following  the "More configuration items" format.
4 years ago
Flyfoxs 11f8f02de6
Timeout exception in feign first time calling
第一次Feign调用时, 由于初始化懒加载, 可能会有timeout异常. 之前会被mock异常掩盖了.
4 years ago
roger 3e5d5a98e1 explicitly add nacos service discovery option, handle divide zero error case 4 years ago
Roger3581321 a42bd2e3a9
explicitly use standalone mode in windows
explicitly use standalone mode otherwise cluster mode in windows batch environment
4 years ago
jacky d7edf9f8ee
correct spelling 4 years ago
mercyblitz 5cd6c0f1e7 Fix the code style issues 4 years ago
mercyblitz f34a8a13c6 Polish alibaba/spring-cloud-alibaba#1665 : [Sample] Upgrading the Dubbo Sample 5 years ago
mercyblitz c0bcd52381 Polish alibaba/spring-cloud-alibaba#1661 : [Feature] Introducing Dubbo Gateway 5 years ago
孙继峰 ad36fd2e95
修正文档 5 years ago
zkzlx f2f58b90a0 Merge remote-tracking branch 'upstream/master' into nacos-register
# Conflicts:
#	spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/NacosServiceDiscovery.java
5 years ago
zkzlx 5135916175 [enhance issue #1492 ]Improved nacos configuration parsing, based on PropertySourceLoader---check 5 years ago
zkzlx c07701d98e [enhance issue #1492 ]Improved nacos configuration parsing, based on PropertySourceLoader 5 years ago
J-Cod3r 1e74332a0a update nacos-discovery-example readme 5 years ago
zkzlx 0a89ad61e1 [enhance issue #1478 ]支持注册非活动节点 5 years ago
yuhuangbin 8a68526da7 fix issue#1456 5 years ago
Mercy Ma 2e934f09e9
Merge pull request #1398 from yuhuangbin/sidecar-enhance
sidecar enhance
5 years ago
Mercy Ma c7ea46301f
Merge pull request #1354 from yuhuangbin/sentinel-nacos
Sentinel Nacos Data Source Certification
5 years ago
yuhuangbin 9831e9b69b upgrade sentinel version to 1.7.2 5 years ago
yuhuangbin fd58f75e41 sidecar enhance 5 years ago
余黄彬 2600e42f51
Update readme-zh.md 5 years ago
yuhuangbin 8991078055 fix issue#1350 5 years ago
yuhuangbin cb27412021 fix issue#1350 5 years ago
mercyblitz a198133852 Update pom.xml 5 years ago
mercyblitz 46b64a96fa Update Samples 5 years ago
TheoneFx 75f98be294
Merge pull request #1306 from theonefx/master
fix link error in document
5 years ago
theonefx a0fc48628c fix document link error
ref: https://github.com/alibaba/spring-cloud-alibaba/issues/1214
5 years ago
yuhuangbin a99b8f845f sidecar enhance 5 years ago
theonefx 2ed48c5506 fix issue: https://github.com/alibaba/spring-cloud-alibaba/issues/1288 5 years ago
mercyblitz 2282d39df6 Polish alibaba/spring-cloud-alibaba/#1261 : Removing the commercial examples and adding starters into spring-cloud-alibaba-coverage module 5 years ago
yuhuangbin e8e49ff39b upgrade Seata and Spring Cloud Version 5 years ago
yuhuangbin 756c82ba1e upgrade nacos client version 5 years ago
mercyblitz 1b749d47c1 Polish alibaba/spring-cloud-alibaba/#1222 : Resolve the examples issues 5 years ago
mercyblitz 93d5ce1054 Polish alibaba/spring-cloud-alibaba/#1222 : Resolve the relative path of pom.xml 5 years ago
mercyblitz 155ea9418f Polish alibaba/spring-cloud-alibaba/#1222 : Combining the code-based and starter modules 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 b1af3e2b87 update example configurations 5 years ago
fangjian0423 86640fc353 update example configurations 5 years ago
fangjian0423 49d0ebdabe just update to match code style 5 years ago
mercyblitz 4402ee0bbe Polish alibaba/spring-cloud-alibaba/#1192 : [Infrastructure] Upgrade the Dubbo 2.7.4.1 dependencies 5 years ago
fangjian0423 57e3059d8d update examples 5 years ago
yuhuangbin ab06f3232c seata feignloadbalancer enhance 5 years ago
Jim Fang 5f8d8cc043
Merge pull request #1154 from slievrly/springboot
adapter: use seata-spring-boot-starter's autoConfiguration instead of spring-cloud-alibaba-seata-starter's autoConfiguration
5 years ago
fangjian0423 9a5518d302 update nacos config example 5 years ago
Jim Fang f789803cac
Merge pull request #1171 from yuhuangbin/sentinel-enhance
[Upgrade] Upgrade Sentinel and Enhance
5 years ago
fangjian0423 00d449ba23 pass code check 5 years ago
slievrly d040d6a3b7 throw exception
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
fangjian0423 ddceb5f312 add spring cloud sentinel circuitbreaker demo 5 years ago
yuhuangbin b0273fb1c8 upgrade sentinel version and enhance 5 years ago
fangjian0423 b70129c17f add reactive discovery example 5 years ago
fangjian0423 a9e519265a add s-c-loadbalancer example 5 years ago
Jim Fang 2a18ddb0be
Merge pull request #1136 from zkzlx/config-eh
[issue #982 & issue #978]enhance nacos config
5 years ago
slievrly f36c94d3ed fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly fbd72a6000 fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly 4ac2622753 fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly c644a2c1ec fix ci
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly c216cad31c fix properties
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
slievrly 7b79b6a11b Merge remote-tracking branch 'upstream/master' into springboot
Signed-off-by: slievrly <slievrly@163.com>

# Conflicts:
#	spring-cloud-alibaba-seata/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java
5 years ago
slievrly 34d8267068 adapter: use seata-spring-boot-starter's autoConfiguration instead of spring-cloud-alibaba-seata-starter's autoConfiguration
Signed-off-by: slievrly <slievrly@163.com>
5 years ago
format aba89ed5ba
Merge pull request #1100 from pigxcloud/master
replace code properties that have expired
5 years ago