From 4bacc628a968dfc5fb97ec0d233fee3efaec46cd Mon Sep 17 00:00:00 2001 From: "Yang.xiangfu" Date: Mon, 22 Apr 2024 14:05:24 +0800 Subject: [PATCH 1/2] fix: 2022.x #3445 A bean for InetIPv6Utils that could not found at project start up A bean for InetIPv6Utils could not be found at project start up when integrating Spring Cloud Config with Spring Cloud Alibaba Nacos Discovery. --- ...acosDiscoveryClientConfigServiceBootstrapConfiguration.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java index 61c00f4915..2e01fac81e 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java @@ -21,6 +21,7 @@ import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration; import com.alibaba.cloud.nacos.discovery.reactive.NacosReactiveDiscoveryClientConfiguration; +import com.alibaba.cloud.nacos.util.UtilIPv6AutoConfiguration; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -38,7 +39,7 @@ @Configuration(proxyBeanMethods = false) @ImportAutoConfiguration({ NacosDiscoveryAutoConfiguration.class, NacosServiceAutoConfiguration.class, NacosDiscoveryClientConfiguration.class, - NacosReactiveDiscoveryClientConfiguration.class }) + NacosReactiveDiscoveryClientConfiguration.class, UtilIPv6AutoConfiguration.class }) public class NacosDiscoveryClientConfigServiceBootstrapConfiguration { } From 2a410801988dfdb86daea116dd61b6fd6ce806aa Mon Sep 17 00:00:00 2001 From: "Yang.xiangfu" Date: Tue, 23 Apr 2024 09:54:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E5=AF=BC=E5=85=A5=E7=BB=84?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E9=A2=9D=E5=A4=96=E7=A9=BA=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...NacosDiscoveryClientConfigServiceBootstrapConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java index 2e01fac81e..14f40bd926 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java @@ -20,8 +20,8 @@ import com.alibaba.cloud.nacos.discovery.NacosDiscoveryAutoConfiguration; import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientConfiguration; import com.alibaba.cloud.nacos.discovery.reactive.NacosReactiveDiscoveryClientConfiguration; - import com.alibaba.cloud.nacos.util.UtilIPv6AutoConfiguration; + import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;