From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
framework/src/main/java/com/yuanchu/mom/handler/GlobalExceptionHandler.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/framework/src/main/java/com/yuanchu/mom/handler/GlobalExceptionHandler.java b/framework/src/main/java/com/yuanchu/mom/handler/GlobalExceptionHandler.java
index fe92f7e..3c7a631 100644
--- a/framework/src/main/java/com/yuanchu/mom/handler/GlobalExceptionHandler.java
+++ b/framework/src/main/java/com/yuanchu/mom/handler/GlobalExceptionHandler.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.handler;
+import com.yuanchu.mom.exception.ErrorException;
import com.yuanchu.mom.exception.MyFileException;
import com.yuanchu.mom.vo.Result;
import lombok.extern.slf4j.Slf4j;
@@ -182,7 +183,7 @@
public Result<?> requestNotReadable(HttpMessageNotReadableException e) {
e.printStackTrace();
response.setStatus(201);
- return Result.fail("Http娑堟伅涓嶅彲璇�");
+ return Result.fail("鍙傛暟浼犻�掗敊璇�");
}
/**
@@ -255,6 +256,7 @@
}else {
msg="鏂囦欢涓婁紶澶辫触銆愭湇鍔″櫒寮傚父銆�";
}
+ e.printStackTrace();
return Result.fail(msg);
}
@@ -264,6 +266,12 @@
return Result.fail("鎶辨瓑涓嶆敮鎸併��" + e.getMessage() +"銆戝悗缂�鐨勬枃浠讹紒");
}
+ @ExceptionHandler({ErrorException.class})
+ public Result<?> errorException(Exception e) {
+ log.error(e.getMessage());
+ return Result.fail(e.getMessage());
+ }
+
/** 鍏朵粬閿欒 */
/**
* 鍏朵粬閿欒
--
Gitblit v1.9.3