Merge remote-tracking branch 'origin/V0.1.1' into V0.1.1

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/websocket/service/impl/WebsocketServiceImpl.java

@@ -242,7 +242,7 @@ public class WebsocketServiceImpl implements WebsocketService {
                 if (info == null) {
                     info = createIotDeviceInfo(dvsInfo, serverInfo);
                     addList.add(info);
-                    addListExtend.add(createIotDeviceInfoExtend(dvsInfo, info.getId()));
+                    addListExtend.add(createIotDeviceInfoExtend(dvsInfo, info.getId(),token));
                 } else {
                     dealDvsInfo(dvsInfo, info,serverInfo);
                     updateList.add(info);
@@ -286,13 +286,14 @@ public class WebsocketServiceImpl implements WebsocketService {
      * @param deviceId
      * @return
      */
-    private IotDeviceInfoExtend createIotDeviceInfoExtend(DvsInfo dvsInfo,Long deviceId) {
+    private IotDeviceInfoExtend createIotDeviceInfoExtend(DvsInfo dvsInfo,Long deviceId,String token) {
         IotDeviceInfoExtend extend = new IotDeviceInfoExtend();
         extend.setDeviceId(deviceId);
         extend.setPort(dvsInfo.getPort());
         extend.setPassword(dvsInfo.getPassword());
         extend.setUserName(dvsInfo.getUserName());
         extend.setNetAddress(dvsInfo.getNetAddress());
+        extend.setIotToken(token);
         extend.setDeleted(0);
         return extend;
     }