diff --git a/lazy-netty-proxy-client/pom.xml b/lazy-netty-proxy-client/pom.xml index ffda0fd..d1b4174 100644 --- a/lazy-netty-proxy-client/pom.xml +++ b/lazy-netty-proxy-client/pom.xml @@ -24,7 +24,7 @@ top.wu2020 wu-framework-web - 1.1.9-JDK1.8-SNAPSHOT + 1.1.9-JDK1.8 org.springframework.boot diff --git a/lazy-netty-proxy-client/src/main/java/com/lazy/netty/proxy/client/proxy/netty/ProxySocket.java b/lazy-netty-proxy-client/src/main/java/com/lazy/netty/proxy/client/proxy/netty/ProxySocket.java index e086344..a411c8b 100644 --- a/lazy-netty-proxy-client/src/main/java/com/lazy/netty/proxy/client/proxy/netty/ProxySocket.java +++ b/lazy-netty-proxy-client/src/main/java/com/lazy/netty/proxy/client/proxy/netty/ProxySocket.java @@ -70,53 +70,50 @@ public class ProxySocket { }); log.info("连接服务端IP:{},连接服务端端口:{}",Constant.serverIp, Constant.serverPort); - bootstrap.connect(Constant.serverIp, Constant.serverPort).addListener(new ChannelFutureListener() { - @Override - public void operationComplete(ChannelFuture future) throws Exception { - if (future.isSuccess()) { - System.out.println("连接服务端成功"); - // 客户端链接代理服务器成功 - Channel channel = future.channel(); - if (StringUtil.isNullOrEmpty(vid)) { - // 告诉服务端这条连接是client的连接 - MyMsg myMsg = new MyMsg(); - myMsg.setType(MyMsg.TYPE_CONNECT); - myMsg.setData("client".getBytes()); - channel.writeAndFlush(myMsg); + bootstrap.connect(Constant.serverIp, Constant.serverPort).addListener((ChannelFutureListener) future -> { + if (future.isSuccess()) { + System.out.println("连接服务端成功"); + // 客户端链接代理服务器成功 + Channel channel = future.channel(); + if (StringUtil.isNullOrEmpty(vid)) { + // 告诉服务端这条连接是client的连接 + MyMsg myMsg = new MyMsg(); + myMsg.setType(MyMsg.TYPE_CONNECT); + myMsg.setData("client".getBytes()); + channel.writeAndFlush(myMsg); - Constant.proxyChannel = channel; - } else { - - // 告诉服务端这条连接是vid的连接 - MyMsg myMsg = new MyMsg(); - myMsg.setType(MyMsg.TYPE_CONNECT); - myMsg.setData(vid.getBytes()); - channel.writeAndFlush(myMsg); - - // 客户端绑定通道关系 - Constant.vpc.put(vid, channel); - channel.attr(Constant.VID).set(vid); - - Channel realChannel = Constant.vrc.get(vid); - if (null != realChannel) { - realChannel.config().setOption(ChannelOption.AUTO_READ, true); - } - } + Constant.proxyChannel = channel; } else { - System.out.println("每隔2s重连...."); - future.channel().eventLoop().schedule(new Runnable() { + // 告诉服务端这条连接是vid的连接 + MyMsg myMsg = new MyMsg(); + myMsg.setType(MyMsg.TYPE_CONNECT); + myMsg.setData(vid.getBytes()); + channel.writeAndFlush(myMsg); - @Override - public void run() { - try { - newConnect(null); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - }, 2, TimeUnit.SECONDS); + // 客户端绑定通道关系 + Constant.vpc.put(vid, channel); + channel.attr(Constant.VID).set(vid); + + Channel realChannel = Constant.vrc.get(vid); + if (null != realChannel) { + realChannel.config().setOption(ChannelOption.AUTO_READ, true); + } } + } else { + + System.out.println("每隔2s重连...."); + future.channel().eventLoop().schedule(new Runnable() { + + @Override + public void run() { + try { + newConnect(null); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + }, 2, TimeUnit.SECONDS); } }); } diff --git a/lazy-netty-proxy-client/src/main/java/com/lazy/netty/proxy/client/proxy/netty/RealSocket.java b/lazy-netty-proxy-client/src/main/java/com/lazy/netty/proxy/client/proxy/netty/RealSocket.java index f723ef4..8460f93 100644 --- a/lazy-netty-proxy-client/src/main/java/com/lazy/netty/proxy/client/proxy/netty/RealSocket.java +++ b/lazy-netty-proxy-client/src/main/java/com/lazy/netty/proxy/client/proxy/netty/RealSocket.java @@ -7,7 +7,9 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.util.internal.StringUtil; +import lombok.extern.slf4j.Slf4j; +@Slf4j public class RealSocket { static EventLoopGroup eventLoopGroup = new NioEventLoopGroup(); @@ -41,6 +43,7 @@ public class RealSocket { } }); + log.info("代理客户端本地端口:{}",Constant.realPort); bootstrap.connect("127.0.0.1", Constant.realPort).addListener(new ChannelFutureListener() { @Override public void operationComplete(ChannelFuture future) throws Exception { diff --git a/lazy-netty-proxy-server/pom.xml b/lazy-netty-proxy-server/pom.xml index cc87d95..d649d14 100644 --- a/lazy-netty-proxy-server/pom.xml +++ b/lazy-netty-proxy-server/pom.xml @@ -34,7 +34,7 @@ top.wu2020 wu-framework-web - 1.1.9-JDK1.8-SNAPSHOT + 1.1.9-JDK1.8 \ No newline at end of file