From ec46a32ca330e5c416302eb082e44fa164b37829 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Fri, 22 Sep 2023 17:41:16 +0800
Subject: [PATCH] 配置修改
---
src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java | 3 +--
src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java b/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java
index bf58c80..05fbd2d 100644
--- a/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java
+++ b/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java
@@ -15,7 +15,6 @@
import java.security.Principal;
import java.util.Map;
import java.util.Optional;
-import java.util.UUID;
/**
* @author sean.zhou
@@ -64,7 +63,7 @@
CustomClaim claim = (CustomClaim) ((ServletServerHttpRequest) request).getServletRequest()
.getAttribute(AuthInterceptor.TOKEN_CLAIM);
- return () -> UUID.randomUUID().toString() + "/" + claim.getUserType() + "/" + claim.getId();
+ return () -> claim.getWorkspaceId() + "/" + claim.getUserType() + "/" + claim.getId();
}
return () -> null;
}
diff --git a/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java b/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java
index e14d3aa..652ba1f 100644
--- a/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java
+++ b/src/main/java/com/dji/sample/control/service/impl/ControlServiceImpl.java
@@ -68,7 +68,7 @@
mapper.convertValue(Objects.nonNull(param) ? param : new Object(), controlMethodEnum.getClazz())
: new RemoteDebugHandler();
if (!handler.canPublish(sn)) {
- throw new RuntimeException("The current state of the dock does not support this function.");
+ throw new RuntimeException("当前的机场状态不支持此功能。");
}
if (Objects.nonNull(param) && !handler.valid()) {
throw new RuntimeException(CommonErrorEnum.ILLEGAL_ARGUMENT.getErrorMsg());
--
Gitblit v1.9.3