From 9ac984d56c94118c82caca8ad01f023d018e7018 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Tue, 23 Aug 2016 14:47:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Route=E7=B1=BB=E7=9A=84domain?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/Route.php | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/library/think/Route.php b/library/think/Route.php index 76d06a74..7fac6027 100644 --- a/library/think/Route.php +++ b/library/think/Route.php @@ -101,23 +101,22 @@ class Route foreach ($domain as $key => $item) { self::domain($key, $item, $option, $pattern); } + } elseif ($rule instanceof \Closure) { + // 执行闭包 + self::setDomain($domain); + call_user_func_array($rule, []); + self::setDomain(null); + } elseif (is_array($rule)) { + self::setDomain($domain); + self::group('', function () use ($rule) { + // 动态注册域名的路由规则 + self::registerRules($rule); + }, $option, $pattern); + self::setDomain(null); } else { - if ($rule instanceof \Closure) { - // 执行闭包 - self::setDomain($domain); - call_user_func_array($rule, []); - self::setDomain(null); - } elseif (is_array($rule)) { - self::setDomain($domain); - self::group('', function () use ($rule) { - // 动态注册域名的路由规则 - self::registerRules($rule); - }, $option, $pattern); - self::setDomain(null); - } else { - self::$rules['domain'][$domain]['[bind]'] = [$rule, $option, $pattern]; - } + self::$rules['domain'][$domain]['[bind]'] = [$rule, $option, $pattern]; } + } private static function setDomain($domain)