github-forks
/
spring-cloud-alibaba
mirror of https://github.com/alibaba/spring-cloud-alibaba.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reformat the codes

Browse Source
pull/2661/head
chengpu.rzh 3 years ago
parent 9a21f3d08e
commit 3628732dad
5 changed files with 194 additions and 158 deletions
Show Stats Download Patch File Download Diff File

2
pom.xml
Unescape Escape View File

@ -80,7 +80,7 @@
<properties>
<!-- Project revision -->
<revision>2.2.8.RELEASE</revision>
<revision>2.2.9-SNAPSHOT</revision>
<!-- Spring Cloud -->
<spring.cloud.version>Hoxton.SR12</spring.cloud.version>

2
spring-cloud-alibaba-dependencies/pom.xml
Unescape Escape View File

@ -18,7 +18,7 @@
<description>Spring Cloud Alibaba Dependencies</description>
<properties>
<revision>2.2.8.RELEASE</revision>
<revision>2.2.9-SNAPSHOT</revision>
<sentinel.version>1.8.4</sentinel.version>
<seata.version>1.5.1</seata.version>
<nacos.client.version>2.1.0</nacos.client.version>

9
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
Unescape Escape View File

@ -17,7 +17,6 @@
package com.alibaba.cloud.nacos;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
@ -166,7 +165,7 @@ public class NacosDiscoveryProperties {
private String networkInterface = "";
/**
* choose IPV4 or IPV6,if you don't set it will choose IPV4
* choose IPV4 or IPV6,if you don't set it will choose IPV4.
*/
private String ipType = "IPv4";
@ -258,12 +257,14 @@ public class NacosDiscoveryProperties {
if (StringUtils.isEmpty(networkInterface)) {
if (ipType.equalsIgnoreCase("IPv4")) {
ip = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
}else if (ipType.equalsIgnoreCase("IPv6")){
}
else if (ipType.equalsIgnoreCase("IPv6")) {
ip = inetIPUtils.findFirstNonLoopbackHostInfo().getIpAddress();
int index = ip.indexOf('%');
ip = index > 0 ? ip.substring(0, index) : ip;
ip = "[" + ip + "]";
}else {
}
else {
throw new IllegalArgumentException(
"please checking the type of IP " + ipType);
}

37
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/intetuntil/InetIPv6Utils.java
Unescape Escape View File

@ -1,13 +1,23 @@
package com.alibaba.cloud.nacos.intetuntil;
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.cloud.commons.util.InetUtilsProperties;
package com.alibaba.cloud.nacos.intetuntil;
import java.io.Closeable;
import java.io.IOException;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
@ -19,10 +29,17 @@ import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.cloud.commons.util.InetUtilsProperties;
/**
* @author HH
*/
public class InetIPv6Utils implements Closeable {
private final ExecutorService executorService;
private final Log log = LogFactory.getLog(InetIPv6Utils.class);
@ -47,7 +64,8 @@ public class InetIPv6Utils implements Closeable {
InetAddress address = this.findFirstNonLoopbackIPv6Address();
if (address != null) {
return this.convertAddress(address);
} else {
}
else {
InetUtils.HostInfo hostInfo = new InetUtils.HostInfo();
this.properties.setDefaultIpAddress("0:0:0:0:0:0:0:1");
hostInfo.setHostname(this.properties.getDefaultHostname());
@ -61,8 +79,8 @@ public class InetIPv6Utils implements Closeable {
try {
int lowest = Integer.MAX_VALUE;
for (Enumeration<NetworkInterface> nics = NetworkInterface.getNetworkInterfaces();
nics.hasMoreElements();) {
for (Enumeration<NetworkInterface> nics = NetworkInterface
.getNetworkInterfaces(); nics.hasMoreElements();) {
NetworkInterface ifc = nics.nextElement();
if (ifc.isUp()) {
log.trace("Testing interface:" + ifc.getDisplayName());
@ -155,4 +173,5 @@ public class InetIPv6Utils implements Closeable {
hostInfo.setIpAddress(address.getHostAddress());
return hostInfo;
}
}

20
spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/intetuntil/UtilIPv6AutoConfiguration.java
Unescape Escape View File

@ -1,3 +1,19 @@
/*
* Copyright 2013-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.alibaba.cloud.nacos.intetuntil;
import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
@ -8,7 +24,6 @@ import org.springframework.cloud.commons.util.InetUtilsProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
/**
* @author HH
*/
@ -16,6 +31,7 @@ import org.springframework.context.annotation.Configuration;
@ConditionalOnDiscoveryEnabled
@ConditionalOnNacosDiscoveryEnabled
public class UtilIPv6AutoConfiguration {
public UtilIPv6AutoConfiguration() {
}
@ -24,5 +40,5 @@ public class UtilIPv6AutoConfiguration {
public InetIPv6Utils inetUtils(InetUtilsProperties properties) {
return new InetIPv6Utils(properties);
}
}
}

Write Preview
Loading…
Cancel
Save