From 01770b21235b25d3d4e435da1cb96042b01c3b24 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Sat, 3 Aug 2024 16:09:02 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=94=B5=E5=8D=95=E8=BD=A6=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/netty/decoder}/MessageDecode.java | 2 +- .../main/java/com/jsowell/netty/decoder}/MessageEncode.java | 2 +- .../ElectricBicyclesServerChannelInitializer.java | 5 +++-- .../java/com/jsowell/pile/rpc/ClientChannelInitializer.java | 4 ++-- .../java/com/jsowell/pile/rpc/ServerChannelInitializer.java | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) rename {jsowell-pile/src/main/java/com/jsowell/pile/rpc => jsowell-netty/src/main/java/com/jsowell/netty/decoder}/MessageDecode.java (97%) rename {jsowell-pile/src/main/java/com/jsowell/pile/rpc => jsowell-netty/src/main/java/com/jsowell/netty/decoder}/MessageEncode.java (96%) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/rpc/MessageDecode.java b/jsowell-netty/src/main/java/com/jsowell/netty/decoder/MessageDecode.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/rpc/MessageDecode.java rename to jsowell-netty/src/main/java/com/jsowell/netty/decoder/MessageDecode.java index c88a68428..9ce5010b7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/rpc/MessageDecode.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/decoder/MessageDecode.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.rpc; +package com.jsowell.netty.decoder; import com.jsowell.common.protocol.Message; import com.jsowell.common.protocol.MessageConstant; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/rpc/MessageEncode.java b/jsowell-netty/src/main/java/com/jsowell/netty/decoder/MessageEncode.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/rpc/MessageEncode.java rename to jsowell-netty/src/main/java/com/jsowell/netty/decoder/MessageEncode.java index e3d0f236e..6f38b5ad6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/rpc/MessageEncode.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/decoder/MessageEncode.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.rpc; +package com.jsowell.netty.decoder; import com.jsowell.common.protocol.Message; import com.jsowell.common.util.bean.SerializationUtil; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerChannelInitializer.java b/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerChannelInitializer.java index 03e6ff0ee..0736646a0 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerChannelInitializer.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/server/electricbicycles/ElectricBicyclesServerChannelInitializer.java @@ -1,6 +1,7 @@ package com.jsowell.netty.server.electricbicycles; import com.jsowell.netty.decoder.ChargingPileDecoder; +import com.jsowell.netty.decoder.MessageDecode; import com.jsowell.netty.decoder.StartAndLengthFieldFrameDecoder; import io.netty.channel.ChannelInitializer; import io.netty.channel.ChannelPipeline; @@ -25,8 +26,8 @@ public class ElectricBicyclesServerChannelInitializer extends ChannelInitializer protected void initChannel(SocketChannel channel) throws Exception { ChannelPipeline pipeline = channel.pipeline(); pipeline.addLast("frameDecoder", new StartAndLengthFieldFrameDecoder()); - pipeline.addLast("decoder", new ByteArrayDecoder()); - pipeline.addLast("encoder", new ByteArrayDecoder()); + pipeline.addLast("decoder", new MessageDecode()); + pipeline.addLast("encoder", new MessageDecode()); //读超时时间设置为10s，0表示不监控 pipeline.addLast(new IdleStateHandler(60, 0, 0, TimeUnit.SECONDS)); pipeline.addLast("handler", chargingPileHandler); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/rpc/ClientChannelInitializer.java b/jsowell-pile/src/main/java/com/jsowell/pile/rpc/ClientChannelInitializer.java index b3e3c73e1..c970c16ef 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/rpc/ClientChannelInitializer.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/rpc/ClientChannelInitializer.java @@ -10,8 +10,8 @@ public class ClientChannelInitializer extends ChannelInitializer protected void initChannel(SocketChannel socketChannel) throws Exception { ChannelPipeline pipeline = socketChannel.pipeline(); - pipeline.addLast(new MessageEncode()); - pipeline.addLast(new MessageDecode()); + // pipeline.addLast(new MessageEncode()); + // pipeline.addLast(new MessageDecode()); pipeline.addLast(new RpcResponseHandler()); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/rpc/ServerChannelInitializer.java b/jsowell-pile/src/main/java/com/jsowell/pile/rpc/ServerChannelInitializer.java index ec9f4a64f..48a3137da 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/rpc/ServerChannelInitializer.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/rpc/ServerChannelInitializer.java @@ -10,8 +10,8 @@ public class ServerChannelInitializer extends ChannelInitializer protected void initChannel(SocketChannel socketChannel) throws Exception { ChannelPipeline pipeline = socketChannel.pipeline(); - pipeline.addLast(new MessageEncode()); - pipeline.addLast(new MessageDecode()); + // pipeline.addLast(new MessageEncode()); + // pipeline.addLast(new MessageDecode()); pipeline.addLast(new RpcRequestHandler()); }