Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/application.yml
This commit is contained in:
longbinbin
2024-12-05 18:07:46 +08:00
62 changed files with 2468 additions and 154 deletions

View File

@ -1,6 +1,6 @@
package com.ycwl.basic.exception;
import com.ycwl.basic.enums.AppStatesCodeEnum;
import com.ycwl.basic.enums.BizCodeEnum;
import lombok.Data;
/**
@ -19,9 +19,14 @@ public class AppException extends RuntimeException {
this.msg = message;
}
public AppException(AppStatesCodeEnum mobileCodeEnum) {
public AppException(BizCodeEnum mobileCodeEnum) {
super(mobileCodeEnum.getMessage());
this.code = mobileCodeEnum.getCode();
this.msg = mobileCodeEnum.getMessage();
}
public AppException(BizCodeEnum mobileCodeEnum, String msg) {
this.code = mobileCodeEnum.getCode();
this.msg = msg;
}
}

View File

@ -59,7 +59,7 @@ public class CustomExceptionHandle {
@ExceptionHandler(value = Exception.class)
public ApiResponse<String> handle(Exception e) {
LOGGER.error("系统异常 -> {}", e.getMessage(), e);
return ApiResponse.buildResult(BizCodeEnum.UNKNOWN_MISTAKE);
return ApiResponse.buildResult(BizCodeEnum.SERVER_UNKONWN_ERROR);
}
/**