Merge branch '20230427' into 'master_dev'

fix: 鉴权脚本有效性校验完善

See merge request yunteng/thingskit!187

@@ -34,6 +34,7 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 import io.netty.handler.codec.mqtt.*;
 import io.netty.handler.codec.mqtt.*;
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.ssl.SslHandler;
+import io.netty.util.CharsetUtil;
 import io.netty.util.ReferenceCountUtil;
 import io.netty.util.ReferenceCountUtil;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
 import io.netty.util.concurrent.GenericFutureListener;
@@ -303,7 +304,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
                 Futures.addCallback(item, new FutureCallback<String>() {
                 Futures.addCallback(item, new FutureCallback<String>() {
                     @Override
                     @Override
                     public void onSuccess(@Nullable String result) {
                     public void onSuccess(@Nullable String result) {
-                        processAuthTokenConnect(ctx, id, JacksonUtil.fromString(result, TcpAuthEntry.class));
+                        processAuthTokenConnect(ctx, id, JacksonUtil.fromString(result.replace("\\","\\\\"), TcpAuthEntry.class));
                     }
                     }
 
 
                     @Override
                     @Override
@@ -319,14 +320,13 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
     private void processAuthTokenConnect(ChannelHandlerContext ctx, UUID scriptId, TcpAuthEntry accessToken) {
     private void processAuthTokenConnect(ChannelHandlerContext ctx, UUID scriptId, TcpAuthEntry accessToken) {
 
 
         log.debug("[{}][{}] Processing connect msg for client with user name: {}!", address, sessionId, accessToken);
         log.debug("[{}][{}] Processing connect msg for client with user name: {}!", address, sessionId, accessToken);
-        TransportProtos.ValidateDeviceTokenRequestMsg.Builder request = TransportProtos.ValidateDeviceTokenRequestMsg.newBuilder();
         if (null != accessToken.getClientId()) {
         if (null != accessToken.getClientId()) {
         }
         }
         if (null != accessToken.getUserName()) {
         if (null != accessToken.getUserName()) {
         }
         }
         String token = accessToken.getPassword();
         String token = accessToken.getPassword();
         if(StringUtils.isNotEmpty(token)){
         if(StringUtils.isNotEmpty(token)){
-            token.trim();
+            TransportProtos.ValidateDeviceTokenRequestMsg.Builder request = TransportProtos.ValidateDeviceTokenRequestMsg.newBuilder();
             request.setToken(token);
             request.setToken(token);
             transportService.process(DeviceTransportType.TCP, request.build(),
             transportService.process(DeviceTransportType.TCP, request.build(),
                     new TransportServiceCallback<>() {
                     new TransportServiceCallback<>() {