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

使用 Response::send 取代 Response::returnData

Browse Source
This commit is contained in:
7IN0SAN9
2015-12-25 14:43:26 +08:00
parent c19ed0e7f1
commit fe393032dd
1 changed files with 110 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
library/think/error.php
View File

@@ -11,15 +11,13 @@
namespace think; namespace think;
class Error class Error {
{
/** /**
* 自定义异常处理 * 自定义异常处理
* @access public * @access public
* @param mixed $e 异常对象 * @param mixed $e 异常对象
*/ */
public static function appException($e) public static function appException($e) {
{
$error = [ $error = [
'message' => $e->getMessage(), 'message' => $e->getMessage(),
'file' => $e->getFile(), 'file' => $e->getFile(),
@@ -42,8 +40,7 @@ class Error
* @param int $errline 错误行数 * @param int $errline 错误行数
* @return void * @return void
*/ */
public static function appError($errno, $errstr, $errfile, $errline) public static function appError($errno, $errstr, $errfile, $errline) {
{
$errorStr = "[{$errno}] {$errstr} {$errfile} 第 {$errline} 行."; $errorStr = "[{$errno}] {$errstr} {$errfile} 第 {$errline} 行.";
switch ($errno) { switch ($errno) {
case E_USER_ERROR: case E_USER_ERROR:
@@ -62,8 +59,7 @@ class Error
* 应用关闭处理 * 应用关闭处理
* @return void * @return void
*/ */
public static function appShutdown() public static function appShutdown() {
{
// 记录日志 // 记录日志
Log::save(); Log::save();
if ($e = error_get_last()) { if ($e = error_get_last()) {
@@ -86,8 +82,7 @@ class Error
* @param mixed $error 错误 * @param mixed $error 错误
* @param int $code * @param int $code
*/ */
public static function halt($error, $code = 1) public static function halt($error, $code = 1) {
{
$message = is_array($error) ? $error['message'] : $error; $message = is_array($error) ? $error['message'] : $error;
$code = is_array($error) ? $error['code'] : $code; $code = is_array($error) ? $error['code'] : $code;
@@ -127,7 +122,7 @@ class Error
// 异常信息输出监听 // 异常信息输出监听
APP_HOOK && Hook::listen('error_output', $e); APP_HOOK && Hook::listen('error_output', $e);
// 输出异常内容 // 输出异常内容
Response::returnData($e, $type); Response::send($e, $type);
} }
exit; exit;
} }