Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java
This commit is contained in:
张松
2025-02-10 15:45:17 +08:00
46 changed files with 1422 additions and 21 deletions

View File

@@ -1,5 +1,7 @@
package com.czg.exception;
import cn.dev33.satoken.exception.NotPermissionException;
import cn.hutool.core.exceptions.ValidateException;
import cn.dev33.satoken.exception.NotPermissionException;
import com.czg.resp.CzgRespCode;
import com.czg.resp.CzgResult;
@@ -48,6 +50,30 @@ public class CzgControllerAdvice {
return CzgResult.failure(CzgRespCode.PARAM_ERROR.getCode(), message);
}
/**
* 处理自定义异常
*/
@ExceptionHandler(value = {CzgException.class, IllegalArgumentException.class})
public CzgResult handleCzgException(CzgException ex) {
return CzgResult.failure(ex.getCode(), ex.getMsg());
}
/**
* 处理Hutool的断言抛出异常
*/
@ExceptionHandler(IllegalArgumentException.class)
public CzgResult handleAssertException(IllegalArgumentException ex) {
return CzgResult.failure(CzgRespCode.PARAM_ERROR.getCode(), ex.getMessage());
}
/**
* 处理Hutool的校验工具类抛出异常
*/
@ExceptionHandler(ValidateException.class)
public CzgResult handleHutoolValidateException(ValidateException ex) {
return CzgResult.failure(CzgRespCode.PARAM_ERROR.getCode(), ex.getMessage());
}
private void setErrorLog(Exception ex) {
log.error(ex.getMessage());
}