diff --git a/src/main/java/com/zhgd/netty/constant/HighFormworkSupport.java b/src/main/java/com/zhgd/netty/tcp/constant/HighFormworkSupport.java similarity index 98% rename from src/main/java/com/zhgd/netty/constant/HighFormworkSupport.java rename to src/main/java/com/zhgd/netty/tcp/constant/HighFormworkSupport.java index e523e7918..40a983419 100644 --- a/src/main/java/com/zhgd/netty/constant/HighFormworkSupport.java +++ b/src/main/java/com/zhgd/netty/tcp/constant/HighFormworkSupport.java @@ -1,4 +1,4 @@ -package com.zhgd.netty.constant; +package com.zhgd.netty.tcp.constant; /** * 高支模常量 diff --git a/src/main/java/com/zhgd/netty/handler/TcpNettyHandler.java b/src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java similarity index 96% rename from src/main/java/com/zhgd/netty/handler/TcpNettyHandler.java rename to src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java index b5cb81f99..210df8510 100644 --- a/src/main/java/com/zhgd/netty/handler/TcpNettyHandler.java +++ b/src/main/java/com/zhgd/netty/tcp/handler/TcpNettyHandler.java @@ -1,7 +1,7 @@ -package com.zhgd.netty.handler; +package com.zhgd.netty.tcp.handler; -import com.zhgd.netty.constant.HighFormworkSupport; -import com.zhgd.netty.service.HighFormworkSupportService; +import com.zhgd.netty.tcp.constant.HighFormworkSupport; +import com.zhgd.netty.tcp.service.HighFormworkSupportService; import com.zhgd.xmgl.modules.poisonous.service.IPoisonousGasDevCurrentDataService; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/main/java/com/zhgd/netty/listener/BindListener.java b/src/main/java/com/zhgd/netty/tcp/listener/BindListener.java similarity index 93% rename from src/main/java/com/zhgd/netty/listener/BindListener.java rename to src/main/java/com/zhgd/netty/tcp/listener/BindListener.java index 2b023a86f..31db621f9 100644 --- a/src/main/java/com/zhgd/netty/listener/BindListener.java +++ b/src/main/java/com/zhgd/netty/tcp/listener/BindListener.java @@ -1,4 +1,4 @@ -package com.zhgd.netty.listener; +package com.zhgd.netty.tcp.listener; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; diff --git a/src/main/java/com/zhgd/netty/listener/CloseListener.java b/src/main/java/com/zhgd/netty/tcp/listener/CloseListener.java similarity index 92% rename from src/main/java/com/zhgd/netty/listener/CloseListener.java rename to src/main/java/com/zhgd/netty/tcp/listener/CloseListener.java index bdb0b1211..e4de09ccb 100644 --- a/src/main/java/com/zhgd/netty/listener/CloseListener.java +++ b/src/main/java/com/zhgd/netty/tcp/listener/CloseListener.java @@ -1,4 +1,4 @@ -package com.zhgd.netty.listener; +package com.zhgd.netty.tcp.listener; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; diff --git a/src/main/java/com/zhgd/netty/server/TcpNettyServer.java b/src/main/java/com/zhgd/netty/tcp/server/TcpNettyServer.java similarity index 87% rename from src/main/java/com/zhgd/netty/server/TcpNettyServer.java rename to src/main/java/com/zhgd/netty/tcp/server/TcpNettyServer.java index 4dda167e2..d7bb05724 100644 --- a/src/main/java/com/zhgd/netty/server/TcpNettyServer.java +++ b/src/main/java/com/zhgd/netty/tcp/server/TcpNettyServer.java @@ -1,8 +1,8 @@ -package com.zhgd.netty.server; +package com.zhgd.netty.tcp.server; -import com.zhgd.netty.handler.TcpNettyHandler; -import com.zhgd.netty.listener.BindListener; -import com.zhgd.netty.listener.CloseListener; +import com.zhgd.netty.tcp.handler.TcpNettyHandler; +import com.zhgd.netty.tcp.listener.BindListener; +import com.zhgd.netty.tcp.listener.CloseListener; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelInitializer; @@ -11,16 +11,12 @@ import io.netty.channel.EventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; -import io.netty.handler.codec.string.StringDecoder; -import io.netty.handler.codec.string.StringEncoder; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; /** * @author chenws diff --git a/src/main/java/com/zhgd/netty/service/HighFormworkSupportService.java b/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java similarity index 99% rename from src/main/java/com/zhgd/netty/service/HighFormworkSupportService.java rename to src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java index b94f8f059..58507fc66 100644 --- a/src/main/java/com/zhgd/netty/service/HighFormworkSupportService.java +++ b/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java @@ -1,9 +1,9 @@ -package com.zhgd.netty.service; +package com.zhgd.netty.tcp.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zhgd.netty.tcp.constant.HighFormworkSupport; import com.zhgd.xmgl.modules.highformwork.entity.*; import com.zhgd.xmgl.modules.highformwork.mapper.*; -import com.zhgd.netty.constant.HighFormworkSupport; import com.zhgd.xmgl.modules.highformwork.service.IHighFormworkMeasureCurrentDataService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils;