UserDTO返回用户密码是否过期

sample/src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java

@@ -516,7 +516,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, UserEntity> implem
         String token = JwtUtil.createToken(customClaim.convertToMap());
         String token = JwtUtil.createToken(customClaim.convertToMap());
 
 
         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);
@@ -1024,7 +1025,9 @@ 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))
                 .build();
                 .build();
     }
     }