diff --git a/src/main/java/com/realtime/protection/configuration/exception/GlobalExceptionHandler.java b/src/main/java/com/realtime/protection/configuration/exception/GlobalExceptionHandler.java index 113b0e9..870f989 100644 --- a/src/main/java/com/realtime/protection/configuration/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/realtime/protection/configuration/exception/GlobalExceptionHandler.java @@ -5,11 +5,13 @@ import cn.dev33.satoken.exception.SaTokenException; import com.realtime.protection.configuration.response.ResponseResult; import com.realtime.protection.configuration.utils.enums.StateEnum; import com.realtime.protection.server.task.status.StateChangeService; +import io.lettuce.core.RedisConnectionException; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.exceptions.PersistenceException; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.core.annotation.Order; import org.springframework.dao.DuplicateKeyException; +import org.springframework.data.redis.RedisConnectionFailureException; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -112,4 +114,11 @@ public class GlobalExceptionHandler { log.error(responseResult.getMessage()); return responseResult; } + + @Order(2) + @ExceptionHandler(value = RedisConnectionFailureException.class) + public ResponseResult handleRedisConnectionException(RedisConnectionFailureException e) { + log.warn("Redis连接失败,具体原因:{}", e.getCause().getMessage()); + return ResponseResult.error().setMessage("Redis连接失败"); + } } diff --git a/src/main/java/com/realtime/protection/server/task/TaskController.java b/src/main/java/com/realtime/protection/server/task/TaskController.java index c520305..5542da2 100644 --- a/src/main/java/com/realtime/protection/server/task/TaskController.java +++ b/src/main/java/com/realtime/protection/server/task/TaskController.java @@ -182,7 +182,7 @@ public class TaskController implements TaskControllerApi { } } if (!errorIds.isEmpty()) { - return new ResponseResult(400, "id or status is invalid") + return ResponseResult.invalid() .setData("tasks_id", errorIds) .setData("success", false); } diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 4dd862a..32da1ea 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -45,6 +45,7 @@ spring: max-idle: 5 min-idle: 1 connect-timeout: 1000 + password: aiihhbfcsy123!@# mybatis: