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

优化域名路由检测 去除无用配置

Browse Source
This commit is contained in:
thinkphp
2016-01-05 23:32:40 +08:00
parent 17a692aa20
commit e8291926cc
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
convention.php
View File

@@ -87,8 +87,6 @@ return [
'url_domain_deploy' => false, 'url_domain_deploy' => false,
// 域名根，如.thinkphp.cn // 域名根，如.thinkphp.cn
'url_domain_root' => '', 'url_domain_root' => '',
// 域名部署规则
'url_domain_rules' => [],
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | 视图及模板设置 // | 视图及模板设置

24
library/think/Route.php
View File

@@ -124,6 +124,12 @@ class Route
} }
} }
// 对路由进行绑定
public static function bind($type, $bind)
{
self::$bind[$type] = $bind;
}
// 路由分组 // 路由分组
public static function group($name, $routes = [], $type = '*', $option = [], $pattern = []) public static function group($name, $routes = [], $type = '*', $option = [], $pattern = [])
{ {
@@ -163,8 +169,6 @@ class Route
// 检测子域名部署 // 检测子域名部署
public static function checkDomain() public static function checkDomain()
{ {
// 检测是否开启子域名支持
if(!Config::get('url_domain_deploy')) return;
// 域名规则 // 域名规则
$rules = self::$domain; $rules = self::$domain;
// 开启子域名部署 支持二级和三级域名 // 开启子域名部署 支持二级和三级域名
@@ -173,12 +177,14 @@ class Route
// 完整域名或者IP配置 // 完整域名或者IP配置
$rule = $rules[$_SERVER['HTTP_HOST']]; $rule = $rules[$_SERVER['HTTP_HOST']];
} else { } else {
// 检测是否配置域名根 $rootDomain = Config::get('url_domain_root');
$root = Config::get('url_domain_root'); if ($rootDomain) {
if(empty($root)) return; // 配置域名根 com.cn net.cn 之类的域名需要配置
$domain = explode('.', rtrim(stristr($_SERVER['HTTP_HOST'], $rootDomain, true), '.'));
} else {
$domain = array_slice(explode('.', $_SERVER['HTTP_HOST']), 0, -2);
}
// 子域名配置 // 子域名配置
$domain = rtrim(preg_replace('/'.preg_quote($root).'$/', '', $_SERVER['HTTP_HOST']), '.');
$domain = explode('.', $domain);
if (!empty($domain)) { if (!empty($domain)) {
$subDomain = implode('.', $domain); $subDomain = implode('.', $domain);
$domain2 = array_pop($domain); // 二级域名 $domain2 = array_pop($domain); // 二级域名
@@ -246,10 +252,12 @@ class Route
public static function check($url, $depr = '/') public static function check($url, $depr = '/')
{ {
// 检测域名部署 // 检测域名部署
if (Config::get('url_domain_deploy')) {
self::checkDomain(); self::checkDomain();
}
if (isset(self::$bind['module'])) { if (isset(self::$bind['module'])) {
// 如果有模块/控制器绑定 // 如果有模块/控制器绑定 针对路由到 模块/控制器 有效
$url = implode('/', self::$bind['module']) . '/' . $url; $url = implode('/', self::$bind['module']) . '/' . $url;
} }