From fa89f5c4b746a41efee0362bd3a42ea2c97e2cff Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 22 Apr 2024 18:13:46 +0800
Subject: [PATCH] 在加水印前对文件进行音视频处理,分别执行不同方法。增加图片压缩、视频压缩方法。

---
 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