ref[move]: move NetUtils

2026-05-23 18:26:18 +00:00 · 2023-09-02 20:54:55 +08:00
parent ff3e06c123
commit 00ac69dca2
48 changed files with 54 additions and 71 deletions
@@ -57,7 +57,7 @@
    <dependencies>
        <dependency>
            <groupId>com.zfoo</groupId>
-            <artifactId>util</artifactId>
+            <artifactId>net</artifactId>
            <version>${zfoo.version}</version>
        </dependency>

@@ -13,11 +13,11 @@
 package com.zfoo.monitor;

 import com.zfoo.monitor.util.OSUtils;
+import com.zfoo.net.util.NetUtils;
 import com.zfoo.protocol.collection.CollectionUtils;
 import com.zfoo.protocol.util.FileUtils;
 import com.zfoo.protocol.util.StringUtils;
 import com.zfoo.scheduler.util.TimeUtils;
-import com.zfoo.util.net.NetUtils;

 import java.util.ArrayList;
 import java.util.List;
@@ -14,10 +14,10 @@
 package com.zfoo.monitor.util;

 import com.zfoo.monitor.*;
+import com.zfoo.net.util.NetUtils;
 import com.zfoo.protocol.util.IOUtils;
 import com.zfoo.protocol.util.StringUtils;
 import com.zfoo.scheduler.util.TimeUtils;
-import com.zfoo.util.net.NetUtils;
 import com.zfoo.util.security.IdUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -13,9 +13,9 @@

 package com.zfoo.net.config.model;

+import com.zfoo.net.core.HostAndPort;
+import com.zfoo.net.util.NetUtils;
 import com.zfoo.protocol.util.StringUtils;
-import com.zfoo.util.net.HostAndPort;
-import com.zfoo.util.net.NetUtils;

 import java.util.List;
 import java.util.Objects;
@@ -16,6 +16,7 @@ package com.zfoo.net.consumer.registry;
 import com.zfoo.event.manager.EventBus;
 import com.zfoo.net.NetContext;
 import com.zfoo.net.consumer.event.ConsumerStartEvent;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpClient;
 import com.zfoo.net.core.tcp.TcpServer;
 import com.zfoo.net.session.Session;
@@ -24,13 +25,8 @@ import com.zfoo.protocol.collection.ArrayUtils;
 import com.zfoo.protocol.collection.concurrent.ConcurrentArrayList;
 import com.zfoo.protocol.collection.concurrent.ConcurrentHashSet;
 import com.zfoo.protocol.exception.ExceptionUtils;
-import com.zfoo.protocol.util.AssertionUtils;
-import com.zfoo.protocol.util.IOUtils;
-import com.zfoo.protocol.util.JsonUtils;
-import com.zfoo.protocol.util.StringUtils;
+import com.zfoo.protocol.util.*;
 import com.zfoo.scheduler.manager.SchedulerBus;
-import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.util.concurrent.FastThreadLocalThread;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
@@ -19,7 +19,6 @@ import com.zfoo.net.session.Session;
 import com.zfoo.protocol.exception.ExceptionUtils;
 import com.zfoo.protocol.util.IOUtils;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.*;
 import io.netty.channel.epoll.Epoll;
@@ -15,7 +15,6 @@ package com.zfoo.net.core;

 import com.zfoo.protocol.util.IOUtils;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.*;
 import io.netty.channel.epoll.Epoll;
@@ -1,6 +1,5 @@
 /*
 * Copyright (C) 2020 The zfoo 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
 *
@@ -11,7 +10,7 @@
 * See the License for the specific language governing permissions and limitations under the License.
 */

-package com.zfoo.util.net;
+package com.zfoo.net.core;

 import com.zfoo.protocol.collection.CollectionUtils;
 import com.zfoo.protocol.util.StringUtils;
@@ -14,12 +14,12 @@
 package com.zfoo.net.core.gateway;

 import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.GatewayRouteHandler;
 import com.zfoo.net.handler.codec.tcp.TcpCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
 import com.zfoo.net.session.Session;
 import com.zfoo.protocol.IPacket;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.timeout.IdleStateHandler;
 import org.springframework.lang.Nullable;
