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

改进Url生成类对域名部署的支持

Browse Source
This commit is contained in:
thinkphp
2016-01-11 10:48:25 +08:00
parent b7e03c8c70
commit 02cf4ac8c0
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Url.php
View File

@@ -101,8 +101,7 @@ class Url
$params[$key] = $val;
}
}
// URL组装
$url = Config::get('base_url') . '/' . $url;
// URL后缀
$suffix = self::parseSuffix($suffix);
// 参数组装
@@ -134,14 +133,17 @@ class Url
$rule = is_array($rule) ? $rule[0] : $rule;
if (false === strpos($key, '*') && 0 === strpos($url, $rule)) {
$domain = $key . strstr($domain, '.'); // 生成对应子域名
$url = substr_replace($url, '', 0, strlen($rule));
break;
}
}
}
}
$url = (self::isSsl() ? 'https://' : 'http://') . $domain . $url;
$domain = (self::isSsl() ? 'https://' : 'http://') . $domain;
} else {
$domain = '';
}
// URL组装
$url = $domain . Config::get('base_url') . '/' . $url;
return $url;
}