|
@@ -1,13 +1,13 @@
|
|
package com.dragoninfo.dcuc.authweb.exception;
|
|
package com.dragoninfo.dcuc.authweb.exception;
|
|
|
|
|
|
|
|
|
|
-import com.dragoninfo.dcuc.common.enums.ErrorCode;
|
|
|
|
-import com.dragoninfo.dcuc.common.enums.HttpCode;
|
|
|
|
|
|
+import com.dragoninfo.dcuc.common.enums.ErrorCodeEnum;
|
|
import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
|
|
import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
|
|
import com.dragonsoft.duceap.commons.util.json.JsonUtils;
|
|
import com.dragonsoft.duceap.commons.util.json.JsonUtils;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.core.annotation.Order;
|
|
import org.springframework.core.annotation.Order;
|
|
|
|
+import org.springframework.http.HttpStatus;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.validation.BindException;
|
|
import org.springframework.validation.BindException;
|
|
import org.springframework.validation.FieldError;
|
|
import org.springframework.validation.FieldError;
|
|
@@ -45,16 +45,16 @@ public class RespExceptionHandler implements HandlerExceptionResolver {
|
|
PrintWriter writer = response.getWriter();
|
|
PrintWriter writer = response.getWriter();
|
|
ResponseStatus fail = null;
|
|
ResponseStatus fail = null;
|
|
if (ex instanceof ConstraintViolationException) {
|
|
if (ex instanceof ConstraintViolationException) {
|
|
- response.setStatus(HttpCode.PARAM_VERIFY_ERROR.getCode());
|
|
|
|
- fail = new ResponseStatus(String.valueOf(ErrorCode.ERROR_PARAMS_VERIFY.getCode()), String.format(ErrorCode.ERROR_PARAMS_VERIFY.getMsg(), ex.getMessage()));
|
|
|
|
|
|
+ response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
|
|
|
|
+ fail = new ResponseStatus(String.valueOf(ErrorCodeEnum.REQUEST_PARAM.getValue()), String.format(ErrorCodeEnum.REQUEST_PARAM.getLabel(), ex.getMessage()));
|
|
} else if (ex instanceof MethodArgumentNotValidException) {
|
|
} else if (ex instanceof MethodArgumentNotValidException) {
|
|
- response.setStatus(HttpCode.PARAM_VERIFY_ERROR.getCode());
|
|
|
|
|
|
+ response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
|
|
String msg = getValidMessage((MethodArgumentNotValidException) ex);
|
|
String msg = getValidMessage((MethodArgumentNotValidException) ex);
|
|
- fail = new ResponseStatus(String.valueOf(ErrorCode.ERROR_PARAMS_VERIFY.getCode()), String.format(ErrorCode.ERROR_PARAMS_VERIFY.getMsg(), msg));
|
|
|
|
|
|
+ fail = new ResponseStatus(String.valueOf(ErrorCodeEnum.REQUEST_PARAM.getValue()), String.format(ErrorCodeEnum.REQUEST_PARAM.getLabel(), msg));
|
|
} else if (ex instanceof BindException) {
|
|
} else if (ex instanceof BindException) {
|
|
- response.setStatus(HttpCode.PARAM_VERIFY_ERROR.getCode());
|
|
|
|
|
|
+ response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
|
|
String message = Objects.requireNonNull(((BindException) ex).getFieldError()).getDefaultMessage();
|
|
String message = Objects.requireNonNull(((BindException) ex).getFieldError()).getDefaultMessage();
|
|
- fail = new ResponseStatus(String.valueOf(ErrorCode.ERROR_PARAMS_VERIFY.getCode()), String.format(ErrorCode.ERROR_PARAMS_VERIFY.getMsg(), message));
|
|
|
|
|
|
+ fail = new ResponseStatus(String.valueOf(ErrorCodeEnum.REQUEST_PARAM.getValue()), String.format(ErrorCodeEnum.REQUEST_PARAM.getLabel(), message));
|
|
} else {
|
|
} else {
|
|
fail = ResponseStatus.fail("500", "未知异常[" + ex.getMessage() + "]");
|
|
fail = ResponseStatus.fail("500", "未知异常[" + ex.getMessage() + "]");
|
|
}
|
|
}
|