From 39ffdf5754b4ebca682bd3c925f7a500e8a1bbda Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Thu, 08 Aug 2024 16:56:36 +0800
Subject: [PATCH] 国土调查云身份凭证token
---
src/main/java/com/dji/sample/manage/service/impl/UserServiceImpl.java | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 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..abdb892 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
@@ -55,7 +55,7 @@
if (userEntity == null) {
return ResponseResult.builder()
.code(HttpStatus.UNAUTHORIZED.value())
- .message("invalid username")
+ .message("无效的用户名")
.build();
}
@@ -72,16 +72,16 @@
if (userEntity == null) {
return ResponseResult.builder()
.code(HttpStatus.UNAUTHORIZED.value())
- .message("invalid username")
+ .message("无效的用户名")
.build();
}
if (flag.intValue() != userEntity.getUserType().intValue()) {
- return ResponseResult.error("The account type does not match.");
+ return ResponseResult.error("帐户类型不匹配");
}
if (!password.equals(userEntity.getPassword())) {
return ResponseResult.builder()
.code(HttpStatus.UNAUTHORIZED.value())
- .message("invalid password")
+ .message("无效的密码")
.build();
}
@@ -89,7 +89,7 @@
if (workspaceOpt.isEmpty()) {
return ResponseResult.builder()
.code(HttpStatus.UNAUTHORIZED.value())
- .message("invalid workspace id")
+ .message("无效的项目id")
.build();
}
@@ -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