Merge branch 'master' of http://120.77.240.215:9701/tianlai3/ioc_sixiang_license

license/src/main/java/iot/sixiang/license/device/DeviceServerHandler.java

@@ -177,11 +177,11 @@ public class DeviceServerHandler extends SimpleChannelInboundHandler<Object> {
     }
 
     private void handleUploadError(SocketChannel channel, String remoteIp, int remotePort, DeviceProtocol protocol) {
-        byte[] bytes = safety.decodeExtendedPayload(protocol.getContent(), 0, protocol.getContent().length);
-        if (bytes == null) {
+        //byte[] bytes = safety.decodeExtendedPayload(protocol.getContent(), 0, protocol.getContent().length);
+        if (protocol.getContent() == null) {
             return;
         }
-        String decodeInfo = CommonUtil.bytesToStr(bytes);
+        String decodeInfo = CommonUtil.bytesToStr(protocol.getContent());
         log.info("upload error byte to string:" + decodeInfo);
         if (decodeInfo == null) {
             return;