diff --git a/base.php b/base.php index d084f86d..61552823 100644 --- a/base.php +++ b/base.php @@ -51,7 +51,7 @@ define('IS_WIN', strstr(PHP_OS, 'WIN') ? 1 : 0); define('IS_CLI', PHP_SAPI == 'cli' ? 1 : 0); define('IS_AJAX', (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest') ? true : false); define('NOW_TIME', $_SERVER['REQUEST_TIME_FLOAT']); -define('REQUEST_METHOD', IS_CLI ? '' : $_SERVER['REQUEST_METHOD']); +define('REQUEST_METHOD', IS_CLI ? 'GET' : $_SERVER['REQUEST_METHOD']); define('IS_GET', REQUEST_METHOD == 'GET' ? true : false); define('IS_POST', REQUEST_METHOD == 'POST' ? true : false); define('IS_PUT', REQUEST_METHOD == 'PUT' ? true : false); diff --git a/library/think/route.php b/library/think/route.php index 45834d28..4bf7b327 100644 --- a/library/think/route.php +++ b/library/think/route.php @@ -237,11 +237,11 @@ class Route } // 获取当前请求类型的路由规则 - $rules = isset(self::$rules[REQUEST_METHOD]) ? self::$rules[REQUEST_METHOD] : []; + $rules = self::$rules[REQUEST_METHOD]; if (!empty(self::$rules['*'])) { // 合并任意请求的路由规则 - $rules = array_merge(self::$rules['*'], (array) $rules); + $rules = array_merge(self::$rules['*'], $rules); } // 路由规则检测 if (!empty($rules)) {