lyd/liaoninghexing
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
zhangzhiqiang
2023-01-18 14:36:13 +08:00
parent e95de87489
commit e8a4db66e0
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/InetAddUtil.java
View File

@@ -89,8 +89,6 @@ public class InetAddUtil {
&& !address.isLinkLocalAddress() // filter 169.254.0.0/16 && !address.isLinkLocalAddress() // filter 169.254.0.0/16
&& !address.getHostAddress().contains(":");// filter IPv6 && !address.getHostAddress().contains(":");// filter IPv6
} }
private final static Ip2regionSearcher IP_SEARCHER = SpringContextHolder.getBean(Ip2regionSearcher.class);
private static final UserAgentAnalyzer USER_AGENT_ANALYZER = UserAgentAnalyzer private static final UserAgentAnalyzer USER_AGENT_ANALYZER = UserAgentAnalyzer
.newBuilder() .newBuilder()
@@ -245,7 +243,7 @@ public class InetAddUtil {
* 根据ip获取详细地址 * 根据ip获取详细地址
*/ */
public static String getLocalCityInfo(String ip) { public static String getLocalCityInfo(String ip) {
IpInfo ipInfo = IP_SEARCHER.memorySearch(ip); IpInfo ipInfo = SpringContextHolder.getBean(Ip2regionSearcher.class).memorySearch(ip);
if(ipInfo != null){ if(ipInfo != null){
return ipInfo.getAddress(); return ipInfo.getAddress();
} }

1
nladmin-system/nlsso-server/src/main/java/org/nl/config/arthas/TunnelServerConfiguration.java
View File

@@ -32,7 +32,6 @@ public class TunnelServerConfiguration {
tunnelServer.setPort(arthasProperties.getHttpPort()); tunnelServer.setPort(arthasProperties.getHttpPort());
tunnelServer.setSsl(false); tunnelServer.setSsl(false);
tunnelServer.setPath(ArthasConstants.DEFAULT_WEBSOCKET_PATH); tunnelServer.setPath(ArthasConstants.DEFAULT_WEBSOCKET_PATH);
tunnelServer.setClientConnectHost(InetAddUtil.getInetAddress()); tunnelServer.setClientConnectHost(InetAddUtil.getInetAddress());
if (tunnelClusterStore != null) { if (tunnelClusterStore != null) {
tunnelServer.setTunnelClusterStore(tunnelClusterStore); tunnelServer.setTunnelClusterStore(tunnelClusterStore);