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

改进路由到类的方法的地址写法

Browse Source
This commit is contained in:
thinkphp
2016-06-07 18:46:07 +08:00
parent 451e7f0dda
commit 0b2359e856
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/Route.php
View File

@@ -1041,7 +1041,8 @@ class Route
$result = ['type' => 'redirect', 'url' => $url, 'status' => (is_array($route) && isset($route[1])) ? $route[1] : 301]; $result = ['type' => 'redirect', 'url' => $url, 'status' => (is_array($route) && isset($route[1])) ? $route[1] : 301];
} elseif (0 === strpos($url, '\\')) { } elseif (0 === strpos($url, '\\')) {
// 路由到方法 // 路由到方法
$result = ['type' => 'method', 'method' => is_array($route) ? [$url, $route[1]] : $url, 'params' => $matches]; $method = strpos($url, '@') ? explode('@', $url) : $url;
$result = ['type' => 'method', 'method' => $method, 'params' => $matches];
} elseif (0 === strpos($url, '@')) { } elseif (0 === strpos($url, '@')) {
// 路由到控制器 // 路由到控制器
$result = ['type' => 'controller', 'controller' => substr($url, 1), 'params' => $matches]; $result = ['type' => 'controller', 'controller' => substr($url, 1), 'params' => $matches];

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

@@ -145,6 +145,7 @@ class Handle
// 不显示详细错误信息 // 不显示详细错误信息
$data['message'] = Config::get('error_message'); $data['message'] = Config::get('error_message');
} }
//保留一层 //保留一层
while (ob_get_level() > 1) { while (ob_get_level() > 1) {
ob_end_clean(); ob_end_clean();
@@ -154,8 +155,7 @@ class Handle
extract($data); extract($data);
include Config::get('exception_tmpl'); include Config::get('exception_tmpl');
// 获取并清空缓存 // 获取并清空缓存
$content = ob_get_clean(); $content = ob_get_clean();
$response = new Response($content, 'html'); $response = new Response($content, 'html');
if ($exception instanceof HttpException) { if ($exception instanceof HttpException) {
@@ -167,7 +167,6 @@ class Handle
$statusCode = 500; $statusCode = 500;
} }
$response->code($statusCode); $response->code($statusCode);
return $response; return $response;
} }