From bb44cfc7eb9241d9bbe5bb68ac23df4fa3ce641c Mon Sep 17 00:00:00 2001
From: limqhz <wb-lmq580142@antfin.com>
Date: Thu, 9 Jul 2020 10:38:01 +0800
Subject: [PATCH] =?UTF-8?q?netty-=E8=B0=83=E8=AF=81=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E6=96=B9=E6=B3=95=EF=BC=88=E6=A8=A1=E6=8B=9F?=
 =?UTF-8?q?=E5=AE=89=E5=8D=93=E5=AE=A2=E6=88=B7=E7=AB=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/com/test/netty/client/ClientHandler.java  |  3 ++-
 .../com/test/netty/client/message/Message.java     | 14 --------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/netty-pad/src/test/com/test/netty/client/ClientHandler.java b/netty-pad/src/test/com/test/netty/client/ClientHandler.java
index cf338ed..5b50d9d 100644
--- a/netty-pad/src/test/com/test/netty/client/ClientHandler.java
+++ b/netty-pad/src/test/com/test/netty/client/ClientHandler.java
@@ -65,6 +65,7 @@ public class ClientHandler extends ChannelInboundHandlerAdapter {
     private Message getHbMessage() {
         HeartBeat hb = new HeartBeat();
 //        hb.setVersionCode(AppUtil.getVersionCode(StartApplication.getAppContext()));
+        hb.setVersionCode(System.currentTimeMillis()+"");
         Message message = new Message();
         message.setCmdId(Cmd.HB.id);
 //        message.setDeviceId(DeviceIdUtil.generateDeviceId(mContext));
@@ -79,7 +80,7 @@ public class ClientHandler extends ChannelInboundHandlerAdapter {
      * @throws Exception
      */
     @Override
-    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
         if (IdleStateEvent.class.isAssignableFrom(evt.getClass())) {
             IdleStateEvent event = (IdleStateEvent) evt;
             if (event.state() == IdleState.ALL_IDLE) {
diff --git a/netty-pad/src/test/com/test/netty/client/message/Message.java b/netty-pad/src/test/com/test/netty/client/message/Message.java
index 1ce04bc..c188419 100644
--- a/netty-pad/src/test/com/test/netty/client/message/Message.java
+++ b/netty-pad/src/test/com/test/netty/client/message/Message.java
@@ -1,7 +1,6 @@
 package com.test.netty.client.message;
 
 import com.google.gson.annotations.Expose;
-import com.test.netty.dto.FaceImageDto;
 
 /**
  * <pre>上位机与通讯服务器的数据协议格式</pre>
@@ -19,10 +18,6 @@ public class Message extends BaseDto {
     @Expose
     private MemberDto result;
 
-
-    @Expose
-    private FaceImageDto faceImage;
-
     /**
      * 机器识别返回字符串
      */
@@ -57,13 +52,4 @@ public class Message extends BaseDto {
     public void setContent(String content) {
         this.content = content;
     }
-
-    public FaceImageDto getFaceImage() {
-        return faceImage;
-    }
-
-    public void setFaceImage(FaceImageDto faceImage) {
-        this.faceImage = faceImage;
-    }
-
 }