Merge remote-tracking branch 'origin/master_dev'

# Conflicts:
#	common/transport/tcp/src/main/java/org/thingsboard/server/transport/tcp/util/ByteUtils.java

@@ -278,8 +278,8 @@ public class ByteUtils {
         return result;
     }
 
-    public static byte[] strToBytes(String str) {
-        if (Pattern.compile(messageRegular).matcher(str).matches()) {
+    public static byte[] strToBytes(String str){
+        if(Pattern.compile("^[A-Fa-f0-9]+$").matcher(str).matches()){
             return hexStr2Bytes(str);
         }
         return getBytes(str, ByteUtils.UTF_8);

@@ -40,10 +40,9 @@ import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.device.profile.TkTcpDeviceProfileTransportConfiguration;
 import org.thingsboard.server.common.data.id.DeviceId;
-import org.thingsboard.server.common.data.id.OtaPackageId;
-import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.rpc.RpcStatus;
 import org.thingsboard.server.common.data.yunteng.enums.TkScriptFunctionType;
+import org.thingsboard.server.common.data.yunteng.utils.ByteUtils;
 import org.thingsboard.server.common.msg.tools.TbRateLimitsException;
 import org.thingsboard.server.common.transport.SessionMsgListener;
 import org.thingsboard.server.common.transport.TransportService;
@@ -62,7 +61,7 @@ import org.thingsboard.server.transport.tcp.adaptors.TcpUpEntry;
 import org.thingsboard.server.transport.tcp.script.TkScriptFactory;
 import org.thingsboard.server.transport.tcp.session.TcpDeviceSessionCtx;
 import org.thingsboard.server.transport.tcp.session.TcpGatewaySessionHandler;
-import org.thingsboard.server.transport.tcp.util.ByteUtils;
+import org.thingsboard.server.transport.tcp.util.ByteBufUtils;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
@@ -156,9 +155,9 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         try {
             if (msg instanceof ByteBuf) {
                 ByteBuf message = (ByteBuf) msg;
-                byte[] byteMsg = ByteUtils.buf2Bytes(message);
+                byte[] byteMsg = ByteBufUtils.buf2Bytes(message);
                 String msgStr = ByteUtils.bytesToStr(byteMsg);
-                log.error("会话【{}】收到设备【{}】来自【{}】数据【{}】", sessionId, deviceSessionCtx.getDeviceId(), address, msgStr);
+                log.debug("会话【{}】收到设备【{}】来自【{}】数据【{}】", sessionId, deviceSessionCtx.getDeviceId(), address, msgStr);
                 deviceSessionCtx.setChannel(ctx);
                 if (deviceSessionCtx.getDeviceInfo() == null || deviceSessionCtx.getDeviceProfile() == null) {
                     processConnect(ctx, msgStr);
@@ -535,7 +534,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
 
     @Override
     public void onToDeviceRpcRequest(UUID sessionId, TransportProtos.ToDeviceRpcRequestMsg rpcRequest) {
-        log.error("【{}】下发RPC命令【{}】给设备【{}】", sessionId, rpcRequest.getParams(), deviceSessionCtx.getDeviceInfo().getDeviceName());
+        log.debug("【{}】下发RPC命令【{}】给设备【{}】", sessionId, rpcRequest.getParams(), deviceSessionCtx.getDeviceInfo().getDeviceName());
         TcpTransportAdaptor adaptor = deviceSessionCtx.getPayloadAdaptor();
         try {
             adaptor.convertToPublish(deviceSessionCtx, rpcRequest).ifPresent(payload -> {
@@ -573,7 +572,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
 
     @Override
     public void onToServerRpcResponse(TransportProtos.ToServerRpcResponseMsg rpcResponse) {
-        log.error("[{}] 服务端响应设备的RPC请求", sessionId);
+        log.debug("[{}] 服务端响应设备的RPC请求", sessionId);
 //        String baseTopic = toServerRpcSubTopicType.getRpcResponseTopicBase();
 //        TcpTransportAdaptor adaptor = deviceSessionCtx.getAdaptor(toServerRpcSubTopicType);
 //        try {

@@ -32,6 +32,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.ConcurrentReferenceHashMap;
 import org.springframework.util.StringUtils;
 import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.yunteng.utils.ByteUtils;
 import org.thingsboard.server.common.transport.TransportService;
 import org.thingsboard.server.common.transport.TransportServiceCallback;
 import org.thingsboard.server.common.transport.adaptor.AdaptorException;
@@ -42,7 +43,7 @@ import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFro
 import org.thingsboard.server.gen.transport.TransportProtos.SessionInfoProto;
 import org.thingsboard.server.transport.tcp.TcpTransportContext;
 import org.thingsboard.server.transport.tcp.adaptors.TcpTransportAdaptor;
-import org.thingsboard.server.transport.tcp.util.ByteUtils;
+import org.thingsboard.server.transport.tcp.util.ByteBufUtils;
 
 import javax.annotation.Nullable;
 import java.io.UnsupportedEncodingException;

+package org.thingsboard.server.transport.tcp.util;
+
+import io.netty.buffer.ByteBuf;
+
+/**
+ *
+ */
+public class ByteBufUtils {
+    public static byte[] buf2Bytes(ByteBuf in) {
+        return buf2Bytes(in, in.readableBytes());
+    }
+
+    public static byte[] buf2Bytes(ByteBuf in, int readable) {
+        byte[] dst = new byte[readable];
+        in.getBytes(0, dst);
+        return dst;
+    }
+
+}

@@ -282,7 +282,7 @@ public class ByteUtils {
     }
 
     public static byte[] strToBytes(String str){
-        if(Pattern.compile("^[A-Fa-f0-9]+$").matcher(str).matches()){
+        if(Pattern.compile(messageRegular).matcher(str).matches()){
             return hexStr2Bytes(str);
         }
         return getBytes(str,ByteUtils.UTF_8);