修改Netty客户端的获取逻辑

iot-client/src/main/java/com/iteaj/iot/client/ClientRequestProtocol.java

@@ -8,6 +8,7 @@ import com.iteaj.network.client.app.AppClientResponseBody;
 import com.iteaj.network.client.app.AppClientUtil;
 import com.iteaj.network.consts.ExecStatus;
 import io.netty.channel.ChannelFuture;
+import org.springframework.core.GenericTypeResolver;
 
 import java.nio.channels.ClosedChannelException;
 import java.util.Optional;
@@ -139,14 +140,6 @@ public abstract class ClientRequestProtocol<C extends ClientMessage> extends Abs
      */
     protected <T extends ClientRequestProtocol> T sendRequest() throws ProtocolException {
         try {
-            /**
-             *  如果没有指定协议业务 and 不是同步请求, 则去除超时时间
-             * @see #isRelation() 返回 false
-             * @see #isSyncRequest() 同步请求必须指定超时时间
-             */
-            if(!isSyncRequest() && !isProtocolHandle()) {
-                this.timeout = 0;
-            }
 
             ClientRequestProtocol requestProtocol = buildRequestMessage();
             if(requestProtocol == null) {
@@ -285,7 +278,9 @@ public abstract class ClientRequestProtocol<C extends ClientMessage> extends Abs
      */
     public abstract void doBuildResponseMessage(C message);
 
-    protected abstract IotNettyClient getIotNettyClient();
+    protected IotNettyClient getIotNettyClient() {
+        return IotClientBootstrap.getClient(requestMessage.getClass());
+    }
 
     /**
      * 此客户端是否激活

iot-client/src/main/java/com/iteaj/iot/client/json/AppClientProtocol.java

@@ -48,11 +48,6 @@ public class AppClientProtocol extends ClientRequestProtocol<AppClientMessage> {
         this.setExecStatus(body.getStatus());
     }
 
-    @Override
-    protected IotNettyClient getIotNettyClient() {
-        return IotClientBootstrap.getClient(AppClientMessage.class);
-    }
-
     @Override
     public CommonProtocolType protocolType() {
         return CommonProtocolType.TCClint;

iot-client/src/main/java/com/iteaj/iot/client/udp/DatagramPacketToMessageDecoder.java

@@ -18,7 +18,7 @@ public abstract class DatagramPacketToMessageDecoder extends SimpleChannelInboun
             final byte[] bytes = new byte[readableBytes];
             content.readBytes(bytes);
 
-            ctx.fireChannelRead(channelReadMessage(bytes));
+            ctx.fireChannelRead(channelReadMessage(bytes).build());
         }
     }
 

iot-client/src/main/java/com/iteaj/iot/client/udp/UdpRequestProtocol.java

 package com.iteaj.iot.client.udp;
 
 import com.iteaj.iot.client.ClientRequestProtocol;
+import com.iteaj.network.ProtocolType;
 import com.iteaj.network.client.ClientMessage;
 import io.netty.channel.socket.DatagramPacket;
 
@@ -9,12 +10,12 @@ public abstract class UdpRequestProtocol<M extends ClientMessage> extends Client
     private DatagramPacket packet;
 
     @Override
-    protected abstract UdpNettyClient getIotNettyClient();
+    protected UdpNettyClient getIotNettyClient() {
+        return (UdpNettyClient) super.getIotNettyClient();
+    }
 
     @Override
-    public Object protocolType() {
-        return null;
-    }
+    public abstract ProtocolType protocolType();
 
     public DatagramPacket getPacket() {
         return packet;