|
@@ -12,6 +12,7 @@ import javax.validation.ConstraintViolation;
|
|
import javax.validation.ConstraintViolationException;
|
|
import javax.validation.ConstraintViolationException;
|
|
import javax.validation.ValidationException;
|
|
import javax.validation.ValidationException;
|
|
|
|
|
|
|
|
+import com.chelvc.framework.base.context.ApplicationContextHolder;
|
|
import com.chelvc.framework.base.context.LoggingContextHolder;
|
|
import com.chelvc.framework.base.context.LoggingContextHolder;
|
|
import com.chelvc.framework.base.context.SessionContextHolder;
|
|
import com.chelvc.framework.base.context.SessionContextHolder;
|
|
import com.chelvc.framework.common.exception.FrameworkException;
|
|
import com.chelvc.framework.common.exception.FrameworkException;
|
|
@@ -190,7 +191,10 @@ public class GlobalExceptionInterceptor extends AbstractErrorController {
|
|
code = ((FrameworkException) e).getCode();
|
|
code = ((FrameworkException) e).getCode();
|
|
data = ((FrameworkException) e).getData();
|
|
data = ((FrameworkException) e).getData();
|
|
}
|
|
}
|
|
- return Objects.equals(code, Result.ERROR) ? Result.failure() : Result.of(code, data, e.getMessage());
|
|
|
|
|
|
+ if (Objects.equals(code, Result.ERROR)) {
|
|
|
|
+ return Result.failure(ApplicationContextHolder.getMessage("Failure"));
|
|
|
|
+ }
|
|
|
|
+ return Result.of(code, data, e.getMessage());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -208,7 +212,7 @@ public class GlobalExceptionInterceptor extends AbstractErrorController {
|
|
String method = request.getMethod();
|
|
String method = request.getMethod();
|
|
String message = (String) attributes.get("message");
|
|
String message = (String) attributes.get("message");
|
|
log.warn(LoggingContextHolder.message(uri, method, message));
|
|
log.warn(LoggingContextHolder.message(uri, method, message));
|
|
- Result<?> result = status.is5xxServerError() ? Result.failure() :
|
|
|
|
|
|
+ Result<?> result = status.is5xxServerError() ? Result.failure(ApplicationContextHolder.getMessage("Failure")) :
|
|
Result.of(status.name(), null, status.getReasonPhrase());
|
|
Result.of(status.name(), null, status.getReasonPhrase());
|
|
response.setStatus(SessionContextHolder.result2status(result).value());
|
|
response.setStatus(SessionContextHolder.result2status(result).value());
|
|
return result;
|
|
return result;
|