Commit 44f989a8eb4bc22360a417656d9bcfbc59c0b0c1

Authored by xp.Huang
2 parents 38a43761 09ff0735

Merge branch '20230426' into 'master_dev'

fix: 鉴权随机失败问题修复

See merge request yunteng/thingskit!185
@@ -450,7 +450,6 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements @@ -450,7 +450,6 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
450 transportService.process(deviceSessionCtx.getSessionInfo(), SESSION_EVENT_MSG_OPEN, new TransportServiceCallback<Void>() { 450 transportService.process(deviceSessionCtx.getSessionInfo(), SESSION_EVENT_MSG_OPEN, new TransportServiceCallback<Void>() {
451 @Override 451 @Override
452 public void onSuccess(Void msg) { 452 public void onSuccess(Void msg) {
453 - authedCounter.incrementAndGet();  
454 SessionMetaData sessionMetaData = transportService.registerAsyncSession(deviceSessionCtx.getSessionInfo(), TcpTransportHandler.this); 453 SessionMetaData sessionMetaData = transportService.registerAsyncSession(deviceSessionCtx.getSessionInfo(), TcpTransportHandler.this);
455 checkGatewaySession(sessionMetaData); 454 checkGatewaySession(sessionMetaData);
456 ctx.writeAndFlush(createTcpConnAckMsg(authEntry.getSuccess())); 455 ctx.writeAndFlush(createTcpConnAckMsg(authEntry.getSuccess()));
@@ -476,7 +475,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements @@ -476,7 +475,7 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
476 475
477 private void onValidateFailed(ChannelHandlerContext ctx, MqttConnectReturnCode msg) { 476 private void onValidateFailed(ChannelHandlerContext ctx, MqttConnectReturnCode msg) {
478 authedCounter.incrementAndGet(); 477 authedCounter.incrementAndGet();
479 - if (TkScriptInvokeService.authScripts.size() == authedCounter.incrementAndGet()) { 478 + if (TkScriptInvokeService.authScripts.size() == authedCounter.intValue()) {
480 ctx.writeAndFlush(createTcpConnAckMsg(msg.name())); 479 ctx.writeAndFlush(createTcpConnAckMsg(msg.name()));
481 ctx.close(); 480 ctx.close();
482 } 481 }