From b78d337fd0f98d02561148cc60c1b39d42ac421a Mon Sep 17 00:00:00 2001
From: caixypromise <caixypromised@gmail.com>
Date: Thu, 22 May 2025 00:49:56 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9C=8D=E5=8A=A1=E7=AB=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81=E5=81=A5=E5=A3=AE?=
 =?UTF-8?q?=E6=80=A7=E4=BC=98=E5=8C=96=EF=BC=8C=E8=A1=A5=E5=85=85=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E4=B8=8E=E5=88=A0=E9=99=A4=E7=BD=B2=E5=90=8D=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ServerSideManageController.java    | 15 ++++++++-------
 .../modules/sys/dto/EmitSeverActionDTO.java       |  3 ---
 .../modules/sys/dto/ServerActionPayloadDTO.java   |  3 ---
 .../modules/sys/enums/ServerActionEnum.java       |  3 ---
 .../sys/enums/ServerActionResponseEnum.java       |  3 ---
 5 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/ServerSideManageController.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/ServerSideManageController.java
index a9664ced..0b6b6a5b 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/ServerSideManageController.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/controller/ServerSideManageController.java
@@ -1,9 +1,6 @@
 package xiaozhi.modules.sys.controller;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.lang3.StringUtils;
@@ -38,7 +35,7 @@ import xiaozhi.modules.sys.utils.WebSocketClientManager;
  * 服务端管理控制器
  */
 @RestController
-@RequestMapping("admin/server")
+@RequestMapping("/admin/server")
 @Tag(name = "服务端管理")
 @AllArgsConstructor
 public class ServerSideManageController {
@@ -46,6 +43,7 @@ public class ServerSideManageController {
     private static final ObjectMapper objectMapper;
     static {
         objectMapper = new ObjectMapper();
+        // 忽略json字符串中存在，但pojo中不存在对应字段的情况
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     }
 
@@ -53,8 +51,11 @@ public class ServerSideManageController {
     @GetMapping("/server-list")
     @RequiresPermissions("sys:role:superAdmin")
     public Result<List<String>> getWsServerList() {
-        String cachedWs = sysParamsService.getValue(Constant.SERVER_WEBSOCKET, true);
-        return new Result<List<String>>().ok(Arrays.asList(cachedWs.split(";")));
+        String wsText = sysParamsService.getValue(Constant.SERVER_WEBSOCKET, true);
+        if (StringUtils.isBlank(wsText)) {
+            return new Result<List<String>>().ok(Collections.emptyList());
+        }
+        return new Result<List<String>>().ok(Arrays.asList(wsText.split(";")));
     }
 
     @Operation(summary = "通知python服务端更新配置")
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/EmitSeverActionDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/EmitSeverActionDTO.java
index 888ef4ec..6de89aab 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/EmitSeverActionDTO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/EmitSeverActionDTO.java
@@ -10,9 +10,6 @@ import xiaozhi.modules.sys.enums.ServerActionEnum;
 
 /**
  * 发送python服务端操作DTO
- *
- * @Author CAIXYPROMISE
- * @since 2025/5/15 4:55
  */
 @Data
 @NoArgsConstructor
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/ServerActionPayloadDTO.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/ServerActionPayloadDTO.java
index cb158d25..fb1427f9 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/ServerActionPayloadDTO.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/dto/ServerActionPayloadDTO.java
@@ -7,9 +7,6 @@ import java.util.Map;
 
 /**
  * 服务端动作DTO
- *
- * @Author CAIXYPROMISE
- * @since 2025/5/15 5:10
  */
 @Data
 public class ServerActionPayloadDTO
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/enums/ServerActionEnum.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/enums/ServerActionEnum.java
index 33babf45..94e2672f 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/enums/ServerActionEnum.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/enums/ServerActionEnum.java
@@ -6,9 +6,6 @@ import xiaozhi.common.exception.RenException;
 
 /**
  * 服务端动作枚举
- *
- * @Author CAIXYPROMISE
- * @since 2025/5/15 4:57
  */
 public enum ServerActionEnum
 {
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/sys/enums/ServerActionResponseEnum.java b/main/manager-api/src/main/java/xiaozhi/modules/sys/enums/ServerActionResponseEnum.java
index e1b54a66..9e4c8307 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/sys/enums/ServerActionResponseEnum.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/sys/enums/ServerActionResponseEnum.java
@@ -7,9 +7,6 @@ import org.apache.commons.lang3.StringUtils;
 
 /**
  * 服务端调用响应枚举
- *
- * @Author CAIXYPROMISE
- * @since 2025/5/15 5:50
  */
 public enum ServerActionResponseEnum
 {