Merge pull request #40 from shuipf/master

优化parseDomain
This commit is contained in:
ThinkPHP
2016-04-26 12:01:02 +08:00

View File

@@ -148,13 +148,23 @@ class Url
// 自动判断域名
$domain = $_SERVER['HTTP_HOST'];
if (Config::get('url_domain_deploy')) {
// 开启子域名部署
$domain = $_SERVER['HTTP_HOST'];
// 根域名
$urlDomainRoot = Config::get('url_domain_root');
foreach (Route::domain() as $key => $rule) {
$rule = is_array($rule) ? $rule[0] : $rule;
if (false === strpos($key, '*') && 0 === strpos($url, $rule)) {
$url = ltrim($url, $rule);
$domain = $key . strstr($domain, '.'); // 生成对应子域名
$domain = $key;
// 生成对应子域名
if(!empty($urlDomainRoot)){
$domain .= $urlDomainRoot;
}
break;
}else if(false !== strpos($key, '*')){
$domain = str_replace('*',strstr($domain,'.',true),$key);
if(!empty($urlDomainRoot)){
$domain .= $urlDomainRoot;
}
break;
}
}