@@ -14,13 +14,13 @@
 package com.zfoo.net.core.gateway;

 import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.GatewayRouteHandler;
 import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
 import com.zfoo.net.session.Session;
 import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.util.IOUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
@@ -14,13 +14,13 @@
 package com.zfoo.net.core.gateway;

 import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.GatewayRouteHandler;
 import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
 import com.zfoo.net.session.Session;
 import com.zfoo.protocol.IPacket;
 import com.zfoo.protocol.util.IOUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
@@ -14,11 +14,11 @@
 package com.zfoo.net.core.http;

 import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ServerRouteHandler;
 import com.zfoo.net.handler.codec.http.HttpCodecHandler;
 import com.zfoo.net.packet.DecodedPacketInfo;
 import com.zfoo.protocol.util.IOUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpObjectAggregator;
@@ -14,12 +14,12 @@
 package com.zfoo.net.core.jprotobuf;

 import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.GatewayRouteHandler;
 import com.zfoo.net.handler.codec.jprotobuf.JProtobufTcpCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
 import com.zfoo.net.session.Session;
 import com.zfoo.protocol.IPacket;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.timeout.IdleStateHandler;
 import org.springframework.lang.Nullable;
@@ -14,10 +14,10 @@
 package com.zfoo.net.core.jprotobuf;

 import com.zfoo.net.core.AbstractClient;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ClientRouteHandler;
 import com.zfoo.net.handler.codec.jprotobuf.JProtobufTcpCodecHandler;
 import com.zfoo.net.handler.idle.ClientIdleHandler;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.timeout.IdleStateHandler;

@@ -14,10 +14,10 @@
 package com.zfoo.net.core.jprotobuf;

 import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ServerRouteHandler;
 import com.zfoo.net.handler.codec.jprotobuf.JProtobufTcpCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.timeout.IdleStateHandler;

@@ -14,10 +14,10 @@
 package com.zfoo.net.core.json;

 import com.zfoo.net.core.AbstractClient;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ClientRouteHandler;
 import com.zfoo.net.handler.codec.json.JsonWebSocketCodecHandler;
 import com.zfoo.protocol.util.IOUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.codec.http.HttpObjectAggregator;
@@ -14,10 +14,10 @@
 package com.zfoo.net.core.json;

 import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ServerRouteHandler;
 import com.zfoo.net.handler.codec.json.JsonWebSocketCodecHandler;
 import com.zfoo.protocol.util.IOUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
@@ -14,10 +14,10 @@
 package com.zfoo.net.core.tcp;

 import com.zfoo.net.core.AbstractClient;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ClientRouteHandler;
 import com.zfoo.net.handler.codec.tcp.TcpCodecHandler;
 import com.zfoo.net.handler.idle.ClientIdleHandler;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.timeout.IdleStateHandler;

@@ -14,10 +14,10 @@
 package com.zfoo.net.core.tcp;

 import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ServerRouteHandler;
 import com.zfoo.net.handler.codec.tcp.TcpCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.timeout.IdleStateHandler;

@@ -15,12 +15,12 @@ package com.zfoo.net.core.udp;

 import com.zfoo.net.NetContext;
 import com.zfoo.net.core.AbstractClient;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.BaseRouteHandler;
 import com.zfoo.net.handler.ClientRouteHandler;
 import com.zfoo.net.handler.codec.udp.UdpCodecHandler;
 import com.zfoo.net.session.Session;
 import com.zfoo.protocol.exception.ExceptionUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelOption;
@@ -13,9 +13,9 @@
 package com.zfoo.net.core.udp;

 import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ServerRouteHandler;
 import com.zfoo.net.handler.codec.udp.UdpCodecHandler;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.bootstrap.Bootstrap;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelOption;
@@ -14,10 +14,10 @@
 package com.zfoo.net.core.websocket;

 import com.zfoo.net.core.AbstractClient;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ClientRouteHandler;
 import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler;
 import com.zfoo.protocol.util.IOUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.codec.http.HttpObjectAggregator;
@@ -14,10 +14,10 @@
 package com.zfoo.net.core.websocket;

 import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ServerRouteHandler;
 import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler;
 import com.zfoo.protocol.util.IOUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
