538 Commits (2.2.x)

Author SHA1 Message Date
zhangqian 93c81bf84c Add Seata example english documentation!
zhangqian c073abae89 Add Seata example english documentation!
zhangqian 7eb1a10eb3 Add Seata example english documentation!
zhangqian 49e4e8adb1 Add Seata example english documentation!
zhangqian 72bb05bbf2 Add Seata example english documentation!
zhangqian 14cd5519dc Add Seata example english documentation!
zhangqian 1646fdc055 Update Seata example configuration and documentation!
zhangqian e9b9826b72 Update Seata example configuration and documentation!
zhangqian a3d0187540 Update Seata to 1.5.1 in Spring Cloud Alibaba 2.2.x branch
zhangqian 6ce99e3e9d Update Seata to 1.5.1 in Spring Cloud Alibaba 2.2.x branch
zhangqian 9e83d727d2 Update Seata to 1.5.1 in Spring Cloud Alibaba 2.2.x branch
chengpu.rzh cb4290d08e Remove duplicated configuration
lixiaoshuang b212cb0bae Add examples of shared-configs and extension-configs
(cherry picked from commit 62e28ebd99)
lixiaoshuang 2038561c88 Add examples of shared-configs and extension-configs
(cherry picked from commit 211545b299)
lixiaoshuang 7e051f4c6b update image
(cherry picked from commit 5bfada9020)
lixiaoshuang 1df21a548c update image
(cherry picked from commit 38b8d5422b)
chengpu.rzh 4ab2ce4566 Add dependency and remove useless annotation
lixiaoshuang 20b8830914 Code optimization
(cherry picked from commit d355f45b25)
lixiaoshuang dcb71d9466 Code optimization
(cherry picked from commit 857e1096b4)
lixiaoshuang ec6ebe6a02 Code optimization
(cherry picked from commit 8e2a41e9ad)
lixiaoshuang 07a5901043 add Executors
(cherry picked from commit 3a1a8c7d71)
lixiaoshuang b13ee0e42e check style
(cherry picked from commit 9f00dd17ca)
lixiaoshuang 983f7a7b1d check style
(cherry picked from commit edff904489)
lixiaoshuang 04a55e4790 add nacos examples
sorie 4905de018d delete unused application.yml
sorie 69dd725137 rocketmq example maven fix
sorie 3b508d8a75 remove deprecated rocketmq example
Freeman Lau cfc15d8cbd cherry-pick freeman Add rocketmq example
sorie e611224fa3 rocketmq example readme improve
sorie 9512166536 remove timed message example from rocketmq examples.
Because it is not supported by rocketmq community version now.
sorie 02e49f90a5 fix rocketmq example code style.
sorie b4a9ca8605 fix rocketmq example errors.
sorie c96b6bf258 rocketmq example docs
sorie 029ea6fd53 Refactor Rocketmq: use StreamBridge.send() instead of functional producer
sorie 677847a477 fix Rocketmq example artifactId prob.
sorie 16b6e8c7a5 fix Application name prob.
sorie 036b3dce57 fix nameserver address prob.
sorie a216edc863 some rocketmq example.
Steve Rao 930e188964
Merge pull request 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
Steve Rao 73911948a8
Merge pull request from alibaba/dependabot/maven/spring-cloud-alibaba-examples/seata-example/account-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/account-service
Steve Rao e70ba310e1
Merge pull request 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
Steve Rao 149f67fc22
Merge pull request 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
Steve Rao e2a665e8ee
Merge pull request 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
dependabot[bot] b854e2cbd9
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>
dependabot[bot] f9e5e0852e
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>
dependabot[bot] d618fbd8ea
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>
dependabot[bot] 77e9c05f58
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>
dependabot[bot] eebd7194cf
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>
dependabot[bot] 33857fad72
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>
chengpu.rzh b8706abc86 Print nacos config log switch
Freeman Lau dd88776615
Merge pull request from Roger3581321/patch-3
Updating readme-zh.md
iaiti 8af1ed84b7
Update readme-zh.md
github网站处于https链接,资源为http被禁止跳转下载,更改为https资源下载
Roger3581321 1b6258a2a1
Updating readme-zh.md
zkzlx e19a71c4e7
Merge pull request from Roger3581321/master
minior improvements for nacos doc, examples code
zkzlx 3c3ba1b4a7
Merge pull request from steverao/rocketmq-2.2.7
Merge branch of rocketmq-2.2.7 to master
chengpu.rzh 1a146c726e Fixed the errors in nacos-config-demo
zkzlx 79f986b4c6 Merge branch 'master' into rocketmq
# Conflicts:
#	spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq-new.adoc
zkzlx 568c64b1cf document
theonefx e4f2f4150c init DubboCloudRegistry when subscribe or unsubscribe
Roger3581321 b78239253b Merge branch 'alibaba:master' into master
yuhuangbin a2b2c2f8c1 Nacos Discovery supports registration for quick failed configurations
zkzlx d55aea9d2b Merge branch 'rocketmq' of github.com:alibaba/spring-cloud-alibaba into rocketmq
TheoneFx 28d2100f5c
Merge pull request from tangyuewei/master
Some spaces are removed, which is more in line with the specification
Roger3581321 495f2bec2e Merge branch 'alibaba:master' into master
zkzlx d17a38d495 Merge branch 'master' of github.com:alibaba/spring-cloud-alibaba into rocketmq
Spike 3ee8d4bf56 事务消息指定方式变更为producerType=Trans
tangyuewei d653a14476 升级案例注解
tangyuewei eaab60ebdb 去掉了一些空格,更符合规范
TheoneFx 139b03e652
Merge pull request from yyaini112/master
sentinel示例,添加sentinel配置,实现sentinel示例功能,以及运行说明。
zkzlx 9379d18ace Code style
zkzlx 6d7c47a366 Code refactoring and some new feature support - delete some invalid files.
TheoneFx 02205e7dea
Merge pull request from theonefx/master
Use spring.cloud.version instead of the version number of each component
theonefx ee1e5d36ef Use spring.cloud.version instead of the version number of each component
TheoneFx 41e65294f5
Merge pull request from ppzzyy11/master
修改了两个错误的URL
派哒 ca9048b251 Merge remote-tracking branch 'upstream/master'
theonefx 8542756d90 dubbo endpoint
zkzlx 5db4161acf updated nacos example
zkzlx e7fedb9d6f Merge branch 'master' of github.com:alibaba/spring-cloud-alibaba
theonefx 38de8b0e47 remove all apache.commons
theonefx a758b45661 push temporary
theonefx a20c665497 update nacos client version 2 1.4.1
派哒 c3db7fdc91 修改了两个错误的URL
zkzlx 79bab3b269 test
TheoneFx 4dd45a4709
Merge pull request from zkzlx/config
[fix & enhance issue     ]Improved nacos configuration parsing,
yangying 1ecf526b5c sentinel示例,添加sentinel配置,实现sentinel示例功能,以及运行说明。
eden-yuan c19bd51584 不应该使用类实例访问静态成员\不应该直接使用不确定的值调用equals容易空指针\final static应该使用大写命名并且使用下划线
zkzlx e26ef50af4 [pr ]build
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
Jim Fang 956acad43e
Merge pull request from Roger3581321/patch-1
Add one missing configuration item
Jim Fang 7316db75be
Merge pull request from Flyfoxs/patch-1
update Seata example
zhongguangxi 1934c4760d maven project name change
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.
Flyfoxs 11f8f02de6
Timeout exception in feign first time calling
第一次Feign调用时, 由于初始化懒加载, 可能会有timeout异常. 之前会被mock异常掩盖了.
roger 3e5d5a98e1 explicitly add nacos service discovery option, handle divide zero error case
Roger3581321 a42bd2e3a9
explicitly use standalone mode in windows
explicitly use standalone mode otherwise cluster mode in windows batch environment
jacky d7edf9f8ee
correct spelling
mercyblitz 5cd6c0f1e7 Fix the code style issues
mercyblitz f34a8a13c6 Polish : [Sample] Upgrading the Dubbo Sample
mercyblitz c0bcd52381 Polish : [Feature] Introducing Dubbo Gateway
孙继峰 ad36fd2e95
修正文档
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
zkzlx 5135916175 [enhance issue ]Improved nacos configuration parsing, based on PropertySourceLoader---check
zkzlx c07701d98e [enhance issue ]Improved nacos configuration parsing, based on PropertySourceLoader
J-Cod3r 1e74332a0a update nacos-discovery-example readme
zkzlx 0a89ad61e1 [enhance issue ]支持注册非活动节点
yuhuangbin 8a68526da7 fix issue#1456
Mercy Ma 2e934f09e9
Merge pull request from yuhuangbin/sidecar-enhance
sidecar enhance
Mercy Ma c7ea46301f
Merge pull request from yuhuangbin/sentinel-nacos
Sentinel Nacos Data Source Certification
yuhuangbin 9831e9b69b upgrade sentinel version to 1.7.2
yuhuangbin fd58f75e41 sidecar enhance
余黄彬 2600e42f51
Update readme-zh.md
yuhuangbin 8991078055 fix issue#1350
yuhuangbin cb27412021 fix issue#1350
mercyblitz a198133852 Update pom.xml
mercyblitz 46b64a96fa Update Samples
TheoneFx 75f98be294
Merge pull request from theonefx/master
fix link error in document
theonefx a0fc48628c fix document link error
ref: https://github.com/alibaba/spring-cloud-alibaba/issues/1214
yuhuangbin a99b8f845f sidecar enhance
theonefx 2ed48c5506 fix issue: https://github.com/alibaba/spring-cloud-alibaba/issues/1288
mercyblitz 2282d39df6 Polish alibaba/spring-cloud-alibaba/#1261 : Removing the commercial examples and adding starters into spring-cloud-alibaba-coverage module
yuhuangbin e8e49ff39b upgrade Seata and Spring Cloud Version
yuhuangbin 756c82ba1e upgrade nacos client version
mercyblitz 1b749d47c1 Polish alibaba/spring-cloud-alibaba/#1222 : Resolve the examples issues
mercyblitz 93d5ce1054 Polish alibaba/spring-cloud-alibaba/#1222 : Resolve the relative path of pom.xml
mercyblitz 155ea9418f Polish alibaba/spring-cloud-alibaba/#1222 : Combining the code-based and starter modules
fangjian0423 88b8319eda Bumping versions to 2.2.1.BUILD-SNAPSHOT after release
fangjian0423 c5e27237fb Closes , closes , closes , closes ; Update SNAPSHOT to 2.2.0.RELEASE.
fangjian0423 b1af3e2b87 update example configurations
fangjian0423 86640fc353 update example configurations
fangjian0423 49d0ebdabe just update to match code style
mercyblitz 4402ee0bbe Polish alibaba/spring-cloud-alibaba/#1192 : [Infrastructure] Upgrade the Dubbo 2.7.4.1 dependencies
fangjian0423 57e3059d8d update examples
yuhuangbin ab06f3232c seata feignloadbalancer enhance
Jim Fang 5f8d8cc043
Merge pull request from slievrly/springboot
adapter: use seata-spring-boot-starter's autoConfiguration instead of spring-cloud-alibaba-seata-starter's autoConfiguration
fangjian0423 9a5518d302 update nacos config example
Jim Fang f789803cac
Merge pull request from yuhuangbin/sentinel-enhance
[Upgrade] Upgrade Sentinel and Enhance
fangjian0423 00d449ba23 pass code check
slievrly d040d6a3b7 throw exception
Signed-off-by: slievrly <slievrly@163.com>
fangjian0423 ddceb5f312 add spring cloud sentinel circuitbreaker demo
yuhuangbin b0273fb1c8 upgrade sentinel version and enhance
fangjian0423 b70129c17f add reactive discovery example
fangjian0423 a9e519265a add s-c-loadbalancer example
Jim Fang 2a18ddb0be
Merge pull request from zkzlx/config-eh
[issue  & issue ]enhance nacos config
slievrly f36c94d3ed fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
slievrly fbd72a6000 fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
slievrly 4ac2622753 fix checkstyle
Signed-off-by: slievrly <slievrly@163.com>
slievrly c644a2c1ec fix ci
Signed-off-by: slievrly <slievrly@163.com>
slievrly c216cad31c fix properties
Signed-off-by: slievrly <slievrly@163.com>
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
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>