From fb9fa0ed4f4c58aa3d7edaef0818cbcc573b5f47 Mon Sep 17 00:00:00 2001
From: limqhz <l>
Date: Mon, 13 Jul 2020 11:03:21 +0800
Subject: [PATCH] =?UTF-8?q?netty-=E4=BF=AE=E6=94=B9netty=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=AB=AF=E5=8F=A3=EF=BC=8C=E6=AD=A4?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=BA=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 netty-pad/build.gradle                                    | 2 +-
 .../java/com/sv/netty/controller/QRCodeControler.java     | 8 ++++----
 .../src/main/java/com/sv/netty/netty/ServerHandler.java   | 4 +---
 .../com/sv/netty/{ => netty}/service/MessageService.java  | 2 +-
 .../service/impl/TcpMessageHandlerAdapter.java            | 5 ++---
 netty-pad/src/main/resources/config/application.yml       | 2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)
 rename netty-pad/src/main/java/com/sv/netty/{ => netty}/service/MessageService.java (94%)
 rename netty-pad/src/main/java/com/sv/netty/{ => netty}/service/impl/TcpMessageHandlerAdapter.java (99%)

diff --git a/netty-pad/build.gradle b/netty-pad/build.gradle
index a2d8ee0..6e77163 100644
--- a/netty-pad/build.gradle
+++ b/netty-pad/build.gradle
@@ -15,7 +15,7 @@ apply plugin: 'java'
 apply plugin: 'org.springframework.boot'
 
 group 'SmartVenue'
-version '1.0-SNAPSHOT'
+version '2.0.0'
 
 sourceCompatibility = 1.8
 
diff --git a/netty-pad/src/main/java/com/sv/netty/controller/QRCodeControler.java b/netty-pad/src/main/java/com/sv/netty/controller/QRCodeControler.java
index 61c680d..6ddfbcd 100644
--- a/netty-pad/src/main/java/com/sv/netty/controller/QRCodeControler.java
+++ b/netty-pad/src/main/java/com/sv/netty/controller/QRCodeControler.java
@@ -33,14 +33,14 @@ public class QRCodeControler {
     }
 
     /**
-     * 微信小程序扫码之后，通知对应的线程进入加载界面，然后随即开始判断逻辑
+     * 检验客户端读取能力
      * @return
      */
-    @RequestMapping("/testChannel")
-    public ResponseDTO testChannel(@RequestParam String id) {
+    @RequestMapping("/checkAlive")
+    public ResponseDTO checkAlive(@RequestParam String id) {
         System.out.println(ClientChannelCache.channelTypes.size());
         Channel channel = ClientChannelCache.getChannelType(id);
-        channel.writeAndFlush("你好呀！");
+        channel.writeAndFlush("check client alive ! ");
         return ResponseDTO.ok();
     }
 
diff --git a/netty-pad/src/main/java/com/sv/netty/netty/ServerHandler.java b/netty-pad/src/main/java/com/sv/netty/netty/ServerHandler.java
index 27dbc1b..612774e 100644
--- a/netty-pad/src/main/java/com/sv/netty/netty/ServerHandler.java
+++ b/netty-pad/src/main/java/com/sv/netty/netty/ServerHandler.java
@@ -4,11 +4,9 @@ import com.sv.netty.config.Constant;
 import com.sv.netty.config.SpringContextHolder;
 import com.sv.netty.netty.message.ChannelParam;
 import com.sv.netty.netty.message.HeartBeat;
-import com.sv.netty.service.MessageService;
+import com.sv.netty.netty.service.MessageService;
 import com.sv.netty.utils.JsonUtils;
 import io.netty.channel.*;
-import io.netty.handler.timeout.IdleState;
-import io.netty.handler.timeout.IdleStateEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/netty-pad/src/main/java/com/sv/netty/service/MessageService.java b/netty-pad/src/main/java/com/sv/netty/netty/service/MessageService.java
similarity index 94%
rename from netty-pad/src/main/java/com/sv/netty/service/MessageService.java
rename to netty-pad/src/main/java/com/sv/netty/netty/service/MessageService.java
index c23f73a..8489558 100644
--- a/netty-pad/src/main/java/com/sv/netty/service/MessageService.java
+++ b/netty-pad/src/main/java/com/sv/netty/netty/service/MessageService.java
@@ -1,4 +1,4 @@
-package com.sv.netty.service;
+package com.sv.netty.netty.service;
 
 import com.sv.netty.netty.message.HeartBeat;
 import io.netty.channel.Channel;
diff --git a/netty-pad/src/main/java/com/sv/netty/service/impl/TcpMessageHandlerAdapter.java b/netty-pad/src/main/java/com/sv/netty/netty/service/impl/TcpMessageHandlerAdapter.java
similarity index 99%
rename from netty-pad/src/main/java/com/sv/netty/service/impl/TcpMessageHandlerAdapter.java
rename to netty-pad/src/main/java/com/sv/netty/netty/service/impl/TcpMessageHandlerAdapter.java
index 610fd54..daf4287 100644
--- a/netty-pad/src/main/java/com/sv/netty/service/impl/TcpMessageHandlerAdapter.java
+++ b/netty-pad/src/main/java/com/sv/netty/netty/service/impl/TcpMessageHandlerAdapter.java
@@ -1,4 +1,4 @@
-package com.sv.netty.service.impl;
+package com.sv.netty.netty.service.impl;
 
 import com.sv.dto.EnterResult;
 import com.sv.entity.Device;
@@ -10,9 +10,8 @@ import com.sv.netty.config.ClientChannelCache;
 import com.sv.netty.dto.MemberDto;
 import com.sv.netty.netty.message.HeartBeat;
 import com.sv.netty.netty.message.Result;
-import com.sv.netty.service.MessageService;
+import com.sv.netty.netty.service.MessageService;
 import com.sv.netty.utils.JsonMapper;
-import com.sv.netty.utils.JsonUtils;
 import com.sv.service.api.MemberEnterVenueLogService;
 import com.sv.service.api.MemberService;
 import com.sv.service.api.VenueService;
diff --git a/netty-pad/src/main/resources/config/application.yml b/netty-pad/src/main/resources/config/application.yml
index ceb3713..a7d1540 100644
--- a/netty-pad/src/main/resources/config/application.yml
+++ b/netty-pad/src/main/resources/config/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8021
+  port: 8022
   context-path: /netty
   tomcat:
     uri-encoding: utf-8