diff --git a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java index 14a1a010..118c8363 100644 --- a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java +++ b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java @@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.ConstraintViolationException; import java.util.List; +import java.util.stream.Collectors; /** * 异常处理 @@ -112,7 +113,8 @@ public class GlobalControllerExceptionHandler { // protected ResponseEntity handleExceptionInternal(Exception ex, Object body, HttpHeaders headers, HttpStatus status, WebRequest request) { // if (ex instanceof MethodArgumentNotValidException) { // MethodArgumentNotValidException exception = (MethodArgumentNotValidException) ex; -// return new ResponseEntity<>(new ResultUtil<>().setErrorMsg(exception.getBindingResult().getAllErrors().get(0).getDefaultMessage()), status); +// return new ResponseEntity<>(new ResultUtil<>().setErrorMsg(exception.getBindingResult().getAllErrors().get(0).getDefaultMessage()), +// status); // } // if (ex instanceof MethodArgumentTypeMismatchException) { // MethodArgumentTypeMismatchException exception = (MethodArgumentTypeMismatchException) ex; @@ -138,10 +140,18 @@ public class GlobalControllerExceptionHandler { BindException exception = (BindException) e; List fieldErrors = exception.getBindingResult().getFieldErrors(); - for (FieldError error : fieldErrors) { - return ResultUtil.error(ResultCode.PARAMS_ERROR.code(), error.getDefaultMessage()); + // 错误消息处理 + try { + if (!fieldErrors.isEmpty()) { + return ResultUtil.error(ResultCode.PARAMS_ERROR.code(), + fieldErrors.stream() + .map(FieldError::getDefaultMessage) // 获取每个对象的名称字段 + .collect(Collectors.joining(", "))); + } + return ResultUtil.error(ResultCode.PARAMS_ERROR); + } catch (Exception ex) { + return ResultUtil.error(ResultCode.PARAMS_ERROR); } - return ResultUtil.error(ResultCode.PARAMS_ERROR); } /** diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java index 1688f519..00fd28f1 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java @@ -223,7 +223,7 @@ public class AliPayPlugin implements Payment { @Override public void callBack(HttpServletRequest request) { log.info("支付同步回调:"); - callback(request); + checkPaymentResult(request); } @@ -274,9 +274,9 @@ public class AliPayPlugin implements Payment { /** * 验证支付结果 * - * @param request + * @param request 请求 */ - private void callback(HttpServletRequest request) { + private void checkPaymentResult(HttpServletRequest request) { try { AlipayPaymentSetting alipayPaymentSetting = alipayPaymentSetting(); //获取支付宝反馈信息