Merge remote-tracking branch 'origin/master'

This commit is contained in:
Tankaikai
2025-02-12 09:50:51 +08:00
10 changed files with 197 additions and 185 deletions

View File

@@ -32,8 +32,8 @@ public class CacheConfig {
.serializeKeysWith(org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
// 设置值的序列化方式,使用 Fastjson2 序列化
.serializeValuesWith(org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair.fromSerializer(fastJson2RedisSerializer))
// 设置缓存过期时间为 30 分钟
.entryTtl(Duration.ofMinutes(30));
// 设置缓存过期时间为 120 分钟
.entryTtl(Duration.ofMinutes(120));
// 创建 Redis 缓存管理器
return RedisCacheManager.builder(redisConnectionFactory)

View File

@@ -5,10 +5,12 @@ import cn.dev33.satoken.exception.NotPermissionException;
import cn.hutool.core.exceptions.ValidateException;
import com.czg.resp.CzgRespCode;
import com.czg.resp.CzgResult;
import com.fasterxml.jackson.databind.exc.InvalidFormatException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.context.support.DefaultMessageSourceResolvable;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.http.HttpStatus;
import org.springframework.http.converter.HttpMessageNotReadableException;
import org.springframework.validation.ObjectError;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -30,6 +32,7 @@ public class CzgControllerAdvice {
@ResponseStatus(HttpStatus.OK)
public CzgResult<Object> errorHandler(Exception ex) {
setErrorLog(ex);
log.error("", ex);
return CzgResult.failure(CzgRespCode.SYSTEM_ERROR);
}
@@ -38,7 +41,15 @@ public class CzgControllerAdvice {
@ResponseStatus(HttpStatus.OK)
public CzgResult<Object> notLoginErrorHandler(NotLoginException ex) {
setErrorLog(ex);
return CzgResult.failure(CzgRespCode.NOT_LOGIN);
return CzgResult.failure(CzgRespCode.NOT_LOGIN + ":" + ex.getMessage());
}
@ResponseBody
@ExceptionHandler(value = HttpMessageNotReadableException.class)
@ResponseStatus(HttpStatus.OK)
public CzgResult<Object> invalidFormatExceptionErrorHandler(HttpMessageNotReadableException ex) {
setErrorLog(ex);
return CzgResult.failure(ex.getRootCause() == null ? ex.getMessage() : ex.getRootCause().getMessage());
}
@ResponseBody
@@ -79,12 +90,13 @@ public class CzgControllerAdvice {
* 处理Hutool的校验工具类抛出异常
*/
@ExceptionHandler(ValidateException.class)
public CzgResult<Object> handleHutoolValidateException(ValidateException ex) {
public CzgResult<Object> handleValidateException(ValidateException ex) {
return CzgResult.failure(CzgRespCode.PARAM_ERROR.getCode(), ex.getMessage());
}
@ExceptionHandler(DuplicateKeyException.class)
public CzgResult handleDuplicateKeyException(DuplicateKeyException ex) {
public CzgResult<Object> handleDuplicateKeyException(DuplicateKeyException ex) {
setErrorLog(ex);
return CzgResult.failure(CzgRespCode.RECORD_EXISTED);
}