This commit is contained in:
thinkphp
2016-10-26 12:10:35 +08:00
parent 087e968b80
commit 82b94b555f
3 changed files with 12 additions and 10 deletions

View File

@@ -277,7 +277,7 @@ if (!function_exists('url')) {
* @param bool|string $domain 域名 * @param bool|string $domain 域名
* @return string * @return string
*/ */
function url($url = '', $vars = '', $suffix = true, $domain = true) function url($url = '', $vars = '', $suffix = true, $domain = false)
{ {
return Url::build($url, $vars, $suffix, $domain); return Url::build($url, $vars, $suffix, $domain);
} }

View File

@@ -30,8 +30,11 @@ class Url
* @param boolean|string $domain 是否显示域名 或者直接传入域名 * @param boolean|string $domain 是否显示域名 或者直接传入域名
* @return string * @return string
*/ */
public static function build($url = '', $vars = '', $suffix = true, $domain = true) public static function build($url = '', $vars = '', $suffix = true, $domain = false)
{ {
if (false === $domain && Route::rules('domain')) {
$domain = true;
}
// 解析URL // 解析URL
if (0 === strpos($url, '[') && $pos = strpos($url, ']')) { if (0 === strpos($url, '[') && $pos = strpos($url, ']')) {
// [name] 表示使用路由命名标识生成URL // [name] 表示使用路由命名标识生成URL
@@ -194,7 +197,6 @@ class Url
self::$bindCheck = true; self::$bindCheck = true;
$url = substr($url, $pos[$domain]); $url = substr($url, $pos[$domain]);
} }
} elseif ($domain) { } elseif ($domain) {
if (isset($domains[$domain]['[bind]'][0])) { if (isset($domains[$domain]['[bind]'][0])) {
$bindModule = $domains[$domain]['[bind]'][0]; $bindModule = $domains[$domain]['[bind]'][0];

View File

@@ -25,13 +25,13 @@ class urlTest extends \PHPUnit_Framework_TestCase
public function setUp() public function setUp()
{ {
Route::rules(['GET' => [], Route::rules(['get' => [],
'POST' => [], 'post' => [],
'PUT' => [], 'put' => [],
'DELETE' => [], 'delete' => [],
'PATCH' => [], 'patch' => [],
'HEAD' => [], 'head' => [],
'OPTIONS' => [], 'options' => [],
'*' => [], '*' => [],
'alias' => [], 'alias' => [],
'domain' => [], 'domain' => [],