From ed1cfe5eb68e790bd48e5c6840cee710e1fce28a Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Wed, 16 Apr 2025 18:03:30 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E5=85=BC=E5=AE=B9=E6=97=A7?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=8C=E6=97=A0Client-Id=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=20(#847)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * update:测试页面增加OTA地址 * update：兼容旧设备，无Client-Id的情况 --- .../xiaozhi/modules/device/controller/OTAController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java b/main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java index a12e7653..30f30b53 100644 --- a/main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java +++ b/main/manager-api/src/main/java/xiaozhi/modules/device/controller/OTAController.java @@ -38,10 +38,13 @@ public class OTAController { public ResponseEntity checkOTAVersion( @RequestBody DeviceReportReqDTO deviceReportReqDTO, @Parameter(name = "Device-Id", description = "设备唯一标识", required = true, in = ParameterIn.HEADER) @RequestHeader("Device-Id") String deviceId, - @Parameter(name = "Client-Id", description = "客户端标识", required = true, in = ParameterIn.HEADER) @RequestHeader("Client-Id") String clientId) { - if (StringUtils.isAnyBlank(deviceId, clientId)) { + @Parameter(name = "Client-Id", description = "客户端标识", required = false, in = ParameterIn.HEADER) @RequestHeader(value = "Client-Id", required = false) String clientId) { + if (StringUtils.isBlank(deviceId)) { return createResponse(DeviceReportRespDTO.createError("Device ID is required")); } + if (StringUtils.isBlank(clientId)) { + clientId = deviceId; + } String macAddress = deviceReportReqDTO.getMacAddress(); boolean macAddressValid = NetworkUtil.isMacAddressValid(macAddress); // 设备Id和Mac地址应是一致的, 并且必须需要application字段