diff --git a/.gitignore b/.gitignore index a063834..c6c0fed 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,12 @@ # Mobile Tools for Java (J2ME) .mtj.tmp/ +#Idea Files # +*.iml +.idea + # Package Files # + *.jar *.war *.ear diff --git a/pom.xml b/pom.xml index 264ce4c..ab38099 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ io.netty netty-all - 4.0.36.Final + 4.1.12.Final org.slf4j diff --git a/proxy-client/src/main/java/org/fengfei/lanproxy/client/ProxyClientContainer.java b/proxy-client/src/main/java/org/fengfei/lanproxy/client/ProxyClientContainer.java index c94887e..9126336 100644 --- a/proxy-client/src/main/java/org/fengfei/lanproxy/client/ProxyClientContainer.java +++ b/proxy-client/src/main/java/org/fengfei/lanproxy/client/ProxyClientContainer.java @@ -102,28 +102,22 @@ public class ProxyClientContainer implements Container, ChannelStatusListener { } private void connectProxyServer() { + bootstrap.connect(config.getStringValue("server.host"), config.getIntValue("server.port")).addListener((ChannelFuture future)->{ + if (future.isSuccess()){ + // 连接成功,向服务器发送客户端认证信息(clientKey) + ClientChannelMannager.setCmdChannel(future.channel()); + ProxyMessage proxyMessage = new ProxyMessage(); + proxyMessage.setType(ProxyMessage.C_TYPE_AUTH); + proxyMessage.setUri(config.getStringValue("client.key")); + future.channel().writeAndFlush(proxyMessage); + sleepTimeMill = 1000; + logger.info("connect proxy server success, {}", future.channel()); + }else { + logger.warn("connect proxy server failed", future.cause()); - bootstrap.connect(config.getStringValue("server.host"), config.getIntValue("server.port")).addListener(new ChannelFutureListener() { - - @Override - public void operationComplete(ChannelFuture future) throws Exception { - if (future.isSuccess()) { - - // 连接成功,向服务器发送客户端认证信息(clientKey) - ClientChannelMannager.setCmdChannel(future.channel()); - ProxyMessage proxyMessage = new ProxyMessage(); - proxyMessage.setType(ProxyMessage.C_TYPE_AUTH); - proxyMessage.setUri(config.getStringValue("client.key")); - future.channel().writeAndFlush(proxyMessage); - sleepTimeMill = 1000; - logger.info("connect proxy server success, {}", future.channel()); - } else { - logger.warn("connect proxy server failed", future.cause()); - - // 连接失败,发起重连 - reconnectWait(); - connectProxyServer(); - } + // 连接失败,发起重连 + reconnectWait(); + connectProxyServer(); } }); }