@@ -14,31 +14,22 @@
 package com.zfoo.net.core.websocket;

 import com.zfoo.net.core.AbstractClient;
-import com.zfoo.net.core.AbstractServer;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ClientRouteHandler;
 import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler;
 import com.zfoo.net.handler.idle.ClientIdleHandler;
 import com.zfoo.protocol.util.IOUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
-import io.netty.handler.codec.http.DefaultHttpHeaders;
 import io.netty.handler.codec.http.HttpClientCodec;
 import io.netty.handler.codec.http.HttpObjectAggregator;
-import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory;
 import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolConfig;
 import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolHandler;
-import io.netty.handler.codec.http.websocketx.WebSocketVersion;
-import io.netty.handler.ssl.SslContext;
-import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.stream.ChunkedWriteHandler;
 import io.netty.handler.timeout.IdleStateHandler;

 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLException;
-import java.io.InputStream;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.NoSuchAlgorithmException;

@@ -14,12 +14,11 @@
 package com.zfoo.net.core.websocket;

 import com.zfoo.net.core.AbstractServer;
-import com.zfoo.net.handler.GatewayRouteHandler;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.handler.ServerRouteHandler;
 import com.zfoo.net.handler.codec.websocket.WebSocketCodecHandler;
 import com.zfoo.net.handler.idle.ServerIdleHandler;
 import com.zfoo.protocol.util.IOUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.channel.socket.SocketChannel;
 import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpServerCodec;
@@ -1,6 +1,5 @@
 /*
 * Copyright (C) 2020 The zfoo 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
 *
@@ -11,7 +10,7 @@
 * See the License for the specific language governing permissions and limitations under the License.
 */

-package com.zfoo.util.net;
+package com.zfoo.net.util;

 import com.zfoo.protocol.collection.ArrayUtils;
 import com.zfoo.protocol.util.AssertionUtils;
@@ -18,8 +18,8 @@ import com.zfoo.net.config.model.ConsumerModule;
 import com.zfoo.net.config.model.ProviderConfig;
 import com.zfoo.net.config.model.ProviderModule;
 import com.zfoo.net.consumer.registry.RegisterVO;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.protocol.registration.ProtocolModule;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.util.NetUtil;
 import org.junit.Assert;
 import org.junit.Test;
@@ -13,10 +13,10 @@

 package com.zfoo.net.core.csharp;

+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpServer;
 import com.zfoo.net.session.SessionUtils;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -14,13 +14,13 @@
 package com.zfoo.net.core.gateway;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpClient;
 import com.zfoo.net.packet.gateway.GatewayToProviderRequest;
 import com.zfoo.net.packet.gateway.GatewayToProviderResponse;
 import com.zfoo.net.session.SessionUtils;
 import com.zfoo.protocol.util.JsonUtils;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -13,13 +13,13 @@

 package com.zfoo.net.core.http;

+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.packet.DecodedPacketInfo;
 import com.zfoo.net.packet.http.HttpHelloRequest;
 import com.zfoo.net.router.attachment.HttpAttachment;
 import com.zfoo.protocol.exception.RunException;
 import com.zfoo.protocol.util.StringUtils;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import org.junit.Ignore;
@@ -14,10 +14,10 @@
 package com.zfoo.net.core.jprotobuf.client;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.jprotobuf.JProtobufTcpClient;
 import com.zfoo.net.packet.jprotobuf.JProtobufHelloRequest;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -13,9 +13,9 @@

 package com.zfoo.net.core.jprotobuf.server;

+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.jprotobuf.JProtobufTcpServer;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -14,10 +14,10 @@
 package com.zfoo.net.core.json.client;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.json.JsonWebsocketClient;
 import com.zfoo.net.packet.json.JsonHelloRequest;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolConfig;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -13,9 +13,9 @@

 package com.zfoo.net.core.json.server;

+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.json.JsonWebsocketServer;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -14,10 +14,10 @@
 package com.zfoo.net.core.tcp.client;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpClient;
 import com.zfoo.net.packet.tcp.TcpHelloRequest;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -13,9 +13,9 @@

 package com.zfoo.net.core.tcp.server;

