From c53c40487ce33f5e96c344f7c552f91c6feceaea Mon Sep 17 00:00:00 2001
From: wuyanwen <wuyanwen@baijiayun.com>
Date: Mon, 6 Jan 2020 17:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/catcher/Code.php                      | 25 ++++++++++----------
 extend/catcher/exceptions/CatchException.php |  2 +-
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/extend/catcher/Code.php b/extend/catcher/Code.php
index 10747e7..4ee596b 100644
--- a/extend/catcher/Code.php
+++ b/extend/catcher/Code.php
@@ -1,13 +1,12 @@
-<?php
-namespace catcher;
-
-class Code
-{
-    public const SUCCESS = 10000; // 成功
-    public const LOST_LOGIN = 10001; //  登录失效
-    public const VALIDATE_FAILED = 10002; // 验证错误
-    public const PERMISSION_FORBIDDEN = 10003; // 权限禁止
-    public const LOGIN_FAILED = 10004; // 登录失败
-    public const FAILED = 10005; // 操作失败
-
-}
+<?php
+namespace catcher;
+
+class Code
+{
+    public const SUCCESS = 10000; // 成功
+    public const LOST_LOGIN = 10001; //  登录失效
+    public const VALIDATE_FAILED = 10002; // 验证错误
+    public const PERMISSION_FORBIDDEN = 10003; // 权限禁止
+    public const LOGIN_FAILED = 10004; // 登录失败
+    public const FAILED = 10005; // 操作失败
+}
diff --git a/extend/catcher/exceptions/CatchException.php b/extend/catcher/exceptions/CatchException.php
index 52bdb19..1f8579c 100644
--- a/extend/catcher/exceptions/CatchException.php
+++ b/extend/catcher/exceptions/CatchException.php
@@ -10,7 +10,7 @@ abstract class CatchException extends HttpException
 
     public function __construct(string $message = '', int $code = 0, Exception $previous = null, array $headers = [], $statusCode = 0)
     {
-        parent::__construct($statusCode, $message, $previous, $headers, $code);
+        parent::__construct($statusCode, $message ? : $this->getMessage(), $previous, $headers, $code);
     }
 
     public function getStatusCode()