Commit Graph

2318 Commits (bddc61284406de314249a7ea89bb1e14c003deca)
 

Author SHA1 Message Date
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 dd88776615
Merge pull request #2382 from Roger3581321/patch-3
Updating readme-zh.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
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
Steve Rao ebb130091e
Update sidecar.adoc 3 years ago
Freeman Lau 67daf1f27e Support refresh single ConfigurationPropertiesBean. 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
zkzlx 2cda113014
Merge pull request #2376 from galaxy-sea/customize_matedata
Modify the customize() method to facilitate subclass override
3 years ago
galaxy 14a71dab27 Modify the customize() method to facilitate subclass override 3 years ago
Steve Rao 52cdd08685
Merge pull request #2373 from alibaba/dependabot/maven/org.apache.dubbo-dubbo-2.7.15
Bump dubbo from 2.7.8 to 2.7.15
3 years ago
Steve Rao f95b0d7ccf
Merge pull request #2375 from galaxy-sea/ServiceInstance
NacosServiceInstance.getInstanceId() is null
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
Steve Rao 30d3536d9b
Merge pull request #2372 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
3 years ago
Freeman Lau 42bdb9844d Add rocketmq example 3 years ago
galaxy 5986556b6b NacosServiceInstance.getInstanceId() is null 3 years ago