mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 07:12:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善think\exception\Handle类

Browse Source
This commit is contained in:
yunwuxin
2016-06-21 12:29:28 +08:00
parent 1cb77502a0
commit 4908633e05
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/exception/Handle.php
View File

@@ -44,13 +44,13 @@ class Handle
'message' => $this->getMessage($exception), 'message' => $this->getMessage($exception),
'code' => $this->getCode($exception), 'code' => $this->getCode($exception),
]; ];
$log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]"; $log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
} else { } else {
$data = [ $data = [
'code' => $this->getCode($exception), 'code' => $this->getCode($exception),
'message' => $this->getMessage($exception), 'message' => $this->getMessage($exception),
]; ];
$log = "[{$data['code']}]{$data['message']}"; $log = "[{$data['code']}]{$data['message']}";
} }
Log::record($log, 'error'); Log::record($log, 'error');
@@ -142,7 +142,7 @@ class Handle
// 部署模式仅显示 Code 和 Message // 部署模式仅显示 Code 和 Message
$data = [ $data = [
'code' => $this->getCode($exception), 'code' => $this->getCode($exception),
'message' => $this->getMessage($exception), 'message' => $this->getMessage($exception),
]; ];
if (!Config::get('show_error_msg')) { if (!Config::get('show_error_msg')) {
@@ -165,7 +165,7 @@ class Handle
if ($exception instanceof HttpException) { if ($exception instanceof HttpException) {
$statusCode = $exception->getStatusCode(); $statusCode = $exception->getStatusCode();
//TODO 设置headers 等待response完善 $response->header($exception->getHeaders());
} }
if (!isset($statusCode)) { if (!isset($statusCode)) {
@@ -198,7 +198,7 @@ class Handle
*/ */
protected function getMessage(Exception $exception) protected function getMessage(Exception $exception)
{ {
$message = $exception->getMessage(); $message = $exception->getMessage();
if (IS_CLI) { if (IS_CLI) {
return $message; return $message;
} }
@@ -206,9 +206,9 @@ class Handle
if (!Config::get('lang_switch_on')) { if (!Config::get('lang_switch_on')) {
Lang::load(THINK_PATH . 'lang' . DS . Lang::detect() . EXT); Lang::load(THINK_PATH . 'lang' . DS . Lang::detect() . EXT);
} }
if (strpos($message,':')) { if (strpos($message, ':')) {
$name = strstr($message, ':', true); $name = strstr($message, ':', true);
return Lang::has($name) ? Lang::get($name) . ' ' . strstr($message, ':') : $message; return Lang::has($name) ? Lang::get($name) . ' ' . strstr($message, ':') : $message;
} else { } else {
return Lang::has($message) ? Lang::get($message) : $message; return Lang::has($message) ? Lang::get($message) : $message;