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

改进路由的域名绑定

Browse Source
This commit is contained in:
thinkphp
2016-01-07 08:49:26 +08:00
parent e6769749b5
commit f19b82ae10
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/think/App.php
View File

@@ -93,9 +93,9 @@ class App
// 模块/控制器/操作
$data = self::module(self::$dispatch['data'], self::$dispatch['bind'], $config);
break;
case 'action':
// 执行操作
$data = Loader::action(self::$dispatch['action'], self::$dispatch['params']);
case 'controller':
// 执行控制器操作
$data = Loader::action(self::$dispatch['controller'], self::$dispatch['params']);
break;
case 'class':
// 执行类，例如行为
@@ -154,14 +154,9 @@ class App
}
// 执行 模块/控制器/操作
private static function module($result, $bind, $config)
private static function module($result, $config)
{
if (APP_MULTI_MODULE) {
if (!empty($bind)) {
(!defined('BIND_MODULE') && !empty($bind[0])) && define('BIND_MODULE', $bind[0]);
(!defined('BIND_CONTROLLER') && !empty($bind[1])) && define('BIND_CONTROLLER', $bind[1]);
(!defined('BIND_ACTION') && !empty($bind[2])) && define('BIND_ACTION', $bind[2]);
}
// 多模块部署
$module = strtolower($result[0] ?: $config['default_module']);
if ($maps = $config['url_module_map']) {

36
library/think/Route.php
View File

@@ -69,6 +69,16 @@ class Route
}
}
// 对路由进行绑定和获取绑定信息
public static function bind($type, $bind = '')
{
if ('' == $bind) {
return isset(self::$bind[$type]) ? self::$bind[$type] : null;
} else {
self::$bind = ['type' => $type, $type => $bind];
}
}
// 注册路由规则
public static function register($rule, $route = '', $type = '*', $option = [], $pattern = [])
{
@@ -124,12 +134,6 @@ class Route
}
}
// 对路由进行绑定
public static function bind($type, $bind)
{
self::$bind[$type] = $bind;
}
// 路由分组
public static function group($name, $routes = [], $type = '*', $option = [], $pattern = [])
{
@@ -467,6 +471,10 @@ class Route
// 解析模块的URL地址 [模块/控制器/操作?]参数1=值1&参数2=值2...
public static function parseUrl($url, $depr = '/')
{
if (isset(self::$bind['module'])) {
// 如果有模块/控制器绑定 针对路由到 模块/控制器 有效
$url = self::$bind['module'] . '/' . $url;
}
// 分隔符替换 确保路由定义使用统一的分隔符
if ('/' != $depr) {
$url = str_replace($depr, '/', $url);
@@ -475,7 +483,7 @@ class Route
if (!empty($result['var'])) {
$_GET = array_merge($result['var'], $_GET);
}
return ['type' => 'module', 'data' => $result['route'], 'bind' => self::$bind];
return ['type' => 'module', 'data' => $result['route']];
}
// 解析规范的路由地址
@@ -563,12 +571,11 @@ class Route
// 解析规则路由
// '路由规则'=>'[控制器/操作]?额外参数1=值1&额外参数2=值2...'
// '路由规则'=> ['[控制器/操作]','额外参数1=值1&额外参数2=值2...']
// '路由规则'=>'外部地址'
// '路由规则'=>['外部地址','重定向代码']
// 路由规则中 :开头 表示动态变量
// 外部地址中可以用动态变量 采用 :1 :2 的方式
// 'news/:month/:day/:id'=>['News/read?cate=1','status=1'],
// 'news/:month/:day/:id'=>'News/read?cate=1&status=1',
// 'new/:id'=>['/new.php?id=:1',301], 重定向
private static function parseRule($rule, $route, $pathinfo)
{
@@ -618,7 +625,7 @@ class Route
$result = ['type' => 'class', 'class' => $url, 'method' => isset($route[1]) ? $route[1] : '', 'params' => $matches];
} elseif (0 === strpos($url, '@')) {
// 路由到控制器
$result = ['type' => 'action', 'action' => substr($url, 1), 'params' => $matches];
$result = ['type' => 'controller', 'controller' => substr($url, 1), 'params' => $matches];
} else {
// 解析路由地址
$result = self::parseRoute($url);
@@ -633,18 +640,17 @@ class Route
$var = array_merge($matches, $var);
// 解析剩余的URL参数
self::parseUrlParams(implode('/', $paths), $var);
$result = ['type' => 'module', 'data' => $result['route'], 'bind' => self::$bind];
$result = ['type' => 'module', 'data' => $result['route']];
}
return $result;
}
// 解析正则路由
// '路由正则'=>'[控制器/操作]?参数1=值1&参数2=值2...'
// '路由正则'=>['[控制器/操作]?参数1=值1&参数2=值2...','额外参数1=值1&额外参数2=值2...']
// '路由正则'=>'外部地址'
// '路由正则'=>['外部地址','重定向代码']
// 参数值和外部地址中可以用动态变量 采用 :1 :2 的方式
// '/new\/(\d+)\/(\d+)/'=>['News/read?id=:1&page=:2&cate=1','status=1'],
// '/new\/(\d+)\/(\d+)/'=>'News/read?id=:1&page=:2&cate=1&status=1',
// '/new\/(\d+)/'=>['/new.php?id=:1&page=:2&status=1','301'], 重定向
private static function parseRegex($matches, $route, $pathinfo)
{
@@ -659,7 +665,7 @@ class Route
$result = ['type' => 'class', 'class' => $url, 'method' => isset($route[1]) ? $route[1] : '', 'params' => $matches];
} elseif (0 === strpos($url, '@')) {
// 路由到控制器
$result = ['type' => 'action', 'action' => substr($url, 1), 'params' => $matches];
$result = ['type' => 'controller', 'controller' => substr($url, 1), 'params' => $matches];
} else {
// 解析路由地址
$result = self::parseRoute($url);
@@ -667,7 +673,7 @@ class Route
// 解析剩余的URL参数
$regx = substr_replace($pathinfo, '', 0, strlen($matches[0]));
self::parseUrlParams($regx, $var);
$result = ['type' => 'module', 'data' => $result['route'], 'bind' => self::$bind];
$result = ['type' => 'module', 'data' => $result['route']];
}
return $result;
}