diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/ClientTest.java b/netty-pad/src/test/com/test/netty/ClientTest.java similarity index 72% rename from netty-pad/src/main/test/java/test/netty/nio/net/ClientTest.java rename to netty-pad/src/test/com/test/netty/ClientTest.java index a280080..1793774 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/ClientTest.java +++ b/netty-pad/src/test/com/test/netty/ClientTest.java @@ -1,6 +1,6 @@ -package test.netty.nio.net; +package com.test.netty; -import test.netty.nio.net.client.ClientThread; +import com.test.netty.client.ClientThread; /** * 开启一个客户端, diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/client/ClientHandler.java b/netty-pad/src/test/com/test/netty/client/ClientHandler.java similarity index 95% rename from netty-pad/src/main/test/java/test/netty/nio/net/client/ClientHandler.java rename to netty-pad/src/test/com/test/netty/client/ClientHandler.java index fa584f6..30a36a0 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/client/ClientHandler.java +++ b/netty-pad/src/test/com/test/netty/client/ClientHandler.java @@ -1,12 +1,12 @@ -package test.netty.nio.net.client; +package com.test.netty.client; +import com.test.netty.dto.HeartBeat; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.handler.timeout.IdleState; import io.netty.handler.timeout.IdleStateEvent; -import test.netty.nio.net.dto.HeartBeat; -import test.netty.nio.net.dto.Message; +import com.test.netty.dto.Message; /** * 通讯服务器请求处理 diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/client/ClientInitializer.java b/netty-pad/src/test/com/test/netty/client/ClientInitializer.java similarity index 97% rename from netty-pad/src/main/test/java/test/netty/nio/net/client/ClientInitializer.java rename to netty-pad/src/test/com/test/netty/client/ClientInitializer.java index 0f345b2..01ec7c3 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/client/ClientInitializer.java +++ b/netty-pad/src/test/com/test/netty/client/ClientInitializer.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.client; +package com.test.netty.client; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/client/ClientThread.java b/netty-pad/src/test/com/test/netty/client/ClientThread.java similarity index 98% rename from netty-pad/src/main/test/java/test/netty/nio/net/client/ClientThread.java rename to netty-pad/src/test/com/test/netty/client/ClientThread.java index 483b6e3..744ccbc 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/client/ClientThread.java +++ b/netty-pad/src/test/com/test/netty/client/ClientThread.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.client; +package com.test.netty.client; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/client/Cmd.java b/netty-pad/src/test/com/test/netty/client/Cmd.java similarity index 95% rename from netty-pad/src/main/test/java/test/netty/nio/net/client/Cmd.java rename to netty-pad/src/test/com/test/netty/client/Cmd.java index c4509f8..68571a0 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/client/Cmd.java +++ b/netty-pad/src/test/com/test/netty/client/Cmd.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.client; +package com.test.netty.client; /** * 消息协议指令定义 diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/client/CustomDecoder.java b/netty-pad/src/test/com/test/netty/client/CustomDecoder.java similarity index 97% rename from netty-pad/src/main/test/java/test/netty/nio/net/client/CustomDecoder.java rename to netty-pad/src/test/com/test/netty/client/CustomDecoder.java index 5354b20..7925379 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/client/CustomDecoder.java +++ b/netty-pad/src/test/com/test/netty/client/CustomDecoder.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.client; +package com.test.netty.client; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/client/DataConfig.java b/netty-pad/src/test/com/test/netty/client/DataConfig.java similarity index 88% rename from netty-pad/src/main/test/java/test/netty/nio/net/client/DataConfig.java rename to netty-pad/src/test/com/test/netty/client/DataConfig.java index 95c2880..e642559 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/client/DataConfig.java +++ b/netty-pad/src/test/com/test/netty/client/DataConfig.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.client; +package com.test.netty.client; /** * Created by hehelt on 16/2/26. diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/client/MessageDecoder.java b/netty-pad/src/test/com/test/netty/client/MessageDecoder.java similarity index 97% rename from netty-pad/src/main/test/java/test/netty/nio/net/client/MessageDecoder.java rename to netty-pad/src/test/com/test/netty/client/MessageDecoder.java index 331abf6..9949a2a 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/client/MessageDecoder.java +++ b/netty-pad/src/test/com/test/netty/client/MessageDecoder.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.client; +package com.test.netty.client; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/client/MessageEncoder.java b/netty-pad/src/test/com/test/netty/client/MessageEncoder.java similarity index 85% rename from netty-pad/src/main/test/java/test/netty/nio/net/client/MessageEncoder.java rename to netty-pad/src/test/com/test/netty/client/MessageEncoder.java index 086bf81..44ca7a8 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/client/MessageEncoder.java +++ b/netty-pad/src/test/com/test/netty/client/MessageEncoder.java @@ -1,10 +1,10 @@ -package test.netty.nio.net.client; +package com.test.netty.client; +import com.test.netty.dto.JsonMapper; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; -import test.netty.nio.net.dto.JsonMapper; -import test.netty.nio.net.dto.Message; +import com.test.netty.dto.Message; /** * 自定义编码器, 1个字节固定头+4个字节长度+内容 diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/dto/AddFaceResponse.java b/netty-pad/src/test/com/test/netty/dto/AddFaceResponse.java similarity index 98% rename from netty-pad/src/main/test/java/test/netty/nio/net/dto/AddFaceResponse.java rename to netty-pad/src/test/com/test/netty/dto/AddFaceResponse.java index bd46e11..417aa63 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/dto/AddFaceResponse.java +++ b/netty-pad/src/test/com/test/netty/dto/AddFaceResponse.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.dto; +package com.test.netty.dto; import com.google.gson.annotations.Expose; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/dto/BaseDto.java b/netty-pad/src/test/com/test/netty/dto/BaseDto.java similarity index 97% rename from netty-pad/src/main/test/java/test/netty/nio/net/dto/BaseDto.java rename to netty-pad/src/test/com/test/netty/dto/BaseDto.java index 074552f..91ff24c 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/dto/BaseDto.java +++ b/netty-pad/src/test/com/test/netty/dto/BaseDto.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.dto; +package com.test.netty.dto; import com.google.gson.annotations.Expose; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/dto/FaceImageDto.java b/netty-pad/src/test/com/test/netty/dto/FaceImageDto.java similarity index 96% rename from netty-pad/src/main/test/java/test/netty/nio/net/dto/FaceImageDto.java rename to netty-pad/src/test/com/test/netty/dto/FaceImageDto.java index 1efb244..be207aa 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/dto/FaceImageDto.java +++ b/netty-pad/src/test/com/test/netty/dto/FaceImageDto.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.dto; +package com.test.netty.dto; import com.google.gson.annotations.Expose; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/dto/FaceRecognizeResponse.java b/netty-pad/src/test/com/test/netty/dto/FaceRecognizeResponse.java similarity index 99% rename from netty-pad/src/main/test/java/test/netty/nio/net/dto/FaceRecognizeResponse.java rename to netty-pad/src/test/com/test/netty/dto/FaceRecognizeResponse.java index 658bec8..ffb7678 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/dto/FaceRecognizeResponse.java +++ b/netty-pad/src/test/com/test/netty/dto/FaceRecognizeResponse.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.dto; +package com.test.netty.dto; import java.io.Serializable; import java.util.List; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/dto/HeartBeat.java b/netty-pad/src/test/com/test/netty/dto/HeartBeat.java similarity index 95% rename from netty-pad/src/main/test/java/test/netty/nio/net/dto/HeartBeat.java rename to netty-pad/src/test/com/test/netty/dto/HeartBeat.java index d460272..cc8f47a 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/dto/HeartBeat.java +++ b/netty-pad/src/test/com/test/netty/dto/HeartBeat.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.dto; +package com.test.netty.dto; import com.google.gson.annotations.Expose; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/dto/JsonMapper.java b/netty-pad/src/test/com/test/netty/dto/JsonMapper.java similarity index 98% rename from netty-pad/src/main/test/java/test/netty/nio/net/dto/JsonMapper.java rename to netty-pad/src/test/com/test/netty/dto/JsonMapper.java index 4761ddb..f2cc9d1 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/dto/JsonMapper.java +++ b/netty-pad/src/test/com/test/netty/dto/JsonMapper.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.dto; +package com.test.netty.dto; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/dto/MemberDto.java b/netty-pad/src/test/com/test/netty/dto/MemberDto.java similarity index 98% rename from netty-pad/src/main/test/java/test/netty/nio/net/dto/MemberDto.java rename to netty-pad/src/test/com/test/netty/dto/MemberDto.java index 97044af..2702dbc 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/dto/MemberDto.java +++ b/netty-pad/src/test/com/test/netty/dto/MemberDto.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.dto; +package com.test.netty.dto; import com.google.gson.annotations.Expose; diff --git a/netty-pad/src/main/test/java/test/netty/nio/net/dto/Message.java b/netty-pad/src/test/com/test/netty/dto/Message.java similarity index 97% rename from netty-pad/src/main/test/java/test/netty/nio/net/dto/Message.java rename to netty-pad/src/test/com/test/netty/dto/Message.java index 351ffaf..edb179f 100644 --- a/netty-pad/src/main/test/java/test/netty/nio/net/dto/Message.java +++ b/netty-pad/src/test/com/test/netty/dto/Message.java @@ -1,4 +1,4 @@ -package test.netty.nio.net.dto; +package com.test.netty.dto; import com.google.gson.annotations.Expose;