TRX преди 1 година
родител
ревизия
14258e75e3
променени са 1 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 5 2
      OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/MqttInfoService.java

+ 5 - 2
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/MqttInfoService.java

@@ -78,8 +78,11 @@ public class MqttInfoService {
         GateWayUserInfo gateWayUserInfo = gateWayUserInfoService.gateWayBindMqttUser(gatewayInfo);
         if (ObjectUtils.isNotEmpty(mqttInfo)) {
             mqttInfoSimpleModel.setBrokerAddress(String.format("%s:%s", mqttInfo.getBrokerHost(), mqttInfo.getBrokerPort()));
-            mqttInfoSimpleModel.setBrokerUsername(gateWayUserInfo.getUserName());
-            mqttInfoSimpleModel.setBrokerPassword(gateWayUserInfo.getPassWord());
+//            mqttInfoSimpleModel.setBrokerUsername(gateWayUserInfo.getUserName());
+//            mqttInfoSimpleModel.setBrokerPassword(gateWayUserInfo.getPassWord());
+
+            mqttInfoSimpleModel.setBrokerUsername(mqttInfo.getUserName());
+            mqttInfoSimpleModel.setBrokerPassword(mqttInfo.getPassword());
         }
         // 只同步网关的 权限
         gateWayUserInfoService.syncSecurityGateToMQTTService(gatewayInfo);