From e4d173ad28786a1237873f942eb4446126f931ef Mon Sep 17 00:00:00 2001 From: hrz <1710360675@qq.com> Date: Tue, 8 Apr 2025 09:17:58 +0800 Subject: [PATCH] =?UTF-8?q?udate:=E4=BC=98=E5=8C=96=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=20(#701)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/xiaozhi/common/exception/RenExceptionHandler.java | 7 +++++++ .../xiaozhi/modules/device/controller/OTAController.java | 7 +++++++ main/manager-api/src/main/resources/application-dev.yml | 5 +---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/main/manager-api/src/main/java/xiaozhi/common/exception/RenExceptionHandler.java b/main/manager-api/src/main/java/xiaozhi/common/exception/RenExceptionHandler.java index 0f83772e..0d0aa118 100644 --- a/main/manager-api/src/main/java/xiaozhi/common/exception/RenExceptionHandler.java +++ b/main/manager-api/src/main/java/xiaozhi/common/exception/RenExceptionHandler.java @@ -4,6 +4,7 @@ import org.apache.shiro.authz.UnauthorizedException; import org.springframework.dao.DuplicateKeyException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.servlet.resource.NoResourceFoundException; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -53,4 +54,10 @@ public class RenExceptionHandler { return new Result().error(); } + @ExceptionHandler(NoResourceFoundException.class) + public Result handleNoResourceFoundException(NoResourceFoundException ex) { + log.warn("Resource not found: {}", ex.getMessage()); + return new Result().error(404, "资源不存在"); + } + } \ No newline at end of file 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 dab84082..4e3a2a95 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 @@ -5,6 +5,7 @@ import java.nio.charset.StandardCharsets; import org.apache.commons.lang3.StringUtils; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -52,6 +53,12 @@ public class OTAController { return createResponse(deviceService.checkDeviceActive(macAddress, deviceId, clientId, deviceReportReqDTO)); } + @Operation(summary = "获取 OTA 提示信息") + @GetMapping + public ResponseEntity getOTAPrompt() { + return createResponse(DeviceReportRespDTO.createError("请提交正确的ota参数")); + } + @SneakyThrows private ResponseEntity createResponse(DeviceReportRespDTO deviceReportRespDTO) { ObjectMapper objectMapper = new ObjectMapper(); diff --git a/main/manager-api/src/main/resources/application-dev.yml b/main/manager-api/src/main/resources/application-dev.yml index e1671b50..b49b31ca 100644 --- a/main/manager-api/src/main/resources/application-dev.yml +++ b/main/manager-api/src/main/resources/application-dev.yml @@ -27,10 +27,7 @@ spring: test-on-borrow: false test-on-return: false stat-view-servlet: - enabled: true - url-pattern: /druid/* - login-username: admin - login-password: D7Xj810i1C + enabled: false filter: stat: log-slow-sql: true