修改连接测试

license/src/main/java/iot/sixiang/license/event/DeviceClientInactiveEventHandler.java

@@ -16,7 +16,6 @@ public class DeviceClientInactiveEventHandler {
     EventPublisher eventPublisher;
 
     public DeviceClientInactiveEventHandler() {
-
     }
 
     @EventListener
@@ -25,24 +24,21 @@ public class DeviceClientInactiveEventHandler {
 
         SessionContext session = deviceManager.getSessionByChannelId(channelId);
         if (session == null) {
-            log.debug("device client inactive undo ...");
+            log.info("device client inactive undo ...");
             return;
         } else {
-            String appId = session.getAppId();
-//            boolean result = deviceManager.removeSessionByChannelId(channelId);
+            String sn = session.getSn();
+            //            boolean result = deviceManager.removeSessionByChannelId(channelId);
             boolean result = deviceManager.changeSessionOffline(channelId);
             if (result) {
-                // TODO device client 离线需要强制中断该设备对应的forward client
+                // device client 离线需要强制中断该设备对应的forward client
                 ForwardClientBeForcedOfflineEvent forwardClientBeForcedOfflineEvent = new ForwardClientBeForcedOfflineEvent();
-                forwardClientBeForcedOfflineEvent.setSn(appId);
+                forwardClientBeForcedOfflineEvent.setSn(sn);
                 eventPublisher.publishEvent(forwardClientBeForcedOfflineEvent);
-                log.debug("device client inactive success ...");
+                log.info("device client inactive success ...");
             }
         }
-
-
     }
-
 }
 
 

license/src/main/java/iot/sixiang/license/event/ForwardClientConnectEventHandler.java

@@ -21,7 +21,7 @@ public class ForwardClientConnectEventHandler {
 
     @EventListener
     public void handlerEvent(ForwardClientConnectEvent event) {
-        String appId = event.getSn();
+        String sn = event.getSn();
         String channelId = event.getChannelId();
         SocketChannel channel = event.getChannel();
 
@@ -29,14 +29,14 @@ public class ForwardClientConnectEventHandler {
         SessionContext session = new SessionContext();
         //        session.setRemoteIp(remoteIp);
         //        session.setRemotePort(remotePort);
-        session.setAppId(appId);
+        session.setSn(sn);
         //        session.setAppKey(appKey);
         //        session.setToken(token);
         session.setChannelId(channelId);
         session.setClientChannel(channel);
 
 
-        forwardManager.putSession(appId, session);
+        forwardManager.putSession(sn, session);
 
         log.debug("forward client connect:" + event);
     }

license/src/main/java/iot/sixiang/license/event/ForwardClientRequestEventHandler.java

@@ -31,14 +31,11 @@ public class ForwardClientRequestEventHandler {
         DeviceProtocol protocol = event.getProtocol();
 
         SessionContext deviceSessionContext = deviceManager.getSessionByChannelId(deviceChannelId);
-        String appId = deviceSessionContext.getAppId();
+        String sn = deviceSessionContext.getSn();
 
-        SessionContext forwardSessionContext = forwardManager.getSessionContextBySN(appId);
-        log.debug("forward client request:" + appId + "," + forwardSessionContext);
+        SessionContext forwardSessionContext = forwardManager.getSessionContextBySN(sn);
+        log.info("forward client request:" + sn + "," + forwardSessionContext);
         SocketChannel clientChannel = forwardSessionContext.getClientChannel();
         clientChannel.writeAndFlush(protocol);
-
     }
-
-
 }

license/src/main/java/iot/sixiang/license/service/TerminalDeviceService.java

@@ -2,7 +2,6 @@ package iot.sixiang.license.service;
 
 import iot.sixiang.license.model.ResResult;
 import iot.sixiang.license.model.dto.GetTerminalDeviceTokenDTO;
-import iot.sixiang.license.model.vo.GetTerminalDeviceTokenVO;
 
 public interface TerminalDeviceService {
     ResResult getToken(GetTerminalDeviceTokenDTO getTerminalDeviceTokenDTO);

license/src/test/java/iot/sixiang/license/controller/DeviceControllerTest.java

@@ -55,7 +55,7 @@ public class DeviceControllerTest {
         int serverPort = 18889;
         String appId = "ebsh71dp5t1ck948l5";
         String sn = "ERE54S619LNYMPKVN9";
-        String snBind = "snabcd";
+        String snBind = "ZA2207G5NQ";
         String appKey = "110801";
         socket(serverIp, serverPort, appId, sn, snBind, appKey);
     }