diff --git a/addons/devteam/view/index/widget.html b/addons/devteam/view/index/widget.html
index 94fa6628..2fdcf797 100644
--- a/addons/devteam/view/index/widget.html
+++ b/addons/devteam/view/index/widget.html
@@ -11,7 +11,7 @@
 				</tr>
 				<tr>
 					<th>产品设计及研发团队</th>
-					<td>郭平平、Colin</td>
+					<td>郭平平</td>
 				</tr>
 				<tr>
 					<th>界面及用户体验团队</th>
diff --git a/addons/syslogin/Syslogin.php b/addons/syslogin/Syslogin.php
index 4dd3c455..d197b2f6 100644
--- a/addons/syslogin/Syslogin.php
+++ b/addons/syslogin/Syslogin.php
@@ -27,7 +27,7 @@ class Syslogin extends Addons{
         'version'=>'0.1'
     );
 
-    public function loginBottom(){
+    public function loginBottomAddon(){
 
     }
 
diff --git a/application/common/view/default/ad/sider.html b/application/common/view/default/ad/sider.html
deleted file mode 100644
index 40bef426..00000000
--- a/application/common/view/default/ad/sider.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="banner">
-	<ul>
-		{volist name="ad" id="item"}
-		<li style="background:{$item['bgcolor']|default='#95FCBD'};" title="{$item['title']}">
-			<div class="body">
-				<div class="content">{$item['content']}</div>
-			</div>
-		</li>
-		{/volist}
-	</ul>
-</div>
-<script type="text/javascript">
-$(function() {
-    $('.banner').unslider({
-    	dots: true,               //  Display dot navigation
-    });
-});
-</script>
\ No newline at end of file
diff --git a/core/convention.php b/core/convention.php
deleted file mode 100644
index 87fe69eb..00000000
--- a/core/convention.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-
-return [
-    // +----------------------------------------------------------------------
-    // | 应用设置
-    // +----------------------------------------------------------------------
-
-    // 应用命名空间
-    'app_namespace'          => 'app',
-    // 应用调试模式
-    'app_debug'              => true,
-    // 应用Trace
-    'app_trace'              => false,
-    // 应用模式状态
-    'app_status'             => '',
-    // 是否支持多模块
-    'app_multi_module'       => true,
-    // 注册的根命名空间
-    'root_namespace'         => [],
-    // 扩展配置文件
-    'extra_config_list'      => ['database', 'route', 'validate'],
-    // 扩展函数文件
-    'extra_file_list'        => [THINK_PATH . 'helper' . EXT],
-    // 默认输出类型
-    'default_return_type'    => 'html',
-    // 默认AJAX 数据返回格式,可选json xml ...
-    'default_ajax_return'    => 'json',
-    // 默认JSONP格式返回的处理方法
-    'default_jsonp_handler'  => 'jsonpReturn',
-    // 默认JSONP处理方法
-    'var_jsonp_handler'      => 'callback',
-    // 默认时区
-    'default_timezone'       => 'PRC',
-    // 是否开启多语言
-    'lang_switch_on'         => false,
-    // 默认全局过滤方法 用逗号分隔多个
-    'default_filter'         => '',
-    // 默认语言
-    'default_lang'           => 'zh-cn',
-    // 应用类库后缀
-    'class_suffix'           => false,
-    // 控制器类后缀
-    'controller_suffix'      => false,
-
-    // +----------------------------------------------------------------------
-    // | 模块设置
-    // +----------------------------------------------------------------------
-
-    // 默认模块名
-    'default_module'         => 'index',
-    // 禁止访问模块
-    'deny_module_list'       => ['common'],
-    // 默认控制器名
-    'default_controller'     => 'Index',
-    // 默认操作名
-    'default_action'         => 'index',
-    // 默认验证器
-    'default_validate'       => '',
-    // 默认的空控制器名
-    'empty_controller'       => 'Error',
-    // 操作方法后缀
-    'action_suffix'          => '',
-    // 自动搜索控制器
-    'controller_auto_search' => false,
-
-    // +----------------------------------------------------------------------
-    // | URL设置
-    // +----------------------------------------------------------------------
-
-    // PATHINFO变量名 用于兼容模式
-    'var_pathinfo'           => 's',
-    // 兼容PATH_INFO获取
-    'pathinfo_fetch'         => ['ORIG_PATH_INFO', 'REDIRECT_PATH_INFO', 'REDIRECT_URL'],
-    // pathinfo分隔符
-    'pathinfo_depr'          => '/',
-    // URL伪静态后缀
-    'url_html_suffix'        => 'html',
-    // URL普通方式参数 用于自动生成
-    'url_common_param'       => false,
-    //url禁止访问的后缀
-    'url_deny_suffix'        => 'ico|png|gif|jpg',
-    // URL参数方式 0 按名称成对解析 1 按顺序解析
-    'url_param_type'         => 0,
-    // 是否开启路由
-    'url_route_on'           => true,
-    // 是否强制使用路由
-    'url_route_must'         => false,
-    // 域名部署
-    'url_domain_deploy'      => false,
-    // 域名根，如.thinkphp.cn
-    'url_domain_root'        => '',
-    // 是否自动转换URL中的控制器和操作名
-    'url_convert'            => true,
-    // 默认的访问控制器层
-    'url_controller_layer'   => 'controller',
-    // 表单请求类型伪装变量
-    'var_method'             => '_method',
-
-    // +----------------------------------------------------------------------
-    // | 模板设置
-    // +----------------------------------------------------------------------
-
-    'template'               => [
-        // 模板引擎类型 支持 php think 支持扩展
-        'type'         => 'Think',
-        // 模板路径
-        'view_path'    => '',
-        // 模板后缀
-        'view_suffix'  => 'html',
-        // 模板文件名分隔符
-        'view_depr'    => DS,
-        // 模板引擎普通标签开始标记
-        'tpl_begin'    => '{',
-        // 模板引擎普通标签结束标记
-        'tpl_end'      => '}',
-        // 标签库标签开始标记
-        'taglib_begin' => '{',
-        // 标签库标签结束标记
-        'taglib_end'   => '}',
-    ],
-
-    // 视图输出字符串内容替换
-    'view_replace_str'       => [],
-    // 默认跳转页面对应的模板文件
-    'dispatch_success_tmpl'  => THINK_PATH . 'tpl' . DS . 'dispatch_jump.tpl',
-    'dispatch_error_tmpl'    => THINK_PATH . 'tpl' . DS . 'dispatch_jump.tpl',
-
-    // +----------------------------------------------------------------------
-    // | 异常及错误设置
-    // +----------------------------------------------------------------------
-
-    // 异常页面的模板文件
-    'exception_tmpl'         => THINK_PATH . 'tpl' . DS . 'think_exception.tpl',
-
-    // 错误显示信息,非调试模式有效
-    'error_message'          => '页面错误！请稍后再试～',
-    // 显示错误信息
-    'show_error_msg'         => false,
-    // 异常处理handle类 留空使用 \think\exception\Handle
-    'exception_handle'       => '',
-
-    // +----------------------------------------------------------------------
-    // | 日志设置
-    // +----------------------------------------------------------------------
-
-    'log'                    => [
-        // 日志记录方式，内置 file socket 支持扩展
-        'type'  => 'File',
-        // 日志保存目录
-        'path'  => LOG_PATH,
-        // 日志记录级别
-        'level' => [],
-    ],
-
-    // +----------------------------------------------------------------------
-    // | Trace设置 开启 app_trace 后 有效
-    // +----------------------------------------------------------------------
-    'trace'                  => [
-        // 内置Html Console 支持扩展
-        'type' => 'Html',
-    ],
-
-    // +----------------------------------------------------------------------
-    // | 缓存设置
-    // +----------------------------------------------------------------------
-
-    'cache'                  => [
-        // 驱动方式
-        'type'   => 'File',
-        // 缓存保存目录
-        'path'   => CACHE_PATH,
-        // 缓存前缀
-        'prefix' => '',
-        // 缓存有效期 0表示永久缓存
-        'expire' => 0,
-    ],
-
-    // +----------------------------------------------------------------------
-    // | 会话设置
-    // +----------------------------------------------------------------------
-
-    'session'                => [
-        'id'             => '',
-        // SESSION_ID的提交变量,解决flash上传跨域
-        'var_session_id' => '',
-        // SESSION 前缀
-        'prefix'         => 'think',
-        // 驱动方式 支持redis memcache memcached
-        'type'           => '',
-        // 是否自动开启 SESSION
-        'auto_start'     => true,
-    ],
-
-    // +----------------------------------------------------------------------
-    // | Cookie设置
-    // +----------------------------------------------------------------------
-    'cookie'                 => [
-        // cookie 名称前缀
-        'prefix'    => '',
-        // cookie 保存时间
-        'expire'    => 0,
-        // cookie 保存路径
-        'path'      => '/',
-        // cookie 有效域名
-        'domain'    => '',
-        //  cookie 启用安全传输
-        'secure'    => false,
-        // httponly设置
-        'httponly'  => '',
-        // 是否使用 setcookie
-        'setcookie' => true,
-    ],
-
-    // +----------------------------------------------------------------------
-    // | 数据库设置
-    // +----------------------------------------------------------------------
-
-    'database'               => [
-        // 数据库类型
-        'type'           => 'mysql',
-        // 数据库连接DSN配置
-        'dsn'            => '',
-        // 服务器地址
-        'hostname'       => 'localhost',
-        // 数据库名
-        'database'       => '',
-        // 数据库用户名
-        'username'       => 'root',
-        // 数据库密码
-        'password'       => '',
-        // 数据库连接端口
-        'hostport'       => '',
-        // 数据库连接参数
-        'params'         => [],
-        // 数据库编码默认采用utf8
-        'charset'        => 'utf8',
-        // 数据库表前缀
-        'prefix'         => '',
-        // 数据库调试模式
-        'debug'          => false,
-        // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
-        'deploy'         => 0,
-        // 数据库读写是否分离 主从式有效
-        'rw_separate'    => false,
-        // 读写分离后 主服务器数量
-        'master_num'     => 1,
-        // 指定从服务器序号
-        'slave_no'       => '',
-        // 是否严格检查字段是否存在
-        'fields_strict'  => true,
-        // 自动写入时间戳字段
-        'auto_timestamp' => false,
-    ],
-
-    //分页配置
-    'paginate'               => [
-        'type'      => 'bootstrap',
-        'var_page'  => 'page',
-        'list_rows' => 15,
-    ],
-
-];
diff --git a/core/library/think/Route.php b/core/library/think/Route.php
deleted file mode 100644
index b8894d86..00000000
--- a/core/library/think/Route.php
+++ /dev/null
@@ -1,1276 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: liu21st <liu21st@gmail.com>
-// +----------------------------------------------------------------------
-
-namespace think;
-
-use think\App;
-use think\Config;
-use think\Hook;
-use think\Log;
-use think\Request;
-use think\Response;
-
-class Route
-{
-    // 路由规则
-    private static $rules = [
-        'GET'     => [],
-        'POST'    => [],
-        'PUT'     => [],
-        'DELETE'  => [],
-        'HEAD'    => [],
-        'OPTIONS' => [],
-        '*'       => [],
-        'map'     => [],
-        'alias'   => [],
-        'domain'  => [],
-        'pattern' => [],
-    ];
-
-    // REST路由操作方法定义
-    private static $rest = [
-        'index'  => ['GET', '', 'index'],
-        'create' => ['GET', '/create', 'create'],
-        'edit'   => ['GET', '/:id/edit', 'edit'],
-        'read'   => ['GET', '/:id', 'read'],
-        'save'   => ['POST', '', 'save'],
-        'update' => ['PUT', '/:id', 'update'],
-        'delete' => ['DELETE', '/:id', 'delete'],
-    ];
-
-    // 不同请求类型的方法前缀
-    private static $methodPrefix = [
-        'GET'    => 'get',
-        'POST'   => 'post',
-        'PUT'    => 'put',
-        'DELETE' => 'delete',
-    ];
-
-    // 子域名
-    private static $subDomain = '';
-    // 域名绑定
-    private static $bind = [];
-    // 当前分组
-    private static $group;
-    // 当前参数
-    private static $option = [];
-
-    /**
-     * 注册变量规则
-     * @access public
-     * @param string|array  $name 变量名
-     * @param string        $rule 变量规则
-     * @return void
-     */
-    public static function pattern($name = null, $rule = '')
-    {
-        if (is_array($name)) {
-            self::$rules['pattern'] = array_merge(self::$rules['pattern'], $name);
-        } else {
-            self::$rules['pattern'][$name] = $rule;
-        }
-    }
-
-    /**
-     * 注册子域名部署规则
-     * @access public
-     * @param string|array  $domain 子域名
-     * @param mixed         $rule 路由规则
-     * @return void
-     */
-    public static function domain($domain = null, $rule = '')
-    {
-        if (is_array($domain)) {
-            self::$rules['domain'] = array_merge(self::$rules['domain'], $domain);
-        } else {
-            self::$rules['domain'][$domain] = $rule;
-        }
-    }
-
-    /**
-     * 设置路由绑定
-     * @access public
-     * @param mixed     $bind 绑定信息
-     * @param string    $type 绑定类型 默认为module
-     * @return mixed
-     */
-    public static function bind($bind, $type = 'module')
-    {
-        self::$bind = ['type' => $type, $type => $bind];
-    }
-
-    /**
-     * 读取路由绑定
-     * @access public
-     * @param string    $type 绑定类型
-     * @return mixed
-     */
-    public static function getBind($type)
-    {
-        return isset(self::$bind[$type]) ? self::$bind[$type] : null;
-    }
-
-    /**
-     * 导入配置文件的路由规则
-     * @access public
-     * @param array     $rule 路由规则
-     * @param string    $type 请求类型
-     * @return void
-     */
-    public static function import(array $rule, $type = '*')
-    {
-        // 检查域名部署
-        if (isset($rule['__domain__'])) {
-            self::domain($rule['__domain__']);
-            unset($rule['__domain__']);
-        }
-
-        // 检查变量规则
-        if (isset($rule['__pattern__'])) {
-            self::pattern($rule['__pattern__']);
-            unset($rule['__pattern__']);
-        }
-
-        // 检查路由别名
-        if (isset($rule['__alias__'])) {
-            self::alias($rule['__alias__']);
-            unset($rule['__alias__']);
-        }
-
-        // 检查资源路由
-        if (isset($rule['__rest__'])) {
-            self::resource($rule['__rest__']);
-            unset($rule['__rest__']);
-        }
-
-        $type = strtoupper($type);
-        foreach ($rule as $key => $val) {
-            if (is_numeric($key)) {
-                $key = array_shift($val);
-            }
-            if (empty($val)) {
-                continue;
-            }
-            if (0 === strpos($key, '[')) {
-                $key = substr($key, 1, -1);
-                self::group($key, $val);
-
-            } elseif (is_array($val)) {
-                self::setRule($key, $val[0], $type, $val[1], isset($val[2]) ? $val[2] : []);
-            } else {
-                self::setRule($key, $val, $type);
-            }
-        }
-    }
-
-    /**
-     * 注册路由规则
-     * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param string    $type 请求类型
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
-     * @return void
-     */
-    public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [])
-    {
-        $group  = self::$group;
-        $option = array_merge(self::$option, $option);
-        $type   = strtoupper($type);
-
-        if (strpos($type, '|')) {
-            $option['method'] = $type;
-            $type             = '*';
-        }
-        if (is_array($rule)) {
-            foreach ($rule as $key => $val) {
-                if (is_numeric($key)) {
-                    $key = array_shift($val);
-                }
-                if (is_array($val)) {
-                    $route    = $val[0];
-                    $option1  = array_merge($option, $val[1]);
-                    $pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []);
-                } else {
-                    $route = $val;
-                }
-                self::setRule($key, $route, $type, isset($option1) ? $option1 : $option, isset($pattern1) ? $pattern1 : $pattern, $group);
-            }
-        } else {
-            self::setRule($rule, $route, $type, $option, $pattern, $group);
-        }
-
-    }
-
-    /**
-     * 设置路由规则
-     * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param string    $type 请求类型
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
-     * @param string    $group 所属分组
-     * @return void
-     */
-    protected static function setRule($rule, $route, $type = '*', $option = [], $pattern = [], $group = '')
-    {
-        if ('$' == substr($rule, -1, 1)) {
-            // 是否完整匹配
-            $option['complete_match'] = true;
-            $rule                     = substr($rule, 0, -1);
-        }
-        if ('/' != $rule) {
-            $rule = trim($rule, '/');
-        }
-        $vars = self::parseVar($rule);
-        if ($group) {
-            self::$rules[$type][$group]['rule'][] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
-        } else {
-            if ('*' != $type && isset(self::$rules['*'][$rule])) {
-                unset(self::$rules['*'][$rule]);
-            }
-            self::$rules[$type][$rule] = ['rule' => $rule, 'route' => $route, 'var' => $vars, 'option' => $option, 'pattern' => $pattern];
-            if ('*' == $type) {
-                // 注册路由快捷方式
-                foreach (['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS'] as $method) {
-                    self::$rules[$method][$rule] = true;
-                }
-            }
-        }
-    }
-
-    /**
-     * 设置当前的路由分组
-     * @access public
-     * @param array $option 路由参数
-     * @return void
-     */
-    public static function setGroup($name)
-    {
-        self::$group = $name;
-    }
-
-    /**
-     * 设置当前的路由参数
-     * @access public
-     * @param array $option 路由参数
-     * @return void
-     */
-    public static function setOption($option)
-    {
-        self::$option = $option;
-    }
-
-    /**
-     * 注册路由分组
-     * @access public
-     * @param string|array      $name 分组名称或者参数
-     * @param array|\Closure    $routes 路由地址
-     * @param array             $option 路由参数
-     * @param string            $type 请求类型
-     * @param array             $pattern 变量规则
-     * @return void
-     */
-    public static function group($name, $routes, $option = [], $type = '*', $pattern = [])
-    {
-        if (is_array($name)) {
-            $option = $name;
-            $name   = isset($option['name']) ? $option['name'] : '';
-        }
-        $type = strtoupper($type);
-        if (!empty($name)) {
-            // 分组
-            if ($routes instanceof \Closure) {
-                self::setGroup($name);
-                call_user_func_array($routes, []);
-                self::setGroup(null);
-                self::$rules[$type][$name]['route']   = '';
-                self::$rules[$type][$name]['var']     = self::parseVar($name);
-                self::$rules[$type][$name]['option']  = $option;
-                self::$rules[$type][$name]['pattern'] = $pattern;
-
-            } else {
-                foreach ($routes as $key => $val) {
-                    if (is_numeric($key)) {
-                        $key = array_shift($val);
-                    }
-                    if (is_array($val)) {
-                        $route    = $val[0];
-                        $option1  = array_merge($option, $val[1]);
-                        $pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []);
-                    } else {
-                        $route = $val;
-                    }
-                    $vars   = self::parseVar($key);
-                    $item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => isset($option1) ? $option1 : $option, 'pattern' => isset($pattern1) ? $pattern1 : $pattern];
-                }
-                self::$rules[$type][$name] = ['rule' => $item, 'route' => '', 'var' => [], 'option' => $option, 'pattern' => $pattern];
-            }
-            if ('*' == $type) {
-                foreach (['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'OPTIONS'] as $method) {
-                    if (!isset(self::$rules[$method][$name])) {
-                        self::$rules[$method][$name] = true;
-                    } else {
-                        self::$rules[$method][$name] = array_merge(self::$rules['*'][$name], self::$rules[$method][$name]);
-                    }
-                }
-            }
-        } else {
-            if ($routes instanceof \Closure) {
-                // 闭包注册
-                self::setOption($option);
-                call_user_func_array($routes, []);
-                self::setOption([]);
-            } else {
-                // 批量注册路由
-                self::rule($routes, '', $type, $option, $pattern);
-            }
-        }
-    }
-
-    /**
-     * 注册路由
-     * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
-     * @return void
-     */
-    public static function any($rule, $route = '', $option = [], $pattern = [])
-    {
-        self::rule($rule, $route, '*', $option, $pattern);
-    }
-
-    /**
-     * 注册GET路由
-     * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
-     * @return void
-     */
-    public static function get($rule, $route = '', $option = [], $pattern = [])
-    {
-        self::rule($rule, $route, 'GET', $option, $pattern);
-    }
-
-    /**
-     * 注册POST路由
-     * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
-     * @return void
-     */
-    public static function post($rule, $route = '', $option = [], $pattern = [])
-    {
-        self::rule($rule, $route, 'POST', $option, $pattern);
-    }
-
-    /**
-     * 注册PUT路由
-     * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
-     * @return void
-     */
-    public static function put($rule, $route = '', $option = [], $pattern = [])
-    {
-        self::rule($rule, $route, 'PUT', $option, $pattern);
-    }
-
-    /**
-     * 注册DELETE路由
-     * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
-     * @return void
-     */
-    public static function delete($rule, $route = '', $option = [], $pattern = [])
-    {
-        self::rule($rule, $route, 'DELETE', $option, $pattern);
-    }
-
-    /**
-     * 注册资源路由
-     * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
-     * @return void
-     */
-    public static function resource($rule, $route = '', $option = [], $pattern = [])
-    {
-        if (is_array($rule)) {
-            foreach ($rule as $key => $val) {
-                if (is_array($val)) {
-                    list($val, $option, $pattern) = array_pad($val, 3, []);
-                }
-                self::resource($key, $val, $option, $pattern);
-            }
-        } else {
-            if (strpos($rule, '.')) {
-                // 注册嵌套资源路由
-                $array = explode('.', $rule);
-                $last  = array_pop($array);
-                $item  = [];
-                foreach ($array as $val) {
-                    $item[] = $val . '/:' . (isset($option['var'][$val]) ? $option['var'][$val] : $val . '_id');
-                }
-                $rule = implode('/', $item) . '/' . $last;
-            }
-            // 注册资源路由
-            foreach (self::$rest as $key => $val) {
-                if ((isset($option['only']) && !in_array($key, $option['only']))
-                    || (isset($option['except']) && in_array($key, $option['except']))) {
-                    continue;
-                }
-                if (strpos($val[1], ':id') && isset($option['var'][$rule])) {
-                    $val[1] = str_replace(':id', ':' . $option['var'][$rule], $val[1]);
-                }
-                $item = ltrim($rule . $val[1], '/');
-                self::rule($item ? $item . '$' : '', $route . '/' . $val[2], $val[0], $option, $pattern);
-            }
-        }
-    }
-
-    /**
-     * 注册控制器路由 操作方法对应不同的请求后缀
-     * @access public
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param array     $option 路由参数
-     * @param array     $pattern 变量规则
-     * @return void
-     */
-    public static function controller($rule, $route = '', $option = [], $pattern = [])
-    {
-        foreach (self::$methodPrefix as $type => $val) {
-            self::$type($rule . '/:action', $route . '/' . $val . ':action', $option, $pattern);
-        }
-    }
-
-    /**
-     * 注册别名路由
-     * @access public
-     * @param string|array  $rule 路由别名
-     * @param string        $route 路由地址
-     * @param array         $option 路由参数
-     * @return void
-     */
-    public static function alias($rule = null, $route = '', $option = [])
-    {
-        if (is_array($rule)) {
-            self::$rules['alias'] = array_merge(self::$rules['alias'], $rule);
-        } else {
-            self::$rules['alias'][$rule] = $option ? [$route, $option] : $route;
-        }
-    }
-
-    /**
-     * 设置不同请求类型下面的方法前缀
-     * @access public
-     * @param string    $method 请求类型
-     * @param string    $prefix 类型前缀
-     * @return void
-     */
-    public static function setMethodPrefix($method, $prefix = '')
-    {
-        if (is_array($method)) {
-            self::$methodPrefix = array_merge(self::$methodPrefix, array_change_key_case($method, CASE_UPPER));
-        } else {
-            self::$methodPrefix[strtoupper($method)] = $prefix;
-        }
-    }
-
-    /**
-     * rest方法定义和修改
-     * @access public
-     * @param string    $name 方法名称
-     * @param array     $resourece 资源
-     * @return void
-     */
-    public static function rest($name, $resource = [])
-    {
-        if (is_array($name)) {
-            self::$rest = array_merge(self::$rest, $name);
-        } else {
-            self::$rest[$name] = $resource;
-        }
-    }
-
-    /**
-     * 注册未匹配路由规则后的处理
-     * @access public
-     * @param string    $route 路由地址
-     * @param string    $method 请求类型
-     * @param array     $option 路由参数
-     * @return void
-     */
-    public static function miss($route, $method = '*', $option = [])
-    {
-        self::rule('__miss__', $route, $method, $option, []);
-    }
-
-    /**
-     * 获取或者批量设置路由定义
-     * @access public
-     * @param mixed $rules 请求类型或者路由定义数组
-     * @return array
-     */
-    public static function rules($rules = '')
-    {
-        if (is_array($rules)) {
-            self::$rules = $rules;
-        } elseif ($rules) {
-            return self::$rules[$rules];
-        } else {
-            $rules = self::$rules;
-            unset($rules['pattern'], $rules['alias'], $rules['domain']);
-            return $rules;
-        }
-    }
-
-    /**
-     * 检测子域名部署
-     * @access public
-     * @param Request   $request Request请求对象
-     * @return void
-     */
-    public static function checkDomain($request)
-    {
-        // 域名规则
-        $rules = self::$rules['domain'];
-        // 开启子域名部署 支持二级和三级域名
-        if (!empty($rules)) {
-            $host = $request->host();
-            if (isset($rules[$host])) {
-                // 完整域名或者IP配置
-                $rule = $rules[$host];
-            } else {
-                $rootDomain = Config::get('url_domain_root');
-                if ($rootDomain) {
-                    // 配置域名根 例如 thinkphp.cn 163.com.cn 如果是国家级域名 com.cn net.cn 之类的域名需要配置
-                    $domain = explode('.', rtrim(stristr($host, $rootDomain, true), '.'));
-                } else {
-                    $domain = explode('.', $host, -2);
-                }
-                // 子域名配置
-                if (!empty($domain)) {
-                    // 当前子域名
-                    $subDomain       = implode('.', $domain);
-                    self::$subDomain = $subDomain;
-                    $domain2         = array_pop($domain);
-                    if ($domain) {
-                        // 存在三级域名
-                        $domain3 = array_pop($domain);
-                    }
-                    if ($subDomain && isset($rules[$subDomain])) {
-                        // 子域名配置
-                        $rule = $rules[$subDomain];
-                    } elseif (isset($rules['*.' . $domain2]) && !empty($domain3)) {
-                        // 泛三级域名
-                        $rule      = $rules['*.' . $domain2];
-                        $panDomain = $domain3;
-                    } elseif (isset($rules['*']) && !empty($domain2)) {
-                        // 泛二级域名
-                        if ('www' != $domain2) {
-                            $rule      = $rules['*'];
-                            $panDomain = $domain2;
-                        }
-                    }
-                }
-            }
-            if (!empty($rule)) {
-                // 子域名部署规则
-                if ($rule instanceof \Closure) {
-                    // 执行闭包
-                    $reflect    = new \ReflectionFunction($rule);
-                    self::$bind = $reflect->invokeArgs([]);
-                    return;
-                }
-
-                if (strpos($rule, '?')) {
-                    // 传入其它参数
-                    $array  = parse_url($rule);
-                    $result = $array['path'];
-                    parse_str($array['query'], $params);
-                    if (isset($panDomain)) {
-                        $pos = array_search('*', $params);
-                        if (false !== $pos) {
-                            // 泛域名作为参数
-                            $params[$pos] = $panDomain;
-                        }
-                    }
-                    $_GET = array_merge($_GET, $params);
-                } else {
-                    $result = $rule;
-                }
-
-                if (0 === strpos($result, '\\')) {
-                    // 绑定到命名空间 例如 \app\index\behavior
-                    self::$bind = ['type' => 'namespace', 'namespace' => $result];
-                } elseif (0 === strpos($result, '@')) {
-                    // 绑定到类 例如 \app\index\controller\User
-                    self::$bind = ['type' => 'class', 'class' => substr($result, 1)];
-                } elseif (0 === strpos($result, '[')) {
-                    // 绑定到分组 例如 [user]
-                    self::$bind = ['type' => 'group', 'group' => substr($result, 1, -1)];
-                } else {
-                    // 绑定到模块/控制器 例如 index/user
-                    self::$bind = ['type' => 'module', 'module' => $result];
-                }
-            }
-        }
-    }
-
-    /**
-     * 检测URL路由
-     * @access public
-     * @param Request   $request Request请求对象
-     * @param string    $url URL地址
-     * @param string    $depr URL分隔符
-     * @param bool      $checkDomain 是否检测域名规则
-     * @return false|array
-     */
-    public static function check($request, $url, $depr = '/', $checkDomain = false)
-    {
-        // 分隔符替换 确保路由定义使用统一的分隔符
-        if ('/' != $depr) {
-            $url = str_replace($depr, '/', $url);
-        }
-
-        if (strpos($url, '/') && isset(self::$rules['alias'][strstr($url, '/', true)])) {
-            // 检测路由别名
-            $result = self::checkRouteAlias($request, $url, $depr);
-            if (false !== $result) {
-                return $result;
-            }
-        }
-
-        // 检测域名部署
-        if ($checkDomain) {
-            self::checkDomain($request);
-        }
-
-        // 检测URL绑定
-        $return = self::checkUrlBind($url, $rules, $depr);
-        if (false !== $return) {
-            return $return;
-        }
-
-        // 获取当前请求类型的路由规则
-        $rules = self::$rules[$request->method()];
-
-        if (isset($rules[$url])) {
-            // 静态路由规则检测
-            $rule = $rules[$url];
-            if (true === $rule) {
-                $rule = self::$rules['*'][$url];
-            }
-            return self::parseRule($url, $rule['route'], $url, $rule['option']);
-        }
-
-        // 路由规则检测
-        if (!empty($rules)) {
-            return self::checkRoute($request, $rules, $url);
-        }
-        return false;
-    }
-
-    /**
-     * 检测路由规则
-     * @access private
-     * @param Request   $request
-     * @param array     $rules 路由规则
-     * @param string    $url URL地址
-     * @param string    $group 路由分组名
-     * @return mixed
-     */
-    private static function checkRoute($request, $rules, $url, $group = '')
-    {
-        foreach ($rules as $key => $item) {
-            if (true === $item) {
-                $item = self::$rules['*'][$key];
-            }
-            $rule    = $item['rule'];
-            $route   = $item['route'];
-            $vars    = $item['var'];
-            $option  = $item['option'];
-            $pattern = $item['pattern'];
-
-            // 检查参数有效性
-            if (!self::checkOption($option, $url, $request)) {
-                continue;
-            }
-
-            if (is_array($rule)) {
-                // 分组路由
-                if (($pos = strpos($key, ':')) || ($pos = strpos($key, '<'))) {
-                    $str = substr($key, 0, $pos);
-                } else {
-                    $str = $key;
-                }
-                if (0 !== strpos($url, $str)) {
-                    continue;
-                }
-
-                $result = self::checkRoute($request, $rule, $url, $key);
-                if (false !== $result) {
-                    return $result;
-                }
-            } else {
-                if ('__miss__' == $rule) {
-                    // 指定MISS路由
-                    $miss = $item;
-                    continue;
-                }
-                if ($group) {
-                    $rule = $group . '/' . ltrim($rule, '/');
-                }
-                $result = self::checkRule($rule, $route, $url, $pattern, $option);
-                if (false !== $result) {
-                    return $result;
-                }
-            }
-        }
-        if (isset($miss)) {
-            // 未匹配所有路由的路由规则处理
-            return self::parseRule('', $miss, $url);
-        }
-        return false;
-    }
-
-    /**
-     * 检测路由别名
-     * @access private
-     * @param Request   $request
-     * @param string    $url URL地址
-     * @param string    $depr URL分隔符
-     * @return mixed
-     */
-    private static function checkRouteAlias($request, $url, $depr)
-    {
-        $array = explode('/', $url, 2);
-        $item  = self::$rules['alias'][$array[0]];
-
-        if (is_array($item)) {
-            list($rule, $option) = $item;
-        } else {
-            $rule = $item;
-        }
-        // 参数有效性检查
-        if (isset($option) && !self::checkOption($option, $url, $request)) {
-            // 路由不匹配
-            return false;
-        } elseif (0 === strpos($rule, '\\')) {
-            // 路由到类
-            return self::bindToClass($array[1], substr($rule, 1), $depr);
-        } elseif (0 === strpos($url, '@')) {
-            // 路由到控制器类
-            return self::bindToController($array[1], substr($rule, 1), $depr);
-        } else {
-            // 路由到模块/控制器
-            return self::bindToModule($array[1], $rule, $depr);
-        }
-    }
-
-    /**
-     * 检测URL绑定
-     * @access private
-     * @param string    $url URL地址
-     * @param array     $rules 路由规则
-     * @param string    $depr URL分隔符
-     * @return mixed
-     */
-    private static function checkUrlBind(&$url, &$rules, $depr = '/')
-    {
-        if (!empty(self::$bind['type'])) {
-            // 记录绑定信息
-            App::$debug && Log::record('[ BIND ] ' . var_export(self::$bind, true), 'info');
-            // 如果有URL绑定 则进行绑定检测
-            switch (self::$bind['type']) {
-                case 'class':
-                    // 绑定到类
-                    return self::bindToClass($url, self::$bind['class'], $depr);
-                case 'namespace':
-                    // 绑定到命名空间
-                    return self::bindToNamespace($url, self::$bind['namespace'], $depr);
-                case 'module':
-                    // 如果有模块/控制器绑定 针对路由到 模块/控制器 有效
-                    $url = self::$bind['module'] . '/' . $url;
-                    break;
-                case 'group':
-                    // 绑定到路由分组
-                    $key = self::$bind['group'];
-                    if (array_key_exists($key, $rules)) {
-                        $rules = [$key => $rules[self::$bind['group']]];
-                    }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 绑定到类
-     * @access public
-     * @param string    $url URL地址
-     * @param string    $class 类名（带命名空间）
-     * @param string    $depr URL分隔符
-     * @return array
-     */
-    public static function bindToClass($url, $class, $depr = '/')
-    {
-        $array  = explode($depr, $url, 2);
-        $action = !empty($array[0]) ? $array[0] : Config::get('default_action');
-        if (!empty($array[1])) {
-            self::parseUrlParams($array[1]);
-        }
-        return ['type' => 'method', 'method' => [$class, $action], 'params' => []];
-    }
-
-    /**
-     * 绑定到命名空间
-     * @access public
-     * @param string    $url URL地址
-     * @param string    $namespace 命名空间
-     * @param string    $depr URL分隔符
-     * @return array
-     */
-    public static function bindToNamespace($url, $namespace, $depr = '/')
-    {
-        $array  = explode($depr, $url, 3);
-        $class  = !empty($array[0]) ? $array[0] : Config::get('default_controller');
-        $method = !empty($array[1]) ? $array[1] : Config::get('default_action');
-        if (!empty($array[2])) {
-            self::parseUrlParams($array[2]);
-        }
-        return ['type' => 'method', 'method' => [$namespace . '\\' . $class, $method], 'params' => []];
-    }
-
-    /**
-     * 绑定到控制器类
-     * @access public
-     * @param string    $url URL地址
-     * @param string    $controller 控制器名 （支持带模块名 index/user ）
-     * @param string    $depr URL分隔符
-     * @return array
-     */
-    public static function bindToController($url, $controller, $depr = '/')
-    {
-        $array  = explode($depr, $url, 2);
-        $action = !empty($array[0]) ? $array[0] : Config::get('default_action');
-        if (!empty($array[1])) {
-            self::parseUrlParams($array[1]);
-        }
-        return ['type' => 'controller', 'controller' => $controller . '/' . $action, 'params' => []];
-    }
-
-    /**
-     * 绑定到模块/控制器
-     * @access public
-     * @param string    $url URL地址
-     * @param string    $class 控制器类名（带命名空间）
-     * @param string    $depr URL分隔符
-     * @return array
-     */
-    public static function bindToModule($url, $controller, $depr = '/')
-    {
-        $array  = explode($depr, $url, 2);
-        $action = !empty($array[0]) ? $array[0] : Config::get('default_action');
-        if (!empty($array[1])) {
-            self::parseUrlParams($array[1]);
-        }
-        return ['type' => 'module', 'module' => $controller . '/' . $action];
-    }
-
-    /**
-     * 路由参数有效性检查
-     * @access private
-     * @param array     $option 路由参数
-     * @param string    $url URL地址
-     * @param Request   $request Request对象
-     * @return bool
-     */
-    private static function checkOption($option, $url, $request)
-    {
-        // 请求类型检测
-        if ((isset($option['method']) && false === stripos($option['method'], $request->method()))
-            || (isset($option['ext']) && false === stripos($option['ext'], $request->ext())) // 伪静态后缀检测
-             || (isset($option['domain']) && !in_array($option['domain'], [$_SERVER['HTTP_HOST'], self::$subDomain])) // 域名检测
-             || (!empty($option['https']) && !$request->isSsl()) // https检测
-             || (!empty($option['before_behavior']) && false === Hook::exec($option['before_behavior'], '', $url)) // 行为检测
-             || (!empty($option['callback']) && is_callable($option['callback']) && false === call_user_func($option['callback'])) // 自定义检测
-        ) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * 检测路由规则
-     * @access private
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param string    $url URL地址
-     * @param array     $pattern 变量规则
-     * @param array     $option 路由参数
-     * @return array|false
-     */
-    private static function checkRule($rule, $route, $url, $pattern, $option)
-    {
-        // 检查完整规则定义
-        if (isset($pattern['__url__']) && !preg_match('/^' . $pattern['__url__'] . '/', $url)) {
-            return false;
-        }
-        // 检测是否设置了参数分隔符
-        if ($depr = Config::get('url_params_depr')) {
-            $url  = str_replace($depr, '/', $url);
-            $rule = str_replace($depr, '/', $rule);
-        }
-
-        $len1 = substr_count($url, '/');
-        $len2 = substr_count($rule, '/');
-        // 多余参数是否合并
-        $merge = !empty($option['merge_extra_vars']) ? true : false;
-
-        if ($len1 >= $len2 || strpos($rule, '[')) {
-            if (!empty($option['complete_match'])) {
-                // 完整匹配
-                if (!$merge && $len1 != $len2 && (false === strpos($rule, '[') || $len1 > $len2 || $len1 < $len2 - substr_count($rule, '['))) {
-                    return false;
-                }
-            }
-            $pattern = array_merge(self::$rules['pattern'], $pattern);
-            if (false !== $match = self::match($url, $rule, $pattern, $merge)) {
-                // 匹配到路由规则
-                return self::parseRule($rule, $route, $url, $option, $match, $merge);
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 解析模块的URL地址 [模块/控制器/操作?]参数1=值1&参数2=值2...
-     * @access public
-     * @param string    $url URL地址
-     * @param string    $depr URL分隔符
-     * @param bool      $autoSearch 是否自动深度搜索控制器
-     * @return array
-     */
-    public static function parseUrl($url, $depr = '/', $autoSearch = false)
-    {
-        if (isset(self::$bind['module'])) {
-            // 如果有模块/控制器绑定
-            $url = self::$bind['module'] . '/' . $url;
-        }
-
-        list($path, $var) = self::parseUrlPath($url, $depr);
-        $route            = [null, null, null];
-        if (isset($path)) {
-            // 解析模块
-            $module = Config::get('app_multi_module') ? array_shift($path) : null;
-            if ($autoSearch) {
-                // 自动搜索控制器
-                $dir    = APP_PATH . ($module ? $module . DS : '') . 'controller';
-                $suffix = App::$suffix || Config::get('controller_suffix') ? ucfirst(Config::get('url_controller_layer')) : '';
-                $item   = [];
-                foreach ($path as $val) {
-                    $item[] = array_shift($path);
-                    if (is_file($dir . DS . $val . $suffix . EXT)) {
-                        break;
-                    } else {
-                        $dir .= DS . $val;
-                    }
-                }
-                $controller = implode('.', $item);
-            } else {
-                // 解析控制器
-                $controller = !empty($path) ? array_shift($path) : null;
-            }
-            // 解析操作
-            $action = !empty($path) ? array_shift($path) : null;
-            // 解析额外参数
-            self::parseUrlParams(empty($path) ? '' : implode('/', $path));
-            // 封装路由
-            $route = [$module, $controller, $action];
-        }
-        return ['type' => 'module', 'module' => $route];
-    }
-
-    /**
-     * 解析URL的pathinfo参数和变量
-     * @access private
-     * @param string    $url URL地址
-     * @param string    $depr URL分隔符
-     * @return array
-     */
-    private static function parseUrlPath($url, $depr = '/')
-    {
-        // 分隔符替换 确保路由定义使用统一的分隔符
-        if ('/' != $depr) {
-            $url = str_replace($depr, '/', $url);
-        }
-        $url = trim($url, '/');
-        $var = [];
-        if (false !== strpos($url, '?')) {
-            // [模块/控制器/操作?]参数1=值1&参数2=值2...
-            $info = parse_url($url);
-            $path = explode('/', $info['path']);
-            parse_str($info['query'], $var);
-        } elseif (strpos($url, '/')) {
-            // [模块/控制器/操作]
-            $path = explode('/', $url);
-        } elseif (false !== strpos($url, '=')) {
-            // 参数1=值1&参数2=值2...
-            parse_str($url, $var);
-        } else {
-            $path = [$url];
-        }
-        return [$path, $var];
-    }
-
-    /**
-     * 检测URL和规则路由是否匹配
-     * @access private
-     * @param string    $url URL地址
-     * @param string    $rule 路由规则
-     * @param array     $pattern 变量规则
-     * @param bool      $merge 合并额外变量
-     * @return array|false
-     */
-    private static function match($url, $rule, $pattern, $merge)
-    {
-        $m2 = explode('/', $rule);
-        $m1 = $merge ? explode('/', $url, count($m2)) : explode('/', $url);
-
-        $var = [];
-        foreach ($m2 as $key => $val) {
-            // val中定义了多个变量 <id><name>
-            if (false !== strpos($val, '<') && preg_match_all('/<(\w+(\??))>/', $val, $matches)) {
-                $value = [];
-                foreach ($matches[1] as $name) {
-                    if (strpos($name, '?')) {
-                        $name      = substr($name, 0, -1);
-                        $replace[] = '((' . (isset($pattern[$name]) ? $pattern[$name] : '') . ')?)';
-                    } else {
-                        $replace[] = '(' . (isset($pattern[$name]) ? $pattern[$name] : '') . ')';
-                    }
-                    $value[] = $name;
-                }
-                $val = str_replace($matches[0], $replace, $val);
-                if (preg_match('/^' . $val . '$/', $m1[$key], $match)) {
-                    array_shift($match);
-                    $match = array_slice($match, 0, count($value));
-                    $var   = array_merge($var, array_combine($value, $match));
-                    continue;
-                } else {
-                    return false;
-                }
-            }
-
-            if (0 === strpos($val, '[:')) {
-                // 可选参数
-                $val = substr($val, 1, -1);
-            }
-            if (0 === strpos($val, ':')) {
-                // URL变量
-                $name = substr($val, 1);
-                if (isset($m1[$key]) && isset($pattern[$name]) && !preg_match('/^' . $pattern[$name] . '$/', $m1[$key])) {
-                    // 检查变量规则
-                    return false;
-                }
-                $var[$name] = isset($m1[$key]) ? $m1[$key] : '';
-            } elseif (0 !== strcasecmp($val, $m1[$key])) {
-                return false;
-            }
-        }
-        // 成功匹配后返回URL中的动态变量数组
-        return $var;
-    }
-
-    /**
-     * 解析规则路由
-     * @access private
-     * @param string    $rule 路由规则
-     * @param string    $route 路由地址
-     * @param string    $pathinfo URL地址
-     * @param array     $option 路由参数
-     * @param array     $matches 匹配的变量
-     * @param bool      $merge 合并额外变量
-     * @return array
-     */
-    private static function parseRule($rule, $route, $pathinfo, $option = [], $matches = [], $merge = false)
-    {
-        // 检测是否定义路由
-        if (!empty($option['after_behavior'])) {
-            if ($option['after_behavior'] instanceof \Closure) {
-                $result = call_user_func_array($option['after_behavior'], [$route]);
-            } else {
-                foreach ((array) $option['after_behavior'] as $behavior) {
-                    $result = Hook::exec($behavior, '', $route);
-                    if (!is_null($result)) {
-                        break;
-                    }
-                }
-            }
-            // 路由规则重定向
-            if ($result instanceof Response) {
-                return ['type' => 'response', 'response' => $result, 'params' => $matches];
-            } elseif (is_array($result)) {
-                return $result;
-            }
-        }
-
-        // 解析路由规则
-        if ($rule) {
-            $rule = explode('/', $rule);
-            // 获取URL地址中的参数
-            $paths = $merge ? explode('/', $pathinfo, count($rule)) : explode('/', $pathinfo);
-            foreach ($rule as $item) {
-                $fun = '';
-                if (0 === strpos($item, '[:')) {
-                    $item = substr($item, 1, -1);
-                }
-                if (0 === strpos($item, ':')) {
-                    $var           = substr($item, 1);
-                    $matches[$var] = array_shift($paths);
-                } else {
-                    // 过滤URL中的静态变量
-                    array_shift($paths);
-                }
-            }
-        } else {
-            $paths = explode('/', $pathinfo);
-        }
-        // 获取路由地址规则
-        $url = is_array($route) ? $route[0] : $route;
-        // 替换路由地址中的变量
-        if (is_string($url) && !empty($matches)) {
-            foreach ($matches as $key => $val) {
-                if (false !== strpos($url, ':' . $key)) {
-                    $url = str_replace(':' . $key, $val, $url);
-                    unset($matches[$key]);
-                }
-            }
-        }
-        if ($url instanceof \Closure) {
-            // 执行闭包
-            $result = ['type' => 'function', 'function' => $url, 'params' => $matches];
-        } elseif (0 === strpos($url, '/') || 0 === strpos($url, 'http')) {
-            // 路由到重定向地址
-            $result = ['type' => 'redirect', 'url' => $url, 'status' => (is_array($route) && isset($route[1])) ? $route[1] : 301];
-        } elseif (0 === strpos($url, '\\')) {
-            // 路由到方法
-            $method = strpos($url, '@') ? explode('@', $url) : $url;
-            $result = ['type' => 'method', 'method' => $method, 'params' => $matches];
-        } elseif (0 === strpos($url, '@')) {
-            // 路由到控制器
-            $result = ['type' => 'controller', 'controller' => substr($url, 1), 'params' => $matches];
-        } else {
-            // 路由到模块/控制器/操作
-            $result = self::parseModule($url);
-        }
-        // 解析额外参数
-        self::parseUrlParams(empty($paths) ? '' : implode('/', $paths), $matches);
-        // 记录匹配的路由信息
-        Request::instance()->routeInfo(['rule' => $rule, 'route' => $route, 'option' => $option]);
-        return $result;
-    }
-
-    /**
-     * 解析URL地址为 模块/控制器/操作
-     * @access private
-     * @param string    $url URL地址
-     * @param string    $depr URL分隔符
-     * @return array
-     */
-    private static function parseModule($url, $depr = '/')
-    {
-        list($path, $var) = self::parseUrlPath($url, $depr);
-        $action           = array_pop($path);
-        $controller       = !empty($path) ? array_pop($path) : null;
-        $module           = Config::get('app_multi_module') && !empty($path) ? array_pop($path) : null;
-        $method           = Request::instance()->method();
-        if (Config::get('use_action_prefix') && !empty(self::$methodPrefix[$method])) {
-            // 操作方法前缀支持
-            $action = 0 !== strpos($action, self::$methodPrefix[$method]) ? self::$methodPrefix[$method] . $action : $action;
-        }
-        $_GET = array_merge($_GET, $var);
-        // 路由到模块/控制器/操作
-        return ['type' => 'module', 'module' => [$module, $controller, $action], 'convert' => false];
-    }
-
-    /**
-     * 解析URL地址中的参数Request对象
-     * @access private
-     * @param string    $rule 路由规则
-     * @param array     $var 变量
-     * @return void
-     */
-    private static function parseUrlParams($url, $var = [])
-    {
-        if ($url) {
-            if (Config::get('url_param_type')) {
-                $var += explode('/', $url);
-            } else {
-                preg_replace_callback('/(\w+)\/([^\/]+)/', function ($match) use (&$var) {
-                    $var[$match[1]] = strip_tags($match[2]);
-                }, $url);
-            }
-        }
-        // 设置当前请求的参数
-        Request::instance()->route($var);
-    }
-
-    // 分析路由规则中的变量
-    private static function parseVar($rule)
-    {
-        // 提取路由规则中的变量
-        $var = [];
-        foreach (explode('/', $rule) as $val) {
-            $optional = false;
-            if (false !== strpos($val, '<') && preg_match_all('/<(\w+(\??))>/', $val, $matches)) {
-                foreach ($matches[1] as $name) {
-                    if (strpos($name, '?')) {
-                        $name     = substr($name, 0, -1);
-                        $optional = true;
-                    } else {
-                        $optional = false;
-                    }
-                    $var[$name] = $optional ? 2 : 1;
-                }
-            }
-
-            if (0 === strpos($val, '[:')) {
-                // 可选参数
-                $optional = true;
-                $val      = substr($val, 1, -1);
-            }
-            if (0 === strpos($val, ':')) {
-                // URL变量
-                $name       = substr($val, 1);
-                $var[$name] = $optional ? 2 : 1;
-            }
-        }
-        return $var;
-    }
-}
diff --git a/core/library/think/Url.php b/core/library/think/Url.php
deleted file mode 100644
index cf570af0..00000000
--- a/core/library/think/Url.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | ThinkPHP [ WE CAN DO IT JUST THINK ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: liu21st <liu21st@gmail.com>
-// +----------------------------------------------------------------------
-
-namespace think;
-
-use think\App;
-use think\Cache;
-use think\Config;
-use think\Request;
-use think\Route;
-
-class Url
-{
-    // 生成URL地址的root
-    protected static $root;
-
-    /**
-     * URL生成 支持路由反射
-     * @param string            $url URL表达式，
-     * 格式：'[模块/控制器/操作]?参数1=值1&参数2=值2...@域名'
-     * @控制器/操作?参数1=值1&参数2=值2...
-     * \\命名空间类\\方法?参数1=值1&参数2=值2...
-     * @param string|array      $vars 传入的参数，支持数组和字符串
-     * @param string|bool       $suffix 伪静态后缀，默认为true表示获取配置值
-     * @param boolean|string    $domain 是否显示域名 或者直接传入域名
-     * @return string
-     */
-    public static function build($url = '', $vars = '', $suffix = true, $domain = false)
-    {
-        if (false === $domain && Config::get('url_domain_deploy')) {
-            $domain = true;
-        }
-        // 解析URL
-        $info = parse_url($url);
-        $url  = !empty($info['path']) ? $info['path'] : '';
-        if (isset($info['fragment'])) {
-            // 解析锚点
-            $anchor = $info['fragment'];
-            if (false !== strpos($anchor, '?')) {
-                // 解析参数
-                list($anchor, $info['query']) = explode('?', $anchor, 2);
-            }
-            if (false !== strpos($anchor, '@')) {
-                // 解析域名
-                list($anchor, $domain) = explode('@', $anchor, 2);
-            }
-        } elseif (strpos($url, '@')) {
-            // 解析域名
-            list($url, $domain) = explode('@', $url, 2);
-        }
-
-        // 解析参数
-        if (is_string($vars)) {
-            // aaa=1&bbb=2 转换成数组
-            parse_str($vars, $vars);
-        }
-
-        if (isset($info['query'])) {
-            // 解析地址里面参数 合并到vars
-            parse_str($info['query'], $params);
-            $vars = array_merge($params, $vars);
-        }
-
-        // 获取路由别名
-        $alias = self::getRouteAlias();
-        // 检测路由
-        if (0 !== strpos($url, '/') && isset($alias[$url]) && $match = self::getRouteUrl($alias[$url], $vars)) {
-            // 处理路由规则中的特殊字符
-            $url = str_replace('[--think--]', '', $match);
-        } else {
-            // 路由不存在 直接解析
-            $url = self::parseUrl($url);
-        }
-
-        // 检测URL绑定
-        $type = Route::getBind('type');
-        if ($type) {
-            $bind = Route::getBind($type);
-            if (0 === strpos($url, $bind)) {
-                $url = substr($url, strlen($bind) + 1);
-            }
-        }
-        // 还原URL分隔符
-        $depr = Config::get('pathinfo_depr');
-        $url  = str_replace('/', $depr, $url);
-
-        // URL后缀
-        $suffix = in_array($url, ['/', '']) ? '' : self::parseSuffix($suffix);
-        // 锚点
-        $anchor = !empty($anchor) ? '#' . $anchor : '';
-        // 参数组装
-        if (!empty($vars)) {
-            // 添加参数
-            if (Config::get('url_common_param')) {
-                $vars = urldecode(http_build_query($vars));
-                $url .= $suffix . '?' . $vars . $anchor;
-            } else {
-                foreach ($vars as $var => $val) {
-                    if ('' !== trim($val)) {
-                        $url .= $depr . $var . $depr . urlencode($val);
-                    }
-                }
-                $url .= $suffix . $anchor;
-            }
-        } else {
-            $url .= $suffix . $anchor;
-        }
-        // 检测域名
-        $domain = self::parseDomain($url, $domain);
-        // URL组装
-        $url = $domain . (self::$root ?: Request::instance()->root()) . '/' . ltrim($url, '/');
-        return $url;
-    }
-
-    // 直接解析URL地址
-    protected static function parseUrl($url)
-    {
-        $request = Request::instance();
-        if (0 === strpos($url, '/')) {
-            // 直接作为路由地址解析
-            $url = substr($url, 1);
-        } elseif (false !== strpos($url, '\\')) {
-            // 解析到类
-            $url = ltrim(str_replace('\\', '/', $url), '/');
-        } elseif (0 === strpos($url, '@')) {
-            // 解析到控制器
-            $url = substr($url, 1);
-        } else {
-            // 解析到 模块/控制器/操作
-            $module     = $request->module();
-            $module     = $module ? $module . '/' : '';
-            $controller = $request->controller();
-            if ('' == $url) {
-                // 空字符串输出当前的 模块/控制器/操作
-                $url = $module . $controller . '/' . $request->action();
-            } else {
-                $path       = explode('/', $url);
-                $action     = Config::get('url_convert') ? strtolower(array_pop($path)) : array_pop($path);
-                $controller = empty($path) ? $controller : (Config::get('url_convert') ? Loader::parseName(array_pop($path)) : array_pop($path));
-                $module     = empty($path) ? $module : array_pop($path) . '/';
-                $url        = $module . $controller . '/' . $action;
-            }
-        }
-        return $url;
-    }
-
-    // 检测域名
-    protected static function parseDomain(&$url, $domain)
-    {
-        if (!$domain) {
-            return '';
-        }
-        $request = Request::instance();
-        if (true === $domain) {
-            // 自动判断域名
-            $domain = $request->host();
-            if (Config::get('url_domain_deploy')) {
-                // 根域名
-                $urlDomainRoot = Config::get('url_domain_root');
-                $domains       = Route::rules('domain');
-                $route_domain  = array_keys($domains);
-                foreach ($route_domain as $domain_prefix) {
-                    if (0 === strpos($domain_prefix, '*.') && strpos($domain, ltrim($domain_prefix, '*.')) !== false) {
-                        foreach ($domains as $key => $rule) {
-                            $rule = is_array($rule) ? $rule[0] : $rule;
-                            if (false === strpos($key, '*') && 0 === strpos($url, $rule)) {
-                                $url    = ltrim($url, $rule);
-                                $domain = $key;
-                                // 生成对应子域名
-                                if (!empty($urlDomainRoot)) {
-                                    $domain .= $urlDomainRoot;
-                                }
-                                break;
-                            } else if (false !== strpos($key, '*')) {
-                                if (!empty($urlDomainRoot)) {
-                                    $domain .= $urlDomainRoot;
-                                }
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        } else {
-            $domain .= strpos($domain, '.') ? '' : strstr($request->host(), '.');
-        }
-        $domain = ($request->isSsl() ? 'https://' : 'http://') . $domain;
-        return $domain;
-    }
-
-    // 检测路由规则中的变量是否有传入
-    protected static function pattern($pattern, $vars)
-    {
-        foreach ($pattern as $key => $type) {
-            if (1 == $type && !isset($vars[$key])) {
-                // 变量未设置
-                return false;
-            }
-        }
-        return true;
-    }
-
-    // 解析URL后缀
-    protected static function parseSuffix($suffix)
-    {
-        if ($suffix) {
-            $suffix = true === $suffix ? Config::get('url_html_suffix') : $suffix;
-            if ($pos = strpos($suffix, '|')) {
-                $suffix = substr($suffix, 0, $pos);
-            }
-        }
-        return (empty($suffix) || 0 === strpos($suffix, '.')) ? $suffix : '.' . $suffix;
-    }
-
-    // 匹配路由地址
-    public static function getRouteUrl($alias, &$vars = [])
-    {
-        foreach ($alias as $key => $val) {
-            list($url, $pattern, $param) = $val;
-            // 解析安全替换
-            if (strpos($url, '$')) {
-                $url = str_replace('$', '[--think--]', $url);
-            }
-            // 检查变量匹配
-            $array = $vars;
-            $match = false;
-            if ($pattern && self::pattern($pattern, $vars)) {
-                foreach ($pattern as $key => $val) {
-                    if (isset($vars[$key])) {
-                        $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key . '', '<' . $key . '>'], $vars[$key], $url);
-                        unset($array[$key]);
-                    } else {
-                        $url = str_replace(['[:' . $key . ']', '<' . $key . '?>'], '', $url);
-                    }
-                }
-                $match = true;
-            } elseif (empty($pattern) && array_intersect_assoc($param, $array) == $param) {
-                $match = true;
-            }
-            if ($match && !empty($param) && array_intersect_assoc($param, $array) != $param) {
-                $match = false;
-            }
-            if ($match) {
-                // 存在变量定义
-                $vars = array_diff_key($array, $param);
-                return $url;
-            }
-        }
-        return false;
-    }
-
-    // 生成路由映射并缓存
-    private static function getRouteAlias()
-    {
-        if ($item = Cache::get('think_route_map')) {
-            return $item;
-        }
-        // 获取路由定义
-        $array = Route::rules();
-        foreach ($array as $type => $rules) {
-            foreach ($rules as $rule => $val) {
-                if (true === $val || empty($val['rule'])) {
-                    continue;
-                }
-                $route = $val['route'];
-                $vars  = $val['var'];
-                if (is_array($val['rule'])) {
-                    foreach ($val['rule'] as $val) {
-                        $key   = $val['rule'];
-                        $route = $val['route'];
-                        $var   = $val['var'];
-                        $param = [];
-                        if (is_array($route)) {
-                            $route = implode('\\', $route);
-                        } elseif ($route instanceof \Closure) {
-                            continue;
-                        } elseif (strpos($route, '?')) {
-                            list($route, $str) = explode('?', $route, 2);
-                            parse_str($str, $param);
-                        }
-                        $var            = array_merge($vars, $var);
-                        $item[$route][] = [$rule . '/' . $key, $var, $param];
-                    }
-                } else {
-                    $param = [];
-                    if (is_array($route)) {
-                        $route = implode('\\', $route);
-                    } elseif ($route instanceof \Closure) {
-                        continue;
-                    } elseif (strpos($route, '?')) {
-                        list($route, $str) = explode('?', $route, 2);
-                        parse_str($str, $param);
-                    }
-                    $item[$route][] = [$rule, $vars, $param];
-                }
-            }
-        }
-
-        // 检测路由别名
-        $alias = Route::rules('alias');
-        foreach ($alias as $rule => $route) {
-            $route          = is_array($route) ? $route[0] : $route;
-            $item[$route][] = [$rule, [], []];
-        }
-        !App::$debug && Cache::set('think_route_map', $item);
-        return $item;
-    }
-
-    // 清空路由别名缓存
-    public static function clearAliasCache()
-    {
-        Cache::rm('think_route_map');
-    }
-
-    // 指定当前生成URL地址的root
-    public static function root($root)
-    {
-        self::$root = $root;
-        Request::instance()->root($root);
-    }
-}