+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpServer;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -13,12 +13,12 @@
 package com.zfoo.net.core.tcpAsync.client;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpClient;
 import com.zfoo.net.packet.tcp.AsyncMessAnswer;
 import com.zfoo.net.packet.tcp.AsyncMessAsk;
 import com.zfoo.protocol.util.JsonUtils;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -14,12 +14,12 @@
 package com.zfoo.net.core.tcpAsync.client;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpClient;
 import com.zfoo.net.packet.tcp.AsyncMessAnswer;
 import com.zfoo.net.packet.tcp.AsyncMessAsk;
 import com.zfoo.protocol.util.JsonUtils;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -13,9 +13,9 @@

 package com.zfoo.net.core.tcpAsync.server;

+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpServer;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -13,12 +13,12 @@
 package com.zfoo.net.core.tcpSync.client;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpClient;
 import com.zfoo.net.packet.tcp.SyncMessAnswer;
 import com.zfoo.net.packet.tcp.SyncMessAsk;
 import com.zfoo.protocol.util.JsonUtils;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -14,12 +14,12 @@
 package com.zfoo.net.core.tcpSync.client;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpClient;
 import com.zfoo.net.packet.tcp.SyncMessAnswer;
 import com.zfoo.net.packet.tcp.SyncMessAsk;
 import com.zfoo.protocol.util.JsonUtils;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -13,9 +13,9 @@

 package com.zfoo.net.core.tcpSync.server;

+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.tcp.TcpServer;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -13,11 +13,11 @@
 package com.zfoo.net.core.udp.client;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.udp.UdpClient;
 import com.zfoo.net.packet.udp.UdpHelloRequest;
 import com.zfoo.net.router.attachment.UdpAttachment;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -12,9 +12,9 @@

 package com.zfoo.net.core.udp.server;

+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.udp.UdpServer;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -14,10 +14,10 @@
 package com.zfoo.net.core.websocket.client;

 import com.zfoo.net.NetContext;
+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.websocket.WebsocketClient;
 import com.zfoo.net.packet.websocket.WebsocketHelloRequest;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import io.netty.handler.codec.http.websocketx.WebSocketClientProtocolConfig;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -13,9 +13,9 @@

 package com.zfoo.net.core.websocket.server;

+import com.zfoo.net.core.HostAndPort;
 import com.zfoo.net.core.websocket.WebsocketServer;
 import com.zfoo.protocol.util.ThreadUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -1,6 +1,5 @@
 /*
 * Copyright (C) 2020 The zfoo 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
 *
@@ -11,9 +10,8 @@
 * See the License for the specific language governing permissions and limitations under the License.
 */

-package com.zfoo.util;
+package com.zfoo.net.util;

-import com.zfoo.util.net.NetUtils;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -35,8 +35,6 @@ import com.zfoo.protocol.collection.ArrayUtils;
 import com.zfoo.protocol.collection.CollectionUtils;
 import com.zfoo.protocol.exception.RunException;
 import com.zfoo.protocol.util.*;
-import com.zfoo.protocol.util.RandomUtils;
-import com.zfoo.util.net.HostAndPort;
 import org.bson.Document;
 import org.bson.codecs.configuration.CodecRegistries;
 import org.bson.codecs.configuration.CodecRegistry;
@@ -107,9 +105,14 @@ public class OrmManager implements IOrmManager {
        // 设置数据库地址
        var hostConfig = ormConfig.getHost();
        if (CollectionUtils.isNotEmpty(hostConfig.getAddress())) {
-            var hostList = HostAndPort.toHostAndPortList(hostConfig.getAddress().values())
+            var hostList = hostConfig.getAddress().values()
                    .stream()
-                    .map(it -> new ServerAddress(it.getHost(), it.getPort()))
+                    .map(it -> it.split(StringUtils.COMMA_REGEX))
+                    .flatMap(it -> Arrays.stream(it))
+                    .map(it -> StringUtils.trim(it))
+                    .filter(it -> StringUtils.isNotBlank(it))
+                    .map(it -> it.split(StringUtils.COLON_REGEX))
+                    .map(it -> new ServerAddress(it[0], Integer.parseInt(it[1])))
                    .collect(Collectors.toList());
            mongoBuilder.applyToClusterSettings(builder -> builder.hosts(hostList));
        }