diff --git a/pom.xml b/pom.xml
index 92e9f0d..099d4e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
io.netty
netty-all
- 4.1.66.Final
+ 4.1.77.Final
net.sf.kxml
diff --git a/src/main/java/com/inspect/tcpserver/tcp/NettyClient.java b/src/main/java/com/inspect/tcpserver/tcp/NettyClient.java
index cc95564..f24616c 100644
--- a/src/main/java/com/inspect/tcpserver/tcp/NettyClient.java
+++ b/src/main/java/com/inspect/tcpserver/tcp/NettyClient.java
@@ -45,8 +45,8 @@ public class NettyClient {
private Logger logger = LoggerFactory.getLogger(NettyClient.class);
// 客户端只需要一个 时间循环组 , 即 NioEventLoopGroup 线程池
- private static final EventLoopGroup eventLoopGroup = new NioEventLoopGroup(1);
- ;
+ private static final EventLoopGroup eventLoopGroup = new NioEventLoopGroup();
+
private String serverIP;
private int serverPort;
private long sendIndex = 0; //若重启系统后还要延续之前的序列号则需要把序列号存入redis中
diff --git a/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java b/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
index 5ebad5c..7724742 100644
--- a/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
+++ b/src/main/java/com/inspect/tcpserver/tcp/NettyServer.java
@@ -89,9 +89,9 @@ public class NettyServer {
init();
//new 一个主线程组
- bossGroup = new NioEventLoopGroup(1);
+ bossGroup = new NioEventLoopGroup();
//new 一个工作线程组
- workGroup = new NioEventLoopGroup(10);
+ workGroup = new NioEventLoopGroup();
ServerBootstrap bootstrap = new ServerBootstrap()
.group(bossGroup, workGroup)
.channel(NioServerSocketChannel.class)
@@ -339,10 +339,12 @@ public class NettyServer {
break;
case PushType.taskState:// insert into basedata_mont_taskstadata and patrol_task_status
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, compactXml, TaskStateControl.class);
+ //root@Linx:/home/atia/data/log/inspect-main# grep -rn "type:41, messageBody:" info.log
logger.info(Color.YELLOW + "###### 客户端[{}]上报设备任务状态 ######" + Color.END, sendCode);
break;
case PushType.result:// insert into basedata_mont_taskresult and patrol_task_result_main
json = downXml2Json.DownStreamJson2Xml(binaryModel.uuid, binaryModel.id, compactXml, TaskResultControl.class);
+ //root@Linx:/home/atia/data/log/inspect-main# grep -rn "type:61, messageBody:" info.log
logger.info(Color.YELLOW + "###### 客户端[{}]上报巡视结果 ######" + Color.END, sendCode);
break;
default:
@@ -566,6 +568,8 @@ public class NettyServer {
}
if (!StringUtils.isEmpty(xml)) {
flushMsgToDevice("", receiveCode, true, xml);
+ } else {
+ logger.error(Color.RED + "###### xml is empty ######" + Color.END, type);
}
}
}