Permalink
Browse files

fix: route checking

  • Loading branch information...
HFO4 committed Dec 22, 2018
1 parent 6b4f999 commit 68399a58777bb330f7c2aed4af2126e753dae033
Showing with 5 additions and 4 deletions.
  1. +5 −4 thinkphp/library/think/App.php
@@ -372,7 +372,11 @@ public static function module($result, $config, $convert = null)
// 获取控制器名
$controller = strip_tags($result[1] ?: $config['default_controller']);
$controller = $convert ? strtolower($controller) : $controller;
if (!preg_match('/^[A-Za-z](\w|\.)*$/', $controller)) {
throw new HttpException(404, 'controller not exists:' . $controller);
}
// 获取操作名
$actionName = strip_tags($result[2] ?: $config['default_action']);
$actionName = $convert ? strtolower($actionName) : $actionName;
@@ -551,9 +555,6 @@ public static function routeCheck($request, array $config)
if (is_file(CONF_PATH . $file . CONF_EXT)) {
// 导入路由配置
$rules = include CONF_PATH . $file . CONF_EXT;
if (!preg_match('/^[A-Za-z](\w|\.)*$/', $controller)) {
throw new HttpException(404, 'controller not exists:' . $controller);
}
if (is_array($rules)) {
Route::import($rules);
}

0 comments on commit 68399a5

Please sign in to comment.