Commit d7411452 by gdj

Revert "修改无人机mqtt,去除外网地址。"

This reverts commit a1d77cdf
parent d69af2f7
...@@ -521,7 +521,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, UserEntity> implem ...@@ -521,7 +521,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, UserEntity> implem
UserDTO userDTO = entityConvertToDTO(userEntity); UserDTO userDTO = entityConvertToDTO(userEntity);
// 无人机登录 获取外网地址 // 无人机登录 获取外网地址
userDTO.setMqttAddr(MqttPropertyConfiguration.getBasicMqttAddress()); userDTO.setMqttAddr(MqttPropertyConfiguration.getNetMqttAddress());
userDTO.setAccessToken(token); userDTO.setAccessToken(token);
userDTO.setWorkspaceId(workspaceOpt.get().getWorkspaceId()); userDTO.setWorkspaceId(workspaceOpt.get().getWorkspaceId());
userDTO.setRoleType(roleType); userDTO.setRoleType(roleType);
...@@ -1030,7 +1030,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, UserEntity> implem ...@@ -1030,7 +1030,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, UserEntity> implem
.roleType(entity.getRoleType()) .roleType(entity.getRoleType())
.mqttUsername(entity.getMqttUsername()) .mqttUsername(entity.getMqttUsername())
.mqttPassword(entity.getMqttPassword()) .mqttPassword(entity.getMqttPassword())
.mqttAddr(MqttPropertyConfiguration.getBasicMqttAddress()) .mqttAddr(MqttPropertyConfiguration.getNetMqttAddress())
// 判断密码是否过期 // 判断密码是否过期
.passwordExpired(isPasswordExpired(entity)) .passwordExpired(isPasswordExpired(entity))
.build(); .build();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment