Commit Graph

2034 Commits (b3d4289c3517512ad80ced3d2112a1084caae55d)
 

Author SHA1 Message Date
chengpu.rzh b3d4289c35 Modified version info 3 years ago
Freeman Lau 66eafa4195
Merge pull request #2421 from DanielLiu1123/tests-module
Add Nacos integration tests.
3 years ago
Freeman Lau 0397ec9036 Add Nacos discovery integration tests. 3 years ago
Freeman Lau b88690a1d6 Add tests module. 3 years ago
Freeman Lau 42ebeaac6a Change test config. 3 years ago
Freeman Lau 8e4f1eb771 Update docs and add @since. 3 years ago
Freeman Lau 366675329b
Merge pull request #2418 from DanielLiu1123/fix-2405
Optimize Sentinel module code.
3 years ago
Freeman Lau 657c8aac72 Make SentinelCircuitBreakerConfiguration deprecated.
make BeanPostProcessor static
update docs
3 years ago
Freeman Lau d6310b1fa0 Refactor Nacos config tests.
add NacosConfigDataMissingEnvironmentPostProcessor
optimize Nacos config pom
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 6cbe62b173
Update sca-upgrade-guide.adoc 3 years ago
Freeman Lau 3385bdbeec Add docs. 3 years ago
Freeman Lau a4c5839d3c Adjust test config. 3 years ago
Freeman Lau 0ede54d0f4 Adjust test config. 3 years ago
Freeman Lau 6fc14b77da
Merge pull request #2408 from ovasty/2022.x
Mmodify error english words.
3 years ago
Freeman Lau 514ef88cc8 Change CI name. 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
ovasty dafb401719
Merge pull request #1 from ovasty/ovasty-patch-1
Update rocketmq.adoc
3 years ago
ovasty 2a9329977f
Update rocketmq.adoc
fix misspelling words
3 years ago
Freeman Lau 98861dff5d
Merge pull request #2407 from DanielLiu1123/upgrade_seata_1.4.2
Upgrade Seata to 1.4.2.
3 years ago
Freeman Lau 98c6a3133d Upgrade Seata to 1.4.2.
fix circular dependency.
optimize pom.
replace deprecated code.
3 years ago
Freeman Lau 713c32a094
Merge pull request #2406 from DanielLiu1123/upgrade_rocketmq_4.9.2
Upgrade rocketmq 4.9.2
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 6475b62664
Merge pull request #2404 from DanielLiu1123/upgrade_sentinel_1.8.3
Upgrade Sentinel to 1.8.3.
3 years ago
Freeman Lau 86b553f644 Upgrade Sentinel to 1.8.3. 3 years ago
Freeman Lau 26f12678b8
Merge pull request #2403 from DanielLiu1123/upgrade_nacos_1.4.3
Upgrade nacos 1.4.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 3e04246ecc
Merge pull request #2402 from jumkey/patch-1
Remove duplicate openfeign dependencies.
3 years ago
Freeman Lau 9d09a6df64 Upgrade nacos to 1.4.3. 3 years ago
jumkey 537c98345f 优化pom 3 years ago
Freeman Lau fe3c1a822d
Merge pull request #2401 from DanielLiu1123/boot_2.6.x_adaptation
Upgrade spring boot to 2.6.x.
3 years ago
Freeman Lau 5a54d8811c Upgrade spring boot to 2.6.x. 3 years ago
Freeman Lau 2569bdf20b
Merge pull request #2400 from DanielLiu1123/merge_2.2.x_2022
Merge 2.2.x to 2022
3 years ago
Freeman Lau 1a7f900a9c Merge 2.2.x to 2022.
fix conflict and checkstyle
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 744afd3b34
Merge pull request #2395 from DanielLiu1123/fix_deprecate_code
Refactor deprecated code.
3 years ago
Freeman Lau 2417181cf2 Revert comment. 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 dee5bdaa72
Merge pull request #2394 from Roger3581321/patch-4
Updating readme.md
3 years ago
Freeman Lau b597c9c0b1
Merge pull request #2399 from onewe/2022.x
[issue#2397] Change the endpoint id to nacosdiscovery
3 years ago
onewe ec75c32f61
[issue#2397] Change the endpoint id to nacosdiscovery 3 years ago
onewe 236b5e8427
[issue#2397]Chnage the endpoint id to nacosdiscovery 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
Steve Rao 98a875760f
Merge pull request #2396 from iaiti/patch-1
Update readme-zh.md
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