From a9e3948c9b9af14a373dacb1cb7babdbe9fd0b07 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 16 七月 2021 14:20:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java
index 6e0e1ab..5abcccf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/exceptions/GlobalExceptionCapture.java
@@ -41,7 +41,7 @@
*/
@ExceptionHandler(value = PartyBuildingMemberException.class)
public R PartyBuildingMemberException(PartyBuildingMemberException ex) {
- return R.fail(ex.getCode(),ex.getMsg());
+ return R.fail(ex.getMsg());
}
/**
@@ -89,11 +89,11 @@
/**
*
- * @param ex 数据库异常
+ * @param ex 服务层业务异常
* @return
*/
@ExceptionHandler(value = ServiceException.class)
- public R serviceException(Exception ex) {
+ public R serviceException(ServiceException ex) {
log.error("服务层业务异常【{}】",ex.getMessage());
return R.fail(ex.getMessage());
}
--
Gitblit v1.7.1