diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java index d3bb9aa..528dafc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java @@ -82,7 +82,7 @@ } catch (InterruptedException e) { e.printStackTrace(); } finally { - // 优雅的关闭 + //优雅的关闭 workerGroup.shutdownGracefully(); bossGroup.shutdownGracefully(); } diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java index d3bb9aa..528dafc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java @@ -82,7 +82,7 @@ } catch (InterruptedException e) { e.printStackTrace(); } finally { - // 优雅的关闭 + //优雅的关闭 workerGroup.shutdownGracefully(); bossGroup.shutdownGracefully(); } diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java new file mode 100644 index 0000000..662ca3f --- /dev/null +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java @@ -0,0 +1,14 @@ +package com.casic.missiles.server.handler; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageDecoder; + +import java.util.List; + +public class AbstractBeforeProccessCodec extends MessageToMessageDecoder { + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) { + } +} diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java index d3bb9aa..528dafc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java @@ -82,7 +82,7 @@ } catch (InterruptedException e) { e.printStackTrace(); } finally { - // 优雅的关闭 + //优雅的关闭 workerGroup.shutdownGracefully(); bossGroup.shutdownGracefully(); } diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java new file mode 100644 index 0000000..662ca3f --- /dev/null +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java @@ -0,0 +1,14 @@ +package com.casic.missiles.server.handler; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageDecoder; + +import java.util.List; + +public class AbstractBeforeProccessCodec extends MessageToMessageDecoder { + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) { + } +} diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java index bcc6db0..f63ee53 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java @@ -9,7 +9,6 @@ import io.netty.handler.codec.base64.Base64Dialect; import io.netty.util.internal.ObjectUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; import java.nio.charset.Charset; @@ -17,12 +16,12 @@ /** * @description: 将从接口取到的数据编码 - * @author: Stone - * @create: 2019-01-11 15:15 + * @author: cz + * @create: 2023-05-04 15:15 **/ @Slf4j @Service -public class AepBeforeProccessCodec extends BeforeProccessCodec { +public class AepBeforeProccessCodec extends AbstractBeforeProccessCodec { private final Base64Dialect dialect; public AepBeforeProccessCodec() { @@ -35,7 +34,7 @@ //执行nb平台前的协议解析 预处理 @Override - public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) throws Exception { + public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) { //aep平台处理 if (msg.toString(Charset.defaultCharset()).contains("aep")) { String httpContent = msg.toString(Charset.defaultCharset()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java index d3bb9aa..528dafc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java @@ -82,7 +82,7 @@ } catch (InterruptedException e) { e.printStackTrace(); } finally { - // 优雅的关闭 + //优雅的关闭 workerGroup.shutdownGracefully(); bossGroup.shutdownGracefully(); } diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java new file mode 100644 index 0000000..662ca3f --- /dev/null +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java @@ -0,0 +1,14 @@ +package com.casic.missiles.server.handler; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageDecoder; + +import java.util.List; + +public class AbstractBeforeProccessCodec extends MessageToMessageDecoder { + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) { + } +} diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java index bcc6db0..f63ee53 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java @@ -9,7 +9,6 @@ import io.netty.handler.codec.base64.Base64Dialect; import io.netty.util.internal.ObjectUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; import java.nio.charset.Charset; @@ -17,12 +16,12 @@ /** * @description: 将从接口取到的数据编码 - * @author: Stone - * @create: 2019-01-11 15:15 + * @author: cz + * @create: 2023-05-04 15:15 **/ @Slf4j @Service -public class AepBeforeProccessCodec extends BeforeProccessCodec { +public class AepBeforeProccessCodec extends AbstractBeforeProccessCodec { private final Base64Dialect dialect; public AepBeforeProccessCodec() { @@ -35,7 +34,7 @@ //执行nb平台前的协议解析 预处理 @Override - public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) throws Exception { + public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) { //aep平台处理 if (msg.toString(Charset.defaultCharset()).contains("aep")) { String httpContent = msg.toString(Charset.defaultCharset()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/BeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/BeforeProccessCodec.java deleted file mode 100644 index 9ac8cb3..0000000 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/BeforeProccessCodec.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.casic.missiles.server.handler; - -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.MessageToMessageDecoder; - -import java.util.List; - -public class BeforeProccessCodec extends MessageToMessageDecoder { - - @Override - protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List list) throws Exception { - return; - } -} diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java index d3bb9aa..528dafc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java @@ -82,7 +82,7 @@ } catch (InterruptedException e) { e.printStackTrace(); } finally { - // 优雅的关闭 + //优雅的关闭 workerGroup.shutdownGracefully(); bossGroup.shutdownGracefully(); } diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java new file mode 100644 index 0000000..662ca3f --- /dev/null +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java @@ -0,0 +1,14 @@ +package com.casic.missiles.server.handler; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageDecoder; + +import java.util.List; + +public class AbstractBeforeProccessCodec extends MessageToMessageDecoder { + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) { + } +} diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java index bcc6db0..f63ee53 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java @@ -9,7 +9,6 @@ import io.netty.handler.codec.base64.Base64Dialect; import io.netty.util.internal.ObjectUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; import java.nio.charset.Charset; @@ -17,12 +16,12 @@ /** * @description: 将从接口取到的数据编码 - * @author: Stone - * @create: 2019-01-11 15:15 + * @author: cz + * @create: 2023-05-04 15:15 **/ @Slf4j @Service -public class AepBeforeProccessCodec extends BeforeProccessCodec { +public class AepBeforeProccessCodec extends AbstractBeforeProccessCodec { private final Base64Dialect dialect; public AepBeforeProccessCodec() { @@ -35,7 +34,7 @@ //执行nb平台前的协议解析 预处理 @Override - public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) throws Exception { + public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) { //aep平台处理 if (msg.toString(Charset.defaultCharset()).contains("aep")) { String httpContent = msg.toString(Charset.defaultCharset()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/BeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/BeforeProccessCodec.java deleted file mode 100644 index 9ac8cb3..0000000 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/BeforeProccessCodec.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.casic.missiles.server.handler; - -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.MessageToMessageDecoder; - -import java.util.List; - -public class BeforeProccessCodec extends MessageToMessageDecoder { - - @Override - protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List list) throws Exception { - return; - } -} diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/SensorhubServerChannelInitialHandler.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/SensorhubServerChannelInitialHandler.java index f25aa7c..b135a66 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/SensorhubServerChannelInitialHandler.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/SensorhubServerChannelInitialHandler.java @@ -19,7 +19,7 @@ public class SensorhubServerChannelInitialHandler extends ChannelInitializer { @Autowired - private List proccessCodecList; + private List proccessCodecList; @Override protected void initChannel(SocketChannel socketChannel) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java index d3bb9aa..528dafc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/SensorhubServer.java @@ -82,7 +82,7 @@ } catch (InterruptedException e) { e.printStackTrace(); } finally { - // 优雅的关闭 + //优雅的关闭 workerGroup.shutdownGracefully(); bossGroup.shutdownGracefully(); } diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java new file mode 100644 index 0000000..662ca3f --- /dev/null +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AbstractBeforeProccessCodec.java @@ -0,0 +1,14 @@ +package com.casic.missiles.server.handler; + +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.MessageToMessageDecoder; + +import java.util.List; + +public class AbstractBeforeProccessCodec extends MessageToMessageDecoder { + + @Override + public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) { + } +} diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java index bcc6db0..f63ee53 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/AepBeforeProccessCodec.java @@ -9,7 +9,6 @@ import io.netty.handler.codec.base64.Base64Dialect; import io.netty.util.internal.ObjectUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; import java.nio.charset.Charset; @@ -17,12 +16,12 @@ /** * @description: 将从接口取到的数据编码 - * @author: Stone - * @create: 2019-01-11 15:15 + * @author: cz + * @create: 2023-05-04 15:15 **/ @Slf4j @Service -public class AepBeforeProccessCodec extends BeforeProccessCodec { +public class AepBeforeProccessCodec extends AbstractBeforeProccessCodec { private final Base64Dialect dialect; public AepBeforeProccessCodec() { @@ -35,7 +34,7 @@ //执行nb平台前的协议解析 预处理 @Override - public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) throws Exception { + public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) { //aep平台处理 if (msg.toString(Charset.defaultCharset()).contains("aep")) { String httpContent = msg.toString(Charset.defaultCharset()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/BeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/BeforeProccessCodec.java deleted file mode 100644 index 9ac8cb3..0000000 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/BeforeProccessCodec.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.casic.missiles.server.handler; - -import io.netty.buffer.ByteBuf; -import io.netty.channel.ChannelHandlerContext; -import io.netty.handler.codec.MessageToMessageDecoder; - -import java.util.List; - -public class BeforeProccessCodec extends MessageToMessageDecoder { - - @Override - protected void decode(ChannelHandlerContext channelHandlerContext, ByteBuf byteBuf, List list) throws Exception { - return; - } -} diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/SensorhubServerChannelInitialHandler.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/SensorhubServerChannelInitialHandler.java index f25aa7c..b135a66 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/SensorhubServerChannelInitialHandler.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/SensorhubServerChannelInitialHandler.java @@ -19,7 +19,7 @@ public class SensorhubServerChannelInitialHandler extends ChannelInitializer { @Autowired - private List proccessCodecList; + private List proccessCodecList; @Override protected void initChannel(SocketChannel socketChannel) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/nbBeforeProccessCodec.java b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/nbBeforeProccessCodec.java index 7bd123f..9a7a95b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/server/handler/nbBeforeProccessCodec.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/server/handler/nbBeforeProccessCodec.java @@ -9,14 +9,12 @@ import io.netty.handler.codec.base64.Base64Dialect; import io.netty.util.internal.ObjectUtil; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; import java.nio.charset.Charset; import java.util.List; -@Component @Slf4j -public class nbBeforeProccessCodec extends BeforeProccessCodec{ +public class nbBeforeProccessCodec extends AbstractBeforeProccessCodec{ private final Base64Dialect dialect; @@ -30,7 +28,7 @@ //执行nb平台前的协议解析 预处理 @Override - public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out) throws Exception { + public void decode(ChannelHandlerContext ctx, ByteBuf msg, List out){ //aep平台处理 if (msg.toString(Charset.defaultCharset()).contains("aep")) { String httpContent = msg.toString(Charset.defaultCharset());