From 642dac3e705380eea241648f875836e64dbc809e Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Thu, 18 May 2023 17:43:06 +0800
Subject: [PATCH] Merge branch 'v1.5.0' What's new? 1. Add new model: DJI Matrices 350 RTK. 2. Update file hms.json. 3. Fixed some issues.
---
src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java b/src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java
index 746fe99..d754831 100644
--- a/src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java
@@ -101,13 +101,7 @@
String token = JwtUtil.createToken(customClaim.convertToMap());
UserDTO userDTO = entityConvertToDTO(userEntity);
- userDTO.setMqttAddr(new StringBuilder()
- .append(mqttConfiguration.getProtocol().trim())
- .append("://")
- .append(mqttConfiguration.getHost().trim())
- .append(":")
- .append(mqttConfiguration.getPort())
- .toString());
+ userDTO.setMqttAddr(MqttConfiguration.getBasicMqttAddress());
userDTO.setAccessToken(token);
userDTO.setWorkspaceId(workspaceOpt.get().getWorkspaceId());
return ResponseResult.success(userDTO);
@@ -218,13 +212,7 @@
.userType(entity.getUserType())
.mqttUsername(entity.getMqttUsername())
.mqttPassword(entity.getMqttPassword())
- .mqttAddr(new StringBuilder()
- .append(mqttConfiguration.getProtocol().trim())
- .append("://")
- .append(mqttConfiguration.getHost().trim())
- .append(":")
- .append(mqttConfiguration.getPort())
- .toString())
+ .mqttAddr(MqttConfiguration.getBasicMqttAddress())
.build();
}
}
--
Gitblit v1.9.3