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 |
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 |
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 |
|
galaxy
|
5986556b6b
|
NacosServiceInstance.getInstanceId() is null
|
3 years ago |
dependabot[bot]
|
36cc1e95ab
|
Bump dubbo from 2.7.8 to 2.7.15
Bumps [dubbo](https://github.com/apache/dubbo) from 2.7.8 to 2.7.15.
- [Release notes](https://github.com/apache/dubbo/releases)
- [Changelog](https://github.com/apache/dubbo/blob/3.0/CHANGES.md)
- [Commits](https://github.com/apache/dubbo/compare/dubbo-2.7.8...dubbo-2.7.15)
---
updated-dependencies:
- dependency-name: org.apache.dubbo:dubbo
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
|
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 |
|
Steve Rao
|
8719706e46
|
Merge pull request #2364 from DanielLiu1123/fix_checkstyle
Fixed checkstyle
|
3 years ago |
|
Freeman Lau
|
d36ee864fd
|
Fixed checkstyle.
|
3 years ago |
|
Steve Rao
|
0344862f62
|
Merge pull request #2360 from DanielLiu1123/nacos_fault_tolerance
Nacos failure tolerance
|
3 years ago |
余黄彬
|
14ecf7870b
|
Merge pull request #2349 from DanielLiu1123/support_spring_config_import
Support spring.config.import
|
3 years ago |
|
Freeman Lau
|
61c2c31cf7
|
Fixed checkstyle.
|
3 years ago |
|
Freeman Lau
|
6f3a5d892a
|
Register NacosConfigManager instead of ConfigService.
Avoiding import *
Avoiding invoke `getUri` repeatedly
|
3 years ago |
|
Freeman Lau
|
08f5438ab0
|
Set default to false.
Avoiding import *
|
3 years ago |
|
Freeman Lau
|
5850798977
|
Add new configuration item.
Fixed equals and hash method.
Replaced StringUtils, Spring's isEmpty method is deprecated.
|
3 years ago |
|
Freeman Lau
|
9a4a7d6f42
|
feature: Nacos failure tolerance.
增加 nacos 失败容错功能, 在查询失败时使用缓存值
|
3 years ago |
|
Freeman Lau
|
96157efaf6
|
Optimize binding logic.
|
3 years ago |
|
Freeman Lau
|
abe1f22345
|
Fix nacos common properties can't bind.
修复 nacos 通用属性无法绑定的问题
|
3 years ago |