|
@@ -14,40 +14,38 @@ class ExceptionHandle extends Handle
|
|
|
|
|
|
public function render(Exception $e)
|
|
|
{
|
|
|
+ return parent::render($e);
|
|
|
+
|
|
|
|
|
|
- if (!\think\Config::get('api_exception')) {
|
|
|
- $statuscode = $code = 500;
|
|
|
+ $statuscode = $code = 500;
|
|
|
+ $msg = $e->getMessage();
|
|
|
+
|
|
|
+ if ($e instanceof \think\exception\ValidateException) {
|
|
|
+ $code = 0;
|
|
|
+ $statuscode = 200;
|
|
|
+ $msg = $e->getError();
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($e instanceof \think\exception\HttpException) {
|
|
|
+ $statuscode = $code = $e->getStatusCode();
|
|
|
$msg = $e->getMessage();
|
|
|
-
|
|
|
- if ($e instanceof \think\exception\ValidateException) {
|
|
|
- $code = 0;
|
|
|
- $statuscode = 200;
|
|
|
- $msg = $e->getError();
|
|
|
- }
|
|
|
-
|
|
|
- if ($e instanceof \think\exception\HttpException) {
|
|
|
- $statuscode = $code = $e->getStatusCode();
|
|
|
- $msg = $e->getMessage();
|
|
|
- }
|
|
|
+ }
|
|
|
|
|
|
- $result = ['code' => $code, 'msg' => $msg, 'time' => time(), 'data' => null];
|
|
|
-
|
|
|
- if (defined('API_REQUEST_LOG_TYPE') && defined('API_REQUEST_LOG_TYPE') == 1){
|
|
|
- LogUtil::error('result','Api-Middleware-Log','request_log',$result);
|
|
|
- LogUtil::error('ExceptionMsg','Api-Middleware-Log','request_log',$e->getMessage());
|
|
|
- LogUtil::error('Exception','Api-Middleware-Log','request_log',$e);
|
|
|
- }else{
|
|
|
-
|
|
|
- if(defined('API_REQUEST_ID')) {
|
|
|
- db('api_request_log')->where('id',API_REQUEST_ID)->update(['result'=>json_encode($result)]);
|
|
|
- }
|
|
|
+ $result = ['code' => $code, 'msg' => $msg, 'time' => time(), 'data' => null];
|
|
|
+
|
|
|
+ if (defined('API_REQUEST_LOG_TYPE') && defined('API_REQUEST_LOG_TYPE') == 1){
|
|
|
+ LogUtil::error('result','Api-Middleware-Log','request_log',$result);
|
|
|
+ LogUtil::error('ExceptionMsg','Api-Middleware-Log','request_log',$e->getMessage());
|
|
|
+ LogUtil::error('Exception','Api-Middleware-Log','request_log',$e);
|
|
|
+ }else{
|
|
|
+
|
|
|
+ if(defined('API_REQUEST_ID')) {
|
|
|
+ db('api_request_log')->where('id',API_REQUEST_ID)->update(['result'=>json_encode($result)]);
|
|
|
}
|
|
|
- $result['msg'] = '网络开小差了';
|
|
|
- return json($result, $statuscode);
|
|
|
}
|
|
|
+
|
|
|
+ return json($result, $statuscode);
|
|
|
|
|
|
-
|
|
|
- return parent::render($e);
|
|
|
}
|
|
|
|
|
|
}
|