diff --git a/.gitignore b/.gitignore
index 5d947ca8879f8a9072fe485c566204e3c2929e80..80c94226455b07ae2d755393faaed7c4b97945a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@ bin-release/
 
 # Other files and folders
 .settings/
+.idea/
+.git/
 
 # Executables
 *.swf
diff --git a/application/.htaccess b/application/.htaccess
new file mode 100644
index 0000000000000000000000000000000000000000..3418e55a68383c1cbc687c52a2994d1e8ed83800
--- /dev/null
+++ b/application/.htaccess
@@ -0,0 +1 @@
+deny from all
\ No newline at end of file
diff --git a/application/api/common/AliSms.php b/application/api/common/AliSms.php
new file mode 100644
index 0000000000000000000000000000000000000000..d3c9156861051fdf4eef56d3fb91083c4abba452
--- /dev/null
+++ b/application/api/common/AliSms.php
@@ -0,0 +1,140 @@
+<?php
+
+namespace app\api\common;
+
+class AliSms
+{
+	public static $accessKeyId = '';       //阿里云申请的keyid
+    public static $accessKeySecret = '';   //serect
+    public static $signNmae = '';          //签名
+    public static $templateCode = '';      //模板code
+
+    /**
+     * 调用方式
+     * AliSms::sendSmd($mobile,$data,$templateCode);
+     */
+    public static function sendSms($mobile = '',$data = '',$templateCode)
+    {
+
+        $params = array ();
+        // *** 需用户填写部分 ***
+
+        // fixme 必填: 请参阅 https://ak-console.aliyun.com/ 取得您的AK信息
+        $accessKeyId = self::$accessKeyId;
+        $accessKeySecret = self::$accessKeySecret;
+
+        // fixme 必填: 短信接收号码
+        $params["PhoneNumbers"] = $mobile;
+
+        // fixme 必填: 短信签名，应严格按"签名名称"填写，请参考: https://dysms.console.aliyun.com/dysms.htm#/develop/sign
+        $params["SignName"] = self::$signNmae;
+
+        // fixme 必填: 短信模板Code，应严格按"模板CODE"填写, 请参考: https://dysms.console.aliyun.com/dysms.htm#/develop/template
+        $params["TemplateCode"] = $templateCode;
+
+        // fixme 可选: 设置模板参数, 假如模板中存在变量需要替换则为必填项
+        if (!empty($data)) {
+            $params['TemplateParam'] = $data;
+        }
+        
+
+        // *** 需用户填写部分结束, 以下代码若无必要无需更改 ***
+        if(!empty($params["TemplateParam"]) && is_array($params["TemplateParam"])) {
+            $params["TemplateParam"] = json_encode($params["TemplateParam"], JSON_UNESCAPED_UNICODE);
+        }
+
+        // 初始化SignatureHelper实例用于设置参数，签名以及发送请求
+        //$helper = new SignatureHelper();
+
+        // 此处可能会抛出异常，注意catch
+        $content = self::request(
+            $accessKeyId,
+            $accessKeySecret,
+            "dysmsapi.aliyuncs.com",
+            array_merge($params, array(
+                "RegionId" => "cn-hangzhou",
+                "Action" => "SendSms",
+                "Version" => "2017-05-25",
+            ))
+        // fixme 选填: 启用https
+        // ,true
+        );
+
+        return $content;
+    }
+
+    /**
+     * 生成签名并发起请求
+     *
+     * @param $accessKeyId string AccessKeyId (https://ak-console.aliyun.com/)
+     * @param $accessKeySecret string AccessKeySecret
+     * @param $domain string API接口所在域名
+     * @param $params array API具体参数
+     * @param $security boolean 使用https
+     * @return bool|\stdClass 返回API接口调用结果，当发生错误时返回false
+     */
+    public static function request($accessKeyId, $accessKeySecret, $domain, $params, $security=false) {
+        $apiParams = array_merge(array (
+            "SignatureMethod" => "HMAC-SHA1",
+            "SignatureNonce" => uniqid(mt_rand(0,0xffff), true),
+            "SignatureVersion" => "1.0",
+            "AccessKeyId" => $accessKeyId,
+            "Timestamp" => gmdate("Y-m-d\TH:i:s\Z"),
+            "Format" => "JSON",
+        ), $params);
+        ksort($apiParams);
+
+        $sortedQueryStringTmp = "";
+        foreach ($apiParams as $key => $value) {
+            $sortedQueryStringTmp .= "&" . self::encode($key) . "=" . self::encode($value);
+        }
+
+        $stringToSign = "GET&%2F&" . self::encode(substr($sortedQueryStringTmp, 1));
+
+        $sign = base64_encode(hash_hmac("sha1", $stringToSign, $accessKeySecret . "&",true));
+
+        $signature = self::encode($sign);
+
+        $url = ($security ? 'https' : 'http')."://{$domain}/?Signature={$signature}{$sortedQueryStringTmp}";
+
+        try {
+            $content = self::fetchContent($url);
+            return json_decode($content);
+        } catch( \Exception $e) {
+            return false;
+        }
+    }
+
+    static function encode($str)
+    {
+        $res = urlencode($str);
+        $res = preg_replace("/\+/", "%20", $res);
+        $res = preg_replace("/\*/", "%2A", $res);
+        $res = preg_replace("/%7E/", "~", $res);
+        return $res;
+    }
+
+    static function fetchContent($url) {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 5);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array(
+            "x-sdk-client" => "php/2.0.0"
+        ));
+
+        if(substr($url, 0,5) == 'https') {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+        }
+
+        $rtn = curl_exec($ch);
+
+        if($rtn === false) {
+            trigger_error("[CURL_" . curl_errno($ch) . "]: " . curl_error($ch), E_USER_ERROR);
+        }
+        curl_close($ch);
+
+        return $rtn;
+    }
+}
\ No newline at end of file
diff --git a/application/api/common/Page.php b/application/api/common/Page.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf3c5c1fb8311e87f32a2857ce441b3a5ca65eb0
--- /dev/null
+++ b/application/api/common/Page.php
@@ -0,0 +1,27 @@
+<?php
+namespace app\api\common;
+
+use think\Controller;
+
+class Page extends Controller
+{
+    /**
+     * 设置分页数据
+     * 如果客户端没传，默认取第一页，每页10条
+     * 客户端传参数，以为客户端为准
+     * @param array $data
+     * @param int $page
+     * @param int $size
+     * @return array
+     */
+    static function getPage($data = [],$page = 1,$size = 10){
+        if(isset($data['page']) && isset($data['size'])){
+            $where_page = $data['page'];
+            $where_size = $data['size'];
+        }else{
+            $where_page = $page;
+            $where_size = $size;
+        }
+        return [$where_page,$where_size];
+    }
+}
\ No newline at end of file
diff --git a/application/api/controller/Api.php b/application/api/controller/Api.php
new file mode 100644
index 0000000000000000000000000000000000000000..9d6d5f6752577fbcd9f5ba35e5025ceaa54a1e25
--- /dev/null
+++ b/application/api/controller/Api.php
@@ -0,0 +1,61 @@
+<?php
+namespace app\api\controller;
+
+use think\Controller;
+use think\Request;
+use app\api\controller\Send;
+use app\api\controller\Oauth;
+
+/**
+ * api 入口文件基类，需要控制权限的控制器都应该继承该类
+ */
+class Api
+{
+	use Send;
+	/**
+     * @var \think\Request Request实例
+     */
+    protected $request;
+
+    protected $clientInfo;
+
+    /**
+     * 不需要鉴权方法
+     */
+    protected $noAuth = ['error'];
+
+	/**
+	 * 构造方法
+	 * @param Request $request Request对象
+	 */
+	public function __construct(Request $request)
+	{
+		$this->request = $request;
+		$this->init();
+	}
+
+	/**
+	 * 初始化
+	 * 检查请求类型，数据格式等
+	 */
+	public function init()
+	{
+		//所有ajax请求的options预请求都会直接返回200，如果需要单独针对某个类中的方法，可以在路由规则中进行配置
+		if($this->request->isOptions()){
+
+			return self::returnMsg(200,'success');
+		}
+		if(!Oauth::match($this->noAuth)){               //请求方法白名单
+			//$oauth = app('app\api\controller\Oauth');   //tp5.1容器，直接绑定类到容器进行实例化
+    		//return $this->clientInfo = $oauth->authenticate();;
+		}
+	}
+
+	/**
+	 * 空方法
+	 */
+	public function _empty()
+    {
+        return self::returnMsg(404, 'empty method!');
+    }
+}
diff --git a/application/api/controller/Oauth.php b/application/api/controller/Oauth.php
new file mode 100644
index 0000000000000000000000000000000000000000..65f562a898af0a501d8c6e0bb3a37e1b4fb0fc7b
--- /dev/null
+++ b/application/api/controller/Oauth.php
@@ -0,0 +1,122 @@
+<?php
+namespace app\api\controller;
+
+use app\api\controller\Send;
+use think\Exception;
+use think\facade\Request;
+use think\facade\Cache;
+
+/**
+ * API鉴权验证
+ */
+class Oauth
+{
+    use Send;
+
+    /**
+     * accessToken存储前缀
+     *
+     * @var string
+     */
+    public static $accessTokenPrefix = 'accessToken_';
+
+    /**
+     * 过期时间秒数
+     *
+     * @var int
+     */
+    public static $expires = 7200;
+
+    /**
+     * 认证授权 通过用户信息和路由
+     * @param Request $request
+     * @return \Exception|UnauthorizedException|mixed|Exception
+     * @throws UnauthorizedException
+     */
+    final function authenticate()
+    {
+        return self::certification(self::getClient());
+    }
+
+    /**
+     * 获取用户信息
+     * @param Request $request
+     * @return $this
+     * @throws UnauthorizedException
+     */
+    public static function getClient()
+    {
+        //获取头部信息
+        try {
+            $authorization = Request::header('authentication');   //获取请求中的authentication字段，值形式为USERID asdsajh..这种形式
+            $authorizationInfo  = explode(":", base64_decode($authorization));  //对base_64解密，获取到用:拼接的自字符串，然后分割，可获取appid、accesstoken、uid这三个参数
+            $clientInfo['appid'] = $authorizationInfo[0];
+            $clientInfo['access_token'] = $authorizationInfo[1];
+            p($authorizationInfo,1);
+            return $clientInfo;
+        } catch (Exception $e) {
+            return self::returnMsg(401,'Invalid authorization credentials');//,Request::header('')
+        }
+    }
+
+    /**
+     * 获取用户信息后 验证权限
+     * @return mixed
+     */
+    public static function certification($data = []){
+        $getCacheAccessToken = Cache::get(self::$accessTokenPrefix . $data['access_token']);  //获取缓存access_token
+        if(!$getCacheAccessToken){
+            return self::returnMsg(401,'access_token不存在或为空');
+        }
+        if($getCacheAccessToken['appid'] !== $data['appid']){
+
+            return self::returnMsg(401,'appid错误');  //appid与缓存中的appid不匹配
+        }
+        return $data;
+    }
+
+    /**
+     * 检测当前控制器和方法是否匹配传递的数组
+     *
+     * @param array $arr 需要验证权限的数组
+     * @return boolean
+     */
+    public static function match($arr = [])
+    {
+        $request = Request::instance();
+        $arr = is_array($arr) ? $arr : explode(',', $arr);
+        if (!$arr)
+        {
+            return false;
+        }
+        $arr = array_map('strtolower', $arr);
+        // 是否存在
+        if (in_array(strtolower($request->action()), $arr) || in_array('*', $arr))
+        {
+            return true;
+        }
+
+        // 没找到匹配
+        return false;
+    }
+
+    /**
+     * 生成签名
+     * _字符开头的变量不参与签名
+     */
+    public static function makeSign ($data = [],$app_secret = '')
+    {
+        unset($data['version']);
+        unset($data['sign']);
+        return self::_getOrderMd5($data);
+    }
+
+    /**
+     * 计算ORDER的MD5签名
+     */
+    private static function _getOrderMd5($params = []) {
+        ksort($params);
+        return strtolower(md5(urldecode(http_build_query($params))));
+    }
+
+}
diff --git a/application/api/controller/Send.php b/application/api/controller/Send.php
new file mode 100644
index 0000000000000000000000000000000000000000..6656acc6ff189363b4025d2f92b01b1717ce1789
--- /dev/null
+++ b/application/api/controller/Send.php
@@ -0,0 +1,31 @@
+<?php
+namespace app\api\controller;
+
+use think\Controller;
+use think\Request;
+
+trait Send
+{
+
+	/**
+	 * 返回成功
+	 */
+	public static function returnMsg($code = 200,$message = '',$data = [],$header = [])
+	{
+		http_response_code($code);    //设置返回头部
+        $return['code'] = (int)$code;
+        $return['msg'] = $message;
+        $return['data'] = is_array($data) ? $data : ['info'=>$data];
+        // 发送头部信息
+        foreach ($header as $name => $val) {
+            if (is_null($val)) {
+                header($name);
+            } else {
+                header($name . ':' . $val);
+            }
+        }
+        return json($return,200);
+        //exit(json_encode($return,JSON_UNESCAPED_UNICODE));
+	}
+}
+
diff --git a/application/api/controller/v1/Facefusion.php b/application/api/controller/v1/Facefusion.php
new file mode 100644
index 0000000000000000000000000000000000000000..52255f2ca72ec63e20f364e0f6bb103d2250ec5e
--- /dev/null
+++ b/application/api/controller/v1/Facefusion.php
@@ -0,0 +1,184 @@
+<?php
+
+namespace app\api\controller\v1;
+
+use data\model\CountModel;
+use TencentCloud\Common\Credential;
+use TencentCloud\Common\Exception\TencentCloudSDKException;
+use TencentCloud\Common\Profile\ClientProfile;
+use TencentCloud\Common\Profile\HttpProfile;
+use TencentCloud\Facefusion\V20181201\FacefusionClient;
+use TencentCloud\Facefusion\V20181201\Models\FaceFusionRequest;
+use TencentCloud\Iai\V20180301\IaiClient;
+use TencentCloud\Iai\V20200303\Models\DetectFaceRequest;
+use think\Log;
+use think\Request;
+use app\api\controller\Api;
+use think\Config;
+
+class Facefusion extends Api
+{
+    /**
+     * 不需要鉴权方法
+     * index、save不需要鉴权
+     * ['index','save']
+     * 所有方法都不需要鉴权
+     * [*]
+     */
+    protected $noAuth = [];
+
+    public function index(Request $request){
+        if($request->isPost()){
+            $base64 = $request->post("base64","");
+            $typeID = $request->post("typeID","");
+            $rsp = $request->post("rsp","url");
+            if($base64 == ""){
+                return self::returnMsg(-1,'请上传您的人脸照片',[]);
+            }
+            if($typeID == ""){
+                return self::returnMsg(-1,'请选择需要融合的职业',[]);
+            }
+
+            $dataCK = [
+                'api_key' => config('ks_api_key'),
+                'api_secret' => config('ks_api_secret'),
+                'image_base64' => $base64
+            ];
+            $urlCK = "https://api-cn.faceplusplus.com/facepp/v3/detect";
+            $resCK = json_to_array(https_post($urlCK,$dataCK));
+            if(isset($resCK['faces']) && empty($resCK['faces']) ){
+                return self::returnMsg(-1,'人脸检测失败，请上传含有人脸的照片',[]);
+            }
+            //获取模版图的url
+            $templateUrls = config('ks_project');
+            p($templateUrls,1);
+
+
+
+
+        }
+    }
+    /**
+     *
+     * @return \think\Response
+     */
+    public function index2(Request $request) {
+        if($request->isPost()){
+            $base64 = $request->post("base64","");
+            $typeID = $request->post("typeID","");
+            $rsp = $request->post("rsp","url");
+
+            if($base64 == ""){
+                return self::returnMsg(-1,'请上传您的人脸照片',[]);
+            }
+            if($typeID == ""){
+                return self::returnMsg(-1,'请选择需要融合的职业',[]);
+            }
+            $typeIDs = config($typeID);
+
+
+            $type = $typeIDs[rand(0,count($typeIDs)-1)];
+            try{
+                // 实例化一个证书对象，入参需要传入腾讯云账户secretId，secretKey
+                $cred = new Credential(config('tx_secretId'),config('tx_secretKey'));
+
+                $httpProfile = new HttpProfile();
+                $httpProfile->setEndpoint("facefusion.tencentcloudapi.com");
+                $clientProfile = new ClientProfile();
+                $clientProfile->setHttpProfile($httpProfile);
+                $client = new FacefusionClient($cred, "", $clientProfile);
+                $req = new FaceFusionRequest();
+                $params = array(
+                    "ProjectId" => config('tx_projectId'),
+                    "ModelId" => $type['modelId'],
+                    "Image" => $base64,
+                    "RspImgType" => $rsp,
+                    'CelebrityIdentify' => 1,
+                );
+                $req->fromJsonString(json_encode($params));
+                $resp = $client->FaceFusion($req);
+                $respArr = json_decode($resp->toJsonString(),1);
+
+                if(isset($respArr['Image'])){
+                    if($respArr['ReviewResultSet'][0]['Suggestion'] == 'BLOCK'){
+                        return self::returnMsg(200,'图片审核不通过，请重新上传',
+                            ['typeID'=> $typeID,'su'=>1,'url'=>'https://tencent.wepromo.cn/3rd/sgd/public/assets/images/error.png']);
+                    }
+                }
+                if($rsp == 'base64'){
+                    $imgUrl = 'data:image/jpeg;base64,'.$respArr['Image'];
+                } else {
+                    $imgUrl = $respArr['Image'];
+                }
+                $countModel = new CountModel();
+                $countModel->where(['id'=>1])->setInc('count',5);
+
+
+
+                return self::returnMsg(200,'success',['url' => $imgUrl,'su'=>0,'typeID'=> $typeID]);
+            }catch (\TencentCloudSDKException $e) {
+                return self::returnMsg(-1,'error',[]);
+            }
+        }
+       return self::returnMsg(200,'success');
+    }
+
+
+    public function check(Request $request){
+        if($request->isPost()){
+            $base64 = $request->post("base64","");
+            if($base64 == ""){
+                return self::returnMsg(-1,'请上传您的人脸照片',[]);
+            }
+            try {
+                $cred = new Credential(config('tx_secretId'),config('tx_secretKey'));
+                $httpProfile = new HttpProfile();
+                $httpProfile->setEndpoint("iai.tencentcloudapi.com");
+
+                $clientProfile = new ClientProfile();
+                $clientProfile->setHttpProfile($httpProfile);
+                $client = new IaiClient($cred, "", $clientProfile);
+
+                $req = new DetectFaceRequest();
+                $params = array(
+                    "MinFaceSize" => 1,
+                    "Image" => $base64,
+                    "NeedFaceAttributes" => 0,
+                    "NeedQualityDetection" => 0
+                );
+                $req->fromJsonString(json_encode($params));
+
+                $resp = $client->DetectFace($req);
+
+                p($resp,1);
+
+
+
+
+            } catch (\TencentCloudSDKException $e) {
+                echo $e;
+            }
+        }
+
+    }
+
+
+    public function savecount(Request $request){
+        if($request->isPost()){
+            //增加当前使用人数
+            $countModel = new CountModel();
+            $countModel->where(['id'=>1])->setInc('count');
+            return self::returnMsg(200,'success');
+        }
+    }
+
+
+    public function getcount(Request $request){
+        if($request->isPost()){
+            //查询当前使用人数
+            $countModel = new CountModel();
+            $countInfo = $countModel->field('count')->where(['id'=>1]) ->find();
+            return self::returnMsg(200,'success',['count'=>$countInfo['count']]);
+        }
+    }
+}
diff --git a/application/api/controller/v1/Token.php b/application/api/controller/v1/Token.php
new file mode 100644
index 0000000000000000000000000000000000000000..fde52366b1892aab0bd15c0f09a5566bc37640ad
--- /dev/null
+++ b/application/api/controller/v1/Token.php
@@ -0,0 +1,171 @@
+<?php
+namespace app\api\controller\v1;
+
+use data\model\SupplierModel;
+use think\Request;
+use app\api\controller\Send;
+use app\api\controller\Oauth;
+use think\facade\Cache;
+/**
+ * 生成token
+ */
+class Token
+{
+	use Send;
+
+	/**
+	 * 请求时间差
+	 */
+	public static $timeDif = 10000;
+
+	public static $accessTokenPrefix = 'accessToken_';
+	public static $refreshAccessTokenPrefix = 'refreshAccessToken_';
+	public static $expires = 7200;
+	public static $refreshExpires = 60*60*24*30;   //刷新token过期时间
+
+	private $supplierModel = null;
+	public function __construct() {
+		$this->supplierModel = new SupplierModel();
+	}
+
+	/**
+	 * 生成token
+	 */
+	public function token(Request $request)
+	{
+		$data = [
+			'appid' => $request->post('appid',''),
+			'nonce' => $request->post('nonce',''),
+			'timestamp' => $request->post('timestamp',''),
+			'sercet' => $request->post('sercet',''),
+            'key' => $request->post('key',''),
+			'sign' => $request->post('sign','')
+		];
+		//参数验证
+		$validate = new \app\api\validate\Token;
+		if(!$validate->check($data)){
+			return self::returnMsg(401,$validate->getError());
+		}
+		$this->checkParams($data);  //参数校验
+
+		try {
+			$accessToken = self::setAccessToken($data);  //传入参数应该是根据手机号查询改用户的数据
+			return $accessToken['access_token'];
+			//return self::returnMsg(200,'success',$accessToken);
+		} catch (Exception $e) {
+			return self::returnMsg(500,'fail',$e);
+		}
+	}
+
+	/**
+	 * 刷新token
+	 */
+	public function refresh($refresh_token='',$appid = '')
+	{
+		$cache_refresh_token = Cache::get(self::$refreshAccessTokenPrefix.$appid);  //查看刷新token是否存在
+		if(!$cache_refresh_token){
+			return self::returnMsg(401,'fail','refresh_token is null');
+		}else{
+			if($cache_refresh_token !== $refresh_token){
+				return self::returnMsg(401,'fail','refresh_token is error');
+			}else{    //重新给用户生成调用token
+				$data['appid'] = $appid;
+				$accessToken = self::setAccessToken($data); 
+				return self::returnMsg(200,'success',$accessToken);
+			}
+		}
+	}
+
+	/**
+	 * 参数检测
+	 */
+	public function checkParams($params = [])
+	{
+		//时间戳校验
+		if(abs($params['timestamp'] - time()) > self::$timeDif){
+
+			return self::returnMsg(401,'请求时间戳与服务器时间戳异常','timestamp：'.time());
+		}
+		//查询是否存在appid
+		$info = $this->supplierModel->getOneByAppID($params['appid'],'appid,appsercet');
+		if(empty($info)){
+			return self::returnMsg(401,'无效的appid');
+		}
+
+		//appid检测，这里是在本地进行测试，正式的应该是查找数据库或者redis进行验证
+		if($params['sercet'] !== $info['appsercet']){
+			return self::returnMsg(401,'无效的sercet');
+		}
+
+		//签名检测
+		$sign = Oauth::makeSign($params,$info['appsercet']);
+		if($sign !== $params['sign']){
+			return self::returnMsg(401,'无效的sign');
+		}
+	}
+
+	/**
+     * 设置AccessToken
+     * @param $clientInfo
+     * @return int
+     */
+    protected function setAccessToken($clientInfo)
+    {
+        //生成令牌
+        $accessToken = self::buildAccessToken();
+        $refresh_token = self::getRefreshToken($clientInfo['appid']);
+
+        $accessTokenInfo = [
+			'appid' => $clientInfo['appid'],
+            'access_token'  => $accessToken,//访问令牌
+            'expires_time'  => time() + self::$expires,      //过期时间时间戳
+            'refresh_token' => $refresh_token,//刷新的token
+            'refresh_expires_time'  => time() + self::$refreshExpires,      //过期时间时间戳
+        ];
+        self::saveAccessToken($accessToken, $accessTokenInfo);  //保存本次token
+        self::saveRefreshToken($refresh_token,$clientInfo['appid']);
+        return $accessTokenInfo;
+    }
+
+    /**
+     * 刷新用的token检测是否还有效
+     */
+    public static function getRefreshToken($appid = '')
+    {
+    	return Cache::get(self::$refreshAccessTokenPrefix.$appid) ? Cache::get(self::$refreshAccessTokenPrefix.$appid) : self::buildAccessToken(); 
+    }
+
+    /**
+     * 生成AccessToken
+     * @return string
+     */
+    protected static function buildAccessToken($lenght = 32)
+    {
+        //生成AccessToken
+        $str_pol = "1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ123456789abcdefghijklmnopqrstuvwxyz";
+		return substr(str_shuffle($str_pol), 0, $lenght);
+
+    }
+
+    /**
+     * 存储token
+     * @param $accessToken
+     * @param $accessTokenInfo
+     */
+    protected static function saveAccessToken($accessToken, $accessTokenInfo)
+    {
+        //存储accessToken
+        cache(self::$accessTokenPrefix . $accessToken, $accessTokenInfo, self::$expires);
+    }
+
+    /**
+     * 刷新token存储
+     * @param $accessToken
+     * @param $accessTokenInfo
+     */
+    protected static function saveRefreshToken($refresh_token,$appid)
+    {
+        //存储RefreshToken
+        cache(self::$refreshAccessTokenPrefix.$appid,$refresh_token,self::$refreshExpires);
+    }
+}
\ No newline at end of file
diff --git a/application/api/exception/BaseException.php b/application/api/exception/BaseException.php
new file mode 100644
index 0000000000000000000000000000000000000000..ee04c651caf0ad506f4334be1c949b1899d52b99
--- /dev/null
+++ b/application/api/exception/BaseException.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace app\api\exception;
+
+use think\Exception;
+
+/**
+ * Class BaseException
+ * 自定义异常类的基类
+ */
+class BaseException extends Exception
+{
+    public $code = 0;
+    public $message = 'invalid parameters';
+
+    /**
+     * 构造函数，接收一个关联数组
+     * @param array $params 关联数组只应包含code、msg，且不应该是空值
+     */
+    public function __construct($params = [])
+    {
+        if (!is_array($params)) {
+            return;
+        }
+        if (array_key_exists('code', $params)) {
+            $this->code = $params['code'];
+        }
+        if (array_key_exists('msg', $params)) {
+            $this->message = $params['msg'];
+        }
+    }
+}
+
diff --git a/application/api/exception/ExceptionHandler.php b/application/api/exception/ExceptionHandler.php
new file mode 100644
index 0000000000000000000000000000000000000000..2df5ee604c663567a380ee211122a81e0b7dc7da
--- /dev/null
+++ b/application/api/exception/ExceptionHandler.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace app\api\exception;
+
+use think\exception\Handle;
+use think\Log;
+use Exception;
+
+/**
+ * 重写Handle的render方法，实现自定义异常消息
+ * Class ExceptionHandler
+ * @package app\api\library\exception
+ */
+class ExceptionHandler extends Handle
+{
+    private $code;
+    private $message;
+    private $statuscode;
+
+    /**
+     * 输出异常信息
+     * @param Exception $e
+     * @return \think\Response|\think\response\Json
+     */
+    public function render(Exception $e)
+    {   
+        $this->statuscode = $this->code = 500;
+
+        if ($e instanceof BaseException) {  //是否异常实例
+            $this->code = $e->code;
+            $this->message = $e->message;
+        } else {
+            if (config('app_debug')) {   //是否开启debug模式，异常交给父类异常处理，否则输出json格式错误
+                return parent::render($e);
+            }
+            $this->code = 500;
+            $this->message = $e->getMessage() ?: '很抱歉，服务器内部错误';
+            //$this->recordErrorLog($e);
+        }
+        // Http异常
+        if ($e instanceof \think\exception\HttpException)
+        {       
+            $this->statuscode = $this->code = $e->getStatusCode();
+        }
+        return json(['msg' => $this->message, 'code' => $this->code,'data' => null],$this->statuscode);
+    }
+
+    /**
+     * 将异常写入日志
+     * @param Exception $e
+     */
+    private function recordErrorLog(Exception $e)
+    {
+        Log::record($e->getMessage(), 'error');
+        Log::record($e->getTraceAsString(), 'error');
+    }
+}
diff --git a/application/api/utils/ArrayUtil.php b/application/api/utils/ArrayUtil.php
new file mode 100644
index 0000000000000000000000000000000000000000..c5a3451331535766abad129d8b0dc4ffe23a5553
--- /dev/null
+++ b/application/api/utils/ArrayUtil.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: dalin
+ * Date: 2017/9/23
+ * Time: 14:19
+ */
+namespace app\api\utils;
+
+class ArrayUtil
+{
+    /**
+     * 移除空值的key
+     * @param $para
+     * @return array
+     * @author helei
+     */
+    public static function paraFilter($para)
+    {
+        $paraFilter = [];
+        while (list($key, $val) = each($para)) {
+            if ($val === '' || $val === null) {
+                continue;
+            } else {
+                if (! is_array($para[$key])) {
+                    $para[$key] = is_bool($para[$key]) ? $para[$key] : trim($para[$key]);
+                }
+
+                $paraFilter[$key] = $para[$key];
+            }
+        }
+
+        return $paraFilter;
+    }
+
+    /**
+     * 删除一位数组中，指定的key与对应的值
+     * @param array $inputs 要操作的数组
+     * @param array|string $keys 需要删除的key的数组，或者用（,）链接的字符串
+     * @return array
+     */
+    public static function removeKeys(array $inputs, $keys)
+    {
+        if (! is_array($keys)) {// 如果不是数组，需要进行转换
+            $keys = explode(',', $keys);
+        }
+
+        if (empty($keys) || ! is_array($keys)) {
+            return $inputs;
+        }
+
+        $flag = true;
+        foreach ($keys as $key) {
+            if (array_key_exists($key, $inputs)) {
+                if (is_int($key)) {
+                    $flag = false;
+                }
+                unset($inputs[$key]);
+            }
+        }
+
+        if (! $flag) {
+            $inputs = array_values($inputs);
+        }
+        return $inputs;
+    }
+
+    /**
+     * 对输入的数组进行字典排序
+     * @param array $param 需要排序的数组
+     * @return array
+     * @author helei
+     */
+    public static function arraySort(array $param)
+    {
+        ksort($param);
+        reset($param);
+
+        return $param;
+    }
+
+    /**
+     * 把数组所有元素，按照“参数=参数值”的模式用“&”字符拼接成字符串
+     * @param array $para 需要拼接的数组
+     * @return string
+     * @throws \Exception
+     */
+    public static function createLinkstring($para)
+    {
+        if (! is_array($para)) {
+            throw new \Exception('必须传入数组参数');
+        }
+
+        reset($para);
+        $arg = '';
+        while (list($key, $val) = each($para)) {
+            if (is_array($val)) {
+                continue;
+            }
+
+            $arg.=$key.'='.urldecode($val).'&';
+        }
+        //去掉最后一个&字符
+        $arg && $arg = rtrim($arg,'&');
+
+        //如果存在转义字符，那么去掉转义
+        if (get_magic_quotes_gpc()) {
+            $arg = stripslashes($arg);
+        }
+
+        return $arg;
+    }
+}
+
diff --git a/application/api/utils/DataParser.php b/application/api/utils/DataParser.php
new file mode 100644
index 0000000000000000000000000000000000000000..3e5e57161ef7e029fc3abc613f40d6d61c2f90ba
--- /dev/null
+++ b/application/api/utils/DataParser.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: dalin
+ * Date: 2017/9/23
+ * Time: 14:20
+ */
+namespace app\api\utils;
+
+class DataParser
+{
+    /**
+     * 输出xml字符
+     * @param array $values
+     * @return string|bool
+     **/
+    public static function toXml($values)
+    {
+        if (!is_array($values) || count($values) <= 0) {
+            return false;
+        }
+
+        $xml = "<xml>";
+        foreach ($values as $key => $val) {
+            if (is_numeric($val)) {
+                $xml.="<".$key.">".$val."</".$key.">";
+            } else {
+                $xml.="<".$key."><![CDATA[".$val."]]></".$key.">";
+            }
+        }
+        $xml.="</xml>";
+        return $xml;
+    }
+
+    /**
+     * 将xml转为array
+     * @param string $xml
+     * @return array|false
+     */
+    public static function toArray($xml)
+    {
+        if (!$xml) {
+            return false;
+        }
+
+        // 检查xml是否合法
+        $xml_parser = xml_parser_create();
+        if (!xml_parse($xml_parser, $xml, true)) {
+            xml_parser_free($xml_parser);
+            return false;
+        }
+
+        //将XML转为array
+        //禁止引用外部xml实体
+        libxml_disable_entity_loader(true);
+
+        $data = json_decode(json_encode(simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA)), true);
+
+        return $data;
+    }
+
+    /**
+     * google api 二维码生成【QRcode可以存储最多4296个字母数字类型的任意文本，具体可以查看二维码数据格式】
+     * @param string $text 二维码包含的信息，可以是数字、字符、二进制信息、汉字。不能混合数据类型，数据必须经过UTF-8 URL-encoded
+     * @param string $widthHeight 生成二维码的尺寸设置
+     * @param string $ecLevel 可选纠错级别，QR码支持四个等级纠错，用来恢复丢失的、读错的、模糊的、数据。
+     *                            L-默认：可以识别已损失的7%的数据
+     *                            M-可以识别已损失15%的数据
+     *                            Q-可以识别已损失25%的数据
+     *                            H-可以识别已损失30%的数据
+     *
+     * @param string $margin 生成的二维码离图片边框的距离
+     *
+     * @return string
+     */
+    public static function toQRimg($text, $widthHeight = '150', $ecLevel = 'L', $margin = '0')
+    {
+        $chl = urlencode($text);
+
+        return "http://chart.apis.google.com/chart?chs={$widthHeight}x{$widthHeight}&cht=qr&chld={$ecLevel}|{$margin}&chl={$chl}";
+    }
+}
diff --git a/application/api/utils/wxBizDataCrypt.php b/application/api/utils/wxBizDataCrypt.php
new file mode 100644
index 0000000000000000000000000000000000000000..533dfb317059d4fc08df16852ad2c8d7e0a61cc5
--- /dev/null
+++ b/application/api/utils/wxBizDataCrypt.php
@@ -0,0 +1,68 @@
+<?php
+namespace app\api\utils;
+
+/**
+ * 
+ */
+class wxBizDataCrypt
+{
+	
+	public static $OK = 0;
+	public static $IllegalAesKey = -41001;
+	public static $IllegalIv = -41002;
+	public static $IllegalBuffer = -41003;
+	public static $DecodeBase64Error = -41004;
+
+	private $appid;
+	private $sessionKey;
+
+	/**
+	 * 构造函数
+	 * @param $sessionKey string 用户在小程序登录后获取的会话密钥
+	 * @param $appid string 小程序的appid
+	 */
+	public function __construct( $appid, $sessionKey)
+	{
+		$this->sessionKey = $sessionKey;
+		$this->appid = $appid;
+	}
+
+
+	/**
+	 * 检验数据的真实性，并且获取解密后的明文.
+	 * @param $encryptedData string 加密的用户数据
+	 * @param $iv string 与用户数据一同返回的初始向量
+	 * @param $data string 解密后的原文
+     *
+	 * @return int 成功0，失败返回对应的错误码
+	 */
+	public function decryptData( $encryptedData, $iv )
+	{
+		if (strlen($this->sessionKey) != 24) {
+			return self::$IllegalAesKey;
+		}
+		$aesKey=base64_decode($this->sessionKey);
+
+        
+		if (strlen($iv) != 24) {
+			return self::$IllegalIv;
+		}
+		$aesIV=base64_decode($iv);
+
+		$aesCipher=base64_decode($encryptedData);
+
+		$result=openssl_decrypt( $aesCipher, "AES-128-CBC", $aesKey, 1, $aesIV);
+
+		$dataObj=json_decode( $result );
+		if( $dataObj  == NULL )
+		{
+			return self::$IllegalBuffer;
+		}
+		if( $dataObj->watermark->appid != $this->appid )
+		{
+			return self::$IllegalBuffer;
+		}
+		$data = $result;
+		return $data;
+	}
+}
\ No newline at end of file
diff --git a/application/api/validate/Token.php b/application/api/validate/Token.php
new file mode 100644
index 0000000000000000000000000000000000000000..7526eddb31a25991f71f70a2e8b73b83051a864a
--- /dev/null
+++ b/application/api/validate/Token.php
@@ -0,0 +1,28 @@
+<?php
+namespace app\api\validate;
+
+use think\Validate;
+/**
+ * 生成token参数验证器
+ */
+class Token extends Validate
+{
+	
+	protected $rule = [
+        'appid'       =>  'require',
+        'sercet'      =>  'require',
+        'nonce'       =>  'require',
+        'key'      =>  'require',
+        'timestamp'   =>  'number|require',
+        'sign'        =>  'require'
+    ];
+
+    protected $message  =   [
+        'appid.require'    => 'appid不能为空',
+        'sercet.require'    => 'sercet不能为空',
+        'key.require'    => '设备信息不能为空',
+        'nonce.require'    => '随机数不能为空',
+        'timestamp.number' => '时间戳格式错误',
+        'sign.require'     => '签名不能为空',    
+    ];
+}
\ No newline at end of file
diff --git a/application/api/validate/ValidataCommon.php b/application/api/validate/ValidataCommon.php
new file mode 100644
index 0000000000000000000000000000000000000000..0f59b9a6a6acb25afc1f57fddfc8ccc93426f4b4
--- /dev/null
+++ b/application/api/validate/ValidataCommon.php
@@ -0,0 +1,51 @@
+<?php
+namespace app\api\validate;
+
+use app\api\controller\Send;
+
+/**
+ * 公共验证码方法
+ * Class Common
+ * @package app\api\validate
+ */
+class ValidataCommon
+{
+    use Send;
+    /**
+     * 默认支持验证规则
+     * 更多验证规则请使用原生验证器
+     * @var array
+     */
+    public static $dataRule = ['require','int','mobile'];
+
+    /**
+     * 接口参数公共验证方法
+     * @param array $rule
+     * @param array $data
+     */
+    static function validateCheck($rule = [],$data = []){
+        if(is_array($rule) && is_array($data)){
+            foreach ($rule as $k => $v){
+                if(!in_array($v,self::$dataRule)){
+                    return self::returnMsg(401,'fail','验证规则只支持require，int');
+                }
+                if(!isset($data[$k]) || empty($data[$k])){
+                    return self::returnMsg(401,'fail',$k.'不能为空');
+                }else{
+                    if($v == 'int'){
+                        if(!is_numeric($data[$k])){
+                            return self::returnMsg(401,'fail',$k.'类型必须为'.$v);
+                        }
+                    }elseif ($v == 'mobile'){
+                        if(!preg_match('/^1[3-9][0-9]\d{8}$/',$data[$k])){
+                            return self::returnMsg(401,'fail',$k.'手机号格式错误');
+                        }
+                    }
+                }
+            }
+        }else{
+            return self::returnMsg(401,'fail','验证数据格式为数组');
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/application/command.php b/application/command.php
new file mode 100644
index 0000000000000000000000000000000000000000..826bb2b231d4f7863167c23aee1ab668e51e872f
--- /dev/null
+++ b/application/command.php
@@ -0,0 +1,12 @@
+<?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: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+return [];
diff --git a/application/common.php b/application/common.php
new file mode 100644
index 0000000000000000000000000000000000000000..a8f87857a31aec0c79618185699c5061c3b803fe
--- /dev/null
+++ b/application/common.php
@@ -0,0 +1,97 @@
+<?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@gmail.com>
+// +----------------------------------------------------------------------
+
+// 应用公共文件
+/**
+ * 打印输出
+ * @param array $obj
+ * @param int $exit
+ */
+function p($obj = array(),$exit = 0,$format=1){
+    if($format){
+        echo "<pre>";
+        print_r($obj);
+        echo "</pre>";
+    } else {
+        print_r($obj);
+    }
+    $exit && exit;
+}
+//获取远程内容
+function geturl($url) {
+    $headers1 = array(
+        //'referer' => $_POST['referer'],
+        'Client-IP' => (empty($_SERVER['HTTP_CLIENT_IP'])? $_SERVER['REMOTE_ADDR'] : $_SERVER['HTTP_CLIENT_IP']),
+        'X-Forwarded-For' => (empty($_SERVER['HTTP_X_FORWARDED_FOR'])? $_SERVER['REMOTE_ADDR'] : $_SERVER['HTTP_X_FORWARDED_FOR']),
+    );
+    // 判断是否支持CURL
+    if (!function_exists('curl_init') || !function_exists('curl_exec')) {
+        exit('您的主机不支持Curl，请开启~');
+    }
+    $curl = curl_init();
+    curl_setopt($curl, CURLOPT_URL, $url);
+    curl_setopt($curl, CURLOPT_USERAGENT, 'Cloud Parse');
+    //curl_setopt($curl, CURLOPT_REFERER, "http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
+    curl_setopt($curl, CURLOPT_AUTOREFERER, 1);
+    curl_setopt($curl, CURLOPT_TIMEOUT, 10);
+    curl_setopt($curl, CURLOPT_HEADER, 0);
+    curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+    curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+    curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
+    $data = curl_exec($curl);
+    curl_close($curl);
+    return $data;
+}
+
+function https_post($url,$data=array()){
+    $curl = curl_init(); // 启动一个CURL会话
+    curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址
+    //curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查
+    //curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 1); // 从证书中检查SSL加密算法是否存在
+    curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器
+    curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转
+    curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer
+    curl_setopt($curl, CURLOPT_POST, 1); // 发送一个常规的Post请求
+    curl_setopt($curl, CURLOPT_POSTFIELDS, $data); // Post提交的数据包
+    curl_setopt($curl, CURLOPT_TIMEOUT, 30); // 设置超时限制防止死循环
+    curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容
+    curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回
+    $tmpInfo = curl_exec($curl); // 执行操作
+    if (curl_errno($curl)) {
+        echo 'Errno'.curl_error($curl);//捕抓异常
+    }
+    curl_close($curl); // 关闭CURL会话
+    return $tmpInfo; // 返回数据，json格式
+}
+/**
+ * json字符窜转换成数组
+ *
+ * @param string $str  json字符窜
+ * @return array
+ */
+function json_to_array($str) {
+    if (is_string($str))
+        $str = json_decode($str);
+    $arr=array();
+    foreach($str as $k=>$v) {
+        if(is_object($v) || is_array($v))
+            $arr[$k]=json_to_array($v);
+        else
+            $arr[$k]=$v;
+    }
+    return $arr;
+}
+//生成订单号
+function _getRandOrderID(){
+    list($t1, $t2) = explode(' ', microtime());
+    $order_id = $t2.rand(10,99).rand(10,99).rand(10,99).rand(0,9);
+    return $order_id;
+}
\ No newline at end of file
diff --git a/application/provider.php b/application/provider.php
new file mode 100644
index 0000000000000000000000000000000000000000..d0fcd2454482b0aa3af3e839ba7836faac6fdda4
--- /dev/null
+++ b/application/provider.php
@@ -0,0 +1,14 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// 应用容器绑定定义
+return [
+];
diff --git a/application/tags.php b/application/tags.php
new file mode 100644
index 0000000000000000000000000000000000000000..4b18d1050b7c1263ff327ba6a149123df323f869
--- /dev/null
+++ b/application/tags.php
@@ -0,0 +1,28 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// 应用行为扩展定义文件
+return [
+    // 应用初始化
+    'app_init'     => [],
+    // 应用开始
+    'app_begin'    => [],
+    // 模块初始化
+    'module_init'  => [],
+    // 操作开始执行
+    'action_begin' => [],
+    // 视图内容过滤
+    'view_filter'  => [],
+    // 日志写入
+    'log_write'    => [],
+    // 应用结束
+    'app_end'      => [],
+];
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..28d0f37c2f5c520e4c90f4b4e5652f54209fcb2d
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,14 @@
+{
+    "name": "smalls/video-tools",
+    "description": "",
+    "type": "library",
+    "require": {
+        "php": ">= 7.0",
+        "ext-json": "*",
+        "ext-openssl": "*",
+        "ext-SimpleXML": "*",
+        "ext-mbstring": "*",
+        "guzzlehttp/guzzle": "^6.3.0",
+        "tencentcloud/tencentcloud-sdk-php": "3.0.235"
+    }
+}
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 0000000000000000000000000000000000000000..304bab33cb186462abf1bce7261ede126d07d9f4
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,775 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "c4cab94fed51556824ce7e7d0371edb5",
+    "packages": [
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.5.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+                "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "ext-json": "*",
+                "guzzlehttp/promises": "^1.0",
+                "guzzlehttp/psr7": "^1.6.1",
+                "php": ">=5.5",
+                "symfony/polyfill-intl-idn": "^1.17.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
+                "psr/log": "^1.1"
+            },
+            "suggest": {
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.5-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2020-06-16T21:01:06+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "v1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2016-12-20T10:07:11+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a",
+                "reference": "239400de7a173fe9901b9ac7c06497751f00727a",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0",
+                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "ext-zlib": "*",
+                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8"
+            },
+            "suggest": {
+                "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "time": "2019-07-01T23:21:34+00:00"
+        },
+        {
+            "name": "paragonie/random_compat",
+            "version": "v9.99.99",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/random_compat.git",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "reference": "84b4dfb120c6f9b4ff7b3685f9b8f1aa365a0c95",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": "^7"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*|5.*",
+                "vimeo/psalm": "^1"
+            },
+            "suggest": {
+                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com"
+                }
+            ],
+            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
+            "keywords": [
+                "csprng",
+                "polyfill",
+                "pseudorandom",
+                "random"
+            ],
+            "time": "2018-07-02T15:55:56+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2016-08-06T14:39:51+00:00"
+        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "time": "2019-03-08T08:55:37+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.18.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/5dcab1bc7146cf8c1beaa4502a3d9be344334251",
+                "reference": "5dcab1bc7146cf8c1beaa4502a3d9be344334251",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php70": "^1.10",
+                "symfony/polyfill-php72": "^1.10"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-08-04T06:02:08+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.18.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+                "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php70",
+            "version": "v1.18.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php70.git",
+                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+                "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "paragonie/random_compat": "~1.0|~2.0|~9.99",
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ],
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.18.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "639447d008615574653fb3bc60d1986d7172eaae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae",
+                "reference": "639447d008615574653fb3bc60d1986d7172eaae",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.18-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-07-14T12:35:20+00:00"
+        },
+        {
+            "name": "tencentcloud/tencentcloud-sdk-php",
+            "version": "3.0.235",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/TencentCloud/tencentcloud-sdk-php.git",
+                "reference": "bed9a47f545ea6b6dc1d25688b9ac53c6fbe7999"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/TencentCloud/tencentcloud-sdk-php/zipball/bed9a47f545ea6b6dc1d25688b9ac53c6fbe7999",
+                "reference": "bed9a47f545ea6b6dc1d25688b9ac53c6fbe7999",
+                "shasum": "",
+                "mirrors": [
+                    {
+                        "url": "https://mirrors.cloud.tencent.com/composer/dists/%package%/%reference%.%type%",
+                        "preferred": true
+                    }
+                ]
+            },
+            "require": {
+                "guzzlehttp/guzzle": "^6.3",
+                "guzzlehttp/psr7": "^1.4",
+                "php": ">=5.6.33"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/QcloudApi/QcloudApi.php"
+                ],
+                "psr-4": {
+                    "TencentCloud\\": "./src/TencentCloud"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "coolli",
+                    "email": "tencentcloudapi@tencent.com",
+                    "homepage": "https://cloud.tencent.com/document/sdk/PHP",
+                    "role": "Developer"
+                }
+            ],
+            "description": "TencentCloudApi php sdk",
+            "homepage": "https://github.com/TencentCloud/tencentcloud-sdk-php",
+            "time": "2020-08-18T01:26:16+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">= 7.0",
+        "ext-json": "*",
+        "ext-openssl": "*",
+        "ext-simplexml": "*",
+        "ext-mbstring": "*"
+    },
+    "platform-dev": [],
+    "plugin-api-version": "1.1.0"
+}
diff --git a/config/app.php b/config/app.php
new file mode 100644
index 0000000000000000000000000000000000000000..8c6e6166fd024d44b3b4760439735e5048cb8be3
--- /dev/null
+++ b/config/app.php
@@ -0,0 +1,271 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// +----------------------------------------------------------------------
+// | 应用设置
+// +----------------------------------------------------------------------
+
+return [
+    // 应用名称
+    'app_name'               => '',
+    // 应用地址
+    'app_host'               => '',
+    // 应用调试模式
+    'app_debug'              => false,
+    // 应用Trace
+    'app_trace'              => false,
+    // 是否支持多模块
+    'app_multi_module'       => true,
+    // 入口自动绑定模块
+    'auto_bind_module'       => false,
+    // 注册的根命名空间
+    'root_namespace'         => ['data'=>'../data/'],
+    // 默认输出类型
+    'default_return_type'    => 'json',
+    // 默认AJAX 数据返回格式,可选json xml ...
+    'default_ajax_return'    => 'json',
+    // 默认JSONP格式返回的处理方法
+    'default_jsonp_handler'  => 'jsonpReturn',
+    // 默认JSONP处理方法
+    'var_jsonp_handler'      => 'callback',
+    // 默认时区
+    'default_timezone'       => 'Asia/Shanghai',
+    // 是否开启多语言
+    '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_module'           => '',
+    // 默认的空控制器名
+    'empty_controller'       => 'Error',
+    // 操作方法前缀
+    'use_action_prefix'      => false,
+    // 操作方法后缀
+    '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'          => '/',
+    // HTTPS代理标识
+    'https_agent_name'       => '',
+    // IP代理获取标识
+    'http_agent_ip'          => 'X-REAL-IP',
+    // URL伪静态后缀
+    'url_html_suffix'        => 'html',
+    // URL普通方式参数 用于自动生成
+    'url_common_param'       => false,
+    // URL参数方式 0 按名称成对解析 1 按顺序解析
+    'url_param_type'         => 0,
+    // 是否开启路由延迟解析
+    'url_lazy_route'         => false,
+    // 是否强制使用路由
+    'url_route_must'         => false,
+    // 合并路由规则
+    'route_rule_merge'       => false,
+    // 路由是否完全匹配
+    'route_complete_match'   => false,
+    // 使用注解路由
+    'route_annotation'       => false,
+    // 域名根，如thinkphp.cn
+    'url_domain_root'        => '',
+    // 是否自动转换URL中的控制器和操作名
+    'url_convert'            => true,
+    // 默认的访问控制器层
+    'url_controller_layer'   => 'controller',
+    // 表单请求类型伪装变量
+    'var_method'             => '_method',
+    // 表单ajax伪装变量
+    'var_ajax'               => '_ajax',
+    // 表单pjax伪装变量
+    'var_pjax'               => '_pjax',
+    // 是否开启请求缓存 true自动缓存 支持设置请求缓存规则
+    'request_cache'          => false,
+    // 请求缓存有效期
+    'request_cache_expire'   => null,
+    // 全局请求缓存排除规则
+    'request_cache_except'   => [],
+    // 是否开启路由缓存
+    'route_check_cache'      => false,
+    // 路由缓存的Key自定义设置（闭包），默认为当前URL和请求类型的md5
+    'route_check_cache_key'  => '',
+    // 路由缓存类型及参数
+    'route_cache_option'     => [],
+
+    // 默认跳转页面对应的模板文件
+    'dispatch_success_tmpl'  => Env::get('think_path') . 'tpl/dispatch_jump.tpl',
+    'dispatch_error_tmpl'    => Env::get('think_path') . 'tpl/dispatch_jump.tpl',
+
+    // 异常页面的模板文件
+    'exception_tmpl'         => Env::get('think_path') . 'tpl/think_exception.tpl',
+
+    // 错误显示信息,非调试模式有效
+    'error_message'          => '页面错误！请稍后再试～',
+    // 显示错误信息
+    'show_error_msg'         => false,
+    // 异常处理handle类 留空使用 \think\exception\Handle
+    //'exception_handle'       => '\\app\\api\\exception\\ExceptionHandler',
+    'exception_handle'       => function($e) {
+        // 参数验证错误
+        return json([
+            'msg'=>$e->getMessage(),
+            'code'=>500,
+            'data'=>'',
+        ]);
+    },
+    //旷世人脸融合
+    'ks_api_key' => "8TK-03JRTc6p26mzHLUYga0D1DMBJ-_v",
+    'ks_api_secret' => "CX7lwCyuxVNWblAUfJXkVf__dG1W-KW2",
+    'ks_project' => [
+        'nurse_nan' => 'https://static.scms.sztv.com.cn/ysz/upload/Image/mrtp/2020/09/23/0ca7639ef73b4df5a968a0f67a47acc7.jpg',
+        'nurse_nv' => 'https://static.scms.sztv.com.cn/ysz/upload/Image/mrtp/2020/09/23/2308f069375c4707a626dc6f95ea8747.jpg',
+        'police_nan' => 'http://static.scms.sztv.com.cn/ysz/upload/Image/mrtp/2020/09/23/8c2d3cb6566045349ff3c4acc2ead6fa.jpg',
+        'police_nv' => 'https://static.scms.sztv.com.cn/ysz/upload/Image/mrtp/2020/09/23/617044ccb2a94e98ab52a55acc7872e6.jpg',
+        'stew_nan' => 'https://static.scms.sztv.com.cn/ysz/upload/Image/mrtp/2020/09/23/e7b35d363be34066a4815fcbf0a07ea1.jpg',
+        'stew_nv' => 'https://static.scms.sztv.com.cn/ysz/upload/Image/mrtp/2020/09/23/e866f9a21de746809ea11fdda2d09b33.jpg',
+        'school_nan' => 'https://static.scms.sztv.com.cn/ysz/upload/Image/mrtp/2020/09/23/00d3312ed3384a6aacef75a0a447ca20.jpg',
+        'school_nv' => 'https://static.scms.sztv.com.cn/ysz/upload/Image/mrtp/2020/09/23/3b65896999d845e287c14444674dda1b.jpg',
+        'volunteer_nan' => 'https://static.scms.sztv.com.cn/ysz/upload/Image/mrtp/2020/09/23/4a42c14a30ba4171951c40a298b94d74.jpg',
+        'volunteer_nv' => 'https://static.scms.sztv.com.cn/ysz/upload/Image/mrtp/2020/09/23/7c94deee07e24d9886f16d623ad90082.jpg',
+    ],
+    //腾讯云人脸融合相关
+    'tx_projectId' => '304220',
+    'tx_secretId' => 'AKIDkOsXFsQYcV6WpxBvCMLo9TdzHNbkGUC2',
+    'tx_secretKey' => 'scFhw5DE3f4PZaTJ7jHsKn8HMFl9Mn7J',
+    'nurse_nan' => [
+        [
+            'modelId' => 'qc_304220_845778_134',
+            'url' => 'nurse_1.jpg'
+        ]
+    ],
+    'nurse_nv' => [
+        [
+            'modelId' => 'qc_304220_898813_117',
+            'url' => 'nurse_1.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_928425_118',
+            'url' => 'nurse_2.jpg'
+        ]
+    ],
+    'police_nan' => [
+        [
+            'modelId' => 'qc_304220_881614_137',
+            'url' => 'police_1.jpg'
+        ]
+    ],
+    'police_nv' =>[
+        [
+            'modelId' => 'qc_304220_463635_119',
+            'url' => 'police_2.jpg'
+        ]
+    ],
+    'stew_nan' =>[
+        [
+            'modelId' => 'qc_304220_889670_129',
+            'url' => 'police_2.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_598880_128',
+            'url' => 'police_2.jpg'
+        ]
+    ],
+    'stew_nv' => [
+        [
+            'modelId' => 'qc_304220_910900_120',
+            'url' => 'stew_1.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_825650_121',
+            'url' => 'stew_2.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_553892_122',
+            'url' => 'stew_3.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_477452_123',
+            'url' => 'stew_4.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_160733_124',
+            'url' => 'stew_5.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_279572_125',
+            'url' => 'stew_6.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_589565_126',
+            'url' => 'stew_7.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_959193_127',
+            'url' => 'stew_8.jpg'
+        ]
+    ],
+    'school_nv' => [
+        [
+            'modelId' => 'qc_304220_226920_130',
+            'url' => 'school_1.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_809183_133',
+            'url' => 'school_1.jpg'
+        ],
+    ],
+    'school_nan' => [
+        [
+            'modelId' => 'qc_304220_276690_140',
+            'url' => 'school_1.jpg'
+        ]
+    ],
+    'volunteer_nan' => [
+        [
+            'modelId' => 'qc_304220_637956_135',
+            'url' => 'volunteer_1.jpg'
+        ]
+    ],
+    'volunteer_nv' => [
+        [
+            'modelId' => 'qc_304220_246292_136',
+            'url' => 'volunteer_2.jpg'
+        ]
+    ],
+    //
+];
diff --git a/config/cache.php b/config/cache.php
new file mode 100644
index 0000000000000000000000000000000000000000..985dbb1c480bd612d18bb6945151396f7216616a
--- /dev/null
+++ b/config/cache.php
@@ -0,0 +1,25 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// +----------------------------------------------------------------------
+// | 缓存设置
+// +----------------------------------------------------------------------
+
+return [
+    // 驱动方式
+    'type'   => 'File',
+    // 缓存保存目录
+    'path'   => '',
+    // 缓存前缀
+    'prefix' => '',
+    // 缓存有效期 0表示永久缓存
+    'expire' => 0,
+];
diff --git a/config/console.php b/config/console.php
new file mode 100644
index 0000000000000000000000000000000000000000..b0f9165ac2dcb7ce5d68e32e113f6b53084c0c3b
--- /dev/null
+++ b/config/console.php
@@ -0,0 +1,19 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// +----------------------------------------------------------------------
+// | 控制台配置
+// +----------------------------------------------------------------------
+return [
+    'name'    => 'Think Console',
+    'version' => '0.1',
+    'user'    => null,
+];
diff --git a/config/cookie.php b/config/cookie.php
new file mode 100644
index 0000000000000000000000000000000000000000..1de07082a6c0a48f5b8cad6b798eef1f3310bfbc
--- /dev/null
+++ b/config/cookie.php
@@ -0,0 +1,30 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// +----------------------------------------------------------------------
+// | Cookie设置
+// +----------------------------------------------------------------------
+return [
+    // cookie 名称前缀
+    'prefix'    => '',
+    // cookie 保存时间
+    'expire'    => 0,
+    // cookie 保存路径
+    'path'      => '/',
+    // cookie 有效域名
+    'domain'    => '',
+    //  cookie 启用安全传输
+    'secure'    => false,
+    // httponly设置
+    'httponly'  => '',
+    // 是否使用 setcookie
+    'setcookie' => true,
+];
diff --git a/config/database.php b/config/database.php
new file mode 100644
index 0000000000000000000000000000000000000000..3c6225786bbb0184832613e93db5fad634977d77
--- /dev/null
+++ b/config/database.php
@@ -0,0 +1,63 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+return [
+    // 数据库类型
+    'type'            => 'mysql',
+    // 服务器地址
+    'hostname'        => '172.21.16.5',
+    // 数据库名
+    'database'        => 'sgd',
+    // 用户名
+    'username'        => 'sgd',
+    // 密码
+    'password'        => 'Sgd_2020',
+    // 端口
+    'hostport'        => '3306',
+    // 连接dsn
+    'dsn'             => '',
+    // 数据库连接参数
+    'params'          => [],
+    // 数据库编码默认采用utf8
+    'charset'         => 'utf8',
+    // 数据库表前缀
+    'prefix'          => '',
+    // 数据库调试模式
+    'debug'           => true,
+    // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
+    'deploy'          => 0,
+    // 数据库读写是否分离 主从式有效
+    'rw_separate'     => false,
+    // 读写分离后 主服务器数量
+    'master_num'      => 1,
+    // 指定从服务器序号
+    'slave_no'        => '',
+    // 自动读取主库数据
+    'read_master'     => false,
+    // 是否严格检查字段是否存在
+    'fields_strict'   => true,
+    // 数据集返回类型
+    'resultset_type'  => 'array',
+    // 自动写入时间戳字段
+    'auto_timestamp'  => false,
+    // 时间字段取出后的默认时间格式
+    'datetime_format' => 'Y-m-d H:i:s',
+    // 是否需要进行SQL性能分析
+    'sql_explain'     => false,
+    // Builder类
+    'builder'         => '',
+    // Query类
+    'query'           => '\\think\\db\\Query',
+    // 是否需要断线重连
+    'break_reconnect' => false,
+    // 断线标识字符串
+    'break_match_str' => [],
+];
diff --git a/config/face.php b/config/face.php
new file mode 100644
index 0000000000000000000000000000000000000000..43f1ef1f1582db9be4f89754dd2b0ef5fee6c513
--- /dev/null
+++ b/config/face.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * 人脸融合模版图对应素材ID
+ */
+
+return [
+    'nurse' => [
+        [
+            'modelId' => 'qc_304220_450453_60',
+            'url' => 'nurse_1.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_973822_59',
+            'url' => 'nurse_2.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_343160_58',
+            'url' => 'nurse_3.jpg'
+        ],
+    ],
+    'police' => [
+        [
+            'modelId' => 'qc_304220_631053_61',
+            'url' => 'police_1.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_497090_62',
+            'url' => 'police_2.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_921215_63',
+            'url' => 'police_3.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_881107_64',
+            'url' => 'police_4.jpg'
+        ],
+    ],
+    'stew' => [
+        [
+            'modelId' => 'qc_304220_235055_65',
+            'url' => 'stew_1.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_399447_66',
+            'url' => 'stew_2.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_829050_67',
+            'url' => 'stew_3.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_654517_68',
+            'url' => 'stew_4.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_169438_69',
+            'url' => 'stew_5.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_786777_70',
+            'url' => 'stew_6.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_882831_71',
+            'url' => 'stew_7.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_630049_72',
+            'url' => 'stew_8.jpg'
+        ]
+    ],
+    'school' => [
+        [
+            'modelId' => 'qc_304220_891187_73',
+            'url' => 'school_1.jpg'
+        ]
+    ],
+    'volunteer' => [
+        [
+            'modelId' => 'qc_304220_309641_74',
+            'url' => 'volunteer_1.jpg'
+        ],
+        [
+            'modelId' => 'qc_304220_718161_75',
+            'url' => 'volunteer_2.jpg'
+        ]
+    ]
+
+];
diff --git a/config/log.php b/config/log.php
new file mode 100644
index 0000000000000000000000000000000000000000..b3d87b4a9481401cb8724f313c170954e5de2ec9
--- /dev/null
+++ b/config/log.php
@@ -0,0 +1,30 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// +----------------------------------------------------------------------
+// | 日志设置
+// +----------------------------------------------------------------------
+return [
+    // 日志记录方式，内置 file socket 支持扩展
+    'type'        => 'File',
+    // 日志保存目录
+    'path'        => '',
+    // 日志记录级别
+    'level'       => [],
+    // 单文件日志写入
+    'single'      => false,
+    // 独立日志级别
+    'apart_level' => [],
+    // 最大日志文件数量
+    'max_files'   => 0,
+    // 是否关闭日志写入
+    'close'       => false,
+];
diff --git a/config/middleware.php b/config/middleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..fe15ec3d9400f6e00e919d3b2171c4a1c3aaa032
--- /dev/null
+++ b/config/middleware.php
@@ -0,0 +1,18 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// +----------------------------------------------------------------------
+// | 中间件配置
+// +----------------------------------------------------------------------
+return [
+    // 默认中间件命名空间
+    'default_namespace' => 'app\\http\\middleware\\',
+];
diff --git a/config/session.php b/config/session.php
new file mode 100644
index 0000000000000000000000000000000000000000..1d7b6c60f5f47756901ddfd6cbbc272e27e690a0
--- /dev/null
+++ b/config/session.php
@@ -0,0 +1,26 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// +----------------------------------------------------------------------
+// | 会话设置
+// +----------------------------------------------------------------------
+
+return [
+    'id'             => '',
+    // SESSION_ID的提交变量,解决flash上传跨域
+    'var_session_id' => '',
+    // SESSION 前缀
+    'prefix'         => 'think',
+    // 驱动方式 支持redis memcache memcached
+    'type'           => '',
+    // 是否自动开启 SESSION
+    'auto_start'     => true,
+];
diff --git a/config/template.php b/config/template.php
new file mode 100644
index 0000000000000000000000000000000000000000..299bd6f43e990055f30a4c2e0e6203edf2ceffe6
--- /dev/null
+++ b/config/template.php
@@ -0,0 +1,35 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// +----------------------------------------------------------------------
+// | 模板设置
+// +----------------------------------------------------------------------
+
+return [
+    // 模板引擎类型 支持 php think 支持扩展
+    'type'         => 'Think',
+    // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法
+    'auto_rule'    => 1,
+    // 模板路径
+    'view_path'    => '',
+    // 模板后缀
+    'view_suffix'  => 'html',
+    // 模板文件名分隔符
+    'view_depr'    => DIRECTORY_SEPARATOR,
+    // 模板引擎普通标签开始标记
+    'tpl_begin'    => '{',
+    // 模板引擎普通标签结束标记
+    'tpl_end'      => '}',
+    // 标签库标签开始标记
+    'taglib_begin' => '{',
+    // 标签库标签结束标记
+    'taglib_end'   => '}',
+];
diff --git a/config/trace.php b/config/trace.php
new file mode 100644
index 0000000000000000000000000000000000000000..425d30148dcdd4cf62c4ff78132637966ccacaea
--- /dev/null
+++ b/config/trace.php
@@ -0,0 +1,18 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// +----------------------------------------------------------------------
+// | Trace设置 开启 app_trace 后 有效
+// +----------------------------------------------------------------------
+return [
+    // 内置Html Console 支持扩展
+    'type' => 'Html',
+];
diff --git a/data/model/BaseModel.php b/data/model/BaseModel.php
new file mode 100644
index 0000000000000000000000000000000000000000..e8d6198d3731485a81a42ea2737c513aa4728202
--- /dev/null
+++ b/data/model/BaseModel.php
@@ -0,0 +1,519 @@
+<?php
+
+namespace data\model;
+
+use think\Db;
+use think\Model;
+use think\Validate;
+
+class BaseModel extends Model
+{
+    protected $error = 0;
+
+    protected $table;
+
+    protected $rule = [];
+
+    protected $msg = [];
+
+    protected $Validate;
+
+    public function __construct($data = [])
+    {
+        parent::__construct($data);
+        $this->Validate = new Validate($this->rule, $this->msg);
+        $this->Validate->extend('no_html_parse', function ($value, $rule) {
+            return true;
+        });
+    }
+    /**
+     * 获取空模型
+     */
+    public function getEModel($tables)
+    {
+        $rs  = Db::query('show columns FROM `' . config('database.prefix') . $tables . "`");
+        $obj = [];
+        if ($rs) {
+            foreach ($rs as $key => $v) {
+                $obj[$v['Field']] = $v['Default'];
+                if ($v['Key'] == 'PRI') {
+                    $obj[$v['Field']] = 0;
+                }
+
+            }
+        }
+        return $obj;
+    }
+
+    /**
+     * 自动验证数据
+     * @access protected
+     * @param array $data 验证数据
+     * @param mixed $rule 验证规则
+     * @param bool  $batch 批量验证
+     * @return bool
+     */
+//     protected function validateData($data, $rule = null, $batch = null)
+    //     {
+    //         $info = is_null($rule) ? $this->Validate : $rule;
+
+//         if (!empty($info)) {
+    //             if (is_array($info)) {
+    //                 $validate = $this->Validate;// Loader::validate();
+    //                 $validate->rule($info['rule']);
+    //                 $validate->message($info['msg']);
+
+//             } else {
+    //                 $name = is_string($info) ? $info : $this->name;
+    //                 if (strpos($name, '.')) {
+    //                     list($name, $scene) = explode('.', $name);
+    //                 }
+    //                 $validate = $this->Validate;// Loader::validate($name);
+    //                 if (!empty($scene)) {
+    //                     $validate->scene($scene);
+    //                 }
+    //             }
+    //             $batch = is_null($batch) ? $this->batchValidate : $batch;
+
+//             if (!$validate->batch($batch)->check($data)) {
+    //                 $this->error = $validate->getError();
+    //                 if ($this->failException) {
+    //                     throw new ValidateException($this->error);
+    //                 } else {
+    //                     return false;
+    //                 }
+    //             }
+    //             $this->validate = null;
+    //         }
+    //         return true;
+    //     }
+
+    public function save($data = [], $where = [], $sequence = null)
+    {
+        $data   = $this->htmlClear($data);
+        $retval = parent::save($data, $where, $sequence);
+        if (!empty($where)) {
+            //表示更新数据
+            if ($retval == 0) {
+                if ($retval !== false) {
+                    $retval = 1;
+                }
+            }
+        }
+//         $retval = ['code' => $code, 'message' => $this->getError()];
+        return $retval;
+    }
+
+    public function ihtmlspecialchars($string)
+    {
+        if (is_array($string)) {
+            foreach ($string as $key => $val) {
+                $string[$key] = $this->ihtmlspecialchars($val);
+            }
+        } else {
+            $string = preg_replace('/&amp;((#(d{3,5}|x[a-fa-f0-9]{4})|[a-za-z][a-z0-9]{2,5});)/', '&\1',
+                str_replace(array('&', '"', '<', '>'), array('&amp;', '&quot;', '&lt;', '&gt;'), $string));
+        }
+        return $string;
+    }
+
+    protected function htmlClear($data)
+    {
+        $rule = $this->rule;
+        $info = empty($rule) ? $this->Validate : $rule;
+        foreach ($data as $k => $v) {
+            if (!empty($info)) {
+                if (is_array($info)) {
+                    $is_Specialchars = $this->is_Specialchars($info, $k);
+                    // 数据对象赋值
+                    if ($is_Specialchars) {
+                        $data[$k] = $this->ihtmlspecialchars($v);
+                    } else {
+                        $data[$k] = $v;
+                    }
+//                     foreach ($rule as $key => $value) {
+                    //                         if(strcasecmp($value,"no_html_parse")!= 0){
+                    //                             $data[$k] = $this->ihtmlspecialchars($v);
+                    //                         }else{
+                    //                             $data[$k] = $v;
+                    //                         }
+                    //                     }
+                } else {
+                    ;
+                }
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * 判断当前k 是否在数组的k值中
+     * @param unknown $rule
+     * @param unknown $k
+     */
+    protected function is_Specialchars($rule, $k)
+    {
+        $is_have = true;
+        foreach ($rule as $key => $value) {
+            if ($key == $k) {
+                if (strcasecmp($value, "no_html_parse") != 0) {
+                    $is_have = true;
+                } else {
+                    $is_have = false;
+                }
+            }
+        }
+        return $is_have;
+    }
+
+    /**
+     * 数据库开启事务
+     */
+    public function startTrans()
+    {
+        Db::startTrans();
+    }
+
+    /**
+     * 数据库事务提交
+     */
+    public function commit()
+    {
+        Db::commit();
+    }
+
+    /**
+     * 数据库事务回滚
+     */
+    public function rollback()
+    {
+        Db::rollback();
+    }
+
+    /**
+     * 列表查询
+     *
+     * @param unknown $page_index
+     * @param number $page_size
+     * @param string $order
+     * @param string $where
+     * @param string $field
+     */
+    public function pageQuery($page_index, $page_size, $condition, $order, $field)
+    {
+        if (isset($condition['whereOr']) && is_array($condition['whereOr'])) {
+            $whereOr = $condition['whereOr'];
+            unset($condition['whereOr']);
+        } else {
+            $whereOr = false;
+        }
+        if ($whereOr) {
+            $count = $this->where($condition)
+                ->whereOr(function ($query) use ($whereOr) {
+                    foreach ($whereOr as $whereKey => $whereValue) {
+                        $query = $query->where($whereKey, $whereValue);
+                    }
+                })->count();
+        } else {
+            $count = $this->where($condition)->count();
+        }
+        if ($page_size == 0) {
+
+            if ($whereOr) {
+                $list = $this->field($field)
+                    ->where($condition)
+                    ->whereOr(function ($query) use ($whereOr) {
+                        foreach ($whereOr as $whereKey => $whereValue) {
+                            $query = $query->where($whereKey, $whereValue);
+                        }
+                    })
+                    ->order($order)
+                    ->select();
+            } else {
+                $list = $this->field($field)
+                    ->where($condition)
+                    ->order($order)
+                    ->select();
+            }
+            $page_count = 1;
+        } else {
+            $start_row = $page_size * ($page_index - 1);
+            if ($whereOr) {
+                $list = $this->field($field)
+                    ->where($condition)
+                    ->whereOr(function ($query) use ($whereOr) {
+                        foreach ($whereOr as $whereKey => $whereValue) {
+                            $query = $query->where($whereKey, $whereValue);
+                        }
+                    })
+                    ->order($order)
+                    ->limit($start_row . "," . $page_size)
+                    ->select();
+            } else {
+                $list = $this->field($field)
+                    ->where($condition)
+                    ->order($order)
+                    ->limit($start_row . "," . $page_size)
+                    ->select();
+            }
+
+            if ($count % $page_size == 0) {
+                $page_count = $count / $page_size;
+            } else {
+                $page_count = (int) ($count / $page_size) + 1;
+            }
+        }
+        return array(
+            'data'        => $list,
+            'total_count' => $count,
+            'page_count'  => $page_count,
+        );
+    }
+    /**
+     * 获取一定条件下的列表
+     * @param unknown $condition
+     * @param unknown $field
+     */
+    public function getQueryLists($condition, $field, $order, $group = '',$offset=0,$limit=0)
+    {
+        $list = $this->field($field)->where($condition)->group($group)->limit($offset,$limit)->order($order)->select();
+        return $list;
+    }
+
+    /**
+     * 获取关联查询列表
+     *
+     * @param unknown $viewObj
+     *            对应view对象
+     * @param unknown $page_index
+     * @param unknown $page_size
+     * @param unknown $condition
+     * @param unknown $order
+     * @return multitype:number unknown
+     */
+    public function viewPageQuery($viewObj, $page_index, $page_size, $condition, $order)
+    {
+        if ($page_size == 0) {
+            $list = $viewObj->where($condition)
+                ->order($order)
+                ->select();
+        } else {
+            $start_row = $page_size * ($page_index - 1);
+
+            $list = $viewObj->where($condition)
+                ->order($order)
+                ->limit($start_row . "," . $page_size)
+                ->select();
+        }
+        return $list;
+    }
+
+    /**
+     * 获取关联查询数量
+     *
+     * @param unknown $viewObj
+     *            视图对象
+     * @param unknown $condition
+     *            下旬条件
+     * @return unknown
+     */
+    public function viewCount($condition, $count = '*')
+    {
+        $count = Db::table($this->table)->where($condition)->count($count);
+        return $count;
+    }
+
+    /**
+     * 设置关联查询返回数据格式
+     *
+     * @param unknown $list
+     *            查询数据列表
+     * @param unknown $count
+     *            查询数据数量
+     * @param unknown $page_size
+     *            每页显示条数
+     * @return multitype:unknown number
+     */
+    public function setReturnList($list, $count, $page_size)
+    {
+        if ($page_size == 0) {
+            $page_count = 1;
+        } else {
+            if ($count % $page_size == 0) {
+                $page_count = $count / $page_size;
+            } else {
+                $page_count = (int) ($count / $page_size) + 1;
+            }
+        }
+        return array(
+            'data'        => $list,
+            'total_count' => $count,
+            'page_count'  => $page_count,
+        );
+    }
+
+    /**
+     * 获取单条记录的基本信息
+     *
+     * @param unknown $condition
+     * @param string $field
+     */
+    public function getInfo($condition = '', $field = '*',$order = '')
+    {
+
+        if($order){
+            $info = Db::table($this->table)->where($condition)
+                ->field($field)
+                ->order($order)
+                ->find();
+        }else{
+            $info = Db::table($this->table)->where($condition)
+                ->field($field)
+                ->find();
+        }
+        return $info;
+    }
+    /**
+     * 查询数据的数量
+     * @param unknown $condition
+     * @return unknown
+     */
+    public function getCount($condition, $field = '*')
+    {
+        $count = Db::table($this->table)->where($condition)
+            ->count($field);
+        return $count;
+    }
+    /**
+     * 查询条件数量
+     * @param unknown $condition
+     * @param unknown $field
+     * @return number|unknown
+     */
+    public function getSum($condition, $field)
+    {
+        $sum = Db::table($this->table)->where($condition)
+            ->sum($field);
+        if (empty($sum)) {
+            return 0;
+        } else {
+            return $sum;
+        }
+
+    }
+    /**
+     * 查询数据最大值
+     * @param unknown $condition
+     * @param unknown $field
+     * @return number|unknown
+     */
+    public function getMax($condition, $field)
+    {
+        $max = Db::table($this->table)->where($condition)
+            ->max($field);
+        if (empty($max)) {
+            return 0;
+        } else {
+            return $max;
+        }
+
+    }
+    /**
+     * 查询数据最小值
+     * @param unknown $condition
+     * @param unknown $field
+     * @return number|unknown
+     */
+    public function getMin($condition, $field)
+    {
+        $min = Db::table($this->table)->where($condition)
+            ->min($field);
+        if (empty($min)) {
+            return 0;
+        } else {
+            return $min;
+        }
+
+    }
+    /**
+     * 查询数据均值
+     * @param unknown $condition
+     * @param unknown $field
+     */
+    public function getAvg($condition, $field)
+    {
+        $avg = Db::table($this->table)->where($condition)
+            ->avg($field);
+        if (empty($avg)) {
+            return 0;
+        } else {
+            return $avg;
+        }
+
+    }
+    /**
+     * 查询第一条数据
+     * @param unknown $condition
+     */
+    public function getFirstData($condition, $order)
+    {
+        $data = Db::table($this->table)->where($condition)->order($order)
+            ->limit(1)->select();
+        if (!empty($data)) {
+            return $data[0];
+        } else {
+            return '';
+        }
+
+    }
+    /**
+     * 修改表单个字段值
+     * @param unknown $pk_id
+     * @param unknown $field_name
+     * @param unknown $field_value
+     */
+    public function ModifyTableField($pk_name, $pk_id, $field_name, $field_value)
+    {
+        $data = array(
+            $field_name => $field_value,
+        );
+        $res = $this->save($data, [$pk_name => $pk_id]);
+        return $res;
+    }
+
+    /**
+     * 原生SQL分页查询
+     *
+     * @param string $sql
+     * @param number $page_index
+     * @param number $page_size
+     * @param return Array
+     */
+    public function sqlPageQuery($sql, $page_index = 1, $page_size = 'all')
+    {
+
+        $list  = Db::query($sql);
+        $count = count($list);
+
+        if ($page_size == 0) {
+            $page_count = 1;
+        } elseif ($page_size == 'all') {
+            //返回所有数据
+        } else {
+            $start_row = $page_size * ($page_index - 1);
+            $sql       = $sql . " Limit " . $start_row . "," . $page_size;
+            $list      = Db::query($sql);
+            if ($count % $page_size == 0) {
+                $page_count = $count / $page_size;
+            } else {
+                $page_count = (int) ($count / $page_size) + 1;
+            }
+        }
+
+        return array(
+            'data'        => $list,
+            'total_count' => $count,
+            'page_count'  => $page_count,
+        );
+    }
+}
diff --git a/data/model/CountModel.php b/data/model/CountModel.php
new file mode 100644
index 0000000000000000000000000000000000000000..d33a54b92e99d086887262157eba442e6d1a4a7c
--- /dev/null
+++ b/data/model/CountModel.php
@@ -0,0 +1,6 @@
+<?php
+namespace data\model;
+
+class CountModel extends BaseModel{
+    protected $table = "tb_count";
+}
diff --git a/extend/.gitignore b/extend/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c96a04f008ee21e260b28f7701595ed59e2839e3
--- /dev/null
+++ b/extend/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/index.html b/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/public/.htaccess b/public/.htaccess
new file mode 100644
index 0000000000000000000000000000000000000000..a0add7e4d77a7e44526fe7b17d6b26d247602541
--- /dev/null
+++ b/public/.htaccess
@@ -0,0 +1,11 @@
+<IfModule mod_rewrite.c>
+  Options +FollowSymlinks -Multiviews
+  RewriteEngine On
+
+  RewriteCond %{REQUEST_FILENAME} !-d
+  RewriteCond %{REQUEST_FILENAME} !-f
+  RewriteRule ^(.*)$ index.php/$1 [QSA,PT,L]
+
+  RewriteCond %{HTTP:Authorization} .
+  RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+</IfModule>
diff --git a/public/index.php b/public/index.php
new file mode 100644
index 0000000000000000000000000000000000000000..22dc158365b3ff360bc146c5f51cae906f0d58f1
--- /dev/null
+++ b/public/index.php
@@ -0,0 +1,21 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// [ 应用入口文件 ]
+namespace think;
+
+// 加载基础文件
+require __DIR__ . '/../thinkphp/base.php';
+
+// 支持事先使用静态方法设置Request对象和Config对象
+
+// 执行应用并响应
+Container::get('app')->run()->send();
diff --git a/public/robots.txt b/public/robots.txt
new file mode 100644
index 0000000000000000000000000000000000000000..eb0536286f3081c6c0646817037faf5446e3547d
--- /dev/null
+++ b/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:
diff --git a/public/router.php b/public/router.php
new file mode 100644
index 0000000000000000000000000000000000000000..4f916b4079c4bcbe9ac64d04331cd2bc4cae6bfe
--- /dev/null
+++ b/public/router.php
@@ -0,0 +1,17 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+// $Id$
+
+if (is_file($_SERVER["DOCUMENT_ROOT"] . $_SERVER["SCRIPT_NAME"])) {
+    return false;
+} else {
+    require __DIR__ . "/index.php";
+}
diff --git a/route/route.php b/route/route.php
new file mode 100644
index 0000000000000000000000000000000000000000..fa0b1a3f8201423238859cbc9c898a9f2ae9ea99
--- /dev/null
+++ b/route/route.php
@@ -0,0 +1,24 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+//Route::miss('api/api/error');
+////一般路由规则，访问的url为：v1/address/1,对应的文件为Address类下的read方法
+//Route::get(':version/cgi-bin/get','api/:version.facefusion/test');
+//Route::post(':version/cgi-bin/facefusion/get','api/:version.facefusion/getcount');
+//Route::post(':version/cgi-bin/facefusion/save','api/:version.facefusion/savecount');
+//Route::post(':version/cgi-bin/facefusion/check','api/:version.facefusion/check');
+//Route::post(':version/cgi-bin/facefusion/testbase','api/:version.facefusion/testBase64');
+//Route::post(':version/cgi-bin/facefusion','api/:version.facefusion/index');
+//Route::get(':version/cgi-bin/facefusion/get','api/api/error');
+//Route::get(':version/cgi-bin/facefusion/save','api/api/error');
+//Route::get(':version/cgi-bin/facefusion','api/api/error');
+
+//Route::post('facefusion','api/v1/facefusion/index');
diff --git a/runtime/.gitignore b/runtime/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c96a04f008ee21e260b28f7701595ed59e2839e3
--- /dev/null
+++ b/runtime/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/thinkphp/.gitignore b/thinkphp/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..f7775ba419fd23959b549ac5542de7a1d720f1e9
--- /dev/null
+++ b/thinkphp/.gitignore
@@ -0,0 +1,8 @@
+/vendor
+composer.phar
+composer.lock
+.DS_Store
+Thumbs.db
+/phpunit.xml
+/.idea
+/.vscode
\ No newline at end of file
diff --git a/thinkphp/.htaccess b/thinkphp/.htaccess
new file mode 100644
index 0000000000000000000000000000000000000000..3418e55a68383c1cbc687c52a2994d1e8ed83800
--- /dev/null
+++ b/thinkphp/.htaccess
@@ -0,0 +1 @@
+deny from all
\ No newline at end of file
diff --git a/thinkphp/CONTRIBUTING.md b/thinkphp/CONTRIBUTING.md
new file mode 100644
index 0000000000000000000000000000000000000000..6cefcb38cb2321eb2cd3f8c059bb873a4025a632
--- /dev/null
+++ b/thinkphp/CONTRIBUTING.md
@@ -0,0 +1,119 @@
+如何贡献我的源代码
+===
+
+此文档介绍了 ThinkPHP 团队的组成以及运转机制，您提交的代码将给 ThinkPHP 项目带来什么好处，以及如何才能加入我们的行列。
+
+## 通过 Github 贡献代码
+
+ThinkPHP 目前使用 Git 来控制程序版本，如果你想为 ThinkPHP 贡献源代码，请先大致了解 Git 的使用方法。我们目前把项目托管在 GitHub 上，任何 GitHub 用户都可以向我们贡献代码。
+
+参与的方式很简单，`fork`一份 ThinkPHP 的代码到你的仓库中，修改后提交，并向我们发起`pull request`申请，我们会及时对代码进行审查并处理你的申请并。审查通过后，你的代码将被`merge`进我们的仓库中，这样你就会自动出现在贡献者名单里了，非常方便。
+
+我们希望你贡献的代码符合：
+
+* ThinkPHP 的编码规范
+* 适当的注释，能让其他人读懂
+* 遵循 Apache2 开源协议
+
+**如果想要了解更多细节或有任何疑问，请继续阅读下面的内容**
+
+### 注意事项
+
+* 本项目代码格式化标准选用 [**PSR-2**](http://www.kancloud.cn/thinkphp/php-fig-psr/3141)；
+* 类名和类文件名遵循 [**PSR-4**](http://www.kancloud.cn/thinkphp/php-fig-psr/3144)；
+* 对于 Issues 的处理，请使用诸如 `fix #xxx(Issue ID)` 的 commit title 直接关闭 issue。
+* 系统会自动在 PHP 5.4 5.5 5.6 7.0 和 HHVM 上测试修改，其中 HHVM 下的测试容许报错，请确保你的修改符合 PHP 5.4 ~ 5.6 和 PHP 7.0 的语法规范；
+* 管理员不会合并造成 CI faild 的修改，若出现 CI faild 请检查自己的源代码或修改相应的[单元测试文件](tests)；
+
+## GitHub Issue
+
+GitHub 提供了 Issue 功能，该功能可以用于：
+
+* 提出 bug
+* 提出功能改进
+* 反馈使用体验
+
+该功能不应该用于：
+
+ * 提出修改意见（涉及代码署名和修订追溯问题）
+ * 不友善的言论
+
+## 快速修改
+
+**GitHub 提供了快速编辑文件的功能**
+
+1. 登录 GitHub 帐号；
+2. 浏览项目文件，找到要进行修改的文件；
+3. 点击右上角铅笔图标进行修改；
+4. 填写 `Commit changes` 相关内容（Title 必填）；
+5. 提交修改，等待 CI 验证和管理员合并。
+
+**若您需要一次提交大量修改，请继续阅读下面的内容**
+
+## 完整流程
+
+1. `fork`本项目；
+2. 克隆(`clone`)你 `fork` 的项目到本地；
+3. 新建分支(`branch`)并检出(`checkout`)新分支；
+4. 添加本项目到你的本地 git 仓库作为上游(`upstream`)；
+5. 进行修改，若你的修改包含方法或函数的增减，请记得修改[单元测试文件](tests)；
+6. 变基（衍合 `rebase`）你的分支到上游 master 分支；
+7. `push` 你的本地仓库到 GitHub；
+8. 提交 `pull request`；
+9. 等待 CI 验证（若不通过则重复 5~7，GitHub 会自动更新你的 `pull request`）；
+10. 等待管理员处理，并及时 `rebase` 你的分支到上游 master 分支（若上游 master 分支有修改）。
+
+*若有必要，可以 `git push -f` 强行推送 rebase 后的分支到自己的 `fork`*
+
+*绝对不可以使用 `git push -f` 强行推送修改到上游*
+
+### 注意事项
+
+* 若对上述流程有任何不清楚的地方，请查阅 GIT 教程，如 [这个](http://backlogtool.com/git-guide/cn/)；
+* 对于代码**不同方面**的修改，请在自己 `fork` 的项目中**创建不同的分支**（原因参见`完整流程`第9条备注部分）；
+* 变基及交互式变基操作参见 [Git 交互式变基](http://pakchoi.me/2015/03/17/git-interactive-rebase/)
+
+## 推荐资源
+
+### 开发环境
+
+* XAMPP for Windows 5.5.x
+* WampServer (for Windows)
+* upupw Apache PHP5.4 ( for Windows)
+
+或自行安装
+
+- Apache / Nginx
+- PHP 5.4 ~ 5.6
+- MySQL / MariaDB
+
+*Windows 用户推荐添加 PHP bin 目录到 PATH，方便使用 composer*
+
+*Linux 用户自行配置环境， Mac 用户推荐使用内置 Apache 配合 Homebrew 安装 PHP 和 MariaDB*
+
+### 编辑器
+
+Sublime Text 3 + phpfmt 插件
+
+phpfmt 插件参数
+
+```json
+{
+	"autocomplete": true,
+	"enable_auto_align": true,
+	"format_on_save": true,
+	"indent_with_space": true,
+	"psr1_naming": false,
+	"psr2": true,
+	"version": 4
+}
+```
+
+或其他 编辑器 / IDE 配合 PSR2 自动格式化工具
+
+### Git GUI
+
+* SourceTree
+* GitHub Desktop
+
+或其他 Git 图形界面客户端
diff --git a/thinkphp/LICENSE.txt b/thinkphp/LICENSE.txt
new file mode 100644
index 0000000000000000000000000000000000000000..574a39c401ff71ffcb90d15edb906b8046c7661b
--- /dev/null
+++ b/thinkphp/LICENSE.txt
@@ -0,0 +1,32 @@
+
+ThinkPHP遵循Apache2开源协议发布，并提供免费使用。
+版权所有Copyright © 2006-2016 by ThinkPHP (http://thinkphp.cn)
+All rights reserved。
+ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。
+
+Apache Licence是著名的非盈利开源组织Apache采用的协议。
+该协议和BSD类似，鼓励代码共享和尊重原作者的著作权，
+允许代码修改，再作为开源或商业软件发布。需要满足
+的条件： 
+1． 需要给代码的用户一份Apache Licence ；
+2． 如果你修改了代码，需要在被修改的文件中说明；
+3． 在延伸的代码中（修改和有源代码衍生的代码中）需要
+带有原来代码中的协议，商标，专利声明和其他原来作者规
+定需要包含的说明；
+4． 如果再发布的产品中包含一个Notice文件，则在Notice文
+件中需要带有本协议内容。你可以在Notice中增加自己的
+许可，但不可以表现为对Apache Licence构成更改。 
+具体的协议参考：http://www.apache.org/licenses/LICENSE-2.0
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/thinkphp/README.md b/thinkphp/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..09b8b2ca7bee172c5d461c764b8cac9ad9112716
--- /dev/null
+++ b/thinkphp/README.md
@@ -0,0 +1,88 @@
+![](http://www.thinkphp.cn/Uploads/editor/2016-06-23/576b4732a6e04.png) 
+
+ThinkPHP 5.1 —— 12载初心，你值得信赖的PHP框架
+===============
+
+[![Build Status](https://travis-ci.org/top-think/framework.svg?branch=master)](https://travis-ci.org/top-think/framework)
+[![Total Downloads](https://poser.pugx.org/topthink/framework/downloads)](https://packagist.org/packages/topthink/framework)
+[![Latest Stable Version](https://poser.pugx.org/topthink/framework/v/stable)](https://packagist.org/packages/topthink/framework)
+[![License](https://poser.pugx.org/topthink/framework/license)](https://packagist.org/packages/topthink/framework)
+
+ThinkPHP5.1对底层架构做了进一步的改进，减少依赖，其主要特性包括：
+
+ + 采用容器统一管理对象
+ + 支持Facade
+ + 更易用的路由
+ + 注解路由支持
+ + 路由跨域请求支持
+ + 验证类增强
+ + 配置和路由目录独立
+ + 取消系统常量
+ + 类库别名机制
+ + 模型和数据库增强
+ + 依赖注入完善
+ + 支持PSR-3日志规范
+ + 中间件支持（`V5.1.6+`）
+ + 支持`Swoole`/`Workerman`运行（`V5.1.18+`）
+
+### 废除的功能：
+
+ + 聚合模型
+ + 内置控制器扩展类
+ + 模型自动验证
+
+> ThinkPHP5.1的运行环境要求PHP5.6+。
+
+## 安装
+
+使用composer安装
+
+~~~
+composer create-project topthink/think tp
+~~~
+
+启动服务
+
+~~~
+cd tp
+php think run
+~~~
+
+然后就可以在浏览器中访问
+
+~~~
+http://localhost:8000
+~~~
+
+更新框架
+~~~
+composer update topthink/framework
+~~~
+
+
+## 在线手册
+
++ [完全开发手册](https://www.kancloud.cn/manual/thinkphp5_1/content)
++ [升级指导](https://www.kancloud.cn/manual/thinkphp5_1/354155) 
+
+## 命名规范
+
+`ThinkPHP5`遵循PSR-2命名规范和PSR-4自动加载规范。
+
+## 参与开发
+
+请参阅 [ThinkPHP5 核心框架包](https://github.com/top-think/framework)。
+
+## 版权信息
+
+ThinkPHP遵循Apache2开源协议发布，并提供免费使用。
+
+本项目包含的第三方源码和二进制文件之版权信息另行标注。
+
+版权所有Copyright © 2006-2018 by ThinkPHP (http://thinkphp.cn)
+
+All rights reserved。
+
+ThinkPHP® 商标和著作权所有者为上海顶想信息科技有限公司。
+
+更多细节参阅 [LICENSE.txt](LICENSE.txt)
diff --git a/thinkphp/base.php b/thinkphp/base.php
new file mode 100644
index 0000000000000000000000000000000000000000..084dd74dba3d99fdd6ed137d46762eb048eaf526
--- /dev/null
+++ b/thinkphp/base.php
@@ -0,0 +1,74 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+namespace think;
+
+// 载入Loader类
+require __DIR__ . '/library/think/Loader.php';
+
+// 注册自动加载
+Loader::register();
+
+// 注册错误和异常处理机制
+Error::register();
+
+// 实现日志接口
+if (interface_exists('Psr\Log\LoggerInterface')) {
+    interface LoggerInterface extends \Psr\Log\LoggerInterface
+    {}
+} else {
+    interface LoggerInterface
+    {}
+}
+
+// 注册核心类的静态代理
+Facade::bind([
+    facade\App::class        => App::class,
+    facade\Build::class      => Build::class,
+    facade\Cache::class      => Cache::class,
+    facade\Config::class     => Config::class,
+    facade\Cookie::class     => Cookie::class,
+    facade\Debug::class      => Debug::class,
+    facade\Env::class        => Env::class,
+    facade\Hook::class       => Hook::class,
+    facade\Lang::class       => Lang::class,
+    facade\Log::class        => Log::class,
+    facade\Middleware::class => Middleware::class,
+    facade\Request::class    => Request::class,
+    facade\Response::class   => Response::class,
+    facade\Route::class      => Route::class,
+    facade\Session::class    => Session::class,
+    facade\Url::class        => Url::class,
+    facade\Validate::class   => Validate::class,
+    facade\View::class       => View::class,
+]);
+
+// 注册类库别名
+Loader::addClassAlias([
+    'App'      => facade\App::class,
+    'Build'    => facade\Build::class,
+    'Cache'    => facade\Cache::class,
+    'Config'   => facade\Config::class,
+    'Cookie'   => facade\Cookie::class,
+    'Db'       => Db::class,
+    'Debug'    => facade\Debug::class,
+    'Env'      => facade\Env::class,
+    'Facade'   => Facade::class,
+    'Hook'     => facade\Hook::class,
+    'Lang'     => facade\Lang::class,
+    'Log'      => facade\Log::class,
+    'Request'  => facade\Request::class,
+    'Response' => facade\Response::class,
+    'Route'    => facade\Route::class,
+    'Session'  => facade\Session::class,
+    'Url'      => facade\Url::class,
+    'Validate' => facade\Validate::class,
+    'View'     => facade\View::class,
+]);
diff --git a/thinkphp/composer.json b/thinkphp/composer.json
new file mode 100644
index 0000000000000000000000000000000000000000..cc4fca9121543c469c53686b5c4d466e48afdf3f
--- /dev/null
+++ b/thinkphp/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "topthink/framework",
+    "description": "the new thinkphp framework",
+    "type": "think-framework",
+    "keywords": [
+        "framework",
+        "thinkphp",
+        "ORM"
+    ],
+    "homepage": "http://thinkphp.cn/",
+    "license": "Apache-2.0",
+    "authors": [
+        {
+            "name": "liu21st",
+            "email": "liu21st@gmail.com"
+        },
+        {
+            "name": "yunwuxin",
+            "email": "448901948@qq.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.6.0",
+        "topthink/think-installer": "2.*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.0|^6.0",
+        "johnkary/phpunit-speedtrap": "^1.0",
+        "mikey179/vfsStream": "~1.6",
+        "phploc/phploc": "2.*",
+        "sebastian/phpcpd": "2.*",
+        "squizlabs/php_codesniffer": "2.*",
+        "phpdocumentor/reflection-docblock": "^2.0"
+    }
+}
diff --git a/thinkphp/convention.php b/thinkphp/convention.php
new file mode 100644
index 0000000000000000000000000000000000000000..6675a57a9cc0f2c9fe40845a1b7f1173c8e97534
--- /dev/null
+++ b/thinkphp/convention.php
@@ -0,0 +1,324 @@
+<?php
+
+return [
+    // +----------------------------------------------------------------------
+    // | 应用设置
+    // +----------------------------------------------------------------------
+    'app'        => [
+        // 应用名称
+        'app_name'               => '',
+        // 应用地址
+        'app_host'               => '',
+        // 应用调试模式
+        'app_debug'              => false,
+        // 应用Trace
+        'app_trace'              => false,
+        // 应用模式状态
+        'app_status'             => '',
+        // 是否HTTPS
+        'is_https'               => false,
+        // 入口自动绑定模块
+        'auto_bind_module'       => false,
+        // 注册的根命名空间
+        'root_namespace'         => [],
+        // 默认输出类型
+        'default_return_type'    => 'html',
+        // 默认AJAX 数据返回格式,可选json xml ...
+        'default_ajax_return'    => 'json',
+        // 默认JSONP格式返回的处理方法
+        'default_jsonp_handler'  => 'jsonpReturn',
+        // 默认JSONP处理方法
+        'var_jsonp_handler'      => 'callback',
+        // 默认时区
+        'default_timezone'       => 'Asia/Shanghai',
+        // 是否开启多语言
+        'lang_switch_on'         => false,
+        // 默认验证器
+        'default_validate'       => '',
+        // 默认语言
+        'default_lang'           => 'zh-cn',
+
+        // +----------------------------------------------------------------------
+        // | 模块设置
+        // +----------------------------------------------------------------------
+
+        // 自动搜索控制器
+        'controller_auto_search' => false,
+        // 操作方法前缀
+        'use_action_prefix'      => false,
+        // 操作方法后缀
+        'action_suffix'          => '',
+        // 默认的空控制器名
+        'empty_controller'       => 'Error',
+        // 默认的空模块名
+        'empty_module'           => '',
+        // 默认模块名
+        'default_module'         => 'index',
+        // 是否支持多模块
+        'app_multi_module'       => true,
+        // 禁止访问模块
+        'deny_module_list'       => ['common'],
+        // 默认控制器名
+        'default_controller'     => 'Index',
+        // 默认操作名
+        'default_action'         => 'index',
+        // 是否自动转换URL中的控制器和操作名
+        'url_convert'            => true,
+        // 默认的访问控制器层
+        'url_controller_layer'   => 'controller',
+        // 应用类库后缀
+        'class_suffix'           => false,
+        // 控制器类后缀
+        'controller_suffix'      => false,
+
+        // +----------------------------------------------------------------------
+        // | URL请求设置
+        // +----------------------------------------------------------------------
+
+        // 默认全局过滤方法 用逗号分隔多个
+        'default_filter'         => '',
+        // PATHINFO变量名 用于兼容模式
+        'var_pathinfo'           => 's',
+        // 兼容PATH_INFO获取
+        'pathinfo_fetch'         => ['ORIG_PATH_INFO', 'REDIRECT_PATH_INFO', 'REDIRECT_URL'],
+        // HTTPS代理标识
+        'https_agent_name'       => '',
+        // IP代理获取标识
+        'http_agent_ip'          => 'HTTP_X_REAL_IP',
+        // URL伪静态后缀
+        'url_html_suffix'        => 'html',
+        // 域名根，如thinkphp.cn
+        'url_domain_root'        => '',
+        // 表单请求类型伪装变量
+        'var_method'             => '_method',
+        // 表单ajax伪装变量
+        'var_ajax'               => '_ajax',
+        // 表单pjax伪装变量
+        'var_pjax'               => '_pjax',
+        // 是否开启请求缓存 true自动缓存 支持设置请求缓存规则
+        'request_cache'          => false,
+        // 请求缓存有效期
+        'request_cache_expire'   => null,
+        // 全局请求缓存排除规则
+        'request_cache_except'   => [],
+
+        // +----------------------------------------------------------------------
+        // | 路由设置
+        // +----------------------------------------------------------------------
+
+        // pathinfo分隔符
+        'pathinfo_depr'          => '/',
+        // URL普通方式参数 用于自动生成
+        'url_common_param'       => false,
+        // URL参数方式 0 按名称成对解析 1 按顺序解析
+        'url_param_type'         => 0,
+        // 是否开启路由延迟解析
+        'url_lazy_route'         => false,
+        // 是否强制使用路由
+        'url_route_must'         => false,
+        // 合并路由规则
+        'route_rule_merge'       => false,
+        // 路由是否完全匹配
+        'route_complete_match'   => false,
+        // 使用注解路由
+        'route_annotation'       => false,
+        // 默认的路由变量规则
+        'default_route_pattern'  => '\w+',
+        // 是否开启路由缓存
+        'route_check_cache'      => false,
+        // 路由缓存的Key自定义设置（闭包），默认为当前URL和请求类型的md5
+        'route_check_cache_key'  => '',
+
+        // +----------------------------------------------------------------------
+        // | 异常及错误设置
+        // +----------------------------------------------------------------------
+
+        // 默认跳转页面对应的模板文件
+        'dispatch_success_tmpl'  => __DIR__ . '/tpl/dispatch_jump.tpl',
+        'dispatch_error_tmpl'    => __DIR__ . '/tpl/dispatch_jump.tpl',
+        // 异常页面的模板文件
+        'exception_tmpl'         => __DIR__ . '/tpl/think_exception.tpl',
+        // 错误显示信息,非调试模式有效
+        'error_message'          => '页面错误！请稍后再试～',
+        // 显示错误信息
+        'show_error_msg'         => false,
+        // 异常处理handle类 留空使用 \think\exception\Handle
+        'exception_handle'       => '',
+    ],
+
+    // +----------------------------------------------------------------------
+    // | 模板设置
+    // +----------------------------------------------------------------------
+
+    'template'   => [
+        // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写
+        'auto_rule'    => 1,
+        // 模板引擎类型 支持 php think 支持扩展
+        'type'         => 'Think',
+        // 视图基础目录，配置目录为所有模块的视图起始目录
+        'view_base'    => '',
+        // 当前模板的视图目录 留空为自动获取
+        'view_path'    => '',
+        // 模板后缀
+        'view_suffix'  => 'html',
+        // 模板文件名分隔符
+        'view_depr'    => DIRECTORY_SEPARATOR,
+        // 模板引擎普通标签开始标记
+        'tpl_begin'    => '{',
+        // 模板引擎普通标签结束标记
+        'tpl_end'      => '}',
+        // 标签库标签开始标记
+        'taglib_begin' => '{',
+        // 标签库标签结束标记
+        'taglib_end'   => '}',
+    ],
+
+    // +----------------------------------------------------------------------
+    // | 日志设置
+    // +----------------------------------------------------------------------
+
+    'log'        => [
+        // 日志记录方式，内置 file socket 支持扩展
+        'type'         => 'File',
+        // 日志保存目录
+        //'path'  => LOG_PATH,
+        // 日志记录级别
+        'level'        => [],
+        // 是否记录trace信息到日志
+        'record_trace' => false,
+        // 是否JSON格式记录
+        'json'         => false,
+    ],
+
+    // +----------------------------------------------------------------------
+    // | Trace设置 开启 app_trace 后 有效
+    // +----------------------------------------------------------------------
+
+    'trace'      => [
+        // 内置Html Console 支持扩展
+        'type' => 'Html',
+        'file' => __DIR__ . '/tpl/page_trace.tpl',
+    ],
+
+    // +----------------------------------------------------------------------
+    // | 缓存设置
+    // +----------------------------------------------------------------------
+
+    '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,
+        'httponly'       => true,
+        'secure'         => false,
+    ],
+
+    // +----------------------------------------------------------------------
+    // | 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'        => '127.0.0.1',
+        // 数据库名
+        '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,
+        // 数据集返回类型
+        'resultset_type'  => 'array',
+        // 自动写入时间戳字段
+        'auto_timestamp'  => false,
+        // 时间字段取出后的默认时间格式
+        'datetime_format' => 'Y-m-d H:i:s',
+        // 是否需要进行SQL性能分析
+        'sql_explain'     => false,
+        // 查询对象
+        'query'           => '\\think\\db\\Query',
+    ],
+
+    //分页配置
+    'paginate'   => [
+        'type'      => 'bootstrap',
+        'var_page'  => 'page',
+        'list_rows' => 15,
+    ],
+
+    //控制台配置
+    'console'    => [
+        'name'    => 'Think Console',
+        'version' => '0.1',
+        'user'    => null,
+    ],
+
+    // 中间件配置
+    'middleware' => [
+        'default_namespace' => 'app\\http\\middleware\\',
+    ],
+];
diff --git a/thinkphp/helper.php b/thinkphp/helper.php
new file mode 100644
index 0000000000000000000000000000000000000000..372357f1284fe44f7b1d1a3419dc852ae1122a85
--- /dev/null
+++ b/thinkphp/helper.php
@@ -0,0 +1,691 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+//------------------------
+// ThinkPHP 助手函数
+//-------------------------
+
+use think\Container;
+use think\Db;
+use think\exception\HttpException;
+use think\exception\HttpResponseException;
+use think\facade\Cache;
+use think\facade\Config;
+use think\facade\Cookie;
+use think\facade\Debug;
+use think\facade\Env;
+use think\facade\Hook;
+use think\facade\Lang;
+use think\facade\Log;
+use think\facade\Request;
+use think\facade\Route;
+use think\facade\Session;
+use think\facade\Url;
+use think\Response;
+use think\route\RuleItem;
+
+if (!function_exists('abort')) {
+    /**
+     * 抛出HTTP异常
+     * @param integer|Response      $code 状态码 或者 Response对象实例
+     * @param string                $message 错误信息
+     * @param array                 $header 参数
+     */
+    function abort($code, $message = null, $header = [])
+    {
+        if ($code instanceof Response) {
+            throw new HttpResponseException($code);
+        } else {
+            throw new HttpException($code, $message, null, $header);
+        }
+    }
+}
+
+if (!function_exists('action')) {
+    /**
+     * 调用模块的操作方法 参数格式 [模块/控制器/]操作
+     * @param string        $url 调用地址
+     * @param string|array  $vars 调用参数 支持字符串和数组
+     * @param string        $layer 要调用的控制层名称
+     * @param bool          $appendSuffix 是否添加类名后缀
+     * @return mixed
+     */
+    function action($url, $vars = [], $layer = 'controller', $appendSuffix = false)
+    {
+        return app()->action($url, $vars, $layer, $appendSuffix);
+    }
+}
+
+if (!function_exists('app')) {
+    /**
+     * 快速获取容器中的实例 支持依赖注入
+     * @param string    $name 类名或标识 默认获取当前应用实例
+     * @param array     $args 参数
+     * @param bool      $newInstance    是否每次创建新的实例
+     * @return mixed|\think\App
+     */
+    function app($name = 'think\App', $args = [], $newInstance = false)
+    {
+        return Container::get($name, $args, $newInstance);
+    }
+}
+
+if (!function_exists('behavior')) {
+    /**
+     * 执行某个行为（run方法） 支持依赖注入
+     * @param mixed $behavior   行为类名或者别名
+     * @param mixed $args       参数
+     * @return mixed
+     */
+    function behavior($behavior, $args = null)
+    {
+        return Hook::exec($behavior, $args);
+    }
+}
+
+if (!function_exists('bind')) {
+    /**
+     * 绑定一个类到容器
+     * @access public
+     * @param string  $abstract    类标识、接口
+     * @param mixed   $concrete    要绑定的类、闭包或者实例
+     * @return Container
+     */
+    function bind($abstract, $concrete = null)
+    {
+        return Container::getInstance()->bindTo($abstract, $concrete);
+    }
+}
+
+if (!function_exists('cache')) {
+    /**
+     * 缓存管理
+     * @param mixed     $name 缓存名称，如果为数组表示进行缓存设置
+     * @param mixed     $value 缓存值
+     * @param mixed     $options 缓存参数
+     * @param string    $tag 缓存标签
+     * @return mixed
+     */
+    function cache($name, $value = '', $options = null, $tag = null)
+    {
+        if (is_array($options)) {
+            // 缓存操作的同时初始化
+            Cache::connect($options);
+        } elseif (is_array($name)) {
+            // 缓存初始化
+            return Cache::connect($name);
+        }
+
+        if ('' === $value) {
+            // 获取缓存
+            return 0 === strpos($name, '?') ? Cache::has(substr($name, 1)) : Cache::get($name);
+        } elseif (is_null($value)) {
+            // 删除缓存
+            return Cache::rm($name);
+        } else {
+            // 缓存数据
+            if (is_array($options)) {
+                $expire = isset($options['expire']) ? $options['expire'] : null; //修复查询缓存无法设置过期时间
+            } else {
+                $expire = is_numeric($options) ? $options : null; //默认快捷缓存设置过期时间
+            }
+
+            if (is_null($tag)) {
+                return Cache::set($name, $value, $expire);
+            } else {
+                return Cache::tag($tag)->set($name, $value, $expire);
+            }
+        }
+    }
+}
+
+if (!function_exists('call')) {
+    /**
+     * 调用反射执行callable 支持依赖注入
+     * @param mixed $callable   支持闭包等callable写法
+     * @param array $args       参数
+     * @return mixed
+     */
+    function call($callable, $args = [])
+    {
+        return Container::getInstance()->invoke($callable, $args);
+    }
+}
+
+if (!function_exists('class_basename')) {
+    /**
+     * 获取类名(不包含命名空间)
+     *
+     * @param  string|object $class
+     * @return string
+     */
+    function class_basename($class)
+    {
+        $class = is_object($class) ? get_class($class) : $class;
+        return basename(str_replace('\\', '/', $class));
+    }
+}
+
+if (!function_exists('class_uses_recursive')) {
+    /**
+     *获取一个类里所有用到的trait，包括父类的
+     *
+     * @param $class
+     * @return array
+     */
+    function class_uses_recursive($class)
+    {
+        if (is_object($class)) {
+            $class = get_class($class);
+        }
+
+        $results = [];
+        $classes = array_merge([$class => $class], class_parents($class));
+        foreach ($classes as $class) {
+            $results += trait_uses_recursive($class);
+        }
+
+        return array_unique($results);
+    }
+}
+
+if (!function_exists('config')) {
+    /**
+     * 获取和设置配置参数
+     * @param string|array  $name 参数名
+     * @param mixed         $value 参数值
+     * @return mixed
+     */
+    function config($name = '', $value = null)
+    {
+        if (is_null($value) && is_string($name)) {
+            if ('.' == substr($name, -1)) {
+                return Config::pull(substr($name, 0, -1));
+            }
+
+            return 0 === strpos($name, '?') ? Config::has(substr($name, 1)) : Config::get($name);
+        } else {
+            return Config::set($name, $value);
+        }
+    }
+}
+
+if (!function_exists('container')) {
+    /**
+     * 获取容器对象实例
+     * @return Container
+     */
+    function container()
+    {
+        return Container::getInstance();
+    }
+}
+
+if (!function_exists('controller')) {
+    /**
+     * 实例化控制器 格式：[模块/]控制器
+     * @param string    $name 资源地址
+     * @param string    $layer 控制层名称
+     * @param bool      $appendSuffix 是否添加类名后缀
+     * @return \think\Controller
+     */
+    function controller($name, $layer = 'controller', $appendSuffix = false)
+    {
+        return app()->controller($name, $layer, $appendSuffix);
+    }
+}
+
+if (!function_exists('cookie')) {
+    /**
+     * Cookie管理
+     * @param string|array  $name cookie名称，如果为数组表示进行cookie设置
+     * @param mixed         $value cookie值
+     * @param mixed         $option 参数
+     * @return mixed
+     */
+    function cookie($name, $value = '', $option = null)
+    {
+        if (is_array($name)) {
+            // 初始化
+            Cookie::init($name);
+        } elseif (is_null($name)) {
+            // 清除
+            Cookie::clear($value);
+        } elseif ('' === $value) {
+            // 获取
+            return 0 === strpos($name, '?') ? Cookie::has(substr($name, 1), $option) : Cookie::get($name);
+        } elseif (is_null($value)) {
+            // 删除
+            return Cookie::delete($name);
+        } else {
+            // 设置
+            return Cookie::set($name, $value, $option);
+        }
+    }
+}
+
+if (!function_exists('db')) {
+    /**
+     * 实例化数据库类
+     * @param string        $name 操作的数据表名称（不含前缀）
+     * @param array|string  $config 数据库配置参数
+     * @param bool          $force 是否强制重新连接
+     * @return \think\db\Query
+     */
+    function db($name = '', $config = [], $force = true)
+    {
+        return Db::connect($config, $force)->name($name);
+    }
+}
+
+if (!function_exists('debug')) {
+    /**
+     * 记录时间（微秒）和内存使用情况
+     * @param string            $start 开始标签
+     * @param string            $end 结束标签
+     * @param integer|string    $dec 小数位 如果是m 表示统计内存占用
+     * @return mixed
+     */
+    function debug($start, $end = '', $dec = 6)
+    {
+        if ('' == $end) {
+            Debug::remark($start);
+        } else {
+            return 'm' == $dec ? Debug::getRangeMem($start, $end) : Debug::getRangeTime($start, $end, $dec);
+        }
+    }
+}
+
+if (!function_exists('dump')) {
+    /**
+     * 浏览器友好的变量输出
+     * @param mixed     $var 变量
+     * @param boolean   $echo 是否输出 默认为true 如果为false 则返回输出字符串
+     * @param string    $label 标签 默认为空
+     * @return void|string
+     */
+    function dump($var, $echo = true, $label = null)
+    {
+        return Debug::dump($var, $echo, $label);
+    }
+}
+
+if (!function_exists('env')) {
+    /**
+     * 获取环境变量值
+     * @access public
+     * @param  string    $name 环境变量名（支持二级 .号分割）
+     * @param  string    $default  默认值
+     * @return mixed
+     */
+    function env($name = null, $default = null)
+    {
+        return Env::get($name, $default);
+    }
+}
+
+if (!function_exists('exception')) {
+    /**
+     * 抛出异常处理
+     *
+     * @param string    $msg  异常消息
+     * @param integer   $code 异常代码 默认为0
+     * @param string    $exception 异常类
+     *
+     * @throws Exception
+     */
+    function exception($msg, $code = 0, $exception = '')
+    {
+        $e = $exception ?: '\think\Exception';
+        throw new $e($msg, $code);
+    }
+}
+
+if (!function_exists('halt')) {
+    /**
+     * 调试变量并且中断输出
+     * @param mixed      $var 调试变量或者信息
+     */
+    function halt($var)
+    {
+        dump($var);
+
+        throw new HttpResponseException(new Response);
+    }
+}
+
+if (!function_exists('input')) {
+    /**
+     * 获取输入数据 支持默认值和过滤
+     * @param string    $key 获取的变量名
+     * @param mixed     $default 默认值
+     * @param string    $filter 过滤方法
+     * @return mixed
+     */
+    function input($key = '', $default = null, $filter = '')
+    {
+        if (0 === strpos($key, '?')) {
+            $key = substr($key, 1);
+            $has = true;
+        }
+
+        if ($pos = strpos($key, '.')) {
+            // 指定参数来源
+            $method = substr($key, 0, $pos);
+            if (in_array($method, ['get', 'post', 'put', 'patch', 'delete', 'route', 'param', 'request', 'session', 'cookie', 'server', 'env', 'path', 'file'])) {
+                $key = substr($key, $pos + 1);
+            } else {
+                $method = 'param';
+            }
+        } else {
+            // 默认为自动判断
+            $method = 'param';
+        }
+
+        if (isset($has)) {
+            return request()->has($key, $method, $default);
+        } else {
+            return request()->$method($key, $default, $filter);
+        }
+    }
+}
+
+if (!function_exists('json')) {
+    /**
+     * 获取\think\response\Json对象实例
+     * @param mixed   $data 返回的数据
+     * @param integer $code 状态码
+     * @param array   $header 头部
+     * @param array   $options 参数
+     * @return \think\response\Json
+     */
+    function json($data = [], $code = 200, $header = [], $options = [])
+    {
+        return Response::create($data, 'json', $code, $header, $options);
+    }
+}
+
+if (!function_exists('jsonp')) {
+    /**
+     * 获取\think\response\Jsonp对象实例
+     * @param mixed   $data    返回的数据
+     * @param integer $code    状态码
+     * @param array   $header 头部
+     * @param array   $options 参数
+     * @return \think\response\Jsonp
+     */
+    function jsonp($data = [], $code = 200, $header = [], $options = [])
+    {
+        return Response::create($data, 'jsonp', $code, $header, $options);
+    }
+}
+
+if (!function_exists('lang')) {
+    /**
+     * 获取语言变量值
+     * @param string    $name 语言变量名
+     * @param array     $vars 动态变量值
+     * @param string    $lang 语言
+     * @return mixed
+     */
+    function lang($name, $vars = [], $lang = '')
+    {
+        return Lang::get($name, $vars, $lang);
+    }
+}
+
+if (!function_exists('model')) {
+    /**
+     * 实例化Model
+     * @param string    $name Model名称
+     * @param string    $layer 业务层名称
+     * @param bool      $appendSuffix 是否添加类名后缀
+     * @return \think\Model
+     */
+    function model($name = '', $layer = 'model', $appendSuffix = false)
+    {
+        return app()->model($name, $layer, $appendSuffix);
+    }
+}
+
+if (!function_exists('parse_name')) {
+    /**
+     * 字符串命名风格转换
+     * type 0 将Java风格转换为C的风格 1 将C风格转换为Java的风格
+     * @param string  $name 字符串
+     * @param integer $type 转换类型
+     * @param bool    $ucfirst 首字母是否大写（驼峰规则）
+     * @return string
+     */
+    function parse_name($name, $type = 0, $ucfirst = true)
+    {
+        if ($type) {
+            $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+                return strtoupper($match[1]);
+            }, $name);
+
+            return $ucfirst ? ucfirst($name) : lcfirst($name);
+        } else {
+            return strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $name), "_"));
+        }
+    }
+}
+
+if (!function_exists('redirect')) {
+    /**
+     * 获取\think\response\Redirect对象实例
+     * @param mixed         $url 重定向地址 支持Url::build方法的地址
+     * @param array|integer $params 额外参数
+     * @param integer       $code 状态码
+     * @return \think\response\Redirect
+     */
+    function redirect($url = [], $params = [], $code = 302)
+    {
+        if (is_integer($params)) {
+            $code   = $params;
+            $params = [];
+        }
+
+        return Response::create($url, 'redirect', $code)->params($params);
+    }
+}
+
+if (!function_exists('request')) {
+    /**
+     * 获取当前Request对象实例
+     * @return Request
+     */
+    function request()
+    {
+        return app('request');
+    }
+}
+
+if (!function_exists('response')) {
+    /**
+     * 创建普通 Response 对象实例
+     * @param mixed      $data   输出数据
+     * @param int|string $code   状态码
+     * @param array      $header 头信息
+     * @param string     $type
+     * @return Response
+     */
+    function response($data = [], $code = 200, $header = [], $type = 'html')
+    {
+        return Response::create($data, $type, $code, $header);
+    }
+}
+
+if (!function_exists('route')) {
+    /**
+     * 路由注册
+     * @param  string    $rule       路由规则
+     * @param  mixed     $route      路由地址
+     * @param  array     $option     路由参数
+     * @param  array     $pattern    变量规则
+     * @return RuleItem
+     */
+    function route($rule, $route, $option = [], $pattern = [])
+    {
+        return Route::rule($rule, $route, '*', $option, $pattern);
+    }
+}
+
+if (!function_exists('session')) {
+    /**
+     * Session管理
+     * @param string|array  $name session名称，如果为数组表示进行session设置
+     * @param mixed         $value session值
+     * @param string        $prefix 前缀
+     * @return mixed
+     */
+    function session($name, $value = '', $prefix = null)
+    {
+        if (is_array($name)) {
+            // 初始化
+            Session::init($name);
+        } elseif (is_null($name)) {
+            // 清除
+            Session::clear($value);
+        } elseif ('' === $value) {
+            // 判断或获取
+            return 0 === strpos($name, '?') ? Session::has(substr($name, 1), $prefix) : Session::get($name, $prefix);
+        } elseif (is_null($value)) {
+            // 删除
+            return Session::delete($name, $prefix);
+        } else {
+            // 设置
+            return Session::set($name, $value, $prefix);
+        }
+    }
+}
+
+if (!function_exists('token')) {
+    /**
+     * 生成表单令牌
+     * @param string $name 令牌名称
+     * @param mixed  $type 令牌生成方法
+     * @return string
+     */
+    function token($name = '__token__', $type = 'md5')
+    {
+        $token = Request::token($name, $type);
+
+        return '<input type="hidden" name="' . $name . '" value="' . $token . '" />';
+    }
+}
+
+if (!function_exists('trace')) {
+    /**
+     * 记录日志信息
+     * @param mixed     $log log信息 支持字符串和数组
+     * @param string    $level 日志级别
+     * @return array|void
+     */
+    function trace($log = '[think]', $level = 'log')
+    {
+        if ('[think]' === $log) {
+            return Log::getLog();
+        } else {
+            Log::record($log, $level);
+        }
+    }
+}
+
+if (!function_exists('trait_uses_recursive')) {
+    /**
+     * 获取一个trait里所有引用到的trait
+     *
+     * @param  string $trait
+     * @return array
+     */
+    function trait_uses_recursive($trait)
+    {
+        $traits = class_uses($trait);
+        foreach ($traits as $trait) {
+            $traits += trait_uses_recursive($trait);
+        }
+
+        return $traits;
+    }
+}
+
+if (!function_exists('url')) {
+    /**
+     * Url生成
+     * @param string        $url 路由地址
+     * @param string|array  $vars 变量
+     * @param bool|string   $suffix 生成的URL后缀
+     * @param bool|string   $domain 域名
+     * @return string
+     */
+    function url($url = '', $vars = '', $suffix = true, $domain = false)
+    {
+        return Url::build($url, $vars, $suffix, $domain);
+    }
+}
+
+if (!function_exists('validate')) {
+    /**
+     * 实例化验证器
+     * @param string    $name 验证器名称
+     * @param string    $layer 业务层名称
+     * @param bool      $appendSuffix 是否添加类名后缀
+     * @return \think\Validate
+     */
+    function validate($name = '', $layer = 'validate', $appendSuffix = false)
+    {
+        return app()->validate($name, $layer, $appendSuffix);
+    }
+}
+
+if (!function_exists('view')) {
+    /**
+     * 渲染模板输出
+     * @param string    $template 模板文件
+     * @param array     $vars 模板变量
+     * @param integer   $code 状态码
+     * @param callable  $filter 内容过滤
+     * @return \think\response\View
+     */
+    function view($template = '', $vars = [], $code = 200, $filter = null)
+    {
+        return Response::create($template, 'view', $code)->assign($vars)->filter($filter);
+    }
+}
+
+if (!function_exists('widget')) {
+    /**
+     * 渲染输出Widget
+     * @param string    $name Widget名称
+     * @param array     $data 传入的参数
+     * @return mixed
+     */
+    function widget($name, $data = [])
+    {
+        return app()->action($name, $data, 'widget');
+    }
+}
+
+if (!function_exists('xml')) {
+    /**
+     * 获取\think\response\Xml对象实例
+     * @param mixed   $data    返回的数据
+     * @param integer $code    状态码
+     * @param array   $header  头部
+     * @param array   $options 参数
+     * @return \think\response\Xml
+     */
+    function xml($data = [], $code = 200, $header = [], $options = [])
+    {
+        return Response::create($data, 'xml', $code, $header, $options);
+    }
+}
diff --git a/thinkphp/lang/zh-cn.php b/thinkphp/lang/zh-cn.php
new file mode 100644
index 0000000000000000000000000000000000000000..d7c82f0c19a913c9e532de64a7a34faf6c5dc8c5
--- /dev/null
+++ b/thinkphp/lang/zh-cn.php
@@ -0,0 +1,142 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+// 核心中文语言包
+return [
+    // 系统错误提示
+    'Undefined variable'                                        => '未定义变量',
+    'Undefined index'                                           => '未定义数组索引',
+    'Undefined offset'                                          => '未定义数组下标',
+    'Parse error'                                               => '语法解析错误',
+    'Type error'                                                => '类型错误',
+    'Fatal error'                                               => '致命错误',
+    'syntax error'                                              => '语法错误',
+
+    // 框架核心错误提示
+    'dispatch type not support'                                 => '不支持的调度类型',
+    'method param miss'                                         => '方法参数错误',
+    'method not exists'                                         => '方法不存在',
+    'function not exists'                                       => '函数不存在',
+    'module not exists'                                         => '模块不存在',
+    'controller not exists'                                     => '控制器不存在',
+    'class not exists'                                          => '类不存在',
+    'property not exists'                                       => '类的属性不存在',
+    'template not exists'                                       => '模板文件不存在',
+    'illegal controller name'                                   => '非法的控制器名称',
+    'illegal action name'                                       => '非法的操作名称',
+    'url suffix deny'                                           => '禁止的URL后缀访问',
+    'Route Not Found'                                           => '当前访问路由未定义或不匹配',
+    'Undefined db type'                                         => '未定义数据库类型',
+    'variable type error'                                       => '变量类型错误',
+    'PSR-4 error'                                               => 'PSR-4 规范错误',
+    'not support total'                                         => '简洁模式下不能获取数据总数',
+    'not support last'                                          => '简洁模式下不能获取最后一页',
+    'error session handler'                                     => '错误的SESSION处理器类',
+    'not allow php tag'                                         => '模板不允许使用PHP语法',
+    'not support'                                               => '不支持',
+    'redisd master'                                             => 'Redisd 主服务器错误',
+    'redisd slave'                                              => 'Redisd 从服务器错误',
+    'must run at sae'                                           => '必须在SAE运行',
+    'memcache init error'                                       => '未开通Memcache服务，请在SAE管理平台初始化Memcache服务',
+    'KVDB init error'                                           => '没有初始化KVDB，请在SAE管理平台初始化KVDB服务',
+    'fields not exists'                                         => '数据表字段不存在',
+    'where express error'                                       => '查询表达式错误',
+    'no data to update'                                         => '没有任何数据需要更新',
+    'miss data to insert'                                       => '缺少需要写入的数据',
+    'not support data'                                          => '不支持的数据表达式',
+    'miss complex primary data'                                 => '缺少复合主键数据',
+    'miss update condition'                                     => '缺少更新条件',
+    'model data Not Found'                                      => '模型数据不存在',
+    'table data not Found'                                      => '表数据不存在',
+    'delete without condition'                                  => '没有条件不会执行删除操作',
+    'miss relation data'                                        => '缺少关联表数据',
+    'tag attr must'                                             => '模板标签属性必须',
+    'tag error'                                                 => '模板标签错误',
+    'cache write error'                                         => '缓存写入失败',
+    'sae mc write error'                                        => 'SAE mc 写入错误',
+    'route name not exists'                                     => '路由标识不存在（或参数不够）',
+    'invalid request'                                           => '非法请求',
+    'bind attr has exists'                                      => '模型的属性已经存在',
+    'relation data not exists'                                  => '关联数据不存在',
+    'relation not support'                                      => '关联不支持',
+    'chunk not support order'                                   => 'Chunk不支持调用order方法',
+    'route pattern error'                                       => '路由变量规则定义错误',
+    'route behavior will not support'                           => '路由行为废弃（使用中间件替代）',
+    'closure not support cache(true)'                           => '使用闭包查询不支持cache(true)，请指定缓存Key',
+
+    // 上传错误信息
+    'unknown upload error'                                      => '未知上传错误！',
+    'file write error'                                          => '文件写入失败！',
+    'upload temp dir not found'                                 => '找不到临时文件夹！',
+    'no file to uploaded'                                       => '没有文件被上传！',
+    'only the portion of file is uploaded'                      => '文件只有部分被上传！',
+    'upload File size exceeds the maximum value'                => '上传文件大小超过了最大值！',
+    'upload write error'                                        => '文件上传保存错误！',
+    'has the same filename: {:filename}'                        => '存在同名文件：{:filename}',
+    'upload illegal files'                                      => '非法上传文件',
+    'illegal image files'                                       => '非法图片文件',
+    'extensions to upload is not allowed'                       => '上传文件后缀不允许',
+    'mimetype to upload is not allowed'                         => '上传文件MIME类型不允许！',
+    'filesize not match'                                        => '上传文件大小不符！',
+    'directory {:path} creation failed'                         => '目录 {:path} 创建失败！',
+
+    'The middleware must return Response instance'              => '中间件方法必须返回Response对象实例',
+    'The queue was exhausted, with no response returned'        => '中间件队列为空',
+    // Validate Error Message
+    ':attribute require'                                        => ':attribute不能为空',
+    ':attribute must'                                           => ':attribute必须',
+    ':attribute must be numeric'                                => ':attribute必须是数字',
+    ':attribute must be integer'                                => ':attribute必须是整数',
+    ':attribute must be float'                                  => ':attribute必须是浮点数',
+    ':attribute must be bool'                                   => ':attribute必须是布尔值',
+    ':attribute not a valid email address'                      => ':attribute格式不符',
+    ':attribute not a valid mobile'                             => ':attribute格式不符',
+    ':attribute must be a array'                                => ':attribute必须是数组',
+    ':attribute must be yes,on or 1'                            => ':attribute必须是yes、on或者1',
+    ':attribute not a valid datetime'                           => ':attribute不是一个有效的日期或时间格式',
+    ':attribute not a valid file'                               => ':attribute不是有效的上传文件',
+    ':attribute not a valid image'                              => ':attribute不是有效的图像文件',
+    ':attribute must be alpha'                                  => ':attribute只能是字母',
+    ':attribute must be alpha-numeric'                          => ':attribute只能是字母和数字',
+    ':attribute must be alpha-numeric, dash, underscore'        => ':attribute只能是字母、数字和下划线_及破折号-',
+    ':attribute not a valid domain or ip'                       => ':attribute不是有效的域名或者IP',
+    ':attribute must be chinese'                                => ':attribute只能是汉字',
+    ':attribute must be chinese or alpha'                       => ':attribute只能是汉字、字母',
+    ':attribute must be chinese,alpha-numeric'                  => ':attribute只能是汉字、字母和数字',
+    ':attribute must be chinese,alpha-numeric,underscore, dash' => ':attribute只能是汉字、字母、数字和下划线_及破折号-',
+    ':attribute not a valid url'                                => ':attribute不是有效的URL地址',
+    ':attribute not a valid ip'                                 => ':attribute不是有效的IP地址',
+    ':attribute must be dateFormat of :rule'                    => ':attribute必须使用日期格式 :rule',
+    ':attribute must be in :rule'                               => ':attribute必须在 :rule 范围内',
+    ':attribute be notin :rule'                                 => ':attribute不能在 :rule 范围内',
+    ':attribute must between :1 - :2'                           => ':attribute只能在 :1 - :2 之间',
+    ':attribute not between :1 - :2'                            => ':attribute不能在 :1 - :2 之间',
+    'size of :attribute must be :rule'                          => ':attribute长度不符合要求 :rule',
+    'max size of :attribute must be :rule'                      => ':attribute长度不能超过 :rule',
+    'min size of :attribute must be :rule'                      => ':attribute长度不能小于 :rule',
+    ':attribute cannot be less than :rule'                      => ':attribute日期不能小于 :rule',
+    ':attribute cannot exceed :rule'                            => ':attribute日期不能超过 :rule',
+    ':attribute not within :rule'                               => '不在有效期内 :rule',
+    'access IP is not allowed'                                  => '不允许的IP访问',
+    'access IP denied'                                          => '禁止的IP访问',
+    ':attribute out of accord with :2'                          => ':attribute和确认字段:2不一致',
+    ':attribute cannot be same with :2'                         => ':attribute和比较字段:2不能相同',
+    ':attribute must greater than or equal :rule'               => ':attribute必须大于等于 :rule',
+    ':attribute must greater than :rule'                        => ':attribute必须大于 :rule',
+    ':attribute must less than or equal :rule'                  => ':attribute必须小于等于 :rule',
+    ':attribute must less than :rule'                           => ':attribute必须小于 :rule',
+    ':attribute must equal :rule'                               => ':attribute必须等于 :rule',
+    ':attribute has exists'                                     => ':attribute已存在',
+    ':attribute not conform to the rules'                       => ':attribute不符合指定规则',
+    'invalid Request method'                                    => '无效的请求类型',
+    'invalid token'                                             => '令牌数据无效',
+    'not conform to the rules'                                  => '规则错误',
+];
diff --git a/thinkphp/library/think/App.php b/thinkphp/library/think/App.php
new file mode 100644
index 0000000000000000000000000000000000000000..235c4d856f734a846e0fac4844fd4321a0b02d8a
--- /dev/null
+++ b/thinkphp/library/think/App.php
@@ -0,0 +1,971 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\exception\ClassNotFoundException;
+use think\exception\HttpResponseException;
+use think\route\Dispatch;
+
+/**
+ * App 应用管理
+ */
+class App extends Container
+{
+    const VERSION = '5.1.19';
+
+    /**
+     * 当前模块路径
+     * @var string
+     */
+    protected $modulePath;
+
+    /**
+     * 应用调试模式
+     * @var bool
+     */
+    protected $appDebug = true;
+
+    /**
+     * 应用开始时间
+     * @var float
+     */
+    protected $beginTime;
+
+    /**
+     * 应用内存初始占用
+     * @var integer
+     */
+    protected $beginMem;
+
+    /**
+     * 应用类库命名空间
+     * @var string
+     */
+    protected $namespace = 'app';
+
+    /**
+     * 应用类库后缀
+     * @var bool
+     */
+    protected $suffix = false;
+
+    /**
+     * 严格路由检测
+     * @var bool
+     */
+    protected $routeMust;
+
+    /**
+     * 应用类库目录
+     * @var string
+     */
+    protected $appPath;
+
+    /**
+     * 框架目录
+     * @var string
+     */
+    protected $thinkPath;
+
+    /**
+     * 应用根目录
+     * @var string
+     */
+    protected $rootPath;
+
+    /**
+     * 运行时目录
+     * @var string
+     */
+    protected $runtimePath;
+
+    /**
+     * 配置目录
+     * @var string
+     */
+    protected $configPath;
+
+    /**
+     * 路由目录
+     * @var string
+     */
+    protected $routePath;
+
+    /**
+     * 配置后缀
+     * @var string
+     */
+    protected $configExt;
+
+    /**
+     * 应用调度实例
+     * @var Dispatch
+     */
+    protected $dispatch;
+
+    /**
+     * 绑定模块（控制器）
+     * @var string
+     */
+    protected $bindModule;
+
+    /**
+     * 初始化
+     * @var bool
+     */
+    protected $initialized = false;
+
+    public function __construct($appPath = '')
+    {
+        $this->appPath = $appPath ? realpath($appPath) . DIRECTORY_SEPARATOR : $this->getAppPath();
+
+        $this->thinkPath   = dirname(dirname(__DIR__)) . DIRECTORY_SEPARATOR;
+        $this->rootPath    = dirname($this->appPath) . DIRECTORY_SEPARATOR;
+        $this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
+        $this->routePath   = $this->rootPath . 'route' . DIRECTORY_SEPARATOR;
+        $this->configPath  = $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
+    }
+
+    /**
+     * 绑定模块或者控制器
+     * @access public
+     * @param  string $bind
+     * @return $this
+     */
+    public function bind($bind)
+    {
+        $this->bindModule = $bind;
+        return $this;
+    }
+
+    /**
+     * 设置应用类库目录
+     * @access public
+     * @param  string $path 路径
+     * @return $this
+     */
+    public function path($path)
+    {
+        $this->appPath = $path;
+        return $this;
+    }
+
+    /**
+     * 初始化应用
+     * @access public
+     * @return void
+     */
+    public function initialize()
+    {
+        if ($this->initialized) {
+            return;
+        }
+
+        $this->initialized = true;
+        $this->beginTime   = microtime(true);
+        $this->beginMem    = memory_get_usage();
+
+        static::setInstance($this);
+
+        $this->instance('app', $this);
+
+        // 加载惯例配置文件
+        $this->config->set(include $this->thinkPath . 'convention.php');
+
+        // 设置路径环境变量
+        $this->env->set([
+            'think_path'   => $this->thinkPath,
+            'root_path'    => $this->rootPath,
+            'app_path'     => $this->appPath,
+            'config_path'  => $this->configPath,
+            'route_path'   => $this->routePath,
+            'runtime_path' => $this->runtimePath,
+            'extend_path'  => $this->rootPath . 'extend' . DIRECTORY_SEPARATOR,
+            'vendor_path'  => $this->rootPath . 'vendor' . DIRECTORY_SEPARATOR,
+        ]);
+
+        // 加载环境变量配置文件
+        if (is_file($this->rootPath . '.env')) {
+            $this->env->load($this->rootPath . '.env');
+        }
+
+        $this->namespace = $this->env->get('app_namespace', $this->namespace);
+        $this->env->set('app_namespace', $this->namespace);
+
+        // 注册应用命名空间
+        Loader::addNamespace($this->namespace, $this->appPath);
+
+        $this->configExt = $this->env->get('config_ext', '.php');
+
+        // 初始化应用
+        $this->init();
+
+        // 开启类名后缀
+        $this->suffix = $this->config('app.class_suffix');
+
+        // 应用调试模式
+        $this->appDebug = $this->env->get('app_debug', $this->config('app.app_debug'));
+        $this->env->set('app_debug', $this->appDebug);
+
+        if (!$this->appDebug) {
+            ini_set('display_errors', 'Off');
+        } elseif (PHP_SAPI != 'cli') {
+            //重新申请一块比较大的buffer
+            if (ob_get_level() > 0) {
+                $output = ob_get_clean();
+            }
+            ob_start();
+            if (!empty($output)) {
+                echo $output;
+            }
+        }
+
+        // 注册异常处理类
+        if ($this->config('app.exception_handle')) {
+            Error::setExceptionHandler($this->config('app.exception_handle'));
+        }
+
+        // 注册根命名空间
+        if (!empty($this->config('app.root_namespace'))) {
+            Loader::addNamespace($this->config('app.root_namespace'));
+        }
+
+        // 加载composer autofile文件
+        Loader::loadComposerAutoloadFiles();
+
+        // 注册类库别名
+        Loader::addClassAlias($this->config->pull('alias'));
+
+        // 数据库配置初始化
+        Db::init($this->config->pull('database'));
+
+        // 设置系统时区
+        date_default_timezone_set($this->config('app.default_timezone'));
+
+        // 读取语言包
+        $this->loadLangPack();
+
+        // 路由初始化
+        $this->routeInit();
+    }
+
+    /**
+     * 初始化应用或模块
+     * @access public
+     * @param  string $module 模块名
+     * @return void
+     */
+    public function init($module = '')
+    {
+        // 定位模块目录
+        $module = $module ? $module . DIRECTORY_SEPARATOR : '';
+        $path   = $this->appPath . $module;
+
+        // 加载初始化文件
+        if (is_file($path . 'init.php')) {
+            include $path . 'init.php';
+        } elseif (is_file($this->runtimePath . $module . 'init.php')) {
+            include $this->runtimePath . $module . 'init.php';
+        } else {
+            // 加载行为扩展文件
+            if (is_file($path . 'tags.php')) {
+                $tags = include $path . 'tags.php';
+                if (is_array($tags)) {
+                    $this->hook->import($tags);
+                }
+            }
+
+            // 加载公共文件
+            if (is_file($path . 'common.php')) {
+                include_once $path . 'common.php';
+            }
+
+            if ('' == $module) {
+                // 加载系统助手函数
+                include $this->thinkPath . 'helper.php';
+            }
+
+            // 加载中间件
+            if (is_file($path . 'middleware.php')) {
+                $middleware = include $path . 'middleware.php';
+                if (is_array($middleware)) {
+                    $this->middleware->import($middleware);
+                }
+            }
+
+            // 注册服务的容器对象实例
+            if (is_file($path . 'provider.php')) {
+                $provider = include $path . 'provider.php';
+                if (is_array($provider)) {
+                    $this->bindTo($provider);
+                }
+            }
+
+            // 自动读取配置文件
+            if (is_dir($path . 'config')) {
+                $dir = $path . 'config';
+            } elseif (is_dir($this->configPath . $module)) {
+                $dir = $this->configPath . $module;
+            }
+
+            $files = isset($dir) ? scandir($dir) : [];
+
+            foreach ($files as $file) {
+                if ('.' . pathinfo($file, PATHINFO_EXTENSION) === $this->configExt) {
+                    $filename = $dir . DIRECTORY_SEPARATOR . $file;
+                    $this->config->load($filename, pathinfo($file, PATHINFO_FILENAME));
+                }
+            }
+        }
+
+        $this->setModulePath($path);
+
+        if ($module) {
+            // 对容器中的对象实例进行配置更新
+            $this->containerConfigUpdate($module);
+        }
+    }
+
+    protected function containerConfigUpdate($module)
+    {
+        $config = $this->config->get();
+
+        // 注册异常处理类
+        if ($config['app']['exception_handle']) {
+            Error::setExceptionHandler($config['app']['exception_handle']);
+        }
+
+        Db::init($config['database']);
+        $this->middleware->setConfig($config['middleware']);
+        $this->route->setConfig($config['app']);
+        $this->request->init($config['app']);
+        $this->cookie->init($config['cookie']);
+        $this->view->init($config['template']);
+        $this->log->init($config['log']);
+        $this->session->setConfig($config['session']);
+        $this->debug->setConfig($config['trace']);
+        $this->cache->init($config['cache'], true);
+
+        // 加载当前模块语言包
+        $this->lang->load($this->appPath . $module . DIRECTORY_SEPARATOR . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php');
+
+        // 模块请求缓存检查
+        $this->checkRequestCache(
+            $config['app']['request_cache'],
+            $config['app']['request_cache_expire'],
+            $config['app']['request_cache_except']
+        );
+    }
+
+    /**
+     * 执行应用程序
+     * @access public
+     * @return Response
+     * @throws Exception
+     */
+    public function run()
+    {
+        try {
+            // 初始化应用
+            $this->initialize();
+
+            // 监听app_init
+            $this->hook->listen('app_init');
+
+            if ($this->bindModule) {
+                // 模块/控制器绑定
+                $this->route->bind($this->bindModule);
+            } elseif ($this->config('app.auto_bind_module')) {
+                // 入口自动绑定
+                $name = pathinfo($this->request->baseFile(), PATHINFO_FILENAME);
+                if ($name && 'index' != $name && is_dir($this->appPath . $name)) {
+                    $this->route->bind($name);
+                }
+            }
+
+            // 监听app_dispatch
+            $this->hook->listen('app_dispatch');
+
+            $dispatch = $this->dispatch;
+
+            if (empty($dispatch)) {
+                // 路由检测
+                $dispatch = $this->routeCheck()->init();
+            }
+
+            // 记录当前调度信息
+            $this->request->dispatch($dispatch);
+
+            // 记录路由和请求信息
+            if ($this->appDebug) {
+                $this->log('[ ROUTE ] ' . var_export($this->request->routeInfo(), true));
+                $this->log('[ HEADER ] ' . var_export($this->request->header(), true));
+                $this->log('[ PARAM ] ' . var_export($this->request->param(), true));
+            }
+
+            // 监听app_begin
+            $this->hook->listen('app_begin');
+
+            // 请求缓存检查
+            $this->checkRequestCache(
+                $this->config('request_cache'),
+                $this->config('request_cache_expire'),
+                $this->config('request_cache_except')
+            );
+
+            $data = null;
+        } catch (HttpResponseException $exception) {
+            $dispatch = null;
+            $data     = $exception->getResponse();
+        }
+
+        $this->middleware->add(function (Request $request, $next) use ($dispatch, $data) {
+            return is_null($data) ? $dispatch->run() : $data;
+        });
+
+        $response = $this->middleware->dispatch($this->request);
+
+        // 监听app_end
+        $this->hook->listen('app_end', $response);
+
+        return $response;
+    }
+
+    protected function getRouteCacheKey()
+    {
+        if ($this->config->get('route_check_cache_key')) {
+            $closure  = $this->config->get('route_check_cache_key');
+            $routeKey = $closure($this->request);
+        } else {
+            $routeKey = md5($this->request->baseUrl(true) . ':' . $this->request->method());
+        }
+
+        return $routeKey;
+    }
+
+    protected function loadLangPack()
+    {
+        // 读取默认语言
+        $this->lang->range($this->config('app.default_lang'));
+
+        if ($this->config('app.lang_switch_on')) {
+            // 开启多语言机制 检测当前语言
+            $this->lang->detect();
+        }
+
+        $this->request->setLangset($this->lang->range());
+
+        // 加载系统语言包
+        $this->lang->load([
+            $this->thinkPath . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php',
+            $this->appPath . 'lang' . DIRECTORY_SEPARATOR . $this->request->langset() . '.php',
+        ]);
+    }
+
+    /**
+     * 设置当前地址的请求缓存
+     * @access public
+     * @param  string $key 缓存标识，支持变量规则 ，例如 item/:name/:id
+     * @param  mixed  $expire 缓存有效期
+     * @param  array  $except 缓存排除
+     * @param  string $tag    缓存标签
+     * @return void
+     */
+    public function checkRequestCache($key, $expire = null, $except = [], $tag = null)
+    {
+        $cache = $this->request->cache($key, $expire, $except, $tag);
+
+        if ($cache) {
+            list($key, $expire, $tag) = $cache;
+            if (strtotime($this->request->server('HTTP_IF_MODIFIED_SINCE')) + $expire > $this->request->server('REQUEST_TIME')) {
+                // 读取缓存
+                $response = Response::create()->code(304);
+                throw new HttpResponseException($response);
+            } elseif ($this->cache->has($key)) {
+                list($content, $header) = $this->cache->get($key);
+
+                $response = Response::create($content)->header($header);
+                throw new HttpResponseException($response);
+            }
+        }
+    }
+
+    /**
+     * 设置当前请求的调度信息
+     * @access public
+     * @param  Dispatch  $dispatch 调度信息
+     * @return $this
+     */
+    public function dispatch(Dispatch $dispatch)
+    {
+        $this->dispatch = $dispatch;
+        return $this;
+    }
+
+    /**
+     * 记录调试信息
+     * @access public
+     * @param  mixed  $msg  调试信息
+     * @param  string $type 信息类型
+     * @return void
+     */
+    public function log($msg, $type = 'info')
+    {
+        $this->appDebug && $this->log->record($msg, $type);
+    }
+
+    /**
+     * 获取配置参数 为空则获取所有配置
+     * @access public
+     * @param  string    $name 配置参数名（支持二级配置 .号分割）
+     * @return mixed
+     */
+    public function config($name = '')
+    {
+        return $this->config->get($name);
+    }
+
+    /**
+     * 路由初始化 导入路由定义规则
+     * @access public
+     * @return void
+     */
+    public function routeInit()
+    {
+        // 路由检测
+        $files = scandir($this->routePath);
+        foreach ($files as $file) {
+            if (strpos($file, '.php')) {
+                $filename = $this->routePath . $file;
+                // 导入路由配置
+                $rules = include $filename;
+                if (is_array($rules)) {
+                    $this->route->import($rules);
+                }
+            }
+        }
+
+        if ($this->route->config('route_annotation')) {
+            // 自动生成路由定义
+            if ($this->appDebug) {
+                $this->build->buildRoute($this->route->config('controller_suffix'));
+            }
+
+            $filename = $this->runtimePath . 'build_route.php';
+
+            if (is_file($filename)) {
+                include $filename;
+            }
+        }
+    }
+
+    /**
+     * URL路由检测（根据PATH_INFO)
+     * @access public
+     * @return Dispatch
+     */
+    public function routeCheck()
+    {
+        // 检测路由缓存
+        if (!$this->appDebug && $this->config->get('route_check_cache')) {
+            $routeKey = $this->getRouteCacheKey();
+            $option   = $this->config->get('route_cache_option') ?: $this->cache->getConfig();
+
+            if ($this->cache->connect($option)->has($routeKey)) {
+                return $this->cache->connect($option)->get($routeKey);
+            }
+        }
+
+        // 获取应用调度信息
+        $path = $this->request->path();
+
+        // 是否强制路由模式
+        $must = !is_null($this->routeMust) ? $this->routeMust : $this->route->config('url_route_must');
+
+        // 路由检测 返回一个Dispatch对象
+        $dispatch = $this->route->check($path, $must);
+
+        if (!empty($routeKey)) {
+            try {
+                $this->cache
+                    ->connect($option)
+                    ->tag('route_cache')
+                    ->set($routeKey, $dispatch);
+            } catch (\Exception $e) {
+                // 存在闭包的时候缓存无效
+            }
+        }
+
+        return $dispatch;
+    }
+
+    /**
+     * 设置应用的路由检测机制
+     * @access public
+     * @param  bool $must  是否强制检测路由
+     * @return $this
+     */
+    public function routeMust($must = false)
+    {
+        $this->routeMust = $must;
+        return $this;
+    }
+
+    /**
+     * 解析模块和类名
+     * @access protected
+     * @param  string $name         资源地址
+     * @param  string $layer        验证层名称
+     * @param  bool   $appendSuffix 是否添加类名后缀
+     * @return array
+     */
+    protected function parseModuleAndClass($name, $layer, $appendSuffix)
+    {
+        if (false !== strpos($name, '\\')) {
+            $class  = $name;
+            $module = $this->request->module();
+        } else {
+            if (strpos($name, '/')) {
+                list($module, $name) = explode('/', $name, 2);
+            } else {
+                $module = $this->request->module();
+            }
+
+            $class = $this->parseClass($module, $layer, $name, $appendSuffix);
+        }
+
+        return [$module, $class];
+    }
+
+    /**
+     * 实例化应用类库
+     * @access public
+     * @param  string $name         类名称
+     * @param  string $layer        业务层名称
+     * @param  bool   $appendSuffix 是否添加类名后缀
+     * @param  string $common       公共模块名
+     * @return object
+     * @throws ClassNotFoundException
+     */
+    public function create($name, $layer, $appendSuffix = false, $common = 'common')
+    {
+        $guid = $name . $layer;
+
+        if ($this->__isset($guid)) {
+            return $this->__get($guid);
+        }
+
+        list($module, $class) = $this->parseModuleAndClass($name, $layer, $appendSuffix);
+
+        if (class_exists($class)) {
+            $object = $this->__get($class);
+        } else {
+            $class = str_replace('\\' . $module . '\\', '\\' . $common . '\\', $class);
+            if (class_exists($class)) {
+                $object = $this->__get($class);
+            } else {
+                throw new ClassNotFoundException('class not exists:' . $class, $class);
+            }
+        }
+
+        $this->__set($guid, $class);
+
+        return $object;
+    }
+
+    /**
+     * 实例化（分层）模型
+     * @access public
+     * @param  string $name         Model名称
+     * @param  string $layer        业务层名称
+     * @param  bool   $appendSuffix 是否添加类名后缀
+     * @param  string $common       公共模块名
+     * @return Model
+     * @throws ClassNotFoundException
+     */
+    public function model($name = '', $layer = 'model', $appendSuffix = false, $common = 'common')
+    {
+        return $this->create($name, $layer, $appendSuffix, $common);
+    }
+
+    /**
+     * 实例化（分层）控制器 格式：[模块名/]控制器名
+     * @access public
+     * @param  string $name              资源地址
+     * @param  string $layer             控制层名称
+     * @param  bool   $appendSuffix      是否添加类名后缀
+     * @param  string $empty             空控制器名称
+     * @return object
+     * @throws ClassNotFoundException
+     */
+    public function controller($name, $layer = 'controller', $appendSuffix = false, $empty = '')
+    {
+        list($module, $class) = $this->parseModuleAndClass($name, $layer, $appendSuffix);
+
+        if (class_exists($class)) {
+            return $this->__get($class);
+        } elseif ($empty && class_exists($emptyClass = $this->parseClass($module, $layer, $empty, $appendSuffix))) {
+            return $this->__get($emptyClass);
+        }
+
+        throw new ClassNotFoundException('class not exists:' . $class, $class);
+    }
+
+    /**
+     * 实例化验证类 格式：[模块名/]验证器名
+     * @access public
+     * @param  string $name         资源地址
+     * @param  string $layer        验证层名称
+     * @param  bool   $appendSuffix 是否添加类名后缀
+     * @param  string $common       公共模块名
+     * @return Validate
+     * @throws ClassNotFoundException
+     */
+    public function validate($name = '', $layer = 'validate', $appendSuffix = false, $common = 'common')
+    {
+        $name = $name ?: $this->config('default_validate');
+
+        if (empty($name)) {
+            return new Validate;
+        }
+
+        return $this->create($name, $layer, $appendSuffix, $common);
+    }
+
+    /**
+     * 数据库初始化
+     * @access public
+     * @param  mixed         $config 数据库配置
+     * @param  bool|string   $name 连接标识 true 强制重新连接
+     * @return \think\db\Query
+     */
+    public function db($config = [], $name = false)
+    {
+        return Db::connect($config, $name);
+    }
+
+    /**
+     * 远程调用模块的操作方法 参数格式 [模块/控制器/]操作
+     * @access public
+     * @param  string       $url          调用地址
+     * @param  string|array $vars         调用参数 支持字符串和数组
+     * @param  string       $layer        要调用的控制层名称
+     * @param  bool         $appendSuffix 是否添加类名后缀
+     * @return mixed
+     * @throws ClassNotFoundException
+     */
+    public function action($url, $vars = [], $layer = 'controller', $appendSuffix = false)
+    {
+        $info   = pathinfo($url);
+        $action = $info['basename'];
+        $module = '.' != $info['dirname'] ? $info['dirname'] : $this->request->controller();
+        $class  = $this->controller($module, $layer, $appendSuffix);
+
+        if (is_scalar($vars)) {
+            if (strpos($vars, '=')) {
+                parse_str($vars, $vars);
+            } else {
+                $vars = [$vars];
+            }
+        }
+
+        return $this->invokeMethod([$class, $action . $this->config('action_suffix')], $vars);
+    }
+
+    /**
+     * 解析应用类的类名
+     * @access public
+     * @param  string $module 模块名
+     * @param  string $layer  层名 controller model ...
+     * @param  string $name   类名
+     * @param  bool   $appendSuffix
+     * @return string
+     */
+    public function parseClass($module, $layer, $name, $appendSuffix = false)
+    {
+        $name  = str_replace(['/', '.'], '\\', $name);
+        $array = explode('\\', $name);
+        $class = Loader::parseName(array_pop($array), 1) . ($this->suffix || $appendSuffix ? ucfirst($layer) : '');
+        $path  = $array ? implode('\\', $array) . '\\' : '';
+
+        return $this->namespace . '\\' . ($module ? $module . '\\' : '') . $layer . '\\' . $path . $class;
+    }
+
+    /**
+     * 获取框架版本
+     * @access public
+     * @return string
+     */
+    public function version()
+    {
+        return static::VERSION;
+    }
+
+    /**
+     * 是否为调试模式
+     * @access public
+     * @return bool
+     */
+    public function isDebug()
+    {
+        return $this->appDebug;
+    }
+
+    /**
+     * 获取模块路径
+     * @access public
+     * @return string
+     */
+    public function getModulePath()
+    {
+        return $this->modulePath;
+    }
+
+    /**
+     * 设置模块路径
+     * @access public
+     * @param  string $path 路径
+     * @return void
+     */
+    public function setModulePath($path)
+    {
+        $this->modulePath = $path;
+        $this->env->set('module_path', $path);
+    }
+
+    /**
+     * 获取应用根目录
+     * @access public
+     * @return string
+     */
+    public function getRootPath()
+    {
+        return $this->rootPath;
+    }
+
+    /**
+     * 获取应用类库目录
+     * @access public
+     * @return string
+     */
+    public function getAppPath()
+    {
+        if (is_null($this->appPath)) {
+            $this->appPath = Loader::getRootPath() . 'application' . DIRECTORY_SEPARATOR;
+        }
+
+        return $this->appPath;
+    }
+
+    /**
+     * 获取应用运行时目录
+     * @access public
+     * @return string
+     */
+    public function getRuntimePath()
+    {
+        return $this->runtimePath;
+    }
+
+    /**
+     * 获取核心框架目录
+     * @access public
+     * @return string
+     */
+    public function getThinkPath()
+    {
+        return $this->thinkPath;
+    }
+
+    /**
+     * 获取路由目录
+     * @access public
+     * @return string
+     */
+    public function getRoutePath()
+    {
+        return $this->routePath;
+    }
+
+    /**
+     * 获取应用配置目录
+     * @access public
+     * @return string
+     */
+    public function getConfigPath()
+    {
+        return $this->configPath;
+    }
+
+    /**
+     * 获取配置后缀
+     * @access public
+     * @return string
+     */
+    public function getConfigExt()
+    {
+        return $this->configExt;
+    }
+
+    /**
+     * 获取应用类库命名空间
+     * @access public
+     * @return string
+     */
+    public function getNamespace()
+    {
+        return $this->namespace;
+    }
+
+    /**
+     * 设置应用类库命名空间
+     * @access public
+     * @param  string $namespace 命名空间名称
+     * @return $this
+     */
+    public function setNamespace($namespace)
+    {
+        $this->namespace = $namespace;
+        return $this;
+    }
+
+    /**
+     * 是否启用类库后缀
+     * @access public
+     * @return bool
+     */
+    public function getSuffix()
+    {
+        return $this->suffix;
+    }
+
+    /**
+     * 获取应用开启时间
+     * @access public
+     * @return float
+     */
+    public function getBeginTime()
+    {
+        return $this->beginTime;
+    }
+
+    /**
+     * 获取应用初始内存占用
+     * @access public
+     * @return integer
+     */
+    public function getBeginMem()
+    {
+        return $this->beginMem;
+    }
+
+}
diff --git a/thinkphp/library/think/Build.php b/thinkphp/library/think/Build.php
new file mode 100644
index 0000000000000000000000000000000000000000..f12c79093292754e54b45c66992d2f58bcc9eb28
--- /dev/null
+++ b/thinkphp/library/think/Build.php
@@ -0,0 +1,407 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class Build
+{
+    /**
+     * 应用对象
+     * @var App
+     */
+    protected $app;
+
+    /**
+     * 应用目录
+     * @var string
+     */
+    protected $basePath;
+
+    public function __construct(App $app)
+    {
+        $this->app      = $app;
+        $this->basePath = $this->app->getAppPath();
+    }
+
+    /**
+     * 根据传入的build资料创建目录和文件
+     * @access public
+     * @param  array  $build build列表
+     * @param  string $namespace 应用类库命名空间
+     * @param  bool   $suffix 类库后缀
+     * @return void
+     */
+    public function run(array $build = [], $namespace = 'app', $suffix = false)
+    {
+        // 锁定
+        $lockfile = $this->basePath . 'build.lock';
+
+        if (is_writable($lockfile)) {
+            return;
+        } elseif (!touch($lockfile)) {
+            throw new Exception('应用目录[' . $this->basePath . ']不可写，目录无法自动生成！<BR>请手动生成项目目录~', 10006);
+        }
+
+        foreach ($build as $module => $list) {
+            if ('__dir__' == $module) {
+                // 创建目录列表
+                $this->buildDir($list);
+            } elseif ('__file__' == $module) {
+                // 创建文件列表
+                $this->buildFile($list);
+            } else {
+                // 创建模块
+                $this->module($module, $list, $namespace, $suffix);
+            }
+        }
+
+        // 解除锁定
+        unlink($lockfile);
+    }
+
+    /**
+     * 创建目录
+     * @access protected
+     * @param  array $list 目录列表
+     * @return void
+     */
+    protected function buildDir($list)
+    {
+        foreach ($list as $dir) {
+            $this->checkDirBuild($this->basePath . $dir);
+        }
+    }
+
+    /**
+     * 创建文件
+     * @access protected
+     * @param  array $list 文件列表
+     * @return void
+     */
+    protected function buildFile($list)
+    {
+        foreach ($list as $file) {
+            if (!is_dir($this->basePath . dirname($file))) {
+                // 创建目录
+                mkdir($this->basePath . dirname($file), 0755, true);
+            }
+
+            if (!is_file($this->basePath . $file)) {
+                file_put_contents($this->basePath . $file, 'php' == pathinfo($file, PATHINFO_EXTENSION) ? "<?php\n" : '');
+            }
+        }
+    }
+
+    /**
+     * 创建模块
+     * @access public
+     * @param  string $module 模块名
+     * @param  array  $list build列表
+     * @param  string $namespace 应用类库命名空间
+     * @param  bool   $suffix 类库后缀
+     * @return void
+     */
+    public function module($module = '', $list = [], $namespace = 'app', $suffix = false)
+    {
+        $module = $module ? $module : '';
+
+        if (!is_dir($this->basePath . $module)) {
+            // 创建模块目录
+            mkdir($this->basePath . $module);
+        }
+
+        if (basename($this->app->getRuntimePath()) != $module) {
+            // 创建配置文件和公共文件
+            $this->buildCommon($module);
+            // 创建模块的默认页面
+            $this->buildHello($module, $namespace, $suffix);
+        }
+
+        if (empty($list)) {
+            // 创建默认的模块目录和文件
+            $list = [
+                '__file__' => ['common.php'],
+                '__dir__'  => ['controller', 'model', 'view', 'config'],
+            ];
+        }
+
+        // 创建子目录和文件
+        foreach ($list as $path => $file) {
+            $modulePath = $this->basePath . $module . DIRECTORY_SEPARATOR;
+            if ('__dir__' == $path) {
+                // 生成子目录
+                foreach ($file as $dir) {
+                    $this->checkDirBuild($modulePath . $dir);
+                }
+            } elseif ('__file__' == $path) {
+                // 生成（空白）文件
+                foreach ($file as $name) {
+                    if (!is_file($modulePath . $name)) {
+                        file_put_contents($modulePath . $name, 'php' == pathinfo($name, PATHINFO_EXTENSION) ? "<?php\n" : '');
+                    }
+                }
+            } else {
+                // 生成相关MVC文件
+                foreach ($file as $val) {
+                    $val      = trim($val);
+                    $filename = $modulePath . $path . DIRECTORY_SEPARATOR . $val . ($suffix ? ucfirst($path) : '') . '.php';
+                    $space    = $namespace . '\\' . ($module ? $module . '\\' : '') . $path;
+                    $class    = $val . ($suffix ? ucfirst($path) : '');
+                    switch ($path) {
+                        case 'controller': // 控制器
+                            $content = "<?php\nnamespace {$space};\n\nclass {$class}\n{\n\n}";
+                            break;
+                        case 'model': // 模型
+                            $content = "<?php\nnamespace {$space};\n\nuse think\Model;\n\nclass {$class} extends Model\n{\n\n}";
+                            break;
+                        case 'view': // 视图
+                            $filename = $modulePath . $path . DIRECTORY_SEPARATOR . $val . '.html';
+                            $this->checkDirBuild(dirname($filename));
+                            $content = '';
+                            break;
+                        default:
+                            // 其他文件
+                            $content = "<?php\nnamespace {$space};\n\nclass {$class}\n{\n\n}";
+                    }
+
+                    if (!is_file($filename)) {
+                        file_put_contents($filename, $content);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 根据注释自动生成路由规则
+     * @access public
+     * @param  bool   $suffix 类库后缀
+     * @param  string $layer  控制器层目录名
+     * @return string
+     */
+    public function buildRoute($suffix = false, $layer = '')
+    {
+        $namespace = $this->app->getNameSpace();
+        $modules   = glob($this->basePath . '*', GLOB_ONLYDIR);
+        $content   = '<?php ' . PHP_EOL . '//根据 Annotation 自动生成的路由规则';
+
+        if (!$layer) {
+            $layer = $this->app->config('app.url_controller_layer');
+        }
+
+        foreach ($modules as $module) {
+            $module = basename($module);
+
+            if (in_array($module, $this->app->config('app.deny_module_list'))) {
+                continue;
+            }
+
+            $path = $this->basePath . $module . DIRECTORY_SEPARATOR . $layer . DIRECTORY_SEPARATOR;
+            $content .= $this->buildDirRoute($path, $namespace, $module, $suffix, $layer);
+        }
+
+        $filename = $this->app->getRuntimePath() . 'build_route.php';
+        file_put_contents($filename, $content);
+
+        return $filename;
+    }
+
+    /**
+     * 生成子目录控制器类的路由规则
+     * @access protected
+     * @param  string $path  控制器目录
+     * @param  string $namespace 应用命名空间
+     * @param  string $module 模块
+     * @param  bool   $suffix 类库后缀
+     * @param  string $layer 控制器层目录名
+     * @return string
+     */
+    protected function buildDirRoute($path, $namespace, $module, $suffix, $layer)
+    {
+        $content     = '';
+        $controllers = glob($path . '*.php');
+
+        foreach ($controllers as $controller) {
+            $controller = basename($controller, '.php');
+
+            if ($suffix) {
+                // 控制器后缀
+                $controller = substr($controller, 0, -10);
+            }
+
+            $class = new \ReflectionClass($namespace . '\\' . $module . '\\' . $layer . '\\' . $controller);
+
+            if (strpos($layer, '\\')) {
+                // 多级控制器
+                $level      = str_replace(DIRECTORY_SEPARATOR, '.', substr($layer, 11));
+                $controller = $level . '.' . $controller;
+            }
+
+            $content .= $this->getControllerRoute($class, $module, $controller);
+        }
+
+        $subDir = glob($path . '*', GLOB_ONLYDIR);
+
+        foreach ($subDir as $dir) {
+            $content .= $this->buildDirRoute($dir . DIRECTORY_SEPARATOR, $namespace, $module, $suffix, $layer . '\\' . basename($dir));
+        }
+
+        return $content;
+    }
+
+    /**
+     * 生成控制器类的路由规则
+     * @access protected
+     * @param  string $class        控制器完整类名
+     * @param  string $module       模块名
+     * @param  string $controller   控制器名
+     * @return string
+     */
+    protected function getControllerRoute($class, $module, $controller)
+    {
+        $content = '';
+        $comment = $class->getDocComment();
+
+        if (false !== strpos($comment, '@route(')) {
+            $comment = $this->parseRouteComment($comment);
+            $route   = $module . '/' . $controller;
+            $comment = preg_replace('/route\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::resource(\1,\'' . $route . '\')', $comment);
+            $content .= PHP_EOL . $comment;
+        } elseif (false !== strpos($comment, '@alias(')) {
+            $comment = $this->parseRouteComment($comment, '@alias(');
+            $route   = $module . '/' . $controller;
+            $comment = preg_replace('/alias\(\s?([\'\"][\-\_\/\w]+[\'\"])\s?\)/is', 'Route::alias(\1,\'' . $route . '\')', $comment);
+            $content .= PHP_EOL . $comment;
+        }
+
+        $methods = $class->getMethods(\ReflectionMethod::IS_PUBLIC);
+
+        foreach ($methods as $method) {
+            $comment = $this->getMethodRouteComment($module, $controller, $method);
+            if ($comment) {
+                $content .= PHP_EOL . $comment;
+            }
+        }
+
+        return $content;
+    }
+
+    /**
+     * 解析路由注释
+     * @access protected
+     * @param  string $comment
+     * @param  string $tag
+     * @return string
+     */
+    protected function parseRouteComment($comment, $tag = '@route(')
+    {
+        $comment = substr($comment, 3, -2);
+        $comment = explode(PHP_EOL, substr(strstr(trim($comment), $tag), 1));
+        $comment = array_map(function ($item) {return trim(trim($item), ' \t*');}, $comment);
+
+        if (count($comment) > 1) {
+            $key     = array_search('', $comment);
+            $comment = array_slice($comment, 0, false === $key ? 1 : $key);
+        }
+
+        $comment = implode(PHP_EOL . "\t", $comment) . ';';
+
+        if (strpos($comment, '{')) {
+            $comment = preg_replace_callback('/\{\s?.*?\s?\}/s', function ($matches) {
+                return false !== strpos($matches[0], '"') ? '[' . substr(var_export(json_decode($matches[0], true), true), 7, -1) . ']' : $matches[0];
+            }, $comment);
+        }
+        return $comment;
+    }
+
+    /**
+     * 获取方法的路由注释
+     * @access protected
+     * @param  string           $module 模块
+     * @param  string           $controller 控制器名
+     * @param  \ReflectMethod   $reflectMethod
+     * @return string|void
+     */
+    protected function getMethodRouteComment($module, $controller, $reflectMethod)
+    {
+        $comment = $reflectMethod->getDocComment();
+
+        if (false !== strpos($comment, '@route(')) {
+            $comment = $this->parseRouteComment($comment);
+            $action  = $reflectMethod->getName();
+
+            if ($suffix = $this->app->config('app.action_suffix')) {
+                $action = substr($action, 0, -strlen($suffix));
+            }
+
+            $route   = $module . '/' . $controller . '/' . $action;
+            $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\,?\s?[\'\"]?(\w+?)[\'\"]?\s?\)/is', 'Route::\2(\1,\'' . $route . '\')', $comment);
+            $comment = preg_replace('/route\s?\(\s?([\'\"][\-\_\/\:\<\>\?\$\[\]\w]+[\'\"])\s?\)/is', 'Route::rule(\1,\'' . $route . '\')', $comment);
+
+            return $comment;
+        }
+    }
+
+    /**
+     * 创建模块的欢迎页面
+     * @access protected
+     * @param  string $module 模块名
+     * @param  string $namespace 应用类库命名空间
+     * @param  bool   $suffix 类库后缀
+     * @return void
+     */
+    protected function buildHello($module, $namespace, $suffix = false)
+    {
+        $filename = $this->basePath . ($module ? $module . DIRECTORY_SEPARATOR : '') . 'controller' . DIRECTORY_SEPARATOR . 'Index' . ($suffix ? 'Controller' : '') . '.php';
+        if (!is_file($filename)) {
+            $content = file_get_contents($this->app->getThinkPath() . 'tpl' . DIRECTORY_SEPARATOR . 'default_index.tpl');
+            $content = str_replace(['{$app}', '{$module}', '{layer}', '{$suffix}'], [$namespace, $module ? $module . '\\' : '', 'controller', $suffix ? 'Controller' : ''], $content);
+            $this->checkDirBuild(dirname($filename));
+
+            file_put_contents($filename, $content);
+        }
+    }
+
+    /**
+     * 创建模块的公共文件
+     * @access protected
+     * @param  string $module 模块名
+     * @return void
+     */
+    protected function buildCommon($module)
+    {
+        $filename = $this->app->getConfigPath() . ($module ? $module . DIRECTORY_SEPARATOR : '') . 'app.php';
+        $this->checkDirBuild(dirname($filename));
+
+        if (!is_file($filename)) {
+            file_put_contents($filename, "<?php\n//配置文件\nreturn [\n\n];");
+        }
+
+        $filename = $this->basePath . ($module ? $module . DIRECTORY_SEPARATOR : '') . 'common.php';
+
+        if (!is_file($filename)) {
+            file_put_contents($filename, "<?php\n");
+        }
+    }
+
+    /**
+     * 创建目录
+     * @access protected
+     * @param  string $dirname 目录名称
+     * @return void
+     */
+    protected function checkDirBuild($dirname)
+    {
+        if (!is_dir($dirname)) {
+            mkdir($dirname, 0755, true);
+        }
+    }
+}
diff --git a/thinkphp/library/think/Cache.php b/thinkphp/library/think/Cache.php
new file mode 100644
index 0000000000000000000000000000000000000000..162cb6d3b7ad14228e85fd0fc08e3ed2f88c78ad
--- /dev/null
+++ b/thinkphp/library/think/Cache.php
@@ -0,0 +1,133 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\cache\Driver;
+
+/**
+ * Class Cache
+ *
+ * @package think
+ *
+ * @mixin Driver
+ * @mixin \think\cache\driver\File
+ */
+class Cache
+{
+    /**
+     * 缓存实例
+     * @var array
+     */
+    protected $instance = [];
+
+    /**
+     * 缓存配置
+     * @var array
+     */
+    protected $config = [];
+
+    /**
+     * 操作句柄
+     * @var object
+     */
+    protected $handler;
+
+    public function __construct(array $config = [])
+    {
+        $this->config = $config;
+        $this->init($config);
+    }
+
+    /**
+     * 连接缓存
+     * @access public
+     * @param  array         $options  配置数组
+     * @param  bool|string   $name 缓存连接标识 true 强制重新连接
+     * @return Driver
+     */
+    public function connect(array $options = [], $name = false)
+    {
+        if (false === $name) {
+            $name = md5(serialize($options));
+        }
+
+        if (true === $name || !isset($this->instance[$name])) {
+            $type = !empty($options['type']) ? $options['type'] : 'File';
+
+            if (true === $name) {
+                $name = md5(serialize($options));
+            }
+
+            $this->instance[$name] = Loader::factory($type, '\\think\\cache\\driver\\', $options);
+        }
+
+        return $this->instance[$name];
+    }
+
+    /**
+     * 自动初始化缓存
+     * @access public
+     * @param  array         $options  配置数组
+     * @param  bool          $force    强制更新
+     * @return Driver
+     */
+    public function init(array $options = [], $force = false)
+    {
+        if (is_null($this->handler) || $force) {
+
+            if ('complex' == $options['type']) {
+                $default = $options['default'];
+                $options = isset($options[$default['type']]) ? $options[$default['type']] : $default;
+            }
+
+            $this->handler = $this->connect($options);
+        }
+
+        return $this->handler;
+    }
+
+    public static function __make(Config $config)
+    {
+        return new static($config->pull('cache'));
+    }
+
+    public function getConfig()
+    {
+        return $this->config;
+    }
+
+    public function setConfig(array $config)
+    {
+        $this->config = array_merge($this->config, $config);
+    }
+
+    /**
+     * 切换缓存类型 需要配置 cache.type 为 complex
+     * @access public
+     * @param  string $name 缓存标识
+     * @return Driver
+     */
+    public function store($name = '')
+    {
+        if ('' !== $name && 'complex' == $this->config['type']) {
+            return $this->connect($this->config[$name], strtolower($name));
+        }
+
+        return $this->init();
+    }
+
+    public function __call($method, $args)
+    {
+        return call_user_func_array([$this->init(), $method], $args);
+    }
+
+}
diff --git a/thinkphp/library/think/Collection.php b/thinkphp/library/think/Collection.php
new file mode 100644
index 0000000000000000000000000000000000000000..929b51939dd73985c592763b6226056f4c9e7559
--- /dev/null
+++ b/thinkphp/library/think/Collection.php
@@ -0,0 +1,388 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: zhangyajun <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use ArrayAccess;
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use JsonSerializable;
+
+class Collection implements ArrayAccess, Countable, IteratorAggregate, JsonSerializable
+{
+    /**
+     * 数据集数据
+     * @var array
+     */
+    protected $items = [];
+
+    public function __construct($items = [])
+    {
+        $this->items = $this->convertToArray($items);
+    }
+
+    public static function make($items = [])
+    {
+        return new static($items);
+    }
+
+    /**
+     * 是否为空
+     * @access public
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->items);
+    }
+
+    public function toArray()
+    {
+        return array_map(function ($value) {
+            return ($value instanceof Model || $value instanceof self) ? $value->toArray() : $value;
+        }, $this->items);
+    }
+
+    public function all()
+    {
+        return $this->items;
+    }
+
+    /**
+     * 合并数组
+     *
+     * @access public
+     * @param  mixed $items
+     * @return static
+     */
+    public function merge($items)
+    {
+        return new static(array_merge($this->items, $this->convertToArray($items)));
+    }
+
+    /**
+     * 比较数组，返回差集
+     *
+     * @access public
+     * @param  mixed $items
+     * @return static
+     */
+    public function diff($items)
+    {
+        return new static(array_diff($this->items, $this->convertToArray($items)));
+    }
+
+    /**
+     * 交换数组中的键和值
+     *
+     * @access public
+     * @return static
+     */
+    public function flip()
+    {
+        return new static(array_flip($this->items));
+    }
+
+    /**
+     * 比较数组，返回交集
+     *
+     * @access public
+     * @param  mixed $items
+     * @return static
+     */
+    public function intersect($items)
+    {
+        return new static(array_intersect($this->items, $this->convertToArray($items)));
+    }
+
+    /**
+     * 返回数组中所有的键名
+     *
+     * @access public
+     * @return static
+     */
+    public function keys()
+    {
+        return new static(array_keys($this->items));
+    }
+
+    /**
+     * 删除数组的最后一个元素（出栈）
+     *
+     * @access public
+     * @return mixed
+     */
+    public function pop()
+    {
+        return array_pop($this->items);
+    }
+
+    /**
+     * 通过使用用户自定义函数，以字符串返回数组
+     *
+     * @access public
+     * @param  callable $callback
+     * @param  mixed    $initial
+     * @return mixed
+     */
+    public function reduce(callable $callback, $initial = null)
+    {
+        return array_reduce($this->items, $callback, $initial);
+    }
+
+    /**
+     * 以相反的顺序返回数组。
+     *
+     * @access public
+     * @return static
+     */
+    public function reverse()
+    {
+        return new static(array_reverse($this->items));
+    }
+
+    /**
+     * 删除数组中首个元素，并返回被删除元素的值
+     *
+     * @access public
+     * @return mixed
+     */
+    public function shift()
+    {
+        return array_shift($this->items);
+    }
+
+    /**
+     * 在数组结尾插入一个元素
+     * @access public
+     * @param  mixed  $value
+     * @param  mixed  $key
+     * @return void
+     */
+    public function push($value, $key = null)
+    {
+        if (is_null($key)) {
+            $this->items[] = $value;
+        } else {
+            $this->items[$key] = $value;
+        }
+    }
+
+    /**
+     * 把一个数组分割为新的数组块.
+     *
+     * @access public
+     * @param  int  $size
+     * @param  bool $preserveKeys
+     * @return static
+     */
+    public function chunk($size, $preserveKeys = false)
+    {
+        $chunks = [];
+
+        foreach (array_chunk($this->items, $size, $preserveKeys) as $chunk) {
+            $chunks[] = new static($chunk);
+        }
+
+        return new static($chunks);
+    }
+
+    /**
+     * 在数组开头插入一个元素
+     * @access public
+     * @param mixed  $value
+     * @param mixed  $key
+     * @return void
+     */
+    public function unshift($value, $key = null)
+    {
+        if (is_null($key)) {
+            array_unshift($this->items, $value);
+        } else {
+            $this->items = [$key => $value] + $this->items;
+        }
+    }
+
+    /**
+     * 给每个元素执行个回调
+     *
+     * @access public
+     * @param  callable $callback
+     * @return $this
+     */
+    public function each(callable $callback)
+    {
+        foreach ($this->items as $key => $item) {
+            $result = $callback($item, $key);
+
+            if (false === $result) {
+                break;
+            } elseif (!is_object($item)) {
+                $this->items[$key] = $result;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 用回调函数过滤数组中的元素
+     * @access public
+     * @param  callable|null $callback
+     * @return static
+     */
+    public function filter(callable $callback = null)
+    {
+        if ($callback) {
+            return new static(array_filter($this->items, $callback));
+        }
+
+        return new static(array_filter($this->items));
+    }
+
+    /**
+     * 返回数据中指定的一列
+     * @access public
+     * @param mixed $columnKey 键名
+     * @param mixed $indexKey  作为索引值的列
+     * @return array
+     */
+    public function column($columnKey, $indexKey = null)
+    {
+        return array_column($this->items, $columnKey, $indexKey);
+    }
+
+    /**
+     * 对数组排序
+     *
+     * @access public
+     * @param  callable|null $callback
+     * @return static
+     */
+    public function sort(callable $callback = null)
+    {
+        $items = $this->items;
+
+        $callback = $callback ?: function ($a, $b) {
+            return $a == $b ? 0 : (($a < $b) ? -1 : 1);
+
+        };
+
+        uasort($items, $callback);
+
+        return new static($items);
+    }
+
+    /**
+     * 将数组打乱
+     *
+     * @access public
+     * @return static
+     */
+    public function shuffle()
+    {
+        $items = $this->items;
+
+        shuffle($items);
+
+        return new static($items);
+    }
+
+    /**
+     * 截取数组
+     *
+     * @access public
+     * @param  int  $offset
+     * @param  int  $length
+     * @param  bool $preserveKeys
+     * @return static
+     */
+    public function slice($offset, $length = null, $preserveKeys = false)
+    {
+        return new static(array_slice($this->items, $offset, $length, $preserveKeys));
+    }
+
+    // ArrayAccess
+    public function offsetExists($offset)
+    {
+        return array_key_exists($offset, $this->items);
+    }
+
+    public function offsetGet($offset)
+    {
+        return $this->items[$offset];
+    }
+
+    public function offsetSet($offset, $value)
+    {
+        if (is_null($offset)) {
+            $this->items[] = $value;
+        } else {
+            $this->items[$offset] = $value;
+        }
+    }
+
+    public function offsetUnset($offset)
+    {
+        unset($this->items[$offset]);
+    }
+
+    //Countable
+    public function count()
+    {
+        return count($this->items);
+    }
+
+    //IteratorAggregate
+    public function getIterator()
+    {
+        return new ArrayIterator($this->items);
+    }
+
+    //JsonSerializable
+    public function jsonSerialize()
+    {
+        return $this->toArray();
+    }
+
+    /**
+     * 转换当前数据集为JSON字符串
+     * @access public
+     * @param  integer $options json参数
+     * @return string
+     */
+    public function toJson($options = JSON_UNESCAPED_UNICODE)
+    {
+        return json_encode($this->toArray(), $options);
+    }
+
+    public function __toString()
+    {
+        return $this->toJson();
+    }
+
+    /**
+     * 转换成数组
+     *
+     * @access public
+     * @param  mixed $items
+     * @return array
+     */
+    protected function convertToArray($items)
+    {
+        if ($items instanceof self) {
+            return $items->all();
+        }
+
+        return (array) $items;
+    }
+}
diff --git a/thinkphp/library/think/Config.php b/thinkphp/library/think/Config.php
new file mode 100644
index 0000000000000000000000000000000000000000..1e60ac9d0317fc586a4e4baa20b69feb0701c46d
--- /dev/null
+++ b/thinkphp/library/think/Config.php
@@ -0,0 +1,279 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class Config implements \ArrayAccess
+{
+    /**
+     * 配置参数
+     * @var array
+     */
+    private $config = [];
+
+    /**
+     * 配置前缀
+     * @var string
+     */
+    private $prefix = 'app';
+
+    /**
+     * 设置配置参数默认前缀
+     * @access public
+     * @param string    $prefix 前缀
+     * @return void
+     */
+    public function setDefaultPrefix($prefix)
+    {
+        $this->prefix = $prefix;
+    }
+
+    /**
+     * 解析配置文件或内容
+     * @access public
+     * @param  string    $config 配置文件路径或内容
+     * @param  string    $type 配置解析类型
+     * @param  string    $name 配置名（如设置即表示二级配置）
+     * @return mixed
+     */
+    public function parse($config, $type = '', $name = '')
+    {
+        if (empty($type)) {
+            $type = pathinfo($config, PATHINFO_EXTENSION);
+        }
+
+        $object = Loader::factory($type, '\\think\\config\\driver\\', $config);
+
+        return $this->set($object->parse(), $name);
+    }
+
+    /**
+     * 加载配置文件（多种格式）
+     * @access public
+     * @param  string    $file 配置文件名
+     * @param  string    $name 一级配置名
+     * @return mixed
+     */
+    public function load($file, $name = '')
+    {
+        if (is_file($file)) {
+            $name = strtolower($name);
+            $type = pathinfo($file, PATHINFO_EXTENSION);
+
+            if ('php' == $type) {
+                return $this->set(include $file, $name);
+            } elseif ('yaml' == $type && function_exists('yaml_parse_file')) {
+                return $this->set(yaml_parse_file($file), $name);
+            }
+            return $this->parse($file, $type, $name);
+        }
+
+        return $this->config;
+    }
+
+    /**
+     * 检测配置是否存在
+     * @access public
+     * @param  string    $name 配置参数名（支持多级配置 .号分割）
+     * @return bool
+     */
+    public function has($name)
+    {
+        if (!strpos($name, '.')) {
+            $name = $this->prefix . '.' . $name;
+        }
+
+        return !is_null($this->get($name)) ? true : false;
+    }
+
+    /**
+     * 获取一级配置
+     * @access public
+     * @param  string    $name 一级配置名
+     * @return array
+     */
+    public function pull($name)
+    {
+        $name = strtolower($name);
+
+        return isset($this->config[$name]) ? $this->config[$name] : [];
+    }
+
+    /**
+     * 获取配置参数 为空则获取所有配置
+     * @access public
+     * @param  string    $name      配置参数名（支持多级配置 .号分割）
+     * @param  mixed     $default   默认值
+     * @return mixed
+     */
+    public function get($name = null, $default = null)
+    {
+        // 无参数时获取所有
+        if (empty($name)) {
+            return $this->config;
+        }
+
+        if (!strpos($name, '.')) {
+            $name = $this->prefix . '.' . $name;
+        } elseif ('.' == substr($name, -1)) {
+            return $this->pull(substr($name, 0, -1));
+        }
+
+        $name    = explode('.', $name);
+        $name[0] = strtolower($name[0]);
+        $config  = $this->config;
+
+        // 按.拆分成多维数组进行判断
+        foreach ($name as $val) {
+            if (isset($config[$val])) {
+                $config = $config[$val];
+            } else {
+                return $default;
+            }
+        }
+
+        return $config;
+    }
+
+    /**
+     * 设置配置参数 name为数组则为批量设置
+     * @access public
+     * @param  string|array  $name 配置参数名（支持三级配置 .号分割）
+     * @param  mixed         $value 配置值
+     * @return mixed
+     */
+    public function set($name, $value = null)
+    {
+        if (is_string($name)) {
+            if (!strpos($name, '.')) {
+                $name = $this->prefix . '.' . $name;
+            }
+
+            $name = explode('.', $name, 3);
+
+            if (count($name) == 2) {
+                $this->config[strtolower($name[0])][$name[1]] = $value;
+            } else {
+                $this->config[strtolower($name[0])][$name[1]][$name[2]] = $value;
+            }
+
+            return $value;
+        } elseif (is_array($name)) {
+            // 批量设置
+            if (!empty($value)) {
+                if (isset($this->config[$value])) {
+                    $result = array_merge($this->config[$value], $name);
+                } else {
+                    $result = $name;
+                }
+
+                $this->config[$value] = $result;
+            } else {
+                $result = $this->config = array_merge($this->config, $name);
+            }
+        } else {
+            // 为空直接返回 已有配置
+            $result = $this->config;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 移除配置
+     * @access public
+     * @param  string  $name 配置参数名（支持三级配置 .号分割）
+     * @return void
+     */
+    public function remove($name)
+    {
+        if (!strpos($name, '.')) {
+            $name = $this->prefix . '.' . $name;
+        }
+
+        $name = explode('.', $name, 3);
+
+        if (count($name) == 2) {
+            unset($this->config[strtolower($name[0])][$name[1]]);
+        } else {
+            unset($this->config[strtolower($name[0])][$name[1]][$name[2]]);
+        }
+    }
+
+    /**
+     * 重置配置参数
+     * @access public
+     * @param  string    $prefix  配置前缀名
+     * @return void
+     */
+    public function reset($prefix = '')
+    {
+        if ('' === $prefix) {
+            $this->config = [];
+        } else {
+            $this->config[$prefix] = [];
+        }
+    }
+
+    /**
+     * 设置配置
+     * @access public
+     * @param  string    $name  参数名
+     * @param  mixed     $value 值
+     */
+    public function __set($name, $value)
+    {
+        return $this->set($name, $value);
+    }
+
+    /**
+     * 获取配置参数
+     * @access public
+     * @param  string $name 参数名
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        return $this->get($name);
+    }
+
+    /**
+     * 检测是否存在参数
+     * @access public
+     * @param  string $name 参数名
+     * @return bool
+     */
+    public function __isset($name)
+    {
+        return $this->has($name);
+    }
+
+    // ArrayAccess
+    public function offsetSet($name, $value)
+    {
+        $this->set($name, $value);
+    }
+
+    public function offsetExists($name)
+    {
+        return $this->has($name);
+    }
+
+    public function offsetUnset($name)
+    {
+        $this->remove($name);
+    }
+
+    public function offsetGet($name)
+    {
+        return $this->get($name);
+    }
+}
diff --git a/thinkphp/library/think/Console.php b/thinkphp/library/think/Console.php
new file mode 100644
index 0000000000000000000000000000000000000000..9757e4766035d491a511d0beb21500e92d4fa8c8
--- /dev/null
+++ b/thinkphp/library/think/Console.php
@@ -0,0 +1,795 @@
+<?php
+// +----------------------------------------------------------------------
+// | TopThink [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2015 http://www.topthink.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: zhangyajun <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\console\Command;
+use think\console\command\Help as HelpCommand;
+use think\console\Input;
+use think\console\input\Argument as InputArgument;
+use think\console\input\Definition as InputDefinition;
+use think\console\input\Option as InputOption;
+use think\console\Output;
+use think\console\output\driver\Buffer;
+
+class Console
+{
+
+    private $name;
+    private $version;
+
+    /** @var Command[] */
+    private $commands = [];
+
+    private $wantHelps = false;
+
+    private $catchExceptions = true;
+    private $autoExit        = true;
+    private $definition;
+    private $defaultCommand;
+
+    private static $defaultCommands = [
+        "think\\console\\command\\Help",
+        "think\\console\\command\\Lists",
+        "think\\console\\command\\Build",
+        "think\\console\\command\\Clear",
+        "think\\console\\command\\make\\Controller",
+        "think\\console\\command\\make\\Model",
+        "think\\console\\command\\make\\Middleware",
+        "think\\console\\command\\make\\Validate",
+        "think\\console\\command\\optimize\\Autoload",
+        "think\\console\\command\\optimize\\Config",
+        "think\\console\\command\\optimize\\Schema",
+        "think\\console\\command\\optimize\\Route",
+        "think\\console\\command\\RunServer",
+    ];
+
+    /**
+     * Console constructor.
+     * @access public
+     * @param  string     $name    名称
+     * @param  string     $version 版本
+     * @param null|string $user    执行用户
+     */
+    public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN', $user = null)
+    {
+        $this->name    = $name;
+        $this->version = $version;
+
+        if ($user) {
+            $this->setUser($user);
+        }
+
+        $this->defaultCommand = 'list';
+        $this->definition     = $this->getDefaultInputDefinition();
+
+        foreach ($this->getDefaultCommands() as $command) {
+            $this->add($command);
+        }
+    }
+
+    /**
+     * 设置执行用户
+     * @param $user
+     */
+    public function setUser($user)
+    {
+        $user = posix_getpwnam($user);
+        if ($user) {
+            posix_setuid($user['uid']);
+            posix_setgid($user['gid']);
+        }
+    }
+
+    /**
+     * 初始化 Console
+     * @access public
+     * @param  bool $run 是否运行 Console
+     * @return int|Console
+     */
+    public static function init($run = true)
+    {
+        static $console;
+
+        if (!$console) {
+            $config = Container::get('config')->pull('console');
+            // 实例化 console
+            $console = new self($config['name'], $config['version'], $config['user']);
+
+            // 读取指令集
+            $file = Container::get('env')->get('app_path') . 'command.php';
+
+            if (is_file($file)) {
+                $commands = include $file;
+
+                if (is_array($commands)) {
+                    foreach ($commands as $command) {
+                        if (class_exists($command) && is_subclass_of($command, "\\think\\console\\Command")) {
+                            // 注册指令
+                            $console->add(new $command());
+                        }
+                    }
+                }
+            }
+        }
+
+        if ($run) {
+            // 运行
+            return $console->run();
+        } else {
+            return $console;
+        }
+    }
+
+    /**
+     * @access public
+     * @param  string $command
+     * @param  array  $parameters
+     * @param  string $driver
+     * @return Output|Buffer
+     */
+    public static function call($command, array $parameters = [], $driver = 'buffer')
+    {
+        $console = self::init(false);
+
+        array_unshift($parameters, $command);
+
+        $input  = new Input($parameters);
+        $output = new Output($driver);
+
+        $console->setCatchExceptions(false);
+        $console->find($command)->run($input, $output);
+
+        return $output;
+    }
+
+    /**
+     * 执行当前的指令
+     * @access public
+     * @return int
+     * @throws \Exception
+     * @api
+     */
+    public function run()
+    {
+        $input  = new Input();
+        $output = new Output();
+
+        $this->configureIO($input, $output);
+
+        try {
+            $exitCode = $this->doRun($input, $output);
+        } catch (\Exception $e) {
+            if (!$this->catchExceptions) {
+                throw $e;
+            }
+
+            $output->renderException($e);
+
+            $exitCode = $e->getCode();
+            if (is_numeric($exitCode)) {
+                $exitCode = (int) $exitCode;
+                if (0 === $exitCode) {
+                    $exitCode = 1;
+                }
+            } else {
+                $exitCode = 1;
+            }
+        }
+
+        if ($this->autoExit) {
+            if ($exitCode > 255) {
+                $exitCode = 255;
+            }
+
+            exit($exitCode);
+        }
+
+        return $exitCode;
+    }
+
+    /**
+     * 执行指令
+     * @access public
+     * @param  Input  $input
+     * @param  Output $output
+     * @return int
+     */
+    public function doRun(Input $input, Output $output)
+    {
+        if (true === $input->hasParameterOption(['--version', '-V'])) {
+            $output->writeln($this->getLongVersion());
+
+            return 0;
+        }
+
+        $name = $this->getCommandName($input);
+
+        if (true === $input->hasParameterOption(['--help', '-h'])) {
+            if (!$name) {
+                $name  = 'help';
+                $input = new Input(['help']);
+            } else {
+                $this->wantHelps = true;
+            }
+        }
+
+        if (!$name) {
+            $name  = $this->defaultCommand;
+            $input = new Input([$this->defaultCommand]);
+        }
+
+        $command = $this->find($name);
+
+        $exitCode = $this->doRunCommand($command, $input, $output);
+
+        return $exitCode;
+    }
+
+    /**
+     * 设置输入参数定义
+     * @access public
+     * @param  InputDefinition $definition
+     */
+    public function setDefinition(InputDefinition $definition)
+    {
+        $this->definition = $definition;
+    }
+
+    /**
+     * 获取输入参数定义
+     * @access public
+     * @return InputDefinition The InputDefinition instance
+     */
+    public function getDefinition()
+    {
+        return $this->definition;
+    }
+
+    /**
+     * Gets the help message.
+     * @access public
+     * @return string A help message.
+     */
+    public function getHelp()
+    {
+        return $this->getLongVersion();
+    }
+
+    /**
+     * 是否捕获异常
+     * @access public
+     * @param  bool $boolean
+     * @api
+     */
+    public function setCatchExceptions($boolean)
+    {
+        $this->catchExceptions = (bool) $boolean;
+    }
+
+    /**
+     * 是否自动退出
+     * @access public
+     * @param  bool $boolean
+     * @api
+     */
+    public function setAutoExit($boolean)
+    {
+        $this->autoExit = (bool) $boolean;
+    }
+
+    /**
+     * 获取名称
+     * @access public
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * 设置名称
+     * @access public
+     * @param  string $name
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * 获取版本
+     * @access public
+     * @return string
+     * @api
+     */
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
+    /**
+     * 设置版本
+     * @access public
+     * @param  string $version
+     */
+    public function setVersion($version)
+    {
+        $this->version = $version;
+    }
+
+    /**
+     * 获取完整的版本号
+     * @access public
+     * @return string
+     */
+    public function getLongVersion()
+    {
+        if ('UNKNOWN' !== $this->getName() && 'UNKNOWN' !== $this->getVersion()) {
+            return sprintf('<info>%s</info> version <comment>%s</comment>', $this->getName(), $this->getVersion());
+        }
+
+        return '<info>Console Tool</info>';
+    }
+
+    /**
+     * 注册一个指令
+     * @access public
+     * @param  string $name
+     * @return Command
+     */
+    public function register($name)
+    {
+        return $this->add(new Command($name));
+    }
+
+    /**
+     * 添加指令
+     * @access public
+     * @param  Command[] $commands
+     */
+    public function addCommands(array $commands)
+    {
+        foreach ($commands as $command) {
+            $this->add($command);
+        }
+    }
+
+    /**
+     * 添加一个指令
+     * @access public
+     * @param  Command $command
+     * @return Command
+     */
+    public function add(Command $command)
+    {
+        $command->setConsole($this);
+
+        if (!$command->isEnabled()) {
+            $command->setConsole(null);
+            return;
+        }
+
+        if (null === $command->getDefinition()) {
+            throw new \LogicException(sprintf('Command class "%s" is not correctly initialized. You probably forgot to call the parent constructor.', get_class($command)));
+        }
+
+        $this->commands[$command->getName()] = $command;
+
+        foreach ($command->getAliases() as $alias) {
+            $this->commands[$alias] = $command;
+        }
+
+        return $command;
+    }
+
+    /**
+     * 获取指令
+     * @access public
+     * @param  string $name 指令名称
+     * @return Command
+     * @throws \InvalidArgumentException
+     */
+    public function get($name)
+    {
+        if (!isset($this->commands[$name])) {
+            throw new \InvalidArgumentException(sprintf('The command "%s" does not exist.', $name));
+        }
+
+        $command = $this->commands[$name];
+
+        if ($this->wantHelps) {
+            $this->wantHelps = false;
+
+            /** @var HelpCommand $helpCommand */
+            $helpCommand = $this->get('help');
+            $helpCommand->setCommand($command);
+
+            return $helpCommand;
+        }
+
+        return $command;
+    }
+
+    /**
+     * 某个指令是否存在
+     * @access public
+     * @param  string $name 指令名称
+     * @return bool
+     */
+    public function has($name)
+    {
+        return isset($this->commands[$name]);
+    }
+
+    /**
+     * 获取所有的命名空间
+     * @access public
+     * @return array
+     */
+    public function getNamespaces()
+    {
+        $namespaces = [];
+        foreach ($this->commands as $command) {
+            $namespaces = array_merge($namespaces, $this->extractAllNamespaces($command->getName()));
+
+            foreach ($command->getAliases() as $alias) {
+                $namespaces = array_merge($namespaces, $this->extractAllNamespaces($alias));
+            }
+        }
+
+        return array_values(array_unique(array_filter($namespaces)));
+    }
+
+    /**
+     * 查找注册命名空间中的名称或缩写。
+     * @access public
+     * @param  string $namespace
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    public function findNamespace($namespace)
+    {
+        $allNamespaces = $this->getNamespaces();
+        $expr          = preg_replace_callback('{([^:]+|)}', function ($matches) {
+            return preg_quote($matches[1]) . '[^:]*';
+        }, $namespace);
+        $namespaces = preg_grep('{^' . $expr . '}', $allNamespaces);
+
+        if (empty($namespaces)) {
+            $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
+
+            if ($alternatives = $this->findAlternatives($namespace, $allNamespaces)) {
+                if (1 == count($alternatives)) {
+                    $message .= "\n\nDid you mean this?\n    ";
+                } else {
+                    $message .= "\n\nDid you mean one of these?\n    ";
+                }
+
+                $message .= implode("\n    ", $alternatives);
+            }
+
+            throw new \InvalidArgumentException($message);
+        }
+
+        $exact = in_array($namespace, $namespaces, true);
+        if (count($namespaces) > 1 && !$exact) {
+            throw new \InvalidArgumentException(sprintf('The namespace "%s" is ambiguous (%s).', $namespace, $this->getAbbreviationSuggestions(array_values($namespaces))));
+        }
+
+        return $exact ? $namespace : reset($namespaces);
+    }
+
+    /**
+     * 查找指令
+     * @access public
+     * @param  string $name 名称或者别名
+     * @return Command
+     * @throws \InvalidArgumentException
+     */
+    public function find($name)
+    {
+        $allCommands = array_keys($this->commands);
+
+        $expr = preg_replace_callback('{([^:]+|)}', function ($matches) {
+            return preg_quote($matches[1]) . '[^:]*';
+        }, $name);
+
+        $commands = preg_grep('{^' . $expr . '}', $allCommands);
+
+        if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) {
+            if (false !== $pos = strrpos($name, ':')) {
+                $this->findNamespace(substr($name, 0, $pos));
+            }
+
+            $message = sprintf('Command "%s" is not defined.', $name);
+
+            if ($alternatives = $this->findAlternatives($name, $allCommands)) {
+                if (1 == count($alternatives)) {
+                    $message .= "\n\nDid you mean this?\n    ";
+                } else {
+                    $message .= "\n\nDid you mean one of these?\n    ";
+                }
+                $message .= implode("\n    ", $alternatives);
+            }
+
+            throw new \InvalidArgumentException($message);
+        }
+
+        if (count($commands) > 1) {
+            $commandList = $this->commands;
+
+            $commands = array_filter($commands, function ($nameOrAlias) use ($commandList, $commands) {
+                $commandName = $commandList[$nameOrAlias]->getName();
+
+                return $commandName === $nameOrAlias || !in_array($commandName, $commands);
+            });
+        }
+
+        $exact = in_array($name, $commands, true);
+        if (count($commands) > 1 && !$exact) {
+            $suggestions = $this->getAbbreviationSuggestions(array_values($commands));
+
+            throw new \InvalidArgumentException(sprintf('Command "%s" is ambiguous (%s).', $name, $suggestions));
+        }
+
+        return $this->get($exact ? $name : reset($commands));
+    }
+
+    /**
+     * 获取所有的指令
+     * @access public
+     * @param  string $namespace 命名空间
+     * @return Command[]
+     * @api
+     */
+    public function all($namespace = null)
+    {
+        if (null === $namespace) {
+            return $this->commands;
+        }
+
+        $commands = [];
+        foreach ($this->commands as $name => $command) {
+            if ($this->extractNamespace($name, substr_count($namespace, ':') + 1) === $namespace) {
+                $commands[$name] = $command;
+            }
+        }
+
+        return $commands;
+    }
+
+    /**
+     * 获取可能的指令名
+     * @access public
+     * @param  array $names
+     * @return array
+     */
+    public static function getAbbreviations($names)
+    {
+        $abbrevs = [];
+        foreach ($names as $name) {
+            for ($len = strlen($name); $len > 0; --$len) {
+                $abbrev             = substr($name, 0, $len);
+                $abbrevs[$abbrev][] = $name;
+            }
+        }
+
+        return $abbrevs;
+    }
+
+    /**
+     * 配置基于用户的参数和选项的输入和输出实例。
+     * @access protected
+     * @param  Input  $input  输入实例
+     * @param  Output $output 输出实例
+     */
+    protected function configureIO(Input $input, Output $output)
+    {
+        if (true === $input->hasParameterOption(['--ansi'])) {
+            $output->setDecorated(true);
+        } elseif (true === $input->hasParameterOption(['--no-ansi'])) {
+            $output->setDecorated(false);
+        }
+
+        if (true === $input->hasParameterOption(['--no-interaction', '-n'])) {
+            $input->setInteractive(false);
+        }
+
+        if (true === $input->hasParameterOption(['--quiet', '-q'])) {
+            $output->setVerbosity(Output::VERBOSITY_QUIET);
+        } else {
+            if ($input->hasParameterOption('-vvv') || $input->hasParameterOption('--verbose=3') || $input->getParameterOption('--verbose') === 3) {
+                $output->setVerbosity(Output::VERBOSITY_DEBUG);
+            } elseif ($input->hasParameterOption('-vv') || $input->hasParameterOption('--verbose=2') || $input->getParameterOption('--verbose') === 2) {
+                $output->setVerbosity(Output::VERBOSITY_VERY_VERBOSE);
+            } elseif ($input->hasParameterOption('-v') || $input->hasParameterOption('--verbose=1') || $input->hasParameterOption('--verbose') || $input->getParameterOption('--verbose')) {
+                $output->setVerbosity(Output::VERBOSITY_VERBOSE);
+            }
+        }
+    }
+
+    /**
+     * 执行指令
+     * @access protected
+     * @param  Command $command 指令实例
+     * @param  Input   $input   输入实例
+     * @param  Output  $output  输出实例
+     * @return int
+     * @throws \Exception
+     */
+    protected function doRunCommand(Command $command, Input $input, Output $output)
+    {
+        return $command->run($input, $output);
+    }
+
+    /**
+     * 获取指令的基础名称
+     * @access protected
+     * @param  Input $input
+     * @return string
+     */
+    protected function getCommandName(Input $input)
+    {
+        return $input->getFirstArgument();
+    }
+
+    /**
+     * 获取默认输入定义
+     * @access protected
+     * @return InputDefinition
+     */
+    protected function getDefaultInputDefinition()
+    {
+        return new InputDefinition([
+            new InputArgument('command', InputArgument::REQUIRED, 'The command to execute'),
+            new InputOption('--help', '-h', InputOption::VALUE_NONE, 'Display this help message'),
+            new InputOption('--version', '-V', InputOption::VALUE_NONE, 'Display this console version'),
+            new InputOption('--quiet', '-q', InputOption::VALUE_NONE, 'Do not output any message'),
+            new InputOption('--verbose', '-v|vv|vvv', InputOption::VALUE_NONE, 'Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug'),
+            new InputOption('--ansi', '', InputOption::VALUE_NONE, 'Force ANSI output'),
+            new InputOption('--no-ansi', '', InputOption::VALUE_NONE, 'Disable ANSI output'),
+            new InputOption('--no-interaction', '-n', InputOption::VALUE_NONE, 'Do not ask any interactive question'),
+        ]);
+    }
+
+    /**
+     * 设置默认命令
+     * @access protected
+     * @return Command[] An array of default Command instances
+     */
+    protected function getDefaultCommands()
+    {
+        $defaultCommands = [];
+
+        foreach (self::$defaultCommands as $classname) {
+            if (class_exists($classname) && is_subclass_of($classname, "think\\console\\Command")) {
+                $defaultCommands[] = new $classname();
+            }
+        }
+
+        return $defaultCommands;
+    }
+
+    public static function addDefaultCommands(array $classnames)
+    {
+        self::$defaultCommands = array_merge(self::$defaultCommands, $classnames);
+    }
+
+    /**
+     * 获取可能的建议
+     * @access private
+     * @param  array $abbrevs
+     * @return string
+     */
+    private function getAbbreviationSuggestions($abbrevs)
+    {
+        return sprintf('%s, %s%s', $abbrevs[0], $abbrevs[1], count($abbrevs) > 2 ? sprintf(' and %d more', count($abbrevs) - 2) : '');
+    }
+
+    /**
+     * 返回命名空间部分
+     * @access public
+     * @param  string $name  指令
+     * @param  string $limit 部分的命名空间的最大数量
+     * @return string
+     */
+    public function extractNamespace($name, $limit = null)
+    {
+        $parts = explode(':', $name);
+        array_pop($parts);
+
+        return implode(':', null === $limit ? $parts : array_slice($parts, 0, $limit));
+    }
+
+    /**
+     * 查找可替代的建议
+     * @access private
+     * @param  string             $name
+     * @param  array|\Traversable $collection
+     * @return array
+     */
+    private function findAlternatives($name, $collection)
+    {
+        $threshold    = 1e3;
+        $alternatives = [];
+
+        $collectionParts = [];
+        foreach ($collection as $item) {
+            $collectionParts[$item] = explode(':', $item);
+        }
+
+        foreach (explode(':', $name) as $i => $subname) {
+            foreach ($collectionParts as $collectionName => $parts) {
+                $exists = isset($alternatives[$collectionName]);
+                if (!isset($parts[$i]) && $exists) {
+                    $alternatives[$collectionName] += $threshold;
+                    continue;
+                } elseif (!isset($parts[$i])) {
+                    continue;
+                }
+
+                $lev = levenshtein($subname, $parts[$i]);
+                if ($lev <= strlen($subname) / 3 || '' !== $subname && false !== strpos($parts[$i], $subname)) {
+                    $alternatives[$collectionName] = $exists ? $alternatives[$collectionName] + $lev : $lev;
+                } elseif ($exists) {
+                    $alternatives[$collectionName] += $threshold;
+                }
+            }
+        }
+
+        foreach ($collection as $item) {
+            $lev = levenshtein($name, $item);
+            if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) {
+                $alternatives[$item] = isset($alternatives[$item]) ? $alternatives[$item] - $lev : $lev;
+            }
+        }
+
+        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) {
+            return $lev < 2 * $threshold;
+        });
+        asort($alternatives);
+
+        return array_keys($alternatives);
+    }
+
+    /**
+     * 设置默认的指令
+     * @access public
+     * @param  string $commandName The Command name
+     */
+    public function setDefaultCommand($commandName)
+    {
+        $this->defaultCommand = $commandName;
+    }
+
+    /**
+     * 返回所有的命名空间
+     * @access private
+     * @param  string $name
+     * @return array
+     */
+    private function extractAllNamespaces($name)
+    {
+        $parts      = explode(':', $name, -1);
+        $namespaces = [];
+
+        foreach ($parts as $part) {
+            if (count($namespaces)) {
+                $namespaces[] = end($namespaces) . ':' . $part;
+            } else {
+                $namespaces[] = $part;
+            }
+        }
+
+        return $namespaces;
+    }
+
+}
diff --git a/thinkphp/library/think/Container.php b/thinkphp/library/think/Container.php
new file mode 100644
index 0000000000000000000000000000000000000000..a8af9fa52b2f72017305c2d3e87be0939beed737
--- /dev/null
+++ b/thinkphp/library/think/Container.php
@@ -0,0 +1,534 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use ArrayAccess;
+use ArrayIterator;
+use Closure;
+use Countable;
+use InvalidArgumentException;
+use IteratorAggregate;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionFunction;
+use ReflectionMethod;
+use think\exception\ClassNotFoundException;
+
+class Container implements ArrayAccess, IteratorAggregate, Countable
+{
+    /**
+     * 容器对象实例
+     * @var Container
+     */
+    protected static $instance;
+
+    /**
+     * 容器中的对象实例
+     * @var array
+     */
+    protected $instances = [];
+
+    /**
+     * 容器绑定标识
+     * @var array
+     */
+    protected $bind = [
+        'app'                   => App::class,
+        'build'                 => Build::class,
+        'cache'                 => Cache::class,
+        'config'                => Config::class,
+        'cookie'                => Cookie::class,
+        'debug'                 => Debug::class,
+        'env'                   => Env::class,
+        'hook'                  => Hook::class,
+        'lang'                  => Lang::class,
+        'log'                   => Log::class,
+        'middleware'            => Middleware::class,
+        'request'               => Request::class,
+        'response'              => Response::class,
+        'route'                 => Route::class,
+        'session'               => Session::class,
+        'url'                   => Url::class,
+        'validate'              => Validate::class,
+        'view'                  => View::class,
+        'rule_name'             => route\RuleName::class,
+        // 接口依赖注入
+        'think\LoggerInterface' => Log::class,
+    ];
+
+    /**
+     * 容器标识别名
+     * @var array
+     */
+    protected $name = [];
+
+    /**
+     * 获取当前容器的实例（单例）
+     * @access public
+     * @return static
+     */
+    public static function getInstance()
+    {
+        if (is_null(static::$instance)) {
+            static::$instance = new static;
+        }
+
+        return static::$instance;
+    }
+
+    /**
+     * 设置当前容器的实例
+     * @access public
+     * @param  object        $instance
+     * @return void
+     */
+    public static function setInstance($instance)
+    {
+        static::$instance = $instance;
+    }
+
+    /**
+     * 获取容器中的对象实例
+     * @access public
+     * @param  string        $abstract       类名或者标识
+     * @param  array|true    $vars           变量
+     * @param  bool          $newInstance    是否每次创建新的实例
+     * @return object
+     */
+    public static function get($abstract, $vars = [], $newInstance = false)
+    {
+        return static::getInstance()->make($abstract, $vars, $newInstance);
+    }
+
+    /**
+     * 绑定一个类、闭包、实例、接口实现到容器
+     * @access public
+     * @param  string  $abstract    类标识、接口
+     * @param  mixed   $concrete    要绑定的类、闭包或者实例
+     * @return Container
+     */
+    public static function set($abstract, $concrete = null)
+    {
+        return static::getInstance()->bindTo($abstract, $concrete);
+    }
+
+    /**
+     * 移除容器中的对象实例
+     * @access public
+     * @param  string  $abstract    类标识、接口
+     * @return void
+     */
+    public static function remove($abstract)
+    {
+        return static::getInstance()->delete($abstract);
+    }
+
+    /**
+     * 清除容器中的对象实例
+     * @access public
+     * @return void
+     */
+    public static function clear()
+    {
+        return static::getInstance()->flush();
+    }
+
+    /**
+     * 绑定一个类、闭包、实例、接口实现到容器
+     * @access public
+     * @param  string|array  $abstract    类标识、接口
+     * @param  mixed         $concrete    要绑定的类、闭包或者实例
+     * @return $this
+     */
+    public function bindTo($abstract, $concrete = null)
+    {
+        if (is_array($abstract)) {
+            $this->bind = array_merge($this->bind, $abstract);
+        } elseif ($concrete instanceof Closure) {
+            $this->bind[$abstract] = $concrete;
+        } elseif (is_object($concrete)) {
+            if (isset($this->bind[$abstract])) {
+                $abstract = $this->bind[$abstract];
+            }
+            $this->instances[$abstract] = $concrete;
+        } else {
+            $this->bind[$abstract] = $concrete;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 绑定一个类实例当容器
+     * @access public
+     * @param  string           $abstract    类名或者标识
+     * @param  object|\Closure  $instance    类的实例
+     * @return $this
+     */
+    public function instance($abstract, $instance)
+    {
+        if ($instance instanceof \Closure) {
+            $this->bind[$abstract] = $instance;
+        } else {
+            if (isset($this->bind[$abstract])) {
+                $abstract = $this->bind[$abstract];
+            }
+
+            $this->instances[$abstract] = $instance;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 判断容器中是否存在类及标识
+     * @access public
+     * @param  string    $abstract    类名或者标识
+     * @return bool
+     */
+    public function bound($abstract)
+    {
+        return isset($this->bind[$abstract]) || isset($this->instances[$abstract]);
+    }
+
+    /**
+     * 判断容器中是否存在对象实例
+     * @access public
+     * @param  string    $abstract    类名或者标识
+     * @return bool
+     */
+    public function exists($abstract)
+    {
+        if (isset($this->bind[$abstract])) {
+            $abstract = $this->bind[$abstract];
+        }
+
+        return isset($this->instances[$abstract]);
+    }
+
+    /**
+     * 判断容器中是否存在类及标识
+     * @access public
+     * @param  string    $name    类名或者标识
+     * @return bool
+     */
+    public function has($name)
+    {
+        return $this->bound($name);
+    }
+
+    /**
+     * 创建类的实例
+     * @access public
+     * @param  string        $abstract       类名或者标识
+     * @param  array|true    $vars           变量
+     * @param  bool          $newInstance    是否每次创建新的实例
+     * @return object
+     */
+    public function make($abstract, $vars = [], $newInstance = false)
+    {
+        if (true === $vars) {
+            // 总是创建新的实例化对象
+            $newInstance = true;
+            $vars        = [];
+        }
+
+        $abstract = isset($this->name[$abstract]) ? $this->name[$abstract] : $abstract;
+
+        if (isset($this->instances[$abstract]) && !$newInstance) {
+            return $this->instances[$abstract];
+        }
+
+        if (isset($this->bind[$abstract])) {
+            $concrete = $this->bind[$abstract];
+
+            if ($concrete instanceof Closure) {
+                $object = $this->invokeFunction($concrete, $vars);
+            } else {
+                $this->name[$abstract] = $concrete;
+                return $this->make($concrete, $vars, $newInstance);
+            }
+        } else {
+            $object = $this->invokeClass($abstract, $vars);
+        }
+
+        if (!$newInstance) {
+            $this->instances[$abstract] = $object;
+        }
+
+        return $object;
+    }
+
+    /**
+     * 删除容器中的对象实例
+     * @access public
+     * @param  string|array    $abstract    类名或者标识
+     * @return void
+     */
+    public function delete($abstract)
+    {
+        foreach ((array) $abstract as $name) {
+            $name = isset($this->name[$name]) ? $this->name[$name] : $name;
+
+            if (isset($this->instances[$name])) {
+                unset($this->instances[$name]);
+            }
+        }
+    }
+
+    /**
+     * 获取容器中的对象实例
+     * @access public
+     * @return array
+     */
+    public function all()
+    {
+        return $this->instances;
+    }
+
+    /**
+     * 清除容器中的对象实例
+     * @access public
+     * @return void
+     */
+    public function flush()
+    {
+        $this->instances = [];
+        $this->bind      = [];
+        $this->name      = [];
+    }
+
+    /**
+     * 执行函数或者闭包方法 支持参数调用
+     * @access public
+     * @param  mixed  $function 函数或者闭包
+     * @param  array  $vars     参数
+     * @return mixed
+     */
+    public function invokeFunction($function, $vars = [])
+    {
+        try {
+            $reflect = new ReflectionFunction($function);
+
+            $args = $this->bindParams($reflect, $vars);
+
+            return call_user_func_array($function, $args);
+        } catch (ReflectionException $e) {
+            throw new Exception('function not exists: ' . $function . '()');
+        }
+    }
+
+    /**
+     * 调用反射执行类的方法 支持参数绑定
+     * @access public
+     * @param  mixed   $method 方法
+     * @param  array   $vars   参数
+     * @return mixed
+     */
+    public function invokeMethod($method, $vars = [])
+    {
+        try {
+            if (is_array($method)) {
+                $class   = is_object($method[0]) ? $method[0] : $this->invokeClass($method[0]);
+                $reflect = new ReflectionMethod($class, $method[1]);
+            } else {
+                // 静态方法
+                $reflect = new ReflectionMethod($method);
+            }
+
+            $args = $this->bindParams($reflect, $vars);
+
+            return $reflect->invokeArgs(isset($class) ? $class : null, $args);
+        } catch (ReflectionException $e) {
+            if (is_array($method) && is_object($method[0])) {
+                $method[0] = get_class($method[0]);
+            }
+
+            throw new Exception('method not exists: ' . (is_array($method) ? $method[0] . '::' . $method[1] : $method) . '()');
+        }
+    }
+
+    /**
+     * 调用反射执行类的方法 支持参数绑定
+     * @access public
+     * @param  object  $instance 对象实例
+     * @param  mixed   $reflect 反射类
+     * @param  array   $vars   参数
+     * @return mixed
+     */
+    public function invokeReflectMethod($instance, $reflect, $vars = [])
+    {
+        $args = $this->bindParams($reflect, $vars);
+
+        return $reflect->invokeArgs($instance, $args);
+    }
+
+    /**
+     * 调用反射执行callable 支持参数绑定
+     * @access public
+     * @param  mixed $callable
+     * @param  array $vars   参数
+     * @return mixed
+     */
+    public function invoke($callable, $vars = [])
+    {
+        if ($callable instanceof Closure) {
+            return $this->invokeFunction($callable, $vars);
+        }
+
+        return $this->invokeMethod($callable, $vars);
+    }
+
+    /**
+     * 调用反射执行类的实例化 支持依赖注入
+     * @access public
+     * @param  string    $class 类名
+     * @param  array     $vars  参数
+     * @return mixed
+     */
+    public function invokeClass($class, $vars = [])
+    {
+        try {
+            $reflect = new ReflectionClass($class);
+
+            if ($reflect->hasMethod('__make')) {
+                $method = new ReflectionMethod($class, '__make');
+
+                if ($method->isPublic() && $method->isStatic()) {
+                    $args = $this->bindParams($method, $vars);
+                    return $method->invokeArgs(null, $args);
+                }
+            }
+
+            $constructor = $reflect->getConstructor();
+
+            $args = $constructor ? $this->bindParams($constructor, $vars) : [];
+
+            return $reflect->newInstanceArgs($args);
+
+        } catch (ReflectionException $e) {
+            throw new ClassNotFoundException('class not exists: ' . $class, $class);
+        }
+    }
+
+    /**
+     * 绑定参数
+     * @access protected
+     * @param  \ReflectionMethod|\ReflectionFunction $reflect 反射类
+     * @param  array                                 $vars    参数
+     * @return array
+     */
+    protected function bindParams($reflect, $vars = [])
+    {
+        if ($reflect->getNumberOfParameters() == 0) {
+            return [];
+        }
+
+        // 判断数组类型 数字数组时按顺序绑定参数
+        reset($vars);
+        $type   = key($vars) === 0 ? 1 : 0;
+        $params = $reflect->getParameters();
+
+        foreach ($params as $param) {
+            $name  = $param->getName();
+            $class = $param->getClass();
+
+            if ($class) {
+                $args[] = $this->getObjectParam($class->getName(), $vars);
+            } elseif (1 == $type && !empty($vars)) {
+                $args[] = array_shift($vars);
+            } elseif (0 == $type && isset($vars[$name])) {
+                $args[] = $vars[$name];
+            } elseif ($param->isDefaultValueAvailable()) {
+                $args[] = $param->getDefaultValue();
+            } else {
+                throw new InvalidArgumentException('method param miss:' . $name);
+            }
+        }
+
+        return $args;
+    }
+
+    /**
+     * 获取对象类型的参数值
+     * @access protected
+     * @param  string   $className  类名
+     * @param  array    $vars       参数
+     * @return mixed
+     */
+    protected function getObjectParam($className, &$vars)
+    {
+        $array = $vars;
+        $value = array_shift($array);
+
+        if ($value instanceof $className) {
+            $result = $value;
+            array_shift($vars);
+        } else {
+            $result = $this->make($className);
+        }
+
+        return $result;
+    }
+
+    public function __set($name, $value)
+    {
+        $this->bindTo($name, $value);
+    }
+
+    public function __get($name)
+    {
+        return $this->make($name);
+    }
+
+    public function __isset($name)
+    {
+        return $this->bound($name);
+    }
+
+    public function __unset($name)
+    {
+        $this->delete($name);
+    }
+
+    public function offsetExists($key)
+    {
+        return $this->__isset($key);
+    }
+
+    public function offsetGet($key)
+    {
+        return $this->__get($key);
+    }
+
+    public function offsetSet($key, $value)
+    {
+        $this->__set($key, $value);
+    }
+
+    public function offsetUnset($key)
+    {
+        $this->__unset($key);
+    }
+
+    //Countable
+    public function count()
+    {
+        return count($this->instances);
+    }
+
+    //IteratorAggregate
+    public function getIterator()
+    {
+        return new ArrayIterator($this->instances);
+    }
+}
diff --git a/thinkphp/library/think/Controller.php b/thinkphp/library/think/Controller.php
new file mode 100644
index 0000000000000000000000000000000000000000..19fc8df6f0b98603b60943f61c2016a9941a1460
--- /dev/null
+++ b/thinkphp/library/think/Controller.php
@@ -0,0 +1,254 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\exception\ValidateException;
+use traits\controller\Jump;
+
+class Controller
+{
+    use Jump;
+
+    /**
+     * 视图类实例
+     * @var \think\View
+     */
+    protected $view;
+
+    /**
+     * Request实例
+     * @var \think\Request
+     */
+    protected $request;
+
+    /**
+     * 验证失败是否抛出异常
+     * @var bool
+     */
+    protected $failException = false;
+
+    /**
+     * 是否批量验证
+     * @var bool
+     */
+    protected $batchValidate = false;
+
+    /**
+     * 前置操作方法列表（即将废弃）
+     * @var array $beforeActionList
+     */
+    protected $beforeActionList = [];
+
+    /**
+     * 控制器中间件
+     * @var array
+     */
+    protected $middleware = [];
+
+    /**
+     * 构造方法
+     * @access public
+     */
+    public function __construct(App $app = null)
+    {
+        $this->app     = $app ?: Container::get('app');
+        $this->request = $this->app['request'];
+        $this->view    = $this->app['view'];
+
+        // 控制器初始化
+        $this->initialize();
+
+        // 控制器中间件
+        if ($this->middleware) {
+            foreach ($this->middleware as $key => $val) {
+                if (!is_int($key)) {
+                    if (isset($val['only']) && !in_array($this->request->action(), $val['only'])) {
+                        continue;
+                    } elseif (isset($val['except']) && in_array($this->request->action(), $val['except'])) {
+                        continue;
+                    } else {
+                        $val = $key;
+                    }
+                }
+
+                $this->app['middleware']->controller($val);
+            }
+        }
+
+        // 前置操作方法 即将废弃
+        foreach ((array) $this->beforeActionList as $method => $options) {
+            is_numeric($method) ?
+            $this->beforeAction($options) :
+            $this->beforeAction($method, $options);
+        }
+    }
+
+    // 初始化
+    protected function initialize()
+    {}
+
+    /**
+     * 前置操作
+     * @access protected
+     * @param  string $method  前置操作方法名
+     * @param  array  $options 调用参数 ['only'=>[...]] 或者['except'=>[...]]
+     */
+    protected function beforeAction($method, $options = [])
+    {
+        if (isset($options['only'])) {
+            if (is_string($options['only'])) {
+                $options['only'] = explode(',', $options['only']);
+            }
+            if (!in_array($this->request->action(), $options['only'])) {
+                return;
+            }
+        } elseif (isset($options['except'])) {
+            if (is_string($options['except'])) {
+                $options['except'] = explode(',', $options['except']);
+            }
+            if (in_array($this->request->action(), $options['except'])) {
+                return;
+            }
+        }
+
+        call_user_func([$this, $method]);
+    }
+
+    /**
+     * 加载模板输出
+     * @access protected
+     * @param  string $template 模板文件名
+     * @param  array  $vars     模板输出变量
+     * @param  array  $config   模板参数
+     * @return mixed
+     */
+    protected function fetch($template = '', $vars = [], $config = [])
+    {
+        return $this->view->fetch($template, $vars, $config);
+    }
+
+    /**
+     * 渲染内容输出
+     * @access protected
+     * @param  string $content 模板内容
+     * @param  array  $vars    模板输出变量
+     * @param  array  $config  模板参数
+     * @return mixed
+     */
+    protected function display($content = '', $vars = [], $config = [])
+    {
+        return $this->view->display($content, $vars, $config);
+    }
+
+    /**
+     * 模板变量赋值
+     * @access protected
+     * @param  mixed $name  要显示的模板变量
+     * @param  mixed $value 变量的值
+     * @return $this
+     */
+    protected function assign($name, $value = '')
+    {
+        $this->view->assign($name, $value);
+
+        return $this;
+    }
+
+    /**
+     * 视图过滤
+     * @access protected
+     * @param  Callable $filter 过滤方法或闭包
+     * @return $this
+     */
+    protected function filter($filter)
+    {
+        $this->view->filter($filter);
+
+        return $this;
+    }
+
+    /**
+     * 初始化模板引擎
+     * @access protected
+     * @param  array|string $engine 引擎参数
+     * @return $this
+     */
+    protected function engine($engine)
+    {
+        $this->view->engine($engine);
+
+        return $this;
+    }
+
+    /**
+     * 设置验证失败后是否抛出异常
+     * @access protected
+     * @param  bool $fail 是否抛出异常
+     * @return $this
+     */
+    protected function validateFailException($fail = true)
+    {
+        $this->failException = $fail;
+
+        return $this;
+    }
+
+    /**
+     * 验证数据
+     * @access protected
+     * @param  array        $data     数据
+     * @param  string|array $validate 验证器名或者验证规则数组
+     * @param  array        $message  提示信息
+     * @param  bool         $batch    是否批量验证
+     * @param  mixed        $callback 回调方法（闭包）
+     * @return array|string|true
+     * @throws ValidateException
+     */
+    protected function validate($data, $validate, $message = [], $batch = false, $callback = null)
+    {
+        if (is_array($validate)) {
+            $v = $this->app->validate();
+            $v->rule($validate);
+        } else {
+            if (strpos($validate, '.')) {
+                // 支持场景
+                list($validate, $scene) = explode('.', $validate);
+            }
+            $v = $this->app->validate($validate);
+            if (!empty($scene)) {
+                $v->scene($scene);
+            }
+        }
+
+        // 是否批量验证
+        if ($batch || $this->batchValidate) {
+            $v->batch(true);
+        }
+
+        if (is_array($message)) {
+            $v->message($message);
+        }
+
+        if ($callback && is_callable($callback)) {
+            call_user_func_array($callback, [$v, &$data]);
+        }
+
+        if (!$v->check($data)) {
+            if ($this->failException) {
+                throw new ValidateException($v->getError());
+            }
+            return $v->getError();
+        }
+
+        return true;
+    }
+}
diff --git a/thinkphp/library/think/Cookie.php b/thinkphp/library/think/Cookie.php
new file mode 100644
index 0000000000000000000000000000000000000000..6a9fb1ee592b921557c041b87e301f3324e91706
--- /dev/null
+++ b/thinkphp/library/think/Cookie.php
@@ -0,0 +1,268 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class Cookie
+{
+    /**
+     * 配置参数
+     * @var array
+     */
+    protected $config = [
+        // cookie 名称前缀
+        'prefix'    => '',
+        // cookie 保存时间
+        'expire'    => 0,
+        // cookie 保存路径
+        'path'      => '/',
+        // cookie 有效域名
+        'domain'    => '',
+        //  cookie 启用安全传输
+        'secure'    => false,
+        // httponly设置
+        'httponly'  => false,
+        // 是否使用 setcookie
+        'setcookie' => true,
+    ];
+
+    /**
+     * 构造方法
+     * @access public
+     */
+    public function __construct(array $config = [])
+    {
+        $this->init($config);
+    }
+
+    /**
+     * Cookie初始化
+     * @access public
+     * @param  array $config
+     * @return void
+     */
+    public function init(array $config = [])
+    {
+        $this->config = array_merge($this->config, array_change_key_case($config));
+
+        if (!empty($this->config['httponly']) && PHP_SESSION_ACTIVE != session_status()) {
+            ini_set('session.cookie_httponly', 1);
+        }
+    }
+
+    public static function __make(Config $config)
+    {
+        return new static($config->pull('cookie'));
+    }
+
+    /**
+     * 设置或者获取cookie作用域（前缀）
+     * @access public
+     * @param  string $prefix
+     * @return string|void
+     */
+    public function prefix($prefix = '')
+    {
+        if (empty($prefix)) {
+            return $this->config['prefix'];
+        }
+
+        $this->config['prefix'] = $prefix;
+    }
+
+    /**
+     * Cookie 设置、获取、删除
+     *
+     * @access public
+     * @param  string $name  cookie名称
+     * @param  mixed  $value cookie值
+     * @param  mixed  $option 可选参数 可能会是 null|integer|string
+     * @return void
+     */
+    public function set($name, $value = '', $option = null)
+    {
+        // 参数设置(会覆盖黙认设置)
+        if (!is_null($option)) {
+            if (is_numeric($option)) {
+                $option = ['expire' => $option];
+            } elseif (is_string($option)) {
+                parse_str($option, $option);
+            }
+
+            $config = array_merge($this->config, array_change_key_case($option));
+        } else {
+            $config = $this->config;
+        }
+
+        $name = $config['prefix'] . $name;
+
+        // 设置cookie
+        if (is_array($value)) {
+            array_walk_recursive($value, [$this, 'jsonFormatProtect'], 'encode');
+            $value = 'think:' . json_encode($value);
+        }
+
+        $expire = !empty($config['expire']) ? $_SERVER['REQUEST_TIME'] + intval($config['expire']) : 0;
+
+        if ($config['setcookie']) {
+            $this->setCookie($name, $value, $expire, $config);
+        }
+
+        $_COOKIE[$name] = $value;
+    }
+
+    /**
+     * Cookie 设置保存
+     *
+     * @access public
+     * @param  string $name  cookie名称
+     * @param  mixed  $value cookie值
+     * @param  array  $option 可选参数
+     * @return void
+     */
+    protected function setCookie($name, $value, $expire, $option = [])
+    {
+        setcookie($name, $value, $expire, $option['path'], $option['domain'], $option['secure'], $option['httponly']);
+    }
+
+    /**
+     * 永久保存Cookie数据
+     * @access public
+     * @param  string $name  cookie名称
+     * @param  mixed  $value cookie值
+     * @param  mixed  $option 可选参数 可能会是 null|integer|string
+     * @return void
+     */
+    public function forever($name, $value = '', $option = null)
+    {
+        if (is_null($option) || is_numeric($option)) {
+            $option = [];
+        }
+
+        $option['expire'] = 315360000;
+
+        $this->set($name, $value, $option);
+    }
+
+    /**
+     * 判断Cookie数据
+     * @access public
+     * @param  string        $name cookie名称
+     * @param  string|null   $prefix cookie前缀
+     * @return bool
+     */
+    public function has($name, $prefix = null)
+    {
+        $prefix = !is_null($prefix) ? $prefix : $this->config['prefix'];
+        $name   = $prefix . $name;
+
+        return isset($_COOKIE[$name]);
+    }
+
+    /**
+     * Cookie获取
+     * @access public
+     * @param  string        $name cookie名称 留空获取全部
+     * @param  string|null   $prefix cookie前缀
+     * @return mixed
+     */
+    public function get($name = '', $prefix = null)
+    {
+        $prefix = !is_null($prefix) ? $prefix : $this->config['prefix'];
+        $key    = $prefix . $name;
+
+        if ('' == $name) {
+            if ($prefix) {
+                $value = [];
+                foreach ($_COOKIE as $k => $val) {
+                    if (0 === strpos($k, $prefix)) {
+                        $value[$k] = $val;
+                    }
+                }
+            } else {
+                $value = $_COOKIE;
+            }
+        } elseif (isset($_COOKIE[$key])) {
+            $value = $_COOKIE[$key];
+
+            if (0 === strpos($value, 'think:')) {
+                $value = substr($value, 6);
+                $value = json_decode($value, true);
+                array_walk_recursive($value, [$this, 'jsonFormatProtect'], 'decode');
+            }
+        } else {
+            $value = null;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Cookie删除
+     * @access public
+     * @param  string        $name cookie名称
+     * @param  string|null   $prefix cookie前缀
+     * @return void
+     */
+    public function delete($name, $prefix = null)
+    {
+        $config = $this->config;
+        $prefix = !is_null($prefix) ? $prefix : $config['prefix'];
+        $name   = $prefix . $name;
+
+        if ($config['setcookie']) {
+            $this->setcookie($name, '', $_SERVER['REQUEST_TIME'] - 3600, $config);
+        }
+
+        // 删除指定cookie
+        unset($_COOKIE[$name]);
+    }
+
+    /**
+     * Cookie清空
+     * @access public
+     * @param  string|null $prefix cookie前缀
+     * @return void
+     */
+    public function clear($prefix = null)
+    {
+        // 清除指定前缀的所有cookie
+        if (empty($_COOKIE)) {
+            return;
+        }
+
+        // 要删除的cookie前缀，不指定则删除config设置的指定前缀
+        $config = $this->config;
+        $prefix = !is_null($prefix) ? $prefix : $config['prefix'];
+
+        if ($prefix) {
+            // 如果前缀为空字符串将不作处理直接返回
+            foreach ($_COOKIE as $key => $val) {
+                if (0 === strpos($key, $prefix)) {
+                    if ($config['setcookie']) {
+                        $this->setcookie($key, '', $_SERVER['REQUEST_TIME'] - 3600, $config);
+                    }
+                    unset($_COOKIE[$key]);
+                }
+            }
+        }
+
+        return;
+    }
+
+    private function jsonFormatProtect(&$val, $key, $type = 'encode')
+    {
+        if (!empty($val) && true !== $val) {
+            $val = 'decode' == $type ? urldecode($val) : urlencode($val);
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/Db.php b/thinkphp/library/think/Db.php
new file mode 100644
index 0000000000000000000000000000000000000000..f72c0f1d1e95ad4606af771a1074243b9b888282
--- /dev/null
+++ b/thinkphp/library/think/Db.php
@@ -0,0 +1,198 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\db\Connection;
+
+/**
+ * Class Db
+ * @package think
+ * @method \think\db\Query connect(array $config =[], mixed $name = false) static 连接/切换数据库连接
+ * @method \think\db\Query master() static 从主服务器读取数据
+ * @method \think\db\Query readMaster(bool $all = false) static 后续从主服务器读取数据
+ * @method \think\db\Query table(string $table) static 指定数据表（含前缀）
+ * @method \think\db\Query name(string $name) static 指定数据表（不含前缀）
+ * @method \think\db\Expression raw(string $value) static 使用表达式设置数据
+ * @method \think\db\Query where(mixed $field, string $op = null, mixed $condition = null) static 查询条件
+ * @method \think\db\Query whereRaw(string $where, array $bind = []) static 表达式查询
+ * @method \think\db\Query whereExp(string $field, string $condition, array $bind = []) static 字段表达式查询
+ * @method \think\db\Query when(mixed $condition, mixed $query, mixed $otherwise = null) static 条件查询
+ * @method \think\db\Query join(mixed $join, mixed $condition = null, string $type = 'INNER') static JOIN查询
+ * @method \think\db\Query view(mixed $join, mixed $field = null, mixed $on = null, string $type = 'INNER') static 视图查询
+ * @method \think\db\Query field(mixed $field, boolean $except = false) static 指定查询字段
+ * @method \think\db\Query fieldRaw(string $field, array $bind = []) static 指定查询字段
+ * @method \think\db\Query union(mixed $union, boolean $all = false) static UNION查询
+ * @method \think\db\Query limit(mixed $offset, integer $length = null) static 查询LIMIT
+ * @method \think\db\Query order(mixed $field, string $order = null) static 查询ORDER
+ * @method \think\db\Query orderRaw(string $field, array $bind = []) static 查询ORDER
+ * @method \think\db\Query cache(mixed $key = null , integer $expire = null) static 设置查询缓存
+ * @method mixed value(string $field) static 获取某个字段的值
+ * @method array column(string $field, string $key = '') static 获取某个列的值
+ * @method mixed find(mixed $data = null) static 查询单个记录
+ * @method mixed select(mixed $data = null) static 查询多个记录
+ * @method integer insert(array $data, boolean $replace = false, boolean $getLastInsID = false, string $sequence = null) static 插入一条记录
+ * @method integer insertGetId(array $data, boolean $replace = false, string $sequence = null) static 插入一条记录并返回自增ID
+ * @method integer insertAll(array $dataSet) static 插入多条记录
+ * @method integer update(array $data) static 更新记录
+ * @method integer delete(mixed $data = null) static 删除记录
+ * @method boolean chunk(integer $count, callable $callback, string $column = null) static 分块获取数据
+ * @method \Generator cursor(mixed $data = null) static 使用游标查找记录
+ * @method mixed query(string $sql, array $bind = [], boolean $master = false, bool $pdo = false) static SQL查询
+ * @method integer execute(string $sql, array $bind = [], boolean $fetch = false, boolean $getLastInsID = false, string $sequence = null) static SQL执行
+ * @method \think\Paginator paginate(integer $listRows = 15, mixed $simple = null, array $config = []) static 分页查询
+ * @method mixed transaction(callable $callback) static 执行数据库事务
+ * @method void startTrans() static 启动事务
+ * @method void commit() static 用于非自动提交状态下面的查询提交
+ * @method void rollback() static 事务回滚
+ * @method boolean batchQuery(array $sqlArray) static 批处理执行SQL语句
+ * @method string getLastInsID(string $sequence = null) static 获取最近插入的ID
+ * @method mixed getConfig(string $name = '') static 获取数据库的配置参数
+ */
+class Db
+{
+    /**
+     * 当前数据库连接对象
+     * @var Connection
+     */
+    protected static $connection;
+
+    /**
+     * 数据库配置
+     * @var array
+     */
+    protected static $config = [];
+
+    /**
+     * 查询次数
+     * @var integer
+     */
+    public static $queryTimes = 0;
+
+    /**
+     * 执行次数
+     * @var integer
+     */
+    public static $executeTimes = 0;
+
+    /**
+     * 配置
+     * @access public
+     * @param  mixed $config
+     * @return void
+     */
+    public static function init($config = [])
+    {
+        self::$config = $config;
+
+        if (empty($config['query'])) {
+            self::$config['query'] = '\\think\\db\\Query';
+        }
+    }
+
+    /**
+     * 获取数据库配置
+     * @access public
+     * @param  string $config 配置名称
+     * @return mixed
+     */
+    public static function getConfig($name = '')
+    {
+        if ('' === $name) {
+            return self::$config;
+        }
+
+        return isset(self::$config[$name]) ? self::$config[$name] : null;
+    }
+
+    /**
+     * 切换数据库连接
+     * @access public
+     * @param  mixed         $config 连接配置
+     * @param  bool|string   $name 连接标识 true 强制重新连接
+     * @param  string        $query 查询对象类名
+     * @return mixed 返回查询对象实例
+     * @throws Exception
+     */
+    public static function connect($config = [], $name = false, $query = '')
+    {
+        // 解析配置参数
+        $options = self::parseConfig($config ?: self::$config);
+
+        $query = $query ?: $options['query'];
+
+        // 创建数据库连接对象实例
+        self::$connection = Connection::instance($options, $name);
+
+        return new $query(self::$connection);
+    }
+
+    /**
+     * 数据库连接参数解析
+     * @access private
+     * @param  mixed $config
+     * @return array
+     */
+    private static function parseConfig($config)
+    {
+        if (is_string($config) && false === strpos($config, '/')) {
+            // 支持读取配置参数
+            $config = isset(self::$config[$config]) ? self::$config[$config] : self::$config;
+        }
+
+        $result = is_string($config) ? self::parseDsnConfig($config) : $config;
+
+        if (empty($result['query'])) {
+            $result['query'] = self::$config['query'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * DSN解析
+     * 格式： mysql://username:passwd@localhost:3306/DbName?param1=val1&param2=val2#utf8
+     * @access private
+     * @param  string $dsnStr
+     * @return array
+     */
+    private static function parseDsnConfig($dsnStr)
+    {
+        $info = parse_url($dsnStr);
+
+        if (!$info) {
+            return [];
+        }
+
+        $dsn = [
+            'type'     => $info['scheme'],
+            'username' => isset($info['user']) ? $info['user'] : '',
+            'password' => isset($info['pass']) ? $info['pass'] : '',
+            'hostname' => isset($info['host']) ? $info['host'] : '',
+            'hostport' => isset($info['port']) ? $info['port'] : '',
+            'database' => !empty($info['path']) ? ltrim($info['path'], '/') : '',
+            'charset'  => isset($info['fragment']) ? $info['fragment'] : 'utf8',
+        ];
+
+        if (isset($info['query'])) {
+            parse_str($info['query'], $dsn['params']);
+        } else {
+            $dsn['params'] = [];
+        }
+
+        return $dsn;
+    }
+
+    public static function __callStatic($method, $args)
+    {
+        return call_user_func_array([static::connect(), $method], $args);
+    }
+}
diff --git a/thinkphp/library/think/Debug.php b/thinkphp/library/think/Debug.php
new file mode 100644
index 0000000000000000000000000000000000000000..8aec3c3b425d511b809e6198becb9b675e42609a
--- /dev/null
+++ b/thinkphp/library/think/Debug.php
@@ -0,0 +1,270 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\model\Collection as ModelCollection;
+use think\response\Redirect;
+
+class Debug
+{
+    /**
+     * 配置参数
+     * @var array
+     */
+    protected $config = [];
+
+    /**
+     * 区间时间信息
+     * @var array
+     */
+    protected $info = [];
+
+    /**
+     * 区间内存信息
+     * @var array
+     */
+    protected $mem = [];
+
+    /**
+     * 应用对象
+     * @var App
+     */
+    protected $app;
+
+    public function __construct(App $app, array $config = [])
+    {
+        $this->app    = $app;
+        $this->config = $config;
+    }
+
+    public static function __make(App $app, Config $config)
+    {
+        return new static($app, $config->pull('trace'));
+    }
+
+    public function setConfig(array $config)
+    {
+        $this->config = array_merge($this->config, $config);
+    }
+
+    /**
+     * 记录时间（微秒）和内存使用情况
+     * @access public
+     * @param  string    $name 标记位置
+     * @param  mixed     $value 标记值 留空则取当前 time 表示仅记录时间 否则同时记录时间和内存
+     * @return void
+     */
+    public function remark($name, $value = '')
+    {
+        // 记录时间和内存使用
+        $this->info[$name] = is_float($value) ? $value : microtime(true);
+
+        if ('time' != $value) {
+            $this->mem['mem'][$name]  = is_float($value) ? $value : memory_get_usage();
+            $this->mem['peak'][$name] = memory_get_peak_usage();
+        }
+    }
+
+    /**
+     * 统计某个区间的时间（微秒）使用情况
+     * @access public
+     * @param  string            $start 开始标签
+     * @param  string            $end 结束标签
+     * @param  integer|string    $dec 小数位
+     * @return integer
+     */
+    public function getRangeTime($start, $end, $dec = 6)
+    {
+        if (!isset($this->info[$end])) {
+            $this->info[$end] = microtime(true);
+        }
+
+        return number_format(($this->info[$end] - $this->info[$start]), $dec);
+    }
+
+    /**
+     * 统计从开始到统计时的时间（微秒）使用情况
+     * @access public
+     * @param  integer|string $dec 小数位
+     * @return integer
+     */
+    public function getUseTime($dec = 6)
+    {
+        return number_format((microtime(true) - $this->app->getBeginTime()), $dec);
+    }
+
+    /**
+     * 获取当前访问的吞吐率情况
+     * @access public
+     * @return string
+     */
+    public function getThroughputRate()
+    {
+        return number_format(1 / $this->getUseTime(), 2) . 'req/s';
+    }
+
+    /**
+     * 记录区间的内存使用情况
+     * @access public
+     * @param  string            $start 开始标签
+     * @param  string            $end 结束标签
+     * @param  integer|string    $dec 小数位
+     * @return string
+     */
+    public function getRangeMem($start, $end, $dec = 2)
+    {
+        if (!isset($this->mem['mem'][$end])) {
+            $this->mem['mem'][$end] = memory_get_usage();
+        }
+
+        $size = $this->mem['mem'][$end] - $this->mem['mem'][$start];
+        $a    = ['B', 'KB', 'MB', 'GB', 'TB'];
+        $pos  = 0;
+
+        while ($size >= 1024) {
+            $size /= 1024;
+            $pos++;
+        }
+
+        return round($size, $dec) . " " . $a[$pos];
+    }
+
+    /**
+     * 统计从开始到统计时的内存使用情况
+     * @access public
+     * @param  integer|string $dec 小数位
+     * @return string
+     */
+    public function getUseMem($dec = 2)
+    {
+        $size = memory_get_usage() - $this->app->getBeginMem();
+        $a    = ['B', 'KB', 'MB', 'GB', 'TB'];
+        $pos  = 0;
+
+        while ($size >= 1024) {
+            $size /= 1024;
+            $pos++;
+        }
+
+        return round($size, $dec) . " " . $a[$pos];
+    }
+
+    /**
+     * 统计区间的内存峰值情况
+     * @access public
+     * @param  string            $start 开始标签
+     * @param  string            $end 结束标签
+     * @param  integer|string    $dec 小数位
+     * @return string
+     */
+    public function getMemPeak($start, $end, $dec = 2)
+    {
+        if (!isset($this->mem['peak'][$end])) {
+            $this->mem['peak'][$end] = memory_get_peak_usage();
+        }
+
+        $size = $this->mem['peak'][$end] - $this->mem['peak'][$start];
+        $a    = ['B', 'KB', 'MB', 'GB', 'TB'];
+        $pos  = 0;
+
+        while ($size >= 1024) {
+            $size /= 1024;
+            $pos++;
+        }
+
+        return round($size, $dec) . " " . $a[$pos];
+    }
+
+    /**
+     * 获取文件加载信息
+     * @access public
+     * @param  bool  $detail 是否显示详细
+     * @return integer|array
+     */
+    public function getFile($detail = false)
+    {
+        if ($detail) {
+            $files = get_included_files();
+            $info  = [];
+
+            foreach ($files as $key => $file) {
+                $info[] = $file . ' ( ' . number_format(filesize($file) / 1024, 2) . ' KB )';
+            }
+
+            return $info;
+        }
+
+        return count(get_included_files());
+    }
+
+    /**
+     * 浏览器友好的变量输出
+     * @access public
+     * @param  mixed         $var 变量
+     * @param  boolean       $echo 是否输出 默认为true 如果为false 则返回输出字符串
+     * @param  string        $label 标签 默认为空
+     * @param  integer       $flags htmlspecialchars flags
+     * @return void|string
+     */
+    public function dump($var, $echo = true, $label = null, $flags = ENT_SUBSTITUTE)
+    {
+        $label = (null === $label) ? '' : rtrim($label) . ':';
+        if ($var instanceof Model || $var instanceof ModelCollection) {
+            $var = $var->toArray();
+        }
+
+        ob_start();
+        var_dump($var);
+
+        $output = ob_get_clean();
+        $output = preg_replace('/\]\=\>\n(\s+)/m', '] => ', $output);
+
+        if (PHP_SAPI == 'cli') {
+            $output = PHP_EOL . $label . $output . PHP_EOL;
+        } else {
+            if (!extension_loaded('xdebug')) {
+                $output = htmlspecialchars($output, $flags);
+            }
+            $output = '<pre>' . $label . $output . '</pre>';
+        }
+        if ($echo) {
+            echo($output);
+            return;
+        }
+        return $output;
+    }
+
+    public function inject(Response $response, &$content)
+    {
+        $config = $this->config;
+        $type   = isset($config['type']) ? $config['type'] : 'Html';
+
+        unset($config['type']);
+
+        $trace = Loader::factory($type, '\\think\\debug\\', $config);
+
+        if ($response instanceof Redirect) {
+            //TODO 记录
+        } else {
+            $output = $trace->output($response, $this->app['log']->getLog());
+            if (is_string($output)) {
+                // trace调试信息注入
+                $pos = strripos($content, '</body>');
+                if (false !== $pos) {
+                    $content = substr($content, 0, $pos) . $output . substr($content, $pos);
+                } else {
+                    $content = $content . $output;
+                }
+            }
+        }
+    }
+}
diff --git a/thinkphp/library/think/Env.php b/thinkphp/library/think/Env.php
new file mode 100644
index 0000000000000000000000000000000000000000..ef5d9468d3fc51528c2b9d46ae524d48e32a36ee
--- /dev/null
+++ b/thinkphp/library/think/Env.php
@@ -0,0 +1,109 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class Env
+{
+    /**
+     * 环境变量数据
+     * @var array
+     */
+    protected $data = [];
+
+    public function __construct()
+    {
+        $this->data = $_ENV;
+    }
+
+    /**
+     * 读取环境变量定义文件
+     * @access public
+     * @param  string    $file  环境变量定义文件
+     * @return void
+     */
+    public function load($file)
+    {
+        $env = parse_ini_file($file, true);
+        $this->set($env);
+    }
+
+    /**
+     * 获取环境变量值
+     * @access public
+     * @param  string    $name 环境变量名
+     * @param  mixed     $default  默认值
+     * @return mixed
+     */
+    public function get($name = null, $default = null)
+    {
+        if (is_null($name)) {
+            return $this->data;
+        }
+
+        $name = strtoupper(str_replace('.', '_', $name));
+
+        if (isset($this->data[$name])) {
+            return $this->data[$name];
+        }
+
+        return $this->getEnv($name, $default);
+    }
+
+    protected function getEnv($name, $default = null)
+    {
+        $result = getenv('PHP_' . $name);
+
+        if (false === $result) {
+            return $default;
+        }
+
+        if ('false' === $result) {
+            $result = false;
+        } elseif ('true' === $result) {
+            $result = true;
+        }
+
+        if (!isset($this->data[$name])) {
+            $this->data[$name] = $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 设置环境变量值
+     * @access public
+     * @param  string|array  $env   环境变量
+     * @param  mixed         $value  值
+     * @return void
+     */
+    public function set($env, $value = null)
+    {
+        if (is_array($env)) {
+            $env = array_change_key_case($env, CASE_UPPER);
+
+            foreach ($env as $key => $val) {
+                if (is_array($val)) {
+                    foreach ($val as $k => $v) {
+                        $this->data[$key . '_' . strtoupper($k)] = $v;
+                    }
+                } else {
+                    $this->data[$key] = $val;
+                }
+            }
+        } else {
+            $name = strtoupper(str_replace('.', '_', $env));
+
+            $this->data[$name] = $value;
+        }
+    }
+}
diff --git a/thinkphp/library/think/Error.php b/thinkphp/library/think/Error.php
new file mode 100644
index 0000000000000000000000000000000000000000..ea3328eecf94cf6a98516e2b4fdedcafff8a5667
--- /dev/null
+++ b/thinkphp/library/think/Error.php
@@ -0,0 +1,147 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\console\Output as ConsoleOutput;
+use think\exception\ErrorException;
+use think\exception\Handle;
+use think\exception\ThrowableError;
+
+class Error
+{
+    /**
+     * 配置参数
+     * @var array
+     */
+    protected static $exceptionHandler;
+
+    /**
+     * 注册异常处理
+     * @access public
+     * @return void
+     */
+    public static function register()
+    {
+        error_reporting(E_ALL);
+        set_error_handler([__CLASS__, 'appError']);
+        set_exception_handler([__CLASS__, 'appException']);
+        register_shutdown_function([__CLASS__, 'appShutdown']);
+    }
+
+    /**
+     * Exception Handler
+     * @access public
+     * @param  \Exception|\Throwable $e
+     */
+    public static function appException($e)
+    {
+        if (!$e instanceof \Exception) {
+            $e = new ThrowableError($e);
+        }
+
+        self::getExceptionHandler()->report($e);
+
+        if (PHP_SAPI == 'cli') {
+            self::getExceptionHandler()->renderForConsole(new ConsoleOutput, $e);
+        } else {
+            self::getExceptionHandler()->render($e)->send();
+        }
+    }
+
+    /**
+     * Error Handler
+     * @access public
+     * @param  integer $errno   错误编号
+     * @param  integer $errstr  详细错误信息
+     * @param  string  $errfile 出错的文件
+     * @param  integer $errline 出错行号
+     * @throws ErrorException
+     */
+    public static function appError($errno, $errstr, $errfile = '', $errline = 0)
+    {
+        $exception = new ErrorException($errno, $errstr, $errfile, $errline);
+        if (error_reporting() & $errno) {
+            // 将错误信息托管至 think\exception\ErrorException
+            throw $exception;
+        }
+
+        self::getExceptionHandler()->report($exception);
+    }
+
+    /**
+     * Shutdown Handler
+     * @access public
+     */
+    public static function appShutdown()
+    {
+        if (!is_null($error = error_get_last()) && self::isFatal($error['type'])) {
+            // 将错误信息托管至think\ErrorException
+            $exception = new ErrorException($error['type'], $error['message'], $error['file'], $error['line']);
+
+            self::appException($exception);
+        }
+
+        // 写入日志
+        Container::get('log')->save();
+    }
+
+    /**
+     * 确定错误类型是否致命
+     *
+     * @access protected
+     * @param  int $type
+     * @return bool
+     */
+    protected static function isFatal($type)
+    {
+        return in_array($type, [E_ERROR, E_CORE_ERROR, E_COMPILE_ERROR, E_PARSE]);
+    }
+
+    /**
+     * 设置异常处理类
+     *
+     * @access public
+     * @param  mixed $handle
+     * @return void
+     */
+    public static function setExceptionHandler($handle)
+    {
+        self::$exceptionHandler = $handle;
+    }
+
+    /**
+     * Get an instance of the exception handler.
+     *
+     * @access public
+     * @return Handle
+     */
+    public static function getExceptionHandler()
+    {
+        static $handle;
+
+        if (!$handle) {
+            // 异常处理handle
+            $class = self::$exceptionHandler;
+
+            if ($class && is_string($class) && class_exists($class) && is_subclass_of($class, "\\think\\exception\\Handle")) {
+                $handle = new $class;
+            } else {
+                $handle = new Handle;
+                if ($class instanceof \Closure) {
+                    $handle->setRender($class);
+                }
+            }
+        }
+
+        return $handle;
+    }
+}
diff --git a/thinkphp/library/think/Exception.php b/thinkphp/library/think/Exception.php
new file mode 100644
index 0000000000000000000000000000000000000000..414a090ad988b26a79e3010e9a530c1b067a06af
--- /dev/null
+++ b/thinkphp/library/think/Exception.php
@@ -0,0 +1,56 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class Exception extends \Exception
+{
+
+    /**
+     * 保存异常页面显示的额外Debug数据
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * 设置异常额外的Debug数据
+     * 数据将会显示为下面的格式
+     *
+     * Exception Data
+     * --------------------------------------------------
+     * Label 1
+     *   key1      value1
+     *   key2      value2
+     * Label 2
+     *   key1      value1
+     *   key2      value2
+     *
+     * @access protected
+     * @param  string $label 数据分类，用于异常页面显示
+     * @param  array  $data  需要显示的数据，必须为关联数组
+     */
+    final protected function setData($label, array $data)
+    {
+        $this->data[$label] = $data;
+    }
+
+    /**
+     * 获取异常额外Debug数据
+     * 主要用于输出到异常页面便于调试
+     * @access public
+     * @return array 由setData设置的Debug数据
+     */
+    final public function getData()
+    {
+        return $this->data;
+    }
+
+}
diff --git a/thinkphp/library/think/Facade.php b/thinkphp/library/think/Facade.php
new file mode 100644
index 0000000000000000000000000000000000000000..f467e0f81344aa31a028590539140494963846e3
--- /dev/null
+++ b/thinkphp/library/think/Facade.php
@@ -0,0 +1,125 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class Facade
+{
+    /**
+     * 绑定对象
+     * @var array
+     */
+    protected static $bind = [];
+
+    /**
+     * 始终创建新的对象实例
+     * @var bool
+     */
+    protected static $alwaysNewInstance;
+
+    /**
+     * 绑定类的静态代理
+     * @static
+     * @access public
+     * @param  string|array  $name    类标识
+     * @param  string        $class   类名
+     * @return object
+     */
+    public static function bind($name, $class = null)
+    {
+        if (__CLASS__ != static::class) {
+            return self::__callStatic('bind', func_get_args());
+        }
+
+        if (is_array($name)) {
+            self::$bind = array_merge(self::$bind, $name);
+        } else {
+            self::$bind[$name] = $class;
+        }
+    }
+
+    /**
+     * 创建Facade实例
+     * @static
+     * @access protected
+     * @param  string    $class          类名或标识
+     * @param  array     $args           变量
+     * @param  bool      $newInstance    是否每次创建新的实例
+     * @return object
+     */
+    protected static function createFacade($class = '', $args = [], $newInstance = false)
+    {
+        $class = $class ?: static::class;
+
+        $facadeClass = static::getFacadeClass();
+
+        if ($facadeClass) {
+            $class = $facadeClass;
+        } elseif (isset(self::$bind[$class])) {
+            $class = self::$bind[$class];
+        }
+
+        if (static::$alwaysNewInstance) {
+            $newInstance = true;
+        }
+
+        return Container::getInstance()->make($class, $args, $newInstance);
+    }
+
+    /**
+     * 获取当前Facade对应类名
+     * @access protected
+     * @return string
+     */
+    protected static function getFacadeClass()
+    {}
+
+    /**
+     * 带参数实例化当前Facade类
+     * @access public
+     * @return mixed
+     */
+    public static function instance(...$args)
+    {
+        if (__CLASS__ != static::class) {
+            return self::createFacade('', $args);
+        }
+    }
+
+    /**
+     * 调用类的实例
+     * @access public
+     * @param  string        $class          类名或者标识
+     * @param  array|true    $args           变量
+     * @param  bool          $newInstance    是否每次创建新的实例
+     * @return mixed
+     */
+    public static function make($class, $args = [], $newInstance = false)
+    {
+        if (__CLASS__ != static::class) {
+            return self::__callStatic('make', func_get_args());
+        }
+
+        if (true === $args) {
+            // 总是创建新的实例化对象
+            $newInstance = true;
+            $args        = [];
+        }
+
+        return self::createFacade($class, $args, $newInstance);
+    }
+
+    // 调用实际类的方法
+    public static function __callStatic($method, $params)
+    {
+        return call_user_func_array([static::createFacade(), $method], $params);
+    }
+}
diff --git a/thinkphp/library/think/File.php b/thinkphp/library/think/File.php
new file mode 100644
index 0000000000000000000000000000000000000000..e9985690c3dfe697156a8287016650d651716c48
--- /dev/null
+++ b/thinkphp/library/think/File.php
@@ -0,0 +1,494 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use SplFileObject;
+
+class File extends SplFileObject
+{
+    /**
+     * 错误信息
+     * @var string
+     */
+    private $error = '';
+
+    /**
+     * 当前完整文件名
+     * @var string
+     */
+    protected $filename;
+
+    /**
+     * 上传文件名
+     * @var string
+     */
+    protected $saveName;
+
+    /**
+     * 上传文件命名规则
+     * @var string
+     */
+    protected $rule = 'date';
+
+    /**
+     * 上传文件验证规则
+     * @var array
+     */
+    protected $validate = [];
+
+    /**
+     * 是否单元测试
+     * @var bool
+     */
+    protected $isTest;
+
+    /**
+     * 上传文件信息
+     * @var array
+     */
+    protected $info = [];
+
+    /**
+     * 文件hash规则
+     * @var array
+     */
+    protected $hash = [];
+
+    public function __construct($filename, $mode = 'r')
+    {
+        parent::__construct($filename, $mode);
+
+        $this->filename = $this->getRealPath() ?: $this->getPathname();
+    }
+
+    /**
+     * 是否测试
+     * @access public
+     * @param  bool   $test 是否测试
+     * @return $this
+     */
+    public function isTest($test = false)
+    {
+        $this->isTest = $test;
+
+        return $this;
+    }
+
+    /**
+     * 设置上传信息
+     * @access public
+     * @param  array   $info 上传文件信息
+     * @return $this
+     */
+    public function setUploadInfo($info)
+    {
+        $this->info = $info;
+
+        return $this;
+    }
+
+    /**
+     * 获取上传文件的信息
+     * @access public
+     * @param  string   $name
+     * @return array|string
+     */
+    public function getInfo($name = '')
+    {
+        return isset($this->info[$name]) ? $this->info[$name] : $this->info;
+    }
+
+    /**
+     * 获取上传文件的文件名
+     * @access public
+     * @return string
+     */
+    public function getSaveName()
+    {
+        return $this->saveName;
+    }
+
+    /**
+     * 设置上传文件的保存文件名
+     * @access public
+     * @param  string   $saveName
+     * @return $this
+     */
+    public function setSaveName($saveName)
+    {
+        $this->saveName = $saveName;
+
+        return $this;
+    }
+
+    /**
+     * 获取文件的哈希散列值
+     * @access public
+     * @param  string $type
+     * @return string
+     */
+    public function hash($type = 'sha1')
+    {
+        if (!isset($this->hash[$type])) {
+            $this->hash[$type] = hash_file($type, $this->filename);
+        }
+
+        return $this->hash[$type];
+    }
+
+    /**
+     * 检查目录是否可写
+     * @access protected
+     * @param  string   $path    目录
+     * @return boolean
+     */
+    protected function checkPath($path)
+    {
+        if (is_dir($path)) {
+            return true;
+        }
+
+        if (mkdir($path, 0755, true)) {
+            return true;
+        }
+
+        $this->error = ['directory {:path} creation failed', ['path' => $path]];
+        return false;
+    }
+
+    /**
+     * 获取文件类型信息
+     * @access public
+     * @return string
+     */
+    public function getMime()
+    {
+        $finfo = finfo_open(FILEINFO_MIME_TYPE);
+
+        return finfo_file($finfo, $this->filename);
+    }
+
+    /**
+     * 设置文件的命名规则
+     * @access public
+     * @param  string   $rule    文件命名规则
+     * @return $this
+     */
+    public function rule($rule)
+    {
+        $this->rule = $rule;
+
+        return $this;
+    }
+
+    /**
+     * 设置上传文件的验证规则
+     * @access public
+     * @param  array   $rule    验证规则
+     * @return $this
+     */
+    public function validate($rule = [])
+    {
+        $this->validate = $rule;
+
+        return $this;
+    }
+
+    /**
+     * 检测是否合法的上传文件
+     * @access public
+     * @return bool
+     */
+    public function isValid()
+    {
+        if ($this->isTest) {
+            return is_file($this->filename);
+        }
+
+        return is_uploaded_file($this->filename);
+    }
+
+    /**
+     * 检测上传文件
+     * @access public
+     * @param  array   $rule    验证规则
+     * @return bool
+     */
+    public function check($rule = [])
+    {
+        $rule = $rule ?: $this->validate;
+
+        if ((isset($rule['size']) && !$this->checkSize($rule['size']))
+            || (isset($rule['type']) && !$this->checkMime($rule['type']))
+            || (isset($rule['ext']) && !$this->checkExt($rule['ext']))
+            || !$this->checkImg()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 检测上传文件后缀
+     * @access public
+     * @param  array|string   $ext    允许后缀
+     * @return bool
+     */
+    public function checkExt($ext)
+    {
+        if (is_string($ext)) {
+            $ext = explode(',', $ext);
+        }
+
+        $extension = strtolower(pathinfo($this->getInfo('name'), PATHINFO_EXTENSION));
+
+        if (!in_array($extension, $ext)) {
+            $this->error = 'extensions to upload is not allowed';
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 检测图像文件
+     * @access public
+     * @return bool
+     */
+    public function checkImg()
+    {
+        $extension = strtolower(pathinfo($this->getInfo('name'), PATHINFO_EXTENSION));
+
+        /* 对图像文件进行严格检测 */
+        if (in_array($extension, ['gif', 'jpg', 'jpeg', 'bmp', 'png', 'swf']) && !in_array($this->getImageType($this->filename), [1, 2, 3, 4, 6, 13])) {
+            $this->error = 'illegal image files';
+            return false;
+        }
+
+        return true;
+    }
+
+    // 判断图像类型
+    protected function getImageType($image)
+    {
+        if (function_exists('exif_imagetype')) {
+            return exif_imagetype($image);
+        }
+
+        try {
+            $info = getimagesize($image);
+            return $info ? $info[2] : false;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * 检测上传文件大小
+     * @access public
+     * @param  integer   $size    最大大小
+     * @return bool
+     */
+    public function checkSize($size)
+    {
+        if ($this->getSize() > $size) {
+            $this->error = 'filesize not match';
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 检测上传文件类型
+     * @access public
+     * @param  array|string   $mime    允许类型
+     * @return bool
+     */
+    public function checkMime($mime)
+    {
+        if (is_string($mime)) {
+            $mime = explode(',', $mime);
+        }
+
+        if (!in_array(strtolower($this->getMime()), $mime)) {
+            $this->error = 'mimetype to upload is not allowed';
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 移动文件
+     * @access public
+     * @param  string           $path    保存路径
+     * @param  string|bool      $savename    保存的文件名 默认自动生成
+     * @param  boolean          $replace 同名文件是否覆盖
+     * @return false|File       false-失败 否则返回File实例
+     */
+    public function move($path, $savename = true, $replace = true)
+    {
+        // 文件上传失败，捕获错误代码
+        if (!empty($this->info['error'])) {
+            $this->error($this->info['error']);
+            return false;
+        }
+
+        // 检测合法性
+        if (!$this->isValid()) {
+            $this->error = 'upload illegal files';
+            return false;
+        }
+
+        // 验证上传
+        if (!$this->check()) {
+            return false;
+        }
+
+        $path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        // 文件保存命名规则
+        $saveName = $this->buildSaveName($savename);
+        $filename = $path . $saveName;
+
+        // 检测目录
+        if (false === $this->checkPath(dirname($filename))) {
+            return false;
+        }
+
+        /* 不覆盖同名文件 */
+        if (!$replace && is_file($filename)) {
+            $this->error = ['has the same filename: {:filename}', ['filename' => $filename]];
+            return false;
+        }
+
+        /* 移动文件 */
+        if ($this->isTest) {
+            rename($this->filename, $filename);
+        } elseif (!move_uploaded_file($this->filename, $filename)) {
+            $this->error = 'upload write error';
+            return false;
+        }
+
+        // 返回 File对象实例
+        $file = new self($filename);
+        $file->setSaveName($saveName);
+        $file->setUploadInfo($this->info);
+
+        return $file;
+    }
+
+    /**
+     * 获取保存文件名
+     * @access protected
+     * @param  string|bool   $savename    保存的文件名 默认自动生成
+     * @return string
+     */
+    protected function buildSaveName($savename)
+    {
+        if (true === $savename) {
+            // 自动生成文件名
+            $savename = $this->autoBuildName();
+        } elseif ('' === $savename || false === $savename) {
+            // 保留原文件名
+            $savename = $this->getInfo('name');
+        }
+
+        if (!strpos($savename, '.')) {
+            $savename .= '.' . pathinfo($this->getInfo('name'), PATHINFO_EXTENSION);
+        }
+
+        return $savename;
+    }
+
+    /**
+     * 自动生成文件名
+     * @access protected
+     * @return string
+     */
+    protected function autoBuildName()
+    {
+        if ($this->rule instanceof \Closure) {
+            $savename = call_user_func_array($this->rule, [$this]);
+        } else {
+            switch ($this->rule) {
+                case 'date':
+                    $savename = date('Ymd') . DIRECTORY_SEPARATOR . md5(microtime(true));
+                    break;
+                default:
+                    if (in_array($this->rule, hash_algos())) {
+                        $hash     = $this->hash($this->rule);
+                        $savename = substr($hash, 0, 2) . DIRECTORY_SEPARATOR . substr($hash, 2);
+                    } elseif (is_callable($this->rule)) {
+                        $savename = call_user_func($this->rule);
+                    } else {
+                        $savename = date('Ymd') . DIRECTORY_SEPARATOR . md5(microtime(true));
+                    }
+            }
+        }
+
+        return $savename;
+    }
+
+    /**
+     * 获取错误代码信息
+     * @access private
+     * @param  int $errorNo  错误号
+     */
+    private function error($errorNo)
+    {
+        switch ($errorNo) {
+            case 1:
+            case 2:
+                $this->error = 'upload File size exceeds the maximum value';
+                break;
+            case 3:
+                $this->error = 'only the portion of file is uploaded';
+                break;
+            case 4:
+                $this->error = 'no file to uploaded';
+                break;
+            case 6:
+                $this->error = 'upload temp dir not found';
+                break;
+            case 7:
+                $this->error = 'file write error';
+                break;
+            default:
+                $this->error = 'unknown upload error';
+        }
+    }
+
+    /**
+     * 获取错误信息（支持多语言）
+     * @access public
+     * @return string
+     */
+    public function getError()
+    {
+        $lang = Container::get('lang');
+
+        if (is_array($this->error)) {
+            list($msg, $vars) = $this->error;
+        } else {
+            $msg  = $this->error;
+            $vars = [];
+        }
+
+        return $lang->has($msg) ? $lang->get($msg, $vars) : $msg;
+    }
+
+    public function __call($method, $args)
+    {
+        return $this->hash($method);
+    }
+}
diff --git a/thinkphp/library/think/Hook.php b/thinkphp/library/think/Hook.php
new file mode 100644
index 0000000000000000000000000000000000000000..58791c815ce61b59f789344f6e47824a57de2d3f
--- /dev/null
+++ b/thinkphp/library/think/Hook.php
@@ -0,0 +1,221 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class Hook
+{
+    /**
+     * 钩子行为定义
+     * @var array
+     */
+    private $tags = [];
+
+    /**
+     * 绑定行为列表
+     * @var array
+     */
+    protected $bind = [];
+
+    /**
+     * 入口方法名称
+     * @var string
+     */
+    private static $portal = 'run';
+
+    /**
+     * 应用对象
+     * @var App
+     */
+    protected $app;
+
+    public function __construct(App $app)
+    {
+        $this->app = $app;
+    }
+
+    /**
+     * 指定入口方法名称
+     * @access public
+     * @param  string  $name     方法名
+     * @return $this
+     */
+    public function portal($name)
+    {
+        self::$portal = $name;
+        return $this;
+    }
+
+    /**
+     * 指定行为标识 便于调用
+     * @access public
+     * @param  string|array  $name     行为标识
+     * @param  mixed         $behavior 行为
+     * @return $this
+     */
+    public function alias($name, $behavior = null)
+    {
+        if (is_array($name)) {
+            $this->bind = array_merge($this->bind, $name);
+        } else {
+            $this->bind[$name] = $behavior;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 动态添加行为扩展到某个标签
+     * @access public
+     * @param  string    $tag 标签名称
+     * @param  mixed     $behavior 行为名称
+     * @param  bool      $first 是否放到开头执行
+     * @return void
+     */
+    public function add($tag, $behavior, $first = false)
+    {
+        isset($this->tags[$tag]) || $this->tags[$tag] = [];
+
+        if (is_array($behavior) && !is_callable($behavior)) {
+            if (!array_key_exists('_overlay', $behavior)) {
+                $this->tags[$tag] = array_merge($this->tags[$tag], $behavior);
+            } else {
+                unset($behavior['_overlay']);
+                $this->tags[$tag] = $behavior;
+            }
+        } elseif ($first) {
+            array_unshift($this->tags[$tag], $behavior);
+        } else {
+            $this->tags[$tag][] = $behavior;
+        }
+    }
+
+    /**
+     * 批量导入插件
+     * @access public
+     * @param  array     $tags 插件信息
+     * @param  bool      $recursive 是否递归合并
+     * @return void
+     */
+    public function import(array $tags, $recursive = true)
+    {
+        if ($recursive) {
+            foreach ($tags as $tag => $behavior) {
+                $this->add($tag, $behavior);
+            }
+        } else {
+            $this->tags = $tags + $this->tags;
+        }
+    }
+
+    /**
+     * 获取插件信息
+     * @access public
+     * @param  string $tag 插件位置 留空获取全部
+     * @return array
+     */
+    public function get($tag = '')
+    {
+        if (empty($tag)) {
+            //获取全部的插件信息
+            return $this->tags;
+        }
+
+        return array_key_exists($tag, $this->tags) ? $this->tags[$tag] : [];
+    }
+
+    /**
+     * 监听标签的行为
+     * @access public
+     * @param  string $tag    标签名称
+     * @param  mixed  $params 传入参数
+     * @param  bool   $once   只获取一个有效返回值
+     * @return mixed
+     */
+    public function listen($tag, $params = null, $once = false)
+    {
+        $results = [];
+        $tags    = $this->get($tag);
+
+        foreach ($tags as $key => $name) {
+            $results[$key] = $this->execTag($name, $tag, $params);
+
+            if (false === $results[$key] || (!is_null($results[$key]) && $once)) {
+                break;
+            }
+        }
+
+        return $once ? end($results) : $results;
+    }
+
+    /**
+     * 执行行为
+     * @access public
+     * @param  mixed     $class  行为
+     * @param  mixed     $params 参数
+     * @return mixed
+     */
+    public function exec($class, $params = null)
+    {
+        if ($class instanceof \Closure || is_array($class)) {
+            $method = $class;
+        } else {
+            if (isset($this->bind[$class])) {
+                $class = $this->bind[$class];
+            }
+            $method = [$class, self::$portal];
+        }
+
+        return $this->app->invoke($method, [$params]);
+    }
+
+    /**
+     * 执行某个标签的行为
+     * @access protected
+     * @param  mixed     $class  要执行的行为
+     * @param  string    $tag    方法名（标签名）
+     * @param  mixed     $params 参数
+     * @return mixed
+     */
+    protected function execTag($class, $tag = '', $params = null)
+    {
+        $this->app->isDebug() && $this->app['debug']->remark('behavior_start', 'time');
+
+        $method = Loader::parseName($tag, 1, false);
+
+        if ($class instanceof \Closure) {
+            $call  = $class;
+            $class = 'Closure';
+        } elseif (strpos($class, '::')) {
+            $call = $class;
+        } else {
+            $obj = Container::get($class);
+
+            if (!is_callable([$obj, $method])) {
+                $method = self::$portal;
+            }
+
+            $call  = [$class, $method];
+            $class = $class . '->' . $method;
+        }
+
+        $result = $this->app->invoke($call, [$params]);
+
+        if ($this->app->isDebug()) {
+            $debug = $this->app['debug'];
+            $debug->remark('behavior_end', 'time');
+            $this->app->log('[ BEHAVIOR ] Run ' . $class . ' @' . $tag . ' [ RunTime:' . $debug->getRangeTime('behavior_start', 'behavior_end') . 's ]');
+        }
+
+        return $result;
+    }
+
+}
diff --git a/thinkphp/library/think/Lang.php b/thinkphp/library/think/Lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..5d8d9d99e9885044202668b54eb1c2e066983077
--- /dev/null
+++ b/thinkphp/library/think/Lang.php
@@ -0,0 +1,284 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class Lang
+{
+    /**
+     * 多语言信息
+     * @var array
+     */
+    private $lang = [];
+
+    /**
+     * 当前语言
+     * @var string
+     */
+    private $range = 'zh-cn';
+
+    /**
+     * 多语言自动侦测变量名
+     * @var string
+     */
+    protected $langDetectVar = 'lang';
+
+    /**
+     * 多语言cookie变量
+     * @var string
+     */
+    protected $langCookieVar = 'think_var';
+
+    /**
+     * 允许的多语言列表
+     * @var array
+     */
+    protected $allowLangList = [];
+
+    /**
+     * Accept-Language转义为对应语言包名称 系统默认配置
+     * @var string
+     */
+    protected $acceptLanguage = [
+        'zh-hans-cn' => 'zh-cn',
+    ];
+
+    /**
+     * 应用对象
+     * @var App
+     */
+    protected $app;
+
+    public function __construct(App $app)
+    {
+        $this->app = $app;
+    }
+
+    // 设定当前的语言
+    public function range($range = '')
+    {
+        if ('' == $range) {
+            return $this->range;
+        } else {
+            $this->range = $range;
+        }
+    }
+
+    /**
+     * 设置语言定义(不区分大小写)
+     * @access public
+     * @param  string|array  $name 语言变量
+     * @param  string        $value 语言值
+     * @param  string        $range 语言作用域
+     * @return mixed
+     */
+    public function set($name, $value = null, $range = '')
+    {
+        $range = $range ?: $this->range;
+        // 批量定义
+        if (!isset($this->lang[$range])) {
+            $this->lang[$range] = [];
+        }
+
+        if (is_array($name)) {
+            return $this->lang[$range] = array_change_key_case($name) + $this->lang[$range];
+        }
+
+        return $this->lang[$range][strtolower($name)] = $value;
+    }
+
+    /**
+     * 加载语言定义(不区分大小写)
+     * @access public
+     * @param  string|array  $file   语言文件
+     * @param  string        $range  语言作用域
+     * @return array
+     */
+    public function load($file, $range = '')
+    {
+        $range = $range ?: $this->range;
+        if (!isset($this->lang[$range])) {
+            $this->lang[$range] = [];
+        }
+
+        // 批量定义
+        if (is_string($file)) {
+            $file = [$file];
+        }
+
+        $lang = [];
+
+        foreach ($file as $_file) {
+            if (is_file($_file)) {
+                // 记录加载信息
+                $this->app->log('[ LANG ] ' . $_file);
+                $_lang = include $_file;
+                if (is_array($_lang)) {
+                    $lang = array_change_key_case($_lang) + $lang;
+                }
+            }
+        }
+
+        if (!empty($lang)) {
+            $this->lang[$range] = $lang + $this->lang[$range];
+        }
+
+        return $this->lang[$range];
+    }
+
+    /**
+     * 获取语言定义(不区分大小写)
+     * @access public
+     * @param  string|null   $name 语言变量
+     * @param  string        $range 语言作用域
+     * @return bool
+     */
+    public function has($name, $range = '')
+    {
+        $range = $range ?: $this->range;
+
+        return isset($this->lang[$range][strtolower($name)]);
+    }
+
+    /**
+     * 获取语言定义(不区分大小写)
+     * @access public
+     * @param  string|null   $name 语言变量
+     * @param  array         $vars 变量替换
+     * @param  string        $range 语言作用域
+     * @return mixed
+     */
+    public function get($name = null, $vars = [], $range = '')
+    {
+        $range = $range ?: $this->range;
+
+        // 空参数返回所有定义
+        if (empty($name)) {
+            return $this->lang[$range];
+        }
+
+        $key   = strtolower($name);
+        $value = isset($this->lang[$range][$key]) ? $this->lang[$range][$key] : $name;
+
+        // 变量解析
+        if (!empty($vars) && is_array($vars)) {
+            /**
+             * Notes:
+             * 为了检测的方便，数字索引的判断仅仅是参数数组的第一个元素的key为数字0
+             * 数字索引采用的是系统的 sprintf 函数替换，用法请参考 sprintf 函数
+             */
+            if (key($vars) === 0) {
+                // 数字索引解析
+                array_unshift($vars, $value);
+                $value = call_user_func_array('sprintf', $vars);
+            } else {
+                // 关联索引解析
+                $replace = array_keys($vars);
+                foreach ($replace as &$v) {
+                    $v = "{:{$v}}";
+                }
+                $value = str_replace($replace, $vars, $value);
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * 自动侦测设置获取语言选择
+     * @access public
+     * @return string
+     */
+    public function detect()
+    {
+        // 自动侦测设置获取语言选择
+        $langSet = '';
+
+        if (isset($_GET[$this->langDetectVar])) {
+            // url中设置了语言变量
+            $langSet = strtolower($_GET[$this->langDetectVar]);
+        } elseif (isset($_COOKIE[$this->langCookieVar])) {
+            // Cookie中设置了语言变量
+            $langSet = strtolower($_COOKIE[$this->langCookieVar]);
+        } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            // 自动侦测浏览器语言
+            preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);
+            $langSet = strtolower($matches[1]);
+            if (isset($this->acceptLanguage[$langSet])) {
+                $langSet = $this->acceptLanguage[$langSet];
+            }
+        }
+
+        if (empty($this->allowLangList) || in_array($langSet, $this->allowLangList)) {
+            // 合法的语言
+            $this->range = $langSet ?: $this->range;
+        }
+
+        return $this->range;
+    }
+
+    /**
+     * 设置当前语言到Cookie
+     * @access public
+     * @param  string $lang 语言
+     * @return void
+     */
+    public function saveToCookie($lang = null)
+    {
+        $range = $lang ?: $this->range;
+
+        $_COOKIE[$this->langCookieVar] = $range;
+    }
+
+    /**
+     * 设置语言自动侦测的变量
+     * @access public
+     * @param  string $var 变量名称
+     * @return void
+     */
+    public function setLangDetectVar($var)
+    {
+        $this->langDetectVar = $var;
+    }
+
+    /**
+     * 设置语言的cookie保存变量
+     * @access public
+     * @param  string $var 变量名称
+     * @return void
+     */
+    public function setLangCookieVar($var)
+    {
+        $this->langCookieVar = $var;
+    }
+
+    /**
+     * 设置允许的语言列表
+     * @access public
+     * @param  array $list 语言列表
+     * @return void
+     */
+    public function setAllowLangList(array $list)
+    {
+        $this->allowLangList = $list;
+    }
+
+    /**
+     * 设置转义的语言列表
+     * @access public
+     * @param  array $list 语言列表
+     * @return void
+     */
+    public function setAcceptLanguage(array $list)
+    {
+        $this->acceptLanguage = array_merge($this->acceptLanguage, $list);
+    }
+}
diff --git a/thinkphp/library/think/Loader.php b/thinkphp/library/think/Loader.php
new file mode 100644
index 0000000000000000000000000000000000000000..d807db6403ad25de7f9f4e612daf4096c3b6f68d
--- /dev/null
+++ b/thinkphp/library/think/Loader.php
@@ -0,0 +1,417 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\exception\ClassNotFoundException;
+
+class Loader
+{
+    /**
+     * 类名映射信息
+     * @var array
+     */
+    protected static $classMap = [];
+
+    /**
+     * 类库别名
+     * @var array
+     */
+    protected static $classAlias = [];
+
+    /**
+     * PSR-4
+     * @var array
+     */
+    private static $prefixLengthsPsr4 = [];
+    private static $prefixDirsPsr4    = [];
+    private static $fallbackDirsPsr4  = [];
+
+    /**
+     * PSR-0
+     * @var array
+     */
+    private static $prefixesPsr0     = [];
+    private static $fallbackDirsPsr0 = [];
+
+    /**
+     * 需要加载的文件
+     * @var array
+     */
+    private static $files = [];
+
+    /**
+     * Composer安装路径
+     * @var string
+     */
+    private static $composerPath;
+
+    // 获取应用根目录
+    public static function getRootPath()
+    {
+        if ('cli' == PHP_SAPI) {
+            $scriptName = realpath($_SERVER['argv'][0]);
+        } else {
+            $scriptName = $_SERVER['SCRIPT_FILENAME'];
+        }
+
+        $path = realpath(dirname($scriptName));
+
+        if (!is_file($path . DIRECTORY_SEPARATOR . 'think')) {
+            $path = dirname($path);
+        }
+
+        return $path . DIRECTORY_SEPARATOR;
+    }
+
+    // 注册自动加载机制
+    public static function register($autoload = '')
+    {
+        // 注册系统自动加载
+        spl_autoload_register($autoload ?: 'think\\Loader::autoload', true, true);
+
+        $rootPath = self::getRootPath();
+
+        self::$composerPath = $rootPath . 'vendor' . DIRECTORY_SEPARATOR . 'composer' . DIRECTORY_SEPARATOR;
+
+        // Composer自动加载支持
+        if (is_dir(self::$composerPath)) {
+            if (is_file(self::$composerPath . 'autoload_static.php')) {
+                require self::$composerPath . 'autoload_static.php';
+
+                $declaredClass = get_declared_classes();
+                $composerClass = array_pop($declaredClass);
+
+                foreach (['prefixLengthsPsr4', 'prefixDirsPsr4', 'fallbackDirsPsr4', 'prefixesPsr0', 'fallbackDirsPsr0', 'classMap', 'files'] as $attr) {
+                    if (property_exists($composerClass, $attr)) {
+                        self::${$attr} = $composerClass::${$attr};
+                    }
+                }
+            } else {
+                self::registerComposerLoader(self::$composerPath);
+            }
+        }
+
+        // 注册命名空间定义
+        self::addNamespace([
+            'think'  => __DIR__,
+            'traits' => dirname(__DIR__) . DIRECTORY_SEPARATOR . 'traits',
+        ]);
+
+        // 加载类库映射文件
+        if (is_file($rootPath . 'runtime' . DIRECTORY_SEPARATOR . 'classmap.php')) {
+            self::addClassMap(__include_file($rootPath . 'runtime' . DIRECTORY_SEPARATOR . 'classmap.php'));
+        }
+
+        // 自动加载extend目录
+        self::addAutoLoadDir($rootPath . 'extend');
+    }
+
+    // 自动加载
+    public static function autoload($class)
+    {
+        if (isset(self::$classAlias[$class])) {
+            return class_alias(self::$classAlias[$class], $class);
+        }
+
+        if ($file = self::findFile($class)) {
+
+            // Win环境严格区分大小写
+            if (strpos(PHP_OS, 'WIN') !== false && pathinfo($file, PATHINFO_FILENAME) != pathinfo(realpath($file), PATHINFO_FILENAME)) {
+                return false;
+            }
+
+            __include_file($file);
+            return true;
+        }
+    }
+
+    /**
+     * 查找文件
+     * @access private
+     * @param  string $class
+     * @return string|false
+     */
+    private static function findFile($class)
+    {
+        if (!empty(self::$classMap[$class])) {
+            // 类库映射
+            return self::$classMap[$class];
+        }
+
+        // 查找 PSR-4
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . '.php';
+
+        $first = $class[0];
+        if (isset(self::$prefixLengthsPsr4[$first])) {
+            foreach (self::$prefixLengthsPsr4[$first] as $prefix => $length) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach (self::$prefixDirsPsr4[$prefix] as $dir) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // 查找 PSR-4 fallback dirs
+        foreach (self::$fallbackDirsPsr4 as $dir) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // 查找 PSR-0
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+            . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . '.php';
+        }
+
+        if (isset(self::$prefixesPsr0[$first])) {
+            foreach (self::$prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // 查找 PSR-0 fallback dirs
+        foreach (self::$fallbackDirsPsr0 as $dir) {
+            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        return self::$classMap[$class] = false;
+    }
+
+    // 注册classmap
+    public static function addClassMap($class, $map = '')
+    {
+        if (is_array($class)) {
+            self::$classMap = array_merge(self::$classMap, $class);
+        } else {
+            self::$classMap[$class] = $map;
+        }
+    }
+
+    // 注册命名空间
+    public static function addNamespace($namespace, $path = '')
+    {
+        if (is_array($namespace)) {
+            foreach ($namespace as $prefix => $paths) {
+                self::addPsr4($prefix . '\\', rtrim($paths, DIRECTORY_SEPARATOR), true);
+            }
+        } else {
+            self::addPsr4($namespace . '\\', rtrim($path, DIRECTORY_SEPARATOR), true);
+        }
+    }
+
+    // 添加Ps0空间
+    private static function addPsr0($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                self::$fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    self::$fallbackDirsPsr0
+                );
+            } else {
+                self::$fallbackDirsPsr0 = array_merge(
+                    self::$fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset(self::$prefixesPsr0[$first][$prefix])) {
+            self::$prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+
+        if ($prepend) {
+            self::$prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                self::$prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            self::$prefixesPsr0[$first][$prefix] = array_merge(
+                self::$prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    // 添加Psr4空间
+    private static function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                self::$fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    self::$fallbackDirsPsr4
+                );
+            } else {
+                self::$fallbackDirsPsr4 = array_merge(
+                    self::$fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset(self::$prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+
+            self::$prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            self::$prefixDirsPsr4[$prefix]                = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            self::$prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                self::$prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            self::$prefixDirsPsr4[$prefix] = array_merge(
+                self::$prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    // 注册自动加载类库目录
+    public static function addAutoLoadDir($path)
+    {
+        self::$fallbackDirsPsr4[] = $path;
+    }
+
+    // 注册类别名
+    public static function addClassAlias($alias, $class = null)
+    {
+        if (is_array($alias)) {
+            self::$classAlias = array_merge(self::$classAlias, $alias);
+        } else {
+            self::$classAlias[$alias] = $class;
+        }
+    }
+
+    // 注册composer自动加载
+    public static function registerComposerLoader($composerPath)
+    {
+        if (is_file($composerPath . 'autoload_namespaces.php')) {
+            $map = require $composerPath . 'autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                self::addPsr0($namespace, $path);
+            }
+        }
+
+        if (is_file($composerPath . 'autoload_psr4.php')) {
+            $map = require $composerPath . 'autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                self::addPsr4($namespace, $path);
+            }
+        }
+
+        if (is_file($composerPath . 'autoload_classmap.php')) {
+            $classMap = require $composerPath . 'autoload_classmap.php';
+            if ($classMap) {
+                self::addClassMap($classMap);
+            }
+        }
+
+        if (is_file($composerPath . 'autoload_files.php')) {
+            self::$files = require $composerPath . 'autoload_files.php';
+        }
+    }
+
+    // 加载composer autofile文件
+    public static function loadComposerAutoloadFiles()
+    {
+        foreach (self::$files as $fileIdentifier => $file) {
+            if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+                __require_file($file);
+
+                $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+            }
+        }
+    }
+
+    /**
+     * 字符串命名风格转换
+     * type 0 将Java风格转换为C的风格 1 将C风格转换为Java的风格
+     * @access public
+     * @param  string  $name 字符串
+     * @param  integer $type 转换类型
+     * @param  bool    $ucfirst 首字母是否大写（驼峰规则）
+     * @return string
+     */
+    public static function parseName($name, $type = 0, $ucfirst = true)
+    {
+        if ($type) {
+            $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+                return strtoupper($match[1]);
+            }, $name);
+            return $ucfirst ? ucfirst($name) : lcfirst($name);
+        }
+
+        return strtolower(trim(preg_replace("/[A-Z]/", "_\\0", $name), "_"));
+    }
+
+    /**
+     * 创建工厂对象实例
+     * @access public
+     * @param  string $name         工厂类名
+     * @param  string $namespace    默认命名空间
+     * @return mixed
+     */
+    public static function factory($name, $namespace = '', ...$args)
+    {
+        $class = false !== strpos($name, '\\') ? $name : $namespace . ucwords($name);
+
+        if (class_exists($class)) {
+            return Container::getInstance()->invokeClass($class, $args);
+        } else {
+            throw new ClassNotFoundException('class not exists:' . $class, $class);
+        }
+    }
+}
+
+/**
+ * 作用范围隔离
+ *
+ * @param $file
+ * @return mixed
+ */
+function __include_file($file)
+{
+    return include $file;
+}
+
+function __require_file($file)
+{
+    return require $file;
+}
diff --git a/thinkphp/library/think/Log.php b/thinkphp/library/think/Log.php
new file mode 100644
index 0000000000000000000000000000000000000000..b63233cd65c0c602d7890add889ba91d52945a1d
--- /dev/null
+++ b/thinkphp/library/think/Log.php
@@ -0,0 +1,381 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class Log implements LoggerInterface
+{
+    const EMERGENCY = 'emergency';
+    const ALERT     = 'alert';
+    const CRITICAL  = 'critical';
+    const ERROR     = 'error';
+    const WARNING   = 'warning';
+    const NOTICE    = 'notice';
+    const INFO      = 'info';
+    const DEBUG     = 'debug';
+    const SQL       = 'sql';
+
+    /**
+     * 日志信息
+     * @var array
+     */
+    protected $log = [];
+
+    /**
+     * 配置参数
+     * @var array
+     */
+    protected $config = [];
+
+    /**
+     * 日志写入驱动
+     * @var object
+     */
+    protected $driver;
+
+    /**
+     * 日志授权key
+     * @var string
+     */
+    protected $key;
+
+    /**
+     * 是否允许日志写入
+     * @var bool
+     */
+    protected $allowWrite = true;
+
+    /**
+     * 应用对象
+     * @var App
+     */
+    protected $app;
+
+    public function __construct(App $app)
+    {
+        $this->app = $app;
+    }
+
+    public static function __make(App $app, Config $config)
+    {
+        return (new static($app))->init($config->pull('log'));
+    }
+
+    /**
+     * 日志初始化
+     * @access public
+     * @param  array $config
+     * @return $this
+     */
+    public function init($config = [])
+    {
+        $type = isset($config['type']) ? $config['type'] : 'File';
+
+        $this->config = $config;
+
+        unset($config['type']);
+
+        if (!empty($config['close'])) {
+            $this->allowWrite = false;
+        }
+
+        $this->driver = Loader::factory($type, '\\think\\log\\driver\\', $config);
+
+        return $this;
+    }
+
+    /**
+     * 获取日志信息
+     * @access public
+     * @param  string $type 信息类型
+     * @return array
+     */
+    public function getLog($type = '')
+    {
+        return $type ? $this->log[$type] : $this->log;
+    }
+
+    /**
+     * 记录日志信息
+     * @access public
+     * @param  mixed  $msg       日志信息
+     * @param  string $type      日志级别
+     * @param  array  $context   替换内容
+     * @return $this
+     */
+    public function record($msg, $type = 'info', array $context = [])
+    {
+        if (!$this->allowWrite) {
+            return;
+        }
+
+        if (is_string($msg) && !empty($context)) {
+            $replace = [];
+            foreach ($context as $key => $val) {
+                $replace['{' . $key . '}'] = $val;
+            }
+
+            $msg = strtr($msg, $replace);
+        }
+
+        if (PHP_SAPI == 'cli') {
+            // 命令行日志实时写入
+            $this->write($msg, $type, true);
+        } else {
+            $this->log[$type][] = $msg;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 清空日志信息
+     * @access public
+     * @return $this
+     */
+    public function clear()
+    {
+        $this->log = [];
+
+        return $this;
+    }
+
+    /**
+     * 当前日志记录的授权key
+     * @access public
+     * @param  string  $key  授权key
+     * @return $this
+     */
+    public function key($key)
+    {
+        $this->key = $key;
+
+        return $this;
+    }
+
+    /**
+     * 检查日志写入权限
+     * @access public
+     * @param  array  $config  当前日志配置参数
+     * @return bool
+     */
+    public function check($config)
+    {
+        if ($this->key && !empty($config['allow_key']) && !in_array($this->key, $config['allow_key'])) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 关闭本次请求日志写入
+     * @access public
+     * @return $this
+     */
+    public function close()
+    {
+        $this->allowWrite = false;
+        $this->log        = [];
+
+        return $this;
+    }
+
+    /**
+     * 保存调试信息
+     * @access public
+     * @return bool
+     */
+    public function save()
+    {
+        if (empty($this->log) || !$this->allowWrite) {
+            return true;
+        }
+
+        if (!$this->check($this->config)) {
+            // 检测日志写入权限
+            return false;
+        }
+
+        if (empty($this->config['level'])) {
+            // 获取全部日志
+            $log = $this->log;
+            if (!$this->app->isDebug() && isset($log['debug'])) {
+                unset($log['debug']);
+            }
+        } else {
+            // 记录允许级别
+            $log = [];
+            foreach ($this->config['level'] as $level) {
+                if (isset($this->log[$level])) {
+                    $log[$level] = $this->log[$level];
+                }
+            }
+        }
+
+        $result = $this->driver->save($log, true);
+
+        if ($result) {
+            $this->log = [];
+        }
+
+        return $result;
+    }
+
+    /**
+     * 实时写入日志信息 并支持行为
+     * @access public
+     * @param  mixed  $msg   调试信息
+     * @param  string $type  日志级别
+     * @param  bool   $force 是否强制写入
+     * @return bool
+     */
+    public function write($msg, $type = 'info', $force = false)
+    {
+        // 封装日志信息
+        if (empty($this->config['level'])) {
+            $force = true;
+        }
+
+        if (true === $force || in_array($type, $this->config['level'])) {
+            $log[$type][] = $msg;
+        } else {
+            return false;
+        }
+
+        // 监听log_write
+        $this->app['hook']->listen('log_write', $log);
+
+        // 写入日志
+        return $this->driver->save($log, false);
+    }
+
+    /**
+     * 记录日志信息
+     * @access public
+     * @param  string $level     日志级别
+     * @param  mixed  $message   日志信息
+     * @param  array  $context   替换内容
+     * @return void
+     */
+    public function log($level, $message, array $context = [])
+    {
+        $this->record($message, $level, $context);
+    }
+
+    /**
+     * 记录emergency信息
+     * @access public
+     * @param  mixed  $message   日志信息
+     * @param  array  $context   替换内容
+     * @return void
+     */
+    public function emergency($message, array $context = [])
+    {
+        $this->log(__FUNCTION__, $message, $context);
+    }
+
+    /**
+     * 记录警报信息
+     * @access public
+     * @param  mixed  $message   日志信息
+     * @param  array  $context   替换内容
+     * @return void
+     */
+    public function alert($message, array $context = [])
+    {
+        $this->log(__FUNCTION__, $message, $context);
+    }
+
+    /**
+     * 记录紧急情况
+     * @access public
+     * @param  mixed  $message   日志信息
+     * @param  array  $context   替换内容
+     * @return void
+     */
+    public function critical($message, array $context = [])
+    {
+        $this->log(__FUNCTION__, $message, $context);
+    }
+
+    /**
+     * 记录错误信息
+     * @access public
+     * @param  mixed  $message   日志信息
+     * @param  array  $context   替换内容
+     * @return void
+     */
+    public function error($message, array $context = [])
+    {
+        $this->log(__FUNCTION__, $message, $context);
+    }
+
+    /**
+     * 记录warning信息
+     * @access public
+     * @param  mixed  $message   日志信息
+     * @param  array  $context   替换内容
+     * @return void
+     */
+    public function warning($message, array $context = [])
+    {
+        $this->log(__FUNCTION__, $message, $context);
+    }
+
+    /**
+     * 记录notice信息
+     * @access public
+     * @param  mixed  $message   日志信息
+     * @param  array  $context   替换内容
+     * @return void
+     */
+    public function notice($message, array $context = [])
+    {
+        $this->log(__FUNCTION__, $message, $context);
+    }
+
+    /**
+     * 记录一般信息
+     * @access public
+     * @param  mixed  $message   日志信息
+     * @param  array  $context   替换内容
+     * @return void
+     */
+    public function info($message, array $context = [])
+    {
+        $this->log(__FUNCTION__, $message, $context);
+    }
+
+    /**
+     * 记录调试信息
+     * @access public
+     * @param  mixed  $message   日志信息
+     * @param  array  $context   替换内容
+     * @return void
+     */
+    public function debug($message, array $context = [])
+    {
+        $this->log(__FUNCTION__, $message, $context);
+    }
+
+    /**
+     * 记录sql信息
+     * @access public
+     * @param  mixed  $message   日志信息
+     * @param  array  $context   替换内容
+     * @return void
+     */
+    public function sql($message, array $context = [])
+    {
+        $this->log(__FUNCTION__, $message, $context);
+    }
+}
diff --git a/thinkphp/library/think/Middleware.php b/thinkphp/library/think/Middleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..4814fdb99b72a9278506db93268dc9b05963c0f6
--- /dev/null
+++ b/thinkphp/library/think/Middleware.php
@@ -0,0 +1,189 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Slince <taosikai@yeah.net>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use InvalidArgumentException;
+use LogicException;
+use think\exception\HttpResponseException;
+
+class Middleware
+{
+    protected $queue = [];
+    protected $app;
+    protected $config = [
+        'default_namespace' => 'app\\http\\middleware\\',
+    ];
+
+    public function __construct(App $app, array $config = [])
+    {
+        $this->app    = $app;
+        $this->config = array_merge($this->config, $config);
+    }
+
+    public static function __make(App $app, Config $config)
+    {
+        return new static($app, $config->pull('middleware'));
+    }
+
+    public function setConfig(array $config)
+    {
+        $this->config = array_merge($this->config, $config);
+    }
+
+    /**
+     * 导入中间件
+     * @access public
+     * @param  array  $middlewares
+     * @param  string $type  中间件类型
+     */
+    public function import(array $middlewares = [], $type = 'route')
+    {
+        foreach ($middlewares as $middleware) {
+            $this->add($middleware, $type);
+        }
+    }
+
+    /**
+     * 注册中间件
+     * @access public
+     * @param  mixed  $middleware
+     * @param  string $type  中间件类型
+     */
+    public function add($middleware, $type = 'route')
+    {
+        if (is_null($middleware)) {
+            return;
+        }
+
+        $middleware = $this->buildMiddleware($middleware, $type);
+
+        if ($middleware) {
+            $this->queue[$type][] = $middleware;
+        }
+    }
+
+    /**
+     * 注册控制器中间件
+     * @access public
+     * @param  mixed  $middleware
+     */
+    public function controller($middleware)
+    {
+        return $this->add($middleware, 'controller');
+    }
+
+    /**
+     * 移除中间件
+     * @access public
+     * @param  mixed  $middleware
+     * @param  string $type  中间件类型
+     */
+    public function unshift($middleware, $type = 'route')
+    {
+        if (is_null($middleware)) {
+            return;
+        }
+
+        $middleware = $this->buildMiddleware($middleware, $type);
+
+        if ($middleware) {
+            array_unshift($this->queue[$type], $middleware);
+        }
+    }
+
+    /**
+     * 获取注册的中间件
+     * @access public
+     * @param  string $type  中间件类型
+     */
+    public function all($type = 'route')
+    {
+        return $this->queue[$type] ?: [];
+    }
+
+    /**
+     * 中间件调度
+     * @access public
+     * @param  Request  $request
+     * @param  string   $type  中间件类型
+     */
+    public function dispatch(Request $request, $type = 'route')
+    {
+        return call_user_func($this->resolve($type), $request);
+    }
+
+    /**
+     * 解析中间件
+     * @access protected
+     * @param  mixed  $middleware
+     * @param  string $type  中间件类型
+     */
+    protected function buildMiddleware($middleware, $type = 'route')
+    {
+        if (is_array($middleware)) {
+            list($middleware, $param) = $middleware;
+        }
+
+        if ($middleware instanceof \Closure) {
+            return [$middleware, isset($param) ? $param : null];
+        }
+
+        if (!is_string($middleware)) {
+            throw new InvalidArgumentException('The middleware is invalid');
+        }
+
+        if (false === strpos($middleware, '\\')) {
+            if (isset($this->config[$middleware])) {
+                $middleware = $this->config[$middleware];
+            } else {
+                $middleware = $this->config['default_namespace'] . $middleware;
+            }
+        }
+
+        if (is_array($middleware)) {
+            return $this->import($middleware, $type);
+        }
+
+        if (strpos($middleware, ':')) {
+            list($middleware, $param) = explode(':', $middleware, 2);
+        }
+
+        return [[$this->app->make($middleware), 'handle'], isset($param) ? $param : null];
+    }
+
+    protected function resolve($type = 'route')
+    {
+        return function (Request $request) use ($type) {
+
+            $middleware = array_shift($this->queue[$type]);
+
+            if (null === $middleware) {
+                throw new InvalidArgumentException('The queue was exhausted, with no response returned');
+            }
+
+            list($call, $param) = $middleware;
+
+            try {
+                $response = call_user_func_array($call, [$request, $this->resolve($type), $param]);
+            } catch (HttpResponseException $exception) {
+                $response = $exception->getResponse();
+            }
+
+            if (!$response instanceof Response) {
+                throw new LogicException('The middleware must return Response instance');
+            }
+
+            return $response;
+        };
+    }
+
+}
diff --git a/thinkphp/library/think/Model.php b/thinkphp/library/think/Model.php
new file mode 100644
index 0000000000000000000000000000000000000000..5b9ab3df7b03267334f462c81b6b7b747532bc87
--- /dev/null
+++ b/thinkphp/library/think/Model.php
@@ -0,0 +1,1140 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use InvalidArgumentException;
+use think\db\Query;
+
+/**
+ * Class Model
+ * @package think
+ * @mixin Query
+ */
+abstract class Model implements \JsonSerializable, \ArrayAccess
+{
+    use model\concern\Attribute;
+    use model\concern\RelationShip;
+    use model\concern\ModelEvent;
+    use model\concern\TimeStamp;
+    use model\concern\Conversion;
+
+    /**
+     * 是否存在数据
+     * @var bool
+     */
+    private $exists = false;
+
+    /**
+     * 是否Replace
+     * @var bool
+     */
+    private $replace = false;
+
+    /**
+     * 是否强制更新所有数据
+     * @var bool
+     */
+    private $force = false;
+
+    /**
+     * 更新条件
+     * @var array
+     */
+    private $updateWhere;
+
+    /**
+     * 数据库配置信息
+     * @var array|string
+     */
+    protected $connection = [];
+
+    /**
+     * 数据库查询对象类名
+     * @var string
+     */
+    protected $query;
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * 数据表名称
+     * @var string
+     */
+    protected $table;
+
+    /**
+     * 写入自动完成定义
+     * @var array
+     */
+    protected $auto = [];
+
+    /**
+     * 新增自动完成定义
+     * @var array
+     */
+    protected $insert = [];
+
+    /**
+     * 更新自动完成定义
+     * @var array
+     */
+    protected $update = [];
+
+    /**
+     * 初始化过的模型.
+     * @var array
+     */
+    protected static $initialized = [];
+
+    /**
+     * 是否从主库读取（主从分布式有效）
+     * @var array
+     */
+    protected static $readMaster;
+
+    /**
+     * 查询对象实例
+     * @var Query
+     */
+    protected $queryInstance;
+
+    /**
+     * 错误信息
+     * @var mixed
+     */
+    protected $error;
+
+    /**
+     * 软删除字段默认值
+     * @var mixed
+     */
+    protected $defaultSoftDelete;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array|object $data 数据
+     */
+    public function __construct($data = [])
+    {
+        if (is_object($data)) {
+            $this->data = get_object_vars($data);
+        } else {
+            $this->data = $data;
+        }
+
+        if ($this->disuse) {
+            // 废弃字段
+            foreach ((array) $this->disuse as $key) {
+                if (array_key_exists($key, $this->data)) {
+                    unset($this->data[$key]);
+                }
+            }
+        }
+
+        // 记录原始数据
+        $this->origin = $this->data;
+
+        $config = Db::getConfig();
+
+        if (empty($this->name)) {
+            // 当前模型名
+            $name       = str_replace('\\', '/', static::class);
+            $this->name = basename($name);
+            if (Container::get('config')->get('class_suffix')) {
+                $suffix     = basename(dirname($name));
+                $this->name = substr($this->name, 0, -strlen($suffix));
+            }
+        }
+
+        if (is_null($this->autoWriteTimestamp)) {
+            // 自动写入时间戳
+            $this->autoWriteTimestamp = $config['auto_timestamp'];
+        }
+
+        if (is_null($this->dateFormat)) {
+            // 设置时间戳格式
+            $this->dateFormat = $config['datetime_format'];
+        }
+
+        if (is_null($this->resultSetType)) {
+            $this->resultSetType = $config['resultset_type'];
+        }
+
+        if (!empty($this->connection) && is_array($this->connection)) {
+            // 设置模型的数据库连接
+            $this->connection = array_merge($config, $this->connection);
+        }
+
+        if ($this->observerClass) {
+            // 注册模型观察者
+            static::observe($this->observerClass);
+        }
+
+        // 执行初始化操作
+        $this->initialize();
+    }
+
+    /**
+     * 获取当前模型名称
+     * @access public
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * 是否从主库读取数据（主从分布有效）
+     * @access public
+     * @param  bool     $all 是否所有模型有效
+     * @return $this
+     */
+    public function readMaster($all = false)
+    {
+        $model = $all ? '*' : static::class;
+
+        static::$readMaster[$model] = true;
+
+        return $this;
+    }
+
+    /**
+     * 创建新的模型实例
+     * @access public
+     * @param  array|object $data 数据
+     * @param  bool         $isUpdate 是否为更新
+     * @param  mixed        $where 更新条件
+     * @return Model
+     */
+    public function newInstance($data = [], $isUpdate = false, $where = null)
+    {
+        return (new static($data))->isUpdate($isUpdate, $where);
+    }
+
+    /**
+     * 创建模型的查询对象
+     * @access protected
+     * @return Query
+     */
+    protected function buildQuery()
+    {
+        // 设置当前模型 确保查询返回模型对象
+        $query = Db::connect($this->connection, false, $this->query);
+        $query->model($this)
+            ->name($this->name)
+            ->json($this->json, $this->jsonAssoc)
+            ->setJsonFieldType($this->jsonType);
+
+        if (isset(static::$readMaster['*']) || isset(static::$readMaster[static::class])) {
+            $query->master(true);
+        }
+
+        // 设置当前数据表和模型名
+        if (!empty($this->table)) {
+            $query->table($this->table);
+        }
+
+        if (!empty($this->pk)) {
+            $query->pk($this->pk);
+        }
+
+        return $query;
+    }
+
+    /**
+     * 获取当前模型的数据库查询对象
+     * @access public
+     * @param  Query $query 查询对象实例
+     * @return $this
+     */
+    public function setQuery($query)
+    {
+        $this->queryInstance = $query;
+        return $this;
+    }
+
+    /**
+     * 获取当前模型的数据库查询对象
+     * @access public
+     * @param  bool $useBaseQuery 是否调用全局查询范围
+     * @return Query
+     */
+    public function db($useBaseQuery = true)
+    {
+        if ($this->queryInstance) {
+            return $this->queryInstance;
+        }
+
+        $query = $this->buildQuery();
+
+        // 软删除
+        if (property_exists($this, 'withTrashed') && !$this->withTrashed) {
+            $this->withNoTrashed($query);
+        }
+
+        // 全局作用域
+        if ($useBaseQuery && method_exists($this, 'base')) {
+            call_user_func_array([$this, 'base'], [ & $query]);
+        }
+
+        // 返回当前模型的数据库查询对象
+        return $query;
+    }
+
+    /**
+     *  初始化模型
+     * @access protected
+     * @return void
+     */
+    protected function initialize()
+    {
+        if (!isset(static::$initialized[static::class])) {
+            static::$initialized[static::class] = true;
+            static::init();
+        }
+    }
+
+    /**
+     * 初始化处理
+     * @access protected
+     * @return void
+     */
+    protected static function init()
+    {}
+
+    /**
+     * 数据自动完成
+     * @access protected
+     * @param  array $auto 要自动更新的字段列表
+     * @return void
+     */
+    protected function autoCompleteData($auto = [])
+    {
+        foreach ($auto as $field => $value) {
+            if (is_integer($field)) {
+                $field = $value;
+                $value = null;
+            }
+
+            if (!isset($this->data[$field])) {
+                $default = null;
+            } else {
+                $default = $this->data[$field];
+            }
+
+            $this->setAttr($field, !is_null($value) ? $value : $default);
+        }
+    }
+
+    /**
+     * 更新是否强制写入数据 而不做比较
+     * @access public
+     * @param  bool $force
+     * @return $this
+     */
+    public function force($force = true)
+    {
+        $this->force = $force;
+        return $this;
+    }
+
+    /**
+     * 判断force
+     * @access public
+     * @return bool
+     */
+    public function isForce()
+    {
+        return $this->force;
+    }
+
+    /**
+     * 新增数据是否使用Replace
+     * @access public
+     * @param  bool $replace
+     * @return $this
+     */
+    public function replace($replace = true)
+    {
+        $this->replace = $replace;
+        return $this;
+    }
+
+    /**
+     * 设置数据是否存在
+     * @access public
+     * @param  bool $exists
+     * @return void
+     */
+    public function exists($exists)
+    {
+        $this->exists = $exists;
+    }
+
+    /**
+     * 判断数据是否存在数据库
+     * @access public
+     * @return bool
+     */
+    public function isExists()
+    {
+        return $this->exists;
+    }
+
+    /**
+     * 保存当前数据对象
+     * @access public
+     * @param  array  $data     数据
+     * @param  array  $where    更新条件
+     * @param  string $sequence 自增序列名
+     * @return bool
+     */
+    public function save($data = [], $where = [], $sequence = null)
+    {
+        if (is_string($data)) {
+            $sequence = $data;
+            $data     = [];
+        }
+
+        if (!$this->checkBeforeSave($data, $where)) {
+            return false;
+        }
+
+        $result = $this->exists ? $this->updateData($where) : $this->insertData($sequence);
+
+        if (false === $result) {
+            return false;
+        }
+
+        // 写入回调
+        $this->trigger('after_write');
+
+        // 重新记录原始数据
+        $this->origin = $this->data;
+
+        return true;
+    }
+
+    /**
+     * 写入之前检查数据
+     * @access protected
+     * @param  array   $data  数据
+     * @param  array   $where 保存条件
+     * @return bool
+     */
+    protected function checkBeforeSave($data, $where)
+    {
+        if (!empty($data)) {
+            // 数据对象赋值
+            foreach ($data as $key => $value) {
+                $this->setAttr($key, $value, $data);
+            }
+
+            if (!empty($where)) {
+                $this->exists      = true;
+                $this->updateWhere = $where;
+            }
+        }
+
+        // 数据自动完成
+        $this->autoCompleteData($this->auto);
+
+        // 事件回调
+        if (false === $this->trigger('before_write')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 检查数据是否允许写入
+     * @access protected
+     * @param  array   $append 自动完成的字段列表
+     * @return array
+     */
+    protected function checkAllowFields(array $append = [])
+    {
+        // 检测字段
+        if (empty($this->field) || true === $this->field) {
+            $query = $this->db(false);
+            $table = $this->table ?: $query->getTable();
+
+            $this->field = $query->getConnection()->getTableFields($table);
+
+            $field = $this->field;
+        } else {
+            $field = array_merge($this->field, $append);
+
+            if ($this->autoWriteTimestamp) {
+                array_push($field, $this->createTime, $this->updateTime);
+            }
+        }
+
+        if ($this->disuse) {
+            // 废弃字段
+            $field = array_diff($field, (array) $this->disuse);
+        }
+
+        return $field;
+    }
+
+    /**
+     * 更新写入数据
+     * @access protected
+     * @param  mixed   $where 更新条件
+     * @return bool
+     */
+    protected function updateData($where)
+    {
+        // 自动更新
+        $this->autoCompleteData($this->update);
+
+        // 事件回调
+        if (false === $this->trigger('before_update')) {
+            return false;
+        }
+
+        // 获取有更新的数据
+        $data = $this->getChangedData();
+
+        if (empty($data)) {
+            // 关联更新
+            if (!empty($this->relationWrite)) {
+                $this->autoRelationUpdate();
+            }
+
+            return false;
+        } elseif ($this->autoWriteTimestamp && $this->updateTime && !isset($data[$this->updateTime])) {
+            // 自动写入更新时间
+            $data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);
+
+            $this->data[$this->updateTime] = $data[$this->updateTime];
+        }
+
+        if (empty($where) && !empty($this->updateWhere)) {
+            $where = $this->updateWhere;
+        }
+
+        // 检查允许字段
+        $allowFields = $this->checkAllowFields(array_merge($this->auto, $this->update));
+
+        // 保留主键数据
+        foreach ($this->data as $key => $val) {
+            if ($this->isPk($key)) {
+                $data[$key] = $val;
+            }
+        }
+
+        $pk    = $this->getPk();
+        $array = [];
+
+        foreach ((array) $pk as $key) {
+            if (isset($data[$key])) {
+                $array[] = [$key, '=', $data[$key]];
+                unset($data[$key]);
+            }
+        }
+
+        if (!empty($array)) {
+            $where = $array;
+        }
+
+        foreach ((array) $this->relationWrite as $name => $val) {
+            if (is_array($val)) {
+                foreach ($val as $key) {
+                    if (isset($data[$key])) {
+                        unset($data[$key]);
+                    }
+                }
+            }
+        }
+
+        // 模型更新
+        $db = $this->db(false);
+        $db->startTrans();
+
+        try {
+            $db->where($where)
+                ->strict(false)
+                ->field($allowFields)
+                ->update($data);
+
+            // 关联更新
+            if (!empty($this->relationWrite)) {
+                $this->autoRelationUpdate();
+            }
+
+            $db->commit();
+
+            // 更新回调
+            $this->trigger('after_update');
+
+            return true;
+        } catch (\Exception $e) {
+            $db->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * 新增写入数据
+     * @access protected
+     * @param  string   $sequence 自增序列名
+     * @return bool
+     */
+    protected function insertData($sequence)
+    {
+        // 自动写入
+        $this->autoCompleteData($this->insert);
+
+        // 时间戳自动写入
+        $this->checkTimeStampWrite();
+
+        if (false === $this->trigger('before_insert')) {
+            return false;
+        }
+
+        // 检查允许字段
+        $allowFields = $this->checkAllowFields(array_merge($this->auto, $this->insert));
+
+        $db = $this->db(false);
+        $db->startTrans();
+
+        try {
+            $result = $db->strict(false)
+                ->field($allowFields)
+                ->insert($this->data, $this->replace, false, $sequence);
+
+            // 获取自动增长主键
+            if ($result && $insertId = $db->getLastInsID($sequence)) {
+                $pk = $this->getPk();
+
+                foreach ((array) $pk as $key) {
+                    if (!isset($this->data[$key]) || '' == $this->data[$key]) {
+                        $this->data[$key] = $insertId;
+                    }
+                }
+            }
+
+            // 关联写入
+            if (!empty($this->relationWrite)) {
+                $this->autoRelationInsert();
+            }
+
+            $db->commit();
+
+            // 标记为更新
+            $this->exists = true;
+
+            // 新增回调
+            $this->trigger('after_insert');
+
+            return true;
+        } catch (\Exception $e) {
+            $db->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * 字段值(延迟)增长
+     * @access public
+     * @param  string  $field    字段名
+     * @param  integer $step     增长值
+     * @param  integer $lazyTime 延时时间(s)
+     * @return bool
+     * @throws Exception
+     */
+    public function setInc($field, $step = 1, $lazyTime = 0)
+    {
+        // 读取更新条件
+        $where = $this->getWhere();
+
+        // 事件回调
+        if (false === $this->trigger('before_update')) {
+            return false;
+        }
+
+        $result = $this->db(false)
+            ->where($where)
+            ->setInc($field, $step, $lazyTime);
+
+        if (true !== $result) {
+            $this->data[$field] += $step;
+        }
+
+        // 更新回调
+        $this->trigger('after_update');
+
+        return true;
+    }
+
+    /**
+     * 字段值(延迟)减少
+     * @access public
+     * @param  string  $field    字段名
+     * @param  integer $step     减少值
+     * @param  integer $lazyTime 延时时间(s)
+     * @return bool
+     * @throws Exception
+     */
+    public function setDec($field, $step = 1, $lazyTime = 0)
+    {
+        // 读取更新条件
+        $where = $this->getWhere();
+
+        // 事件回调
+        if (false === $this->trigger('before_update')) {
+            return false;
+        }
+
+        $result = $this->db(false)
+            ->where($where)
+            ->setDec($field, $step, $lazyTime);
+
+        if (true !== $result) {
+            $this->data[$field] -= $step;
+        }
+
+        // 更新回调
+        $this->trigger('after_update');
+
+        return true;
+    }
+
+    /**
+     * 获取当前的更新条件
+     * @access protected
+     * @return mixed
+     */
+    protected function getWhere()
+    {
+        // 删除条件
+        $pk = $this->getPk();
+
+        if (is_string($pk) && isset($this->data[$pk])) {
+            $where[] = [$pk, '=', $this->data[$pk]];
+        } elseif (!empty($this->updateWhere)) {
+            $where = $this->updateWhere;
+        } else {
+            $where = null;
+        }
+
+        return $where;
+    }
+
+    /**
+     * 保存多个数据到当前数据对象
+     * @access public
+     * @param  array   $dataSet 数据
+     * @param  boolean $replace 是否自动识别更新和写入
+     * @return Collection
+     * @throws \Exception
+     */
+    public function saveAll($dataSet, $replace = true)
+    {
+        $db = $this->db(false);
+        $db->startTrans();
+
+        try {
+            $pk = $this->getPk();
+
+            if (is_string($pk) && $replace) {
+                $auto = true;
+            }
+
+            $result = [];
+
+            foreach ($dataSet as $key => $data) {
+                if ($this->exists || (!empty($auto) && isset($data[$pk]))) {
+                    $result[$key] = self::update($data, [], $this->field);
+                } else {
+                    $result[$key] = self::create($data, $this->field, $this->replace);
+                }
+            }
+
+            $db->commit();
+
+            return $this->toCollection($result);
+        } catch (\Exception $e) {
+            $db->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * 是否为更新数据
+     * @access public
+     * @param  mixed  $update
+     * @param  mixed  $where
+     * @return $this
+     */
+    public function isUpdate($update = true, $where = null)
+    {
+        if (is_bool($update)) {
+            $this->exists = $update;
+
+            if (!empty($where)) {
+                $this->updateWhere = $where;
+            }
+        } else {
+            $this->exists      = true;
+            $this->updateWhere = $update;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 删除当前的记录
+     * @access public
+     * @return bool
+     */
+    public function delete()
+    {
+        if (!$this->exists || false === $this->trigger('before_delete')) {
+            return false;
+        }
+
+        // 读取更新条件
+        $where = $this->getWhere();
+
+        $db = $this->db(false);
+        $db->startTrans();
+
+        try {
+            // 删除当前模型数据
+            $result = $db->where($where)->delete();
+
+            // 关联删除
+            if (!empty($this->relationWrite)) {
+                $this->autoRelationDelete();
+            }
+
+            $db->commit();
+
+            $this->trigger('after_delete');
+
+            $this->exists = false;
+
+            return true;
+        } catch (\Exception $e) {
+            $db->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * 设置自动完成的字段（ 规则通过修改器定义）
+     * @access public
+     * @param  array $fields 需要自动完成的字段
+     * @return $this
+     */
+    public function auto($fields)
+    {
+        $this->auto = $fields;
+
+        return $this;
+    }
+
+    /**
+     * 写入数据
+     * @access public
+     * @param  array      $data  数据数组
+     * @param  array|true $field 允许字段
+     * @param  bool       $replace 使用Replace
+     * @return static
+     */
+    public static function create($data = [], $field = null, $replace = false)
+    {
+        $model = new static();
+
+        if (!empty($field)) {
+            $model->allowField($field);
+        }
+
+        $model->isUpdate(false)->replace($replace)->save($data, []);
+
+        return $model;
+    }
+
+    /**
+     * 更新数据
+     * @access public
+     * @param  array      $data  数据数组
+     * @param  array      $where 更新条件
+     * @param  array|true $field 允许字段
+     * @return static
+     */
+    public static function update($data = [], $where = [], $field = null)
+    {
+        $model = new static();
+
+        if (!empty($field)) {
+            $model->allowField($field);
+        }
+
+        $model->isUpdate(true)->save($data, $where);
+
+        return $model;
+    }
+
+    /**
+     * 查找单条记录
+     * @access public
+     * @param  mixed     $data  主键值或者查询条件（闭包）
+     * @param  mixed     $with  关联预查询
+     * @param  bool      $cache 是否缓存
+     * @param  bool      $failException 是否抛出异常
+     * @return static|null
+     * @throws exception\DbException
+     */
+    public static function get($data, $with = [], $cache = false, $failException = false)
+    {
+        if (is_null($data)) {
+            return;
+        }
+
+        if (true === $with || is_int($with)) {
+            $cache = $with;
+            $with  = [];
+        }
+
+        $query = static::parseQuery($data, $with, $cache);
+
+        return $query->failException($failException)->find($data);
+    }
+
+    /**
+     * 查找单条记录 如果不存在直接抛出异常
+     * @access public
+     * @param  mixed     $data  主键值或者查询条件（闭包）
+     * @param  mixed     $with  关联预查询
+     * @param  bool      $cache 是否缓存
+     * @return static|null
+     * @throws exception\DbException
+     */
+    public static function getOrFail($data, $with = [], $cache = false)
+    {
+        return self::get($data, $with, $cache, true);
+    }
+
+    /**
+     * 查找所有记录
+     * @access public
+     * @param  mixed        $data  主键列表或者查询条件（闭包）
+     * @param  array|string $with  关联预查询
+     * @param  bool         $cache 是否缓存
+     * @return static[]|false
+     * @throws exception\DbException
+     */
+    public static function all($data = null, $with = [], $cache = false)
+    {
+        if (true === $with || is_int($with)) {
+            $cache = $with;
+            $with  = [];
+        }
+
+        $query = static::parseQuery($data, $with, $cache);
+
+        return $query->select($data);
+    }
+
+    /**
+     * 分析查询表达式
+     * @access public
+     * @param  mixed  $data  主键列表或者查询条件（闭包）
+     * @param  string $with  关联预查询
+     * @param  bool   $cache 是否缓存
+     * @return Query
+     */
+    protected static function parseQuery(&$data, $with, $cache)
+    {
+        $result = self::with($with)->cache($cache);
+
+        if (is_array($data) && key($data) !== 0) {
+            $result = $result->where($data);
+            $data   = null;
+        } elseif ($data instanceof \Closure) {
+            $data($result);
+            $data = null;
+        } elseif ($data instanceof Query) {
+            $result = $data->with($with)->cache($cache);
+            $data   = null;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 删除记录
+     * @access public
+     * @param  mixed $data 主键列表 支持闭包查询条件
+     * @return bool
+     */
+    public static function destroy($data)
+    {
+        if (empty($data) && 0 !== $data) {
+            return false;
+        }
+
+        $model = new static();
+
+        $query = $model->db();
+
+        if (is_array($data) && key($data) !== 0) {
+            $query->where($data);
+            $data = null;
+        } elseif ($data instanceof \Closure) {
+            $data($query);
+            $data = null;
+        }
+
+        $resultSet = $query->select($data);
+
+        if ($resultSet) {
+            foreach ($resultSet as $data) {
+                $data->delete();
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 获取错误信息
+     * @access public
+     * @return mixed
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * 解序列化后处理
+     */
+    public function __wakeup()
+    {
+        $this->initialize();
+    }
+
+    public function __debugInfo()
+    {
+        return [
+            'data'     => $this->data,
+            'relation' => $this->relation,
+        ];
+    }
+
+    /**
+     * 修改器 设置数据对象的值
+     * @access public
+     * @param  string $name  名称
+     * @param  mixed  $value 值
+     * @return void
+     */
+    public function __set($name, $value)
+    {
+        $this->setAttr($name, $value);
+    }
+
+    /**
+     * 获取器 获取数据对象的值
+     * @access public
+     * @param  string $name 名称
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        return $this->getAttr($name);
+    }
+
+    /**
+     * 检测数据对象的值
+     * @access public
+     * @param  string $name 名称
+     * @return boolean
+     */
+    public function __isset($name)
+    {
+        try {
+            return !is_null($this->getAttr($name));
+        } catch (InvalidArgumentException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * 销毁数据对象的值
+     * @access public
+     * @param  string $name 名称
+     * @return void
+     */
+    public function __unset($name)
+    {
+        unset($this->data[$name], $this->relation[$name]);
+    }
+
+    // ArrayAccess
+    public function offsetSet($name, $value)
+    {
+        $this->setAttr($name, $value);
+    }
+
+    public function offsetExists($name)
+    {
+        return $this->__isset($name);
+    }
+
+    public function offsetUnset($name)
+    {
+        $this->__unset($name);
+    }
+
+    public function offsetGet($name)
+    {
+        return $this->getAttr($name);
+    }
+
+    /**
+     * 设置是否使用全局查询范围
+     * @access public
+     * @param  bool $use 是否启用全局查询范围
+     * @return Query
+     */
+    public static function useGlobalScope($use)
+    {
+        $model = new static();
+
+        return $model->db($use);
+    }
+
+    public function __call($method, $args)
+    {
+        return call_user_func_array([$this->db(), $method], $args);
+    }
+
+    public static function __callStatic($method, $args)
+    {
+        $model = new static();
+
+        return call_user_func_array([$model->db(), $method], $args);
+    }
+}
diff --git a/thinkphp/library/think/Paginator.php b/thinkphp/library/think/Paginator.php
new file mode 100644
index 0000000000000000000000000000000000000000..bbe63e2e31fad0a785638086305c153e5292ba84
--- /dev/null
+++ b/thinkphp/library/think/Paginator.php
@@ -0,0 +1,445 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: zhangyajun <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use ArrayAccess;
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use JsonSerializable;
+use Traversable;
+
+abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, JsonSerializable
+{
+    /**
+     * 是否简洁模式
+     * @var bool
+     */
+    protected $simple = false;
+
+    /**
+     * 数据集
+     * @var Collection
+     */
+    protected $items;
+
+    /**
+     * 当前页
+     * @var integer
+     */
+    protected $currentPage;
+
+    /**
+     * 最后一页
+     * @var integer
+     */
+    protected $lastPage;
+
+    /**
+     * 数据总数
+     * @var integer|null
+     */
+    protected $total;
+
+    /**
+     * 每页数量
+     * @var integer
+     */
+    protected $listRows;
+
+    /**
+     * 是否有下一页
+     * @var bool
+     */
+    protected $hasMore;
+
+    /**
+     * 分页配置
+     * @var array
+     */
+    protected $options = [
+        'var_page' => 'page',
+        'path'     => '/',
+        'query'    => [],
+        'fragment' => '',
+    ];
+
+    public function __construct($items, $listRows, $currentPage = null, $total = null, $simple = false, $options = [])
+    {
+        $this->options = array_merge($this->options, $options);
+
+        $this->options['path'] = '/' != $this->options['path'] ? rtrim($this->options['path'], '/') : $this->options['path'];
+
+        $this->simple   = $simple;
+        $this->listRows = $listRows;
+
+        if (!$items instanceof Collection) {
+            $items = Collection::make($items);
+        }
+
+        if ($simple) {
+            $this->currentPage = $this->setCurrentPage($currentPage);
+            $this->hasMore     = count($items) > ($this->listRows);
+            $items             = $items->slice(0, $this->listRows);
+        } else {
+            $this->total       = $total;
+            $this->lastPage    = (int) ceil($total / $listRows);
+            $this->currentPage = $this->setCurrentPage($currentPage);
+            $this->hasMore     = $this->currentPage < $this->lastPage;
+        }
+        $this->items = $items;
+    }
+
+    /**
+     * @access public
+     * @param       $items
+     * @param       $listRows
+     * @param null  $currentPage
+     * @param null  $total
+     * @param bool  $simple
+     * @param array $options
+     * @return Paginator
+     */
+    public static function make($items, $listRows, $currentPage = null, $total = null, $simple = false, $options = [])
+    {
+        return new static($items, $listRows, $currentPage, $total, $simple, $options);
+    }
+
+    protected function setCurrentPage($currentPage)
+    {
+        if (!$this->simple && $currentPage > $this->lastPage) {
+            return $this->lastPage > 0 ? $this->lastPage : 1;
+        }
+
+        return $currentPage;
+    }
+
+    /**
+     * 获取页码对应的链接
+     *
+     * @access protected
+     * @param  $page
+     * @return string
+     */
+    protected function url($page)
+    {
+        if ($page <= 0) {
+            $page = 1;
+        }
+
+        if (strpos($this->options['path'], '[PAGE]') === false) {
+            $parameters = [$this->options['var_page'] => $page];
+            $path       = $this->options['path'];
+        } else {
+            $parameters = [];
+            $path       = str_replace('[PAGE]', $page, $this->options['path']);
+        }
+
+        if (count($this->options['query']) > 0) {
+            $parameters = array_merge($this->options['query'], $parameters);
+        }
+
+        $url = $path;
+        if (!empty($parameters)) {
+            $url .= '?' . http_build_query($parameters, null, '&');
+        }
+
+        return $url . $this->buildFragment();
+    }
+
+    /**
+     * 自动获取当前页码
+     * @access public
+     * @param  string $varPage
+     * @param  int    $default
+     * @return int
+     */
+    public static function getCurrentPage($varPage = 'page', $default = 1)
+    {
+        $page = Container::get('request')->param($varPage);
+
+        if (filter_var($page, FILTER_VALIDATE_INT) !== false && (int) $page >= 1) {
+            return $page;
+        }
+
+        return $default;
+    }
+
+    /**
+     * 自动获取当前的path
+     * @access public
+     * @return string
+     */
+    public static function getCurrentPath()
+    {
+        return Container::get('request')->baseUrl();
+    }
+
+    public function total()
+    {
+        if ($this->simple) {
+            throw new \DomainException('not support total');
+        }
+
+        return $this->total;
+    }
+
+    public function listRows()
+    {
+        return $this->listRows;
+    }
+
+    public function currentPage()
+    {
+        return $this->currentPage;
+    }
+
+    public function lastPage()
+    {
+        if ($this->simple) {
+            throw new \DomainException('not support last');
+        }
+
+        return $this->lastPage;
+    }
+
+    /**
+     * 数据是否足够分页
+     * @access public
+     * @return boolean
+     */
+    public function hasPages()
+    {
+        return !(1 == $this->currentPage && !$this->hasMore);
+    }
+
+    /**
+     * 创建一组分页链接
+     *
+     * @access public
+     * @param  int $start
+     * @param  int $end
+     * @return array
+     */
+    public function getUrlRange($start, $end)
+    {
+        $urls = [];
+
+        for ($page = $start; $page <= $end; $page++) {
+            $urls[$page] = $this->url($page);
+        }
+
+        return $urls;
+    }
+
+    /**
+     * 设置URL锚点
+     *
+     * @access public
+     * @param  string|null $fragment
+     * @return $this
+     */
+    public function fragment($fragment)
+    {
+        $this->options['fragment'] = $fragment;
+
+        return $this;
+    }
+
+    /**
+     * 添加URL参数
+     *
+     * @access public
+     * @param  array|string $key
+     * @param  string|null  $value
+     * @return $this
+     */
+    public function appends($key, $value = null)
+    {
+        if (!is_array($key)) {
+            $queries = [$key => $value];
+        } else {
+            $queries = $key;
+        }
+
+        foreach ($queries as $k => $v) {
+            if ($k !== $this->options['var_page']) {
+                $this->options['query'][$k] = $v;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 构造锚点字符串
+     *
+     * @access public
+     * @return string
+     */
+    protected function buildFragment()
+    {
+        return $this->options['fragment'] ? '#' . $this->options['fragment'] : '';
+    }
+
+    /**
+     * 渲染分页html
+     * @access public
+     * @return mixed
+     */
+    abstract public function render();
+
+    public function items()
+    {
+        return $this->items->all();
+    }
+
+    public function getCollection()
+    {
+        return $this->items;
+    }
+
+    public function isEmpty()
+    {
+        return $this->items->isEmpty();
+    }
+
+    /**
+     * 给每个元素执行个回调
+     *
+     * @access public
+     * @param  callable $callback
+     * @return $this
+     */
+    public function each(callable $callback)
+    {
+        foreach ($this->items as $key => $item) {
+            $result = $callback($item, $key);
+
+            if (false === $result) {
+                break;
+            } elseif (!is_object($item)) {
+                $this->items[$key] = $result;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Retrieve an external iterator
+     * @access public
+     * @return Traversable An instance of an object implementing <b>Iterator</b> or
+     * <b>Traversable</b>
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->items->all());
+    }
+
+    /**
+     * Whether a offset exists
+     * @access public
+     * @param  mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset)
+    {
+        return $this->items->offsetExists($offset);
+    }
+
+    /**
+     * Offset to retrieve
+     * @access public
+     * @param  mixed $offset
+     * @return mixed
+     */
+    public function offsetGet($offset)
+    {
+        return $this->items->offsetGet($offset);
+    }
+
+    /**
+     * Offset to set
+     * @access public
+     * @param  mixed $offset
+     * @param  mixed $value
+     */
+    public function offsetSet($offset, $value)
+    {
+        $this->items->offsetSet($offset, $value);
+    }
+
+    /**
+     * Offset to unset
+     * @access public
+     * @param  mixed $offset
+     * @return void
+     * @since  5.0.0
+     */
+    public function offsetUnset($offset)
+    {
+        $this->items->offsetUnset($offset);
+    }
+
+    /**
+     * Count elements of an object
+     */
+    public function count()
+    {
+        return $this->items->count();
+    }
+
+    public function __toString()
+    {
+        return (string) $this->render();
+    }
+
+    public function toArray()
+    {
+        try {
+            $total = $this->total();
+        } catch (\DomainException $e) {
+            $total = null;
+        }
+
+        return [
+            'total'        => $total,
+            'per_page'     => $this->listRows(),
+            'current_page' => $this->currentPage(),
+            'last_page'    => $this->lastPage,
+            'data'         => $this->items->toArray(),
+        ];
+    }
+
+    /**
+     * Specify data which should be serialized to JSON
+     */
+    public function jsonSerialize()
+    {
+        return $this->toArray();
+    }
+
+    public function __call($name, $arguments)
+    {
+        $collection = $this->getCollection();
+
+        $result = call_user_func_array([$collection, $name], $arguments);
+
+        if ($result === $collection) {
+            return $this;
+        }
+
+        return $result;
+    }
+
+}
diff --git a/thinkphp/library/think/Process.php b/thinkphp/library/think/Process.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b574db490258fd5030fb054e86f3c47190bfa5f
--- /dev/null
+++ b/thinkphp/library/think/Process.php
@@ -0,0 +1,1268 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\process\exception\Failed as ProcessFailedException;
+use think\process\exception\Timeout as ProcessTimeoutException;
+use think\process\pipes\Pipes;
+use think\process\pipes\Unix as UnixPipes;
+use think\process\pipes\Windows as WindowsPipes;
+use think\process\Utils;
+
+class Process
+{
+
+    const ERR = 'err';
+    const OUT = 'out';
+
+    const STATUS_READY      = 'ready';
+    const STATUS_STARTED    = 'started';
+    const STATUS_TERMINATED = 'terminated';
+
+    const STDIN  = 0;
+    const STDOUT = 1;
+    const STDERR = 2;
+
+    const TIMEOUT_PRECISION = 0.2;
+
+    private $callback;
+    private $commandline;
+    private $cwd;
+    private $env;
+    private $input;
+    private $starttime;
+    private $lastOutputTime;
+    private $timeout;
+    private $idleTimeout;
+    private $options;
+    private $exitcode;
+    private $fallbackExitcode;
+    private $processInformation;
+    private $outputDisabled = false;
+    private $stdout;
+    private $stderr;
+    private $enhanceWindowsCompatibility = true;
+    private $enhanceSigchildCompatibility;
+    private $process;
+    private $status                       = self::STATUS_READY;
+    private $incrementalOutputOffset      = 0;
+    private $incrementalErrorOutputOffset = 0;
+    private $tty;
+    private $pty;
+
+    private $useFileHandles = false;
+
+    /** @var Pipes */
+    private $processPipes;
+
+    private $latestSignal;
+
+    private static $sigchild;
+
+    /**
+     * @var array
+     */
+    public static $exitCodes = [
+        0   => 'OK',
+        1   => 'General error',
+        2   => 'Misuse of shell builtins',
+        126 => 'Invoked command cannot execute',
+        127 => 'Command not found',
+        128 => 'Invalid exit argument',
+        // signals
+        129 => 'Hangup',
+        130 => 'Interrupt',
+        131 => 'Quit and dump core',
+        132 => 'Illegal instruction',
+        133 => 'Trace/breakpoint trap',
+        134 => 'Process aborted',
+        135 => 'Bus error: "access to undefined portion of memory object"',
+        136 => 'Floating point exception: "erroneous arithmetic operation"',
+        137 => 'Kill (terminate immediately)',
+        138 => 'User-defined 1',
+        139 => 'Segmentation violation',
+        140 => 'User-defined 2',
+        141 => 'Write to pipe with no one reading',
+        142 => 'Signal raised by alarm',
+        143 => 'Termination (request to terminate)',
+        // 144 - not defined
+        145 => 'Child process terminated, stopped (or continued*)',
+        146 => 'Continue if stopped',
+        147 => 'Stop executing temporarily',
+        148 => 'Terminal stop signal',
+        149 => 'Background process attempting to read from tty ("in")',
+        150 => 'Background process attempting to write to tty ("out")',
+        151 => 'Urgent data available on socket',
+        152 => 'CPU time limit exceeded',
+        153 => 'File size limit exceeded',
+        154 => 'Signal raised by timer counting virtual time: "virtual timer expired"',
+        155 => 'Profiling timer expired',
+        // 156 - not defined
+        157 => 'Pollable event',
+        // 158 - not defined
+        159 => 'Bad syscall',
+    ];
+
+    /**
+     * 构造方法
+     * @access public
+     * @param  string         $commandline 指令
+     * @param  string|null    $cwd         工作目录
+     * @param  array|null     $env         环境变量
+     * @param  string|null    $input       输入
+     * @param  int|float|null $timeout     超时时间
+     * @param  array          $options     proc_open的选项
+     * @throws \RuntimeException
+     * @api
+     */
+    public function __construct($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = [])
+    {
+        if (!function_exists('proc_open')) {
+            throw new \RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.');
+        }
+
+        $this->commandline = $commandline;
+        $this->cwd         = $cwd;
+
+        if (null === $this->cwd && (defined('ZEND_THREAD_SAFE') || '\\' === DIRECTORY_SEPARATOR)) {
+            $this->cwd = getcwd();
+        }
+        if (null !== $env) {
+            $this->setEnv($env);
+        }
+
+        $this->input = $input;
+        $this->setTimeout($timeout);
+        $this->useFileHandles               = '\\' === DIRECTORY_SEPARATOR;
+        $this->pty                          = false;
+        $this->enhanceWindowsCompatibility  = true;
+        $this->enhanceSigchildCompatibility = '\\' !== DIRECTORY_SEPARATOR && $this->isSigchildEnabled();
+        $this->options                      = array_replace([
+            'suppress_errors' => true,
+            'binary_pipes'    => true,
+        ], $options);
+    }
+
+    public function __destruct()
+    {
+        $this->stop();
+    }
+
+    public function __clone()
+    {
+        $this->resetProcessData();
+    }
+
+    /**
+     * 运行指令
+     * @access public
+     * @param  callback|null $callback
+     * @return int
+     */
+    public function run($callback = null)
+    {
+        $this->start($callback);
+
+        return $this->wait();
+    }
+
+    /**
+     * 运行指令
+     * @access public
+     * @param  callable|null $callback
+     * @return self
+     * @throws \RuntimeException
+     * @throws ProcessFailedException
+     */
+    public function mustRun($callback = null)
+    {
+        if ($this->isSigchildEnabled() && !$this->enhanceSigchildCompatibility) {
+            throw new \RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.');
+        }
+
+        if (0 !== $this->run($callback)) {
+            throw new ProcessFailedException($this);
+        }
+
+        return $this;
+    }
+
+    /**
+     * 启动进程并写到 STDIN 输入后返回。
+     * @access public
+     * @param  callable|null $callback
+     * @throws \RuntimeException
+     * @throws \RuntimeException
+     * @throws \LogicException
+     */
+    public function start($callback = null)
+    {
+        if ($this->isRunning()) {
+            throw new \RuntimeException('Process is already running');
+        }
+        if ($this->outputDisabled && null !== $callback) {
+            throw new \LogicException('Output has been disabled, enable it to allow the use of a callback.');
+        }
+
+        $this->resetProcessData();
+        $this->starttime = $this->lastOutputTime = microtime(true);
+        $this->callback  = $this->buildCallback($callback);
+        $descriptors     = $this->getDescriptors();
+
+        $commandline = $this->commandline;
+
+        if ('\\' === DIRECTORY_SEPARATOR && $this->enhanceWindowsCompatibility) {
+            $commandline = 'cmd /V:ON /E:ON /C "(' . $commandline . ')';
+            foreach ($this->processPipes->getFiles() as $offset => $filename) {
+                $commandline .= ' ' . $offset . '>' . Utils::escapeArgument($filename);
+            }
+            $commandline .= '"';
+
+            if (!isset($this->options['bypass_shell'])) {
+                $this->options['bypass_shell'] = true;
+            }
+        }
+
+        $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $this->env, $this->options);
+
+        if (!is_resource($this->process)) {
+            throw new \RuntimeException('Unable to launch a new process.');
+        }
+        $this->status = self::STATUS_STARTED;
+
+        if ($this->tty) {
+            return;
+        }
+
+        $this->updateStatus(false);
+        $this->checkTimeout();
+    }
+
+    /**
+     * 重启进程
+     * @access public
+     * @param  callable|null $callback
+     * @return Process
+     * @throws \RuntimeException
+     * @throws \RuntimeException
+     */
+    public function restart($callback = null)
+    {
+        if ($this->isRunning()) {
+            throw new \RuntimeException('Process is already running');
+        }
+
+        $process = clone $this;
+        $process->start($callback);
+
+        return $process;
+    }
+
+    /**
+     * 等待要终止的进程
+     * @access public
+     * @param  callable|null $callback
+     * @return int
+     */
+    public function wait($callback = null)
+    {
+        $this->requireProcessIsStarted(__FUNCTION__);
+
+        $this->updateStatus(false);
+        if (null !== $callback) {
+            $this->callback = $this->buildCallback($callback);
+        }
+
+        do {
+            $this->checkTimeout();
+            $running = '\\' === DIRECTORY_SEPARATOR ? $this->isRunning() : $this->processPipes->areOpen();
+            $close   = '\\' !== DIRECTORY_SEPARATOR || !$running;
+            $this->readPipes(true, $close);
+        } while ($running);
+
+        while ($this->isRunning()) {
+            usleep(1000);
+        }
+
+        if ($this->processInformation['signaled'] && $this->processInformation['termsig'] !== $this->latestSignal) {
+            throw new \RuntimeException(sprintf('The process has been signaled with signal "%s".', $this->processInformation['termsig']));
+        }
+
+        return $this->exitcode;
+    }
+
+    /**
+     * 获取PID
+     * @access public
+     * @return int|null
+     * @throws \RuntimeException
+     */
+    public function getPid()
+    {
+        if ($this->isSigchildEnabled()) {
+            throw new \RuntimeException('This PHP has been compiled with --enable-sigchild. The process identifier can not be retrieved.');
+        }
+
+        $this->updateStatus(false);
+
+        return $this->isRunning() ? $this->processInformation['pid'] : null;
+    }
+
+    /**
+     * 将一个 POSIX 信号发送到进程中
+     * @access public
+     * @param  int $signal
+     * @return Process
+     */
+    public function signal($signal)
+    {
+        $this->doSignal($signal, true);
+
+        return $this;
+    }
+
+    /**
+     * 禁用从底层过程获取输出和错误输出。
+     * @access public
+     * @return Process
+     */
+    public function disableOutput()
+    {
+        if ($this->isRunning()) {
+            throw new \RuntimeException('Disabling output while the process is running is not possible.');
+        }
+        if (null !== $this->idleTimeout) {
+            throw new \LogicException('Output can not be disabled while an idle timeout is set.');
+        }
+
+        $this->outputDisabled = true;
+
+        return $this;
+    }
+
+    /**
+     * 开启从底层过程获取输出和错误输出。
+     * @access public
+     * @return Process
+     * @throws \RuntimeException
+     */
+    public function enableOutput()
+    {
+        if ($this->isRunning()) {
+            throw new \RuntimeException('Enabling output while the process is running is not possible.');
+        }
+
+        $this->outputDisabled = false;
+
+        return $this;
+    }
+
+    /**
+     * 输出是否禁用
+     * @access public
+     * @return bool
+     */
+    public function isOutputDisabled()
+    {
+        return $this->outputDisabled;
+    }
+
+    /**
+     * 获取当前的输出管道
+     * @access public
+     * @return string
+     * @throws \LogicException
+     * @api
+     */
+    public function getOutput()
+    {
+        if ($this->outputDisabled) {
+            throw new \LogicException('Output has been disabled.');
+        }
+
+        $this->requireProcessIsStarted(__FUNCTION__);
+
+        $this->readPipes(false, '\\' === DIRECTORY_SEPARATOR ? !$this->processInformation['running'] : true);
+
+        return $this->stdout;
+    }
+
+    /**
+     * 以增量方式返回的输出结果。
+     * @access public
+     * @return string
+     */
+    public function getIncrementalOutput()
+    {
+        $this->requireProcessIsStarted(__FUNCTION__);
+
+        $data = $this->getOutput();
+
+        $latest = substr($data, $this->incrementalOutputOffset);
+
+        if (false === $latest) {
+            return '';
+        }
+
+        $this->incrementalOutputOffset = strlen($data);
+
+        return $latest;
+    }
+
+    /**
+     * 清空输出
+     * @access public
+     * @return Process
+     */
+    public function clearOutput()
+    {
+        $this->stdout                  = '';
+        $this->incrementalOutputOffset = 0;
+
+        return $this;
+    }
+
+    /**
+     * 返回当前的错误输出的过程 (STDERR)。
+     * @access public
+     * @return string
+     */
+    public function getErrorOutput()
+    {
+        if ($this->outputDisabled) {
+            throw new \LogicException('Output has been disabled.');
+        }
+
+        $this->requireProcessIsStarted(__FUNCTION__);
+
+        $this->readPipes(false, '\\' === DIRECTORY_SEPARATOR ? !$this->processInformation['running'] : true);
+
+        return $this->stderr;
+    }
+
+    /**
+     * 以增量方式返回 errorOutput
+     * @access public
+     * @return string
+     */
+    public function getIncrementalErrorOutput()
+    {
+        $this->requireProcessIsStarted(__FUNCTION__);
+
+        $data = $this->getErrorOutput();
+
+        $latest = substr($data, $this->incrementalErrorOutputOffset);
+
+        if (false === $latest) {
+            return '';
+        }
+
+        $this->incrementalErrorOutputOffset = strlen($data);
+
+        return $latest;
+    }
+
+    /**
+     * 清空 errorOutput
+     * @access public
+     * @return Process
+     */
+    public function clearErrorOutput()
+    {
+        $this->stderr                       = '';
+        $this->incrementalErrorOutputOffset = 0;
+
+        return $this;
+    }
+
+    /**
+     * 获取退出码
+     * @access public
+     * @return null|int
+     */
+    public function getExitCode()
+    {
+        if ($this->isSigchildEnabled() && !$this->enhanceSigchildCompatibility) {
+            throw new \RuntimeException('This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.');
+        }
+
+        $this->updateStatus(false);
+
+        return $this->exitcode;
+    }
+
+    /**
+     * 获取退出文本
+     * @access public
+     * @return null|string
+     */
+    public function getExitCodeText()
+    {
+        if (null === $exitcode = $this->getExitCode()) {
+            return;
+        }
+
+        return isset(self::$exitCodes[$exitcode]) ? self::$exitCodes[$exitcode] : 'Unknown error';
+    }
+
+    /**
+     * 检查是否成功
+     * @access public
+     * @return bool
+     */
+    public function isSuccessful()
+    {
+        return 0 === $this->getExitCode();
+    }
+
+    /**
+     * 是否未捕获的信号已被终止子进程
+     * @access public
+     * @return bool
+     */
+    public function hasBeenSignaled()
+    {
+        $this->requireProcessIsTerminated(__FUNCTION__);
+
+        if ($this->isSigchildEnabled()) {
+            throw new \RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
+        }
+
+        $this->updateStatus(false);
+
+        return $this->processInformation['signaled'];
+    }
+
+    /**
+     * 返回导致子进程终止其执行的数。
+     * @access public
+     * @return int
+     */
+    public function getTermSignal()
+    {
+        $this->requireProcessIsTerminated(__FUNCTION__);
+
+        if ($this->isSigchildEnabled()) {
+            throw new \RuntimeException('This PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.');
+        }
+
+        $this->updateStatus(false);
+
+        return $this->processInformation['termsig'];
+    }
+
+    /**
+     * 检查子进程信号是否已停止
+     * @access public
+     * @return bool
+     */
+    public function hasBeenStopped()
+    {
+        $this->requireProcessIsTerminated(__FUNCTION__);
+
+        $this->updateStatus(false);
+
+        return $this->processInformation['stopped'];
+    }
+
+    /**
+     * 返回导致子进程停止其执行的数。
+     * @access public
+     * @return int
+     */
+    public function getStopSignal()
+    {
+        $this->requireProcessIsTerminated(__FUNCTION__);
+
+        $this->updateStatus(false);
+
+        return $this->processInformation['stopsig'];
+    }
+
+    /**
+     * 检查是否正在运行
+     * @access public
+     * @return bool
+     */
+    public function isRunning()
+    {
+        if (self::STATUS_STARTED !== $this->status) {
+            return false;
+        }
+
+        $this->updateStatus(false);
+
+        return $this->processInformation['running'];
+    }
+
+    /**
+     * 检查是否已开始
+     * @access public
+     * @return bool
+     */
+    public function isStarted()
+    {
+        return self::STATUS_READY != $this->status;
+    }
+
+    /**
+     * 检查是否已终止
+     * @access public
+     * @return bool
+     */
+    public function isTerminated()
+    {
+        $this->updateStatus(false);
+
+        return self::STATUS_TERMINATED == $this->status;
+    }
+
+    /**
+     * 获取当前的状态
+     * @access public
+     * @return string
+     */
+    public function getStatus()
+    {
+        $this->updateStatus(false);
+
+        return $this->status;
+    }
+
+    /**
+     * 终止进程
+     * @access public
+     */
+    public function stop()
+    {
+        if ($this->isRunning()) {
+            if ('\\' === DIRECTORY_SEPARATOR && !$this->isSigchildEnabled()) {
+                exec(sprintf('taskkill /F /T /PID %d 2>&1', $this->getPid()), $output, $exitCode);
+                if ($exitCode > 0) {
+                    throw new \RuntimeException('Unable to kill the process');
+                }
+            } else {
+                $pids = preg_split('/\s+/', `ps -o pid --no-heading --ppid {$this->getPid()}`);
+                foreach ($pids as $pid) {
+                    if (is_numeric($pid)) {
+                        posix_kill($pid, 9);
+                    }
+                }
+            }
+        }
+
+        $this->updateStatus(false);
+        if ($this->processInformation['running']) {
+            $this->close();
+        }
+
+        return $this->exitcode;
+    }
+
+    /**
+     * 添加一行输出
+     * @access public
+     * @param string $line
+     */
+    public function addOutput($line)
+{
+        $this->lastOutputTime = microtime(true);
+        $this->stdout .= $line;
+    }
+
+    /**
+     * 添加一行错误输出
+     * @access public
+     * @param string $line
+     */
+    public function addErrorOutput($line)
+{
+        $this->lastOutputTime = microtime(true);
+        $this->stderr .= $line;
+    }
+
+    /**
+     * 获取被执行的指令
+     * @access public
+     * @return string
+     */
+    public function getCommandLine()
+{
+        return $this->commandline;
+    }
+
+    /**
+     * 设置指令
+     * @access public
+     * @param string $commandline
+     * @return self
+     */
+    public function setCommandLine($commandline)
+{
+        $this->commandline = $commandline;
+
+        return $this;
+    }
+
+    /**
+     * 获取超时时间
+     * @access public
+     * @return float|null
+     */
+    public function getTimeout()
+{
+        return $this->timeout;
+    }
+
+    /**
+     * 获取idle超时时间
+     * @access public
+     * @return float|null
+     */
+    public function getIdleTimeout()
+{
+        return $this->idleTimeout;
+    }
+
+    /**
+     * 设置超时时间
+     * @access public
+     * @param  int|float|null $timeout
+     * @return self
+     */
+    public function setTimeout($timeout)
+{
+        $this->timeout = $this->validateTimeout($timeout);
+
+        return $this;
+    }
+
+    /**
+     * 设置idle超时时间
+     * @access public
+     * @param  int|float|null $timeout
+     * @return self
+     */
+    public function setIdleTimeout($timeout)
+{
+        if (null !== $timeout && $this->outputDisabled) {
+            throw new \LogicException('Idle timeout can not be set while the output is disabled.');
+        }
+
+        $this->idleTimeout = $this->validateTimeout($timeout);
+
+        return $this;
+    }
+
+    /**
+     * 设置TTY
+     * @access public
+     * @param  bool $tty
+     * @return self
+     */
+    public function setTty($tty)
+{
+        if ('\\' === DIRECTORY_SEPARATOR && $tty) {
+            throw new \RuntimeException('TTY mode is not supported on Windows platform.');
+        }
+        if ($tty && (!file_exists('/dev/tty') || !is_readable('/dev/tty'))) {
+            throw new \RuntimeException('TTY mode requires /dev/tty to be readable.');
+        }
+
+        $this->tty = (bool) $tty;
+
+        return $this;
+    }
+
+    /**
+     * 检查是否是tty模式
+     * @access public
+     * @return bool
+     */
+    public function isTty()
+{
+        return $this->tty;
+    }
+
+    /**
+     * 设置pty模式
+     * @access public
+     * @param  bool $bool
+     * @return self
+     */
+    public function setPty($bool)
+{
+        $this->pty = (bool) $bool;
+
+        return $this;
+    }
+
+    /**
+     * 是否是pty模式
+     * @access public
+     * @return bool
+     */
+    public function isPty()
+{
+        return $this->pty;
+    }
+
+    /**
+     * 获取工作目录
+     * @access public
+     * @return string|null
+     */
+    public function getWorkingDirectory()
+{
+        if (null === $this->cwd) {
+            return getcwd() ?: null;
+        }
+
+        return $this->cwd;
+    }
+
+    /**
+     * 设置工作目录
+     * @access public
+     * @param  string $cwd
+     * @return self
+     */
+    public function setWorkingDirectory($cwd)
+{
+        $this->cwd = $cwd;
+
+        return $this;
+    }
+
+    /**
+     * 获取环境变量
+     * @access public
+     * @return array
+     */
+    public function getEnv()
+{
+        return $this->env;
+    }
+
+    /**
+     * 设置环境变量
+     * @access public
+     * @param  array $env
+     * @return self
+     */
+    public function setEnv(array $env)
+{
+        $env = array_filter($env, function ($value) {
+            return !is_array($value);
+        });
+
+        $this->env = [];
+        foreach ($env as $key => $value) {
+            $this->env[(binary) $key] = (binary) $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 获取输入
+     * @access public
+     * @return null|string
+     */
+    public function getInput()
+{
+        return $this->input;
+    }
+
+    /**
+     * 设置输入
+     * @access public
+     * @param  mixed $input
+     * @return self
+     */
+    public function setInput($input)
+{
+        if ($this->isRunning()) {
+            throw new \LogicException('Input can not be set while the process is running.');
+        }
+
+        $this->input = Utils::validateInput(sprintf('%s::%s', __CLASS__, __FUNCTION__), $input);
+
+        return $this;
+    }
+
+    /**
+     * 获取proc_open的选项
+     * @access public
+     * @return array
+     */
+    public function getOptions()
+{
+        return $this->options;
+    }
+
+    /**
+     * 设置proc_open的选项
+     * @access public
+     * @param  array $options
+     * @return self
+     */
+    public function setOptions(array $options)
+{
+        $this->options = $options;
+
+        return $this;
+    }
+
+    /**
+     * 是否兼容windows
+     * @access public
+     * @return bool
+     */
+    public function getEnhanceWindowsCompatibility()
+{
+        return $this->enhanceWindowsCompatibility;
+    }
+
+    /**
+     * 设置是否兼容windows
+     * @access public
+     * @param  bool $enhance
+     * @return self
+     */
+    public function setEnhanceWindowsCompatibility($enhance)
+{
+        $this->enhanceWindowsCompatibility = (bool) $enhance;
+
+        return $this;
+    }
+
+    /**
+     * 返回是否 sigchild 兼容模式激活
+     * @access public
+     * @return bool
+     */
+    public function getEnhanceSigchildCompatibility()
+{
+        return $this->enhanceSigchildCompatibility;
+    }
+
+    /**
+     * 激活 sigchild 兼容性模式。
+     * @access public
+     * @param  bool $enhance
+     * @return self
+     */
+    public function setEnhanceSigchildCompatibility($enhance)
+{
+        $this->enhanceSigchildCompatibility = (bool) $enhance;
+
+        return $this;
+    }
+
+    /**
+     * 是否超时
+     */
+    public function checkTimeout()
+{
+        if (self::STATUS_STARTED !== $this->status) {
+            return;
+        }
+
+        if (null !== $this->timeout && $this->timeout < microtime(true) - $this->starttime) {
+            $this->stop();
+
+            throw new ProcessTimeoutException($this, ProcessTimeoutException::TYPE_GENERAL);
+        }
+
+        if (null !== $this->idleTimeout && $this->idleTimeout < microtime(true) - $this->lastOutputTime) {
+            $this->stop();
+
+            throw new ProcessTimeoutException($this, ProcessTimeoutException::TYPE_IDLE);
+        }
+    }
+
+    /**
+     * 是否支持pty
+     * @access public
+     * @return bool
+     */
+    public static function isPtySupported()
+{
+        static $result;
+
+        if (null !== $result) {
+            return $result;
+        }
+
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            return $result = false;
+        }
+
+        $proc = @proc_open('echo 1', [['pty'], ['pty'], ['pty']], $pipes);
+        if (is_resource($proc)) {
+            proc_close($proc);
+
+            return $result = true;
+        }
+
+        return $result = false;
+    }
+
+    /**
+     * 创建所需的 proc_open 的描述符
+     * @access private
+     * @return array
+     */
+    private function getDescriptors()
+{
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            $this->processPipes = WindowsPipes::create($this, $this->input);
+        } else {
+            $this->processPipes = UnixPipes::create($this, $this->input);
+        }
+        $descriptors = $this->processPipes->getDescriptors($this->outputDisabled);
+
+        if (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
+
+            $descriptors = array_merge($descriptors, [['pipe', 'w']]);
+
+            $this->commandline = '(' . $this->commandline . ') 3>/dev/null; code=$?; echo $code >&3; exit $code';
+        }
+
+        return $descriptors;
+    }
+
+    /**
+     * 建立 wait () 使用的回调。
+     * @access protected
+     * @param  callable|null $callback
+     * @return callable
+     */
+    protected function buildCallback($callback)
+{
+        $out      = self::OUT;
+        $callback = function ($type, $data) use ($callback, $out) {
+            if ($out == $type) {
+                $this->addOutput($data);
+            } else {
+                $this->addErrorOutput($data);
+            }
+
+            if (null !== $callback) {
+                call_user_func($callback, $type, $data);
+            }
+        };
+
+        return $callback;
+    }
+
+    /**
+     * 更新状态
+     * @access protected
+     * @param bool $blocking
+     */
+    protected function updateStatus($blocking)
+{
+        if (self::STATUS_STARTED !== $this->status) {
+            return;
+        }
+
+        $this->processInformation = proc_get_status($this->process);
+        $this->captureExitCode();
+
+        $this->readPipes($blocking, '\\' === DIRECTORY_SEPARATOR ? !$this->processInformation['running'] : true);
+
+        if (!$this->processInformation['running']) {
+            $this->close();
+        }
+    }
+
+    /**
+     * 是否开启 '--enable-sigchild'
+     * @access protected
+     * @return bool
+     */
+    protected function isSigchildEnabled()
+{
+        if (null !== self::$sigchild) {
+            return self::$sigchild;
+        }
+
+        if (!function_exists('phpinfo')) {
+            return self::$sigchild = false;
+        }
+
+        ob_start();
+        phpinfo(INFO_GENERAL);
+
+        return self::$sigchild = false !== strpos(ob_get_clean(), '--enable-sigchild');
+    }
+
+    /**
+     * 验证是否超时
+     * @access private
+     * @param  int|float|null $timeout
+     * @return float|null
+     */
+    private function validateTimeout($timeout)
+{
+        $timeout = (float) $timeout;
+
+        if (0.0 === $timeout) {
+            $timeout = null;
+        } elseif ($timeout < 0) {
+            throw new \InvalidArgumentException('The timeout value must be a valid positive integer or float number.');
+        }
+
+        return $timeout;
+    }
+
+    /**
+     * 读取pipes
+     * @access private
+     * @param  bool $blocking
+     * @param  bool $close
+     */
+    private function readPipes($blocking, $close)
+{
+        $result = $this->processPipes->readAndWrite($blocking, $close);
+
+        $callback = $this->callback;
+        foreach ($result as $type => $data) {
+            if (3 == $type) {
+                $this->fallbackExitcode = (int) $data;
+            } else {
+                $callback(self::STDOUT === $type ? self::OUT : self::ERR, $data);
+            }
+        }
+    }
+
+    /**
+     * 捕获退出码
+     */
+    private function captureExitCode()
+{
+        if (isset($this->processInformation['exitcode']) && -1 != $this->processInformation['exitcode']) {
+            $this->exitcode = $this->processInformation['exitcode'];
+        }
+    }
+
+    /**
+     * 关闭资源
+     * @access private
+     * @return int 退出码
+     */
+    private function close()
+{
+        $this->processPipes->close();
+        if (is_resource($this->process)) {
+            $exitcode = proc_close($this->process);
+        } else {
+            $exitcode = -1;
+        }
+
+        $this->exitcode = -1 !== $exitcode ? $exitcode : (null !== $this->exitcode ? $this->exitcode : -1);
+        $this->status   = self::STATUS_TERMINATED;
+
+        if (-1 === $this->exitcode && null !== $this->fallbackExitcode) {
+            $this->exitcode = $this->fallbackExitcode;
+        } elseif (-1 === $this->exitcode && $this->processInformation['signaled']
+            && 0 < $this->processInformation['termsig']
+        ) {
+            $this->exitcode = 128 + $this->processInformation['termsig'];
+        }
+
+        return $this->exitcode;
+    }
+
+    /**
+     * 重置数据
+     */
+    private function resetProcessData()
+{
+        $this->starttime                    = null;
+        $this->callback                     = null;
+        $this->exitcode                     = null;
+        $this->fallbackExitcode             = null;
+        $this->processInformation           = null;
+        $this->stdout                       = null;
+        $this->stderr                       = null;
+        $this->process                      = null;
+        $this->latestSignal                 = null;
+        $this->status                       = self::STATUS_READY;
+        $this->incrementalOutputOffset      = 0;
+        $this->incrementalErrorOutputOffset = 0;
+    }
+
+    /**
+     * 将一个 POSIX 信号发送到进程中。
+     * @access private
+     * @param  int  $signal
+     * @param  bool $throwException
+     * @return bool
+     */
+    private function doSignal($signal, $throwException)
+{
+        if (!$this->isRunning()) {
+            if ($throwException) {
+                throw new \LogicException('Can not send signal on a non running process.');
+            }
+
+            return false;
+        }
+
+        if ($this->isSigchildEnabled()) {
+            if ($throwException) {
+                throw new \RuntimeException('This PHP has been compiled with --enable-sigchild. The process can not be signaled.');
+            }
+
+            return false;
+        }
+
+        if (true !== @proc_terminate($this->process, $signal)) {
+            if ($throwException) {
+                throw new \RuntimeException(sprintf('Error while sending signal `%s`.', $signal));
+            }
+
+            return false;
+        }
+
+        $this->latestSignal = $signal;
+
+        return true;
+    }
+
+    /**
+     * 确保进程已经开启
+     * @access private
+     * @param  string $functionName
+     */
+    private function requireProcessIsStarted($functionName)
+{
+        if (!$this->isStarted()) {
+            throw new \LogicException(sprintf('Process must be started before calling %s.', $functionName));
+        }
+    }
+
+    /**
+     * 确保进程已经终止
+     * @access private
+     * @param  string $functionName
+     */
+    private function requireProcessIsTerminated($functionName)
+{
+        if (!$this->isTerminated()) {
+            throw new \LogicException(sprintf('Process must be terminated before calling %s.', $functionName));
+        }
+    }
+}
diff --git a/thinkphp/library/think/Request.php b/thinkphp/library/think/Request.php
new file mode 100644
index 0000000000000000000000000000000000000000..37760280bd5806784e168550a266e29ed8dead6f
--- /dev/null
+++ b/thinkphp/library/think/Request.php
@@ -0,0 +1,2170 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\facade\Cookie;
+use think\facade\Session;
+
+class Request
+{
+    /**
+     * 配置参数
+     * @var array
+     */
+    protected $config = [
+        // 表单请求类型伪装变量
+        'var_method'       => '_method',
+        // 表单ajax伪装变量
+        'var_ajax'         => '_ajax',
+        // 表单pjax伪装变量
+        'var_pjax'         => '_pjax',
+        // PATHINFO变量名 用于兼容模式
+        'var_pathinfo'     => 's',
+        // 兼容PATH_INFO获取
+        'pathinfo_fetch'   => ['ORIG_PATH_INFO', 'REDIRECT_PATH_INFO', 'REDIRECT_URL'],
+        // 默认全局过滤方法 用逗号分隔多个
+        'default_filter'   => '',
+        // 域名根，如thinkphp.cn
+        'url_domain_root'  => '',
+        // HTTPS代理标识
+        'https_agent_name' => '',
+        // IP代理获取标识
+        'http_agent_ip'    => 'HTTP_X_REAL_IP',
+        // URL伪静态后缀
+        'url_html_suffix'  => 'html',
+    ];
+
+    /**
+     * 请求类型
+     * @var string
+     */
+    protected $method;
+
+    /**
+     * 主机名（含端口）
+     * @var string
+     */
+    protected $host;
+
+    /**
+     * 域名（含协议及端口）
+     * @var string
+     */
+    protected $domain;
+
+    /**
+     * 子域名
+     * @var string
+     */
+    protected $subDomain;
+
+    /**
+     * 泛域名
+     * @var string
+     */
+    protected $panDomain;
+
+    /**
+     * 当前URL地址
+     * @var string
+     */
+    protected $url;
+
+    /**
+     * 基础URL
+     * @var string
+     */
+    protected $baseUrl;
+
+    /**
+     * 当前执行的文件
+     * @var string
+     */
+    protected $baseFile;
+
+    /**
+     * 访问的ROOT地址
+     * @var string
+     */
+    protected $root;
+
+    /**
+     * pathinfo
+     * @var string
+     */
+    protected $pathinfo;
+
+    /**
+     * pathinfo（不含后缀）
+     * @var string
+     */
+    protected $path;
+
+    /**
+     * 当前路由信息
+     * @var array
+     */
+    protected $routeInfo = [];
+
+    /**
+     * 当前调度信息
+     * @var \think\route\Dispatch
+     */
+    protected $dispatch;
+
+    /**
+     * 当前模块名
+     * @var string
+     */
+    protected $module;
+
+    /**
+     * 当前控制器名
+     * @var string
+     */
+    protected $controller;
+
+    /**
+     * 当前操作名
+     * @var string
+     */
+    protected $action;
+
+    /**
+     * 当前语言集
+     * @var string
+     */
+    protected $langset;
+
+    /**
+     * 当前请求参数
+     * @var array
+     */
+    protected $param = [];
+
+    /**
+     * 当前GET参数
+     * @var array
+     */
+    protected $get = [];
+
+    /**
+     * 当前POST参数
+     * @var array
+     */
+    protected $post = [];
+
+    /**
+     * 当前REQUEST参数
+     * @var array
+     */
+    protected $request = [];
+
+    /**
+     * 当前ROUTE参数
+     * @var array
+     */
+    protected $route = [];
+
+    /**
+     * 当前PUT参数
+     * @var array
+     */
+    protected $put;
+
+    /**
+     * 当前SESSION参数
+     * @var array
+     */
+    protected $session = [];
+
+    /**
+     * 当前FILE参数
+     * @var array
+     */
+    protected $file = [];
+
+    /**
+     * 当前COOKIE参数
+     * @var array
+     */
+    protected $cookie = [];
+
+    /**
+     * 当前SERVER参数
+     * @var array
+     */
+    protected $server = [];
+
+    /**
+     * 当前ENV参数
+     * @var array
+     */
+    protected $env = [];
+
+    /**
+     * 当前HEADER参数
+     * @var array
+     */
+    protected $header = [];
+
+    /**
+     * 资源类型定义
+     * @var array
+     */
+    protected $mimeType = [
+        'xml'   => 'application/xml,text/xml,application/x-xml',
+        'json'  => 'application/json,text/x-json,application/jsonrequest,text/json',
+        'js'    => 'text/javascript,application/javascript,application/x-javascript',
+        'css'   => 'text/css',
+        'rss'   => 'application/rss+xml',
+        'yaml'  => 'application/x-yaml,text/yaml',
+        'atom'  => 'application/atom+xml',
+        'pdf'   => 'application/pdf',
+        'text'  => 'text/plain',
+        'image' => 'image/png,image/jpg,image/jpeg,image/pjpeg,image/gif,image/webp,image/*',
+        'csv'   => 'text/csv',
+        'html'  => 'text/html,application/xhtml+xml,*/*',
+    ];
+
+    /**
+     * 当前请求内容
+     * @var string
+     */
+    protected $content;
+
+    /**
+     * 全局过滤规则
+     * @var array
+     */
+    protected $filter;
+
+    /**
+     * 扩展方法
+     * @var array
+     */
+    protected $hook = [];
+
+    /**
+     * php://input内容
+     * @var string
+     */
+    protected $input;
+
+    /**
+     * 请求缓存
+     * @var array
+     */
+    protected $cache;
+
+    /**
+     * 缓存是否检查
+     * @var bool
+     */
+    protected $isCheckCache;
+
+    /**
+     * 请求安全Key
+     * @var string
+     */
+    protected $secureKey;
+
+    /**
+     * 是否合并Param
+     * @var bool
+     */
+    protected $mergeParam = false;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array  $options 参数
+     */
+    public function __construct(array $options = [])
+    {
+        $this->init($options);
+
+        // 保存 php://input
+        $this->input = file_get_contents('php://input');
+    }
+
+    public function init(array $options = [])
+    {
+        $this->config = array_merge($this->config, $options);
+
+        if (is_null($this->filter) && !empty($this->config['default_filter'])) {
+            $this->filter = $this->config['default_filter'];
+        }
+    }
+
+    public function config($name = null)
+    {
+        if (is_null($name)) {
+            return $this->config;
+        }
+        return isset($this->config[$name]) ? $this->config[$name] : null;
+    }
+
+    public static function __make(App $app, Config $config)
+    {
+        $request = new static($config->pull('app'));
+
+        $request->server = $_SERVER;
+        $request->env    = $app['env']->get();
+
+        return $request;
+    }
+
+    public function __call($method, $args)
+    {
+        if (array_key_exists($method, $this->hook)) {
+            array_unshift($args, $this);
+            return call_user_func_array($this->hook[$method], $args);
+        }
+
+        throw new Exception('method not exists:' . static::class . '->' . $method);
+    }
+
+    /**
+     * Hook 方法注入
+     * @access public
+     * @param  string|array  $method 方法名
+     * @param  mixed         $callback callable
+     * @return void
+     */
+    public function hook($method, $callback = null)
+    {
+        if (is_array($method)) {
+            $this->hook = array_merge($this->hook, $method);
+        } else {
+            $this->hook[$method] = $callback;
+        }
+    }
+
+    /**
+     * 创建一个URL请求
+     * @access public
+     * @param  string    $uri URL地址
+     * @param  string    $method 请求类型
+     * @param  array     $params 请求参数
+     * @param  array     $cookie
+     * @param  array     $files
+     * @param  array     $server
+     * @param  string    $content
+     * @return \think\Request
+     */
+    public function create($uri, $method = 'GET', $params = [], $cookie = [], $files = [], $server = [], $content = null)
+    {
+        $server['PATH_INFO']      = '';
+        $server['REQUEST_METHOD'] = strtoupper($method);
+        $info                     = parse_url($uri);
+
+        if (isset($info['host'])) {
+            $server['SERVER_NAME'] = $info['host'];
+            $server['HTTP_HOST']   = $info['host'];
+        }
+
+        if (isset($info['scheme'])) {
+            if ('https' === $info['scheme']) {
+                $server['HTTPS']       = 'on';
+                $server['SERVER_PORT'] = 443;
+            } else {
+                unset($server['HTTPS']);
+                $server['SERVER_PORT'] = 80;
+            }
+        }
+
+        if (isset($info['port'])) {
+            $server['SERVER_PORT'] = $info['port'];
+            $server['HTTP_HOST']   = $server['HTTP_HOST'] . ':' . $info['port'];
+        }
+
+        if (isset($info['user'])) {
+            $server['PHP_AUTH_USER'] = $info['user'];
+        }
+
+        if (isset($info['pass'])) {
+            $server['PHP_AUTH_PW'] = $info['pass'];
+        }
+
+        if (!isset($info['path'])) {
+            $info['path'] = '/';
+        }
+
+        $options     = [];
+        $queryString = '';
+
+        $options[strtolower($method)] = $params;
+
+        if (isset($info['query'])) {
+            parse_str(html_entity_decode($info['query']), $query);
+            if (!empty($params)) {
+                $params      = array_replace($query, $params);
+                $queryString = http_build_query($params, '', '&');
+            } else {
+                $params      = $query;
+                $queryString = $info['query'];
+            }
+        } elseif (!empty($params)) {
+            $queryString = http_build_query($params, '', '&');
+        }
+
+        if ($queryString) {
+            parse_str($queryString, $get);
+            $options['get'] = isset($options['get']) ? array_merge($get, $options['get']) : $get;
+        }
+
+        $server['REQUEST_URI']  = $info['path'] . ('' !== $queryString ? '?' . $queryString : '');
+        $server['QUERY_STRING'] = $queryString;
+        $options['cookie']      = $cookie;
+        $options['param']       = $params;
+        $options['file']        = $files;
+        $options['server']      = $server;
+        $options['url']         = $server['REQUEST_URI'];
+        $options['baseUrl']     = $info['path'];
+        $options['pathinfo']    = '/' == $info['path'] ? '/' : ltrim($info['path'], '/');
+        $options['method']      = $server['REQUEST_METHOD'];
+        $options['domain']      = isset($info['scheme']) ? $info['scheme'] . '://' . $server['HTTP_HOST'] : '';
+        $options['content']     = $content;
+
+        $request = new static();
+        foreach ($options as $name => $item) {
+            if (property_exists($request, $name)) {
+                $request->$name = $item;
+            }
+        }
+
+        return $request;
+    }
+
+    /**
+     * 获取当前包含协议、端口的域名
+     * @access public
+     * @param  bool $port 是否需要去除端口号
+     * @return string
+     */
+    public function domain($port = false)
+    {
+        return $this->scheme() . '://' . $this->host($port);
+    }
+
+    /**
+     * 获取当前根域名
+     * @access public
+     * @return string
+     */
+    public function rootDomain()
+    {
+        $root = $this->config['url_domain_root'];
+
+        if (!$root) {
+            $item  = explode('.', $this->host(true));
+            $count = count($item);
+            $root  = $count > 1 ? $item[$count - 2] . '.' . $item[$count - 1] : $item[0];
+        }
+
+        return $root;
+    }
+
+    /**
+     * 获取当前子域名
+     * @access public
+     * @return string
+     */
+    public function subDomain()
+    {
+        if (is_null($this->subDomain)) {
+            // 获取当前主域名
+            $rootDomain = $this->config['url_domain_root'];
+
+            if ($rootDomain) {
+                // 配置域名根 例如 thinkphp.cn 163.com.cn 如果是国家级域名 com.cn net.cn 之类的域名需要配置
+                $domain = explode('.', rtrim(stristr($this->host(true), $rootDomain, true), '.'));
+            } else {
+                $domain = explode('.', $this->host(true), -2);
+            }
+
+            $this->subDomain = implode('.', $domain);
+        }
+
+        return $this->subDomain;
+    }
+
+    /**
+     * 设置当前泛域名的值
+     * @access public
+     * @param  string $domain 域名
+     * @return $this
+     */
+    public function setPanDomain($domain)
+    {
+        $this->panDomain = $domain;
+        return $this;
+    }
+
+    /**
+     * 获取当前泛域名的值
+     * @access public
+     * @return string
+     */
+    public function panDomain()
+    {
+        return $this->panDomain;
+    }
+
+    /**
+     * 获取当前完整URL 包括QUERY_STRING
+     * @access public
+     * @param  bool $complete 是否包含域名
+     * @return string
+     */
+    public function url($complete = false)
+    {
+        if (!$this->url) {
+            if ($this->isCli()) {
+                $this->url = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : '';
+            } elseif ($this->server('HTTP_X_REWRITE_URL')) {
+                $this->url = $this->server('HTTP_X_REWRITE_URL');
+            } elseif ($this->server('REQUEST_URI')) {
+                $this->url = $this->server('REQUEST_URI');
+            } elseif ($this->server('ORIG_PATH_INFO')) {
+                $this->url = $this->server('ORIG_PATH_INFO') . (!empty($this->server('QUERY_STRING')) ? '?' . $this->server('QUERY_STRING') : '');
+            } else {
+                $this->url = '';
+            }
+        }
+
+        return $complete ? $this->domain() . $this->url : $this->url;
+    }
+
+    /**
+     * 获取当前URL 不含QUERY_STRING
+     * @access public
+     * @param  bool     $domain 是否包含域名
+     * @return string|$this
+     */
+    public function baseUrl($domain = false)
+    {
+        if (!$this->baseUrl) {
+            $str           = $this->url();
+            $this->baseUrl = strpos($str, '?') ? strstr($str, '?', true) : $str;
+        }
+
+        return $domain ? $this->domain() . $this->baseUrl : $this->baseUrl;
+    }
+
+    /**
+     * 设置或获取当前执行的文件 SCRIPT_NAME
+     * @access public
+     * @param  bool     $domain 是否包含域名
+     * @return string|$this
+     */
+    public function baseFile($domain = false)
+    {
+        if (!$this->baseFile) {
+            $url = '';
+            if (!$this->isCli()) {
+                $script_name = basename($this->server('SCRIPT_FILENAME'));
+                if (basename($this->server('SCRIPT_NAME')) === $script_name) {
+                    $url = $this->server('SCRIPT_NAME');
+                } elseif (basename($this->server('PHP_SELF')) === $script_name) {
+                    $url = $this->server('PHP_SELF');
+                } elseif (basename($this->server('ORIG_SCRIPT_NAME')) === $script_name) {
+                    $url = $this->server('ORIG_SCRIPT_NAME');
+                } elseif (($pos = strpos($this->server('PHP_SELF'), '/' . $script_name)) !== false) {
+                    $url = substr($this->server('SCRIPT_NAME'), 0, $pos) . '/' . $script_name;
+                } elseif ($this->server('DOCUMENT_ROOT') && strpos($this->server('SCRIPT_FILENAME'), $this->server('DOCUMENT_ROOT')) === 0) {
+                    $url = str_replace('\\', '/', str_replace($this->server('DOCUMENT_ROOT'), '', $this->server('SCRIPT_FILENAME')));
+                }
+            }
+            $this->baseFile = $url;
+        }
+
+        return $domain ? $this->domain() . $this->baseFile : $this->baseFile;
+    }
+
+    /**
+     * 设置URL访问根地址
+     * @access public
+     * @param  string $url URL地址
+     * @return string|$this
+     */
+    public function setRoot($url = null)
+    {
+        $this->root = $url;
+        return $this;
+    }
+
+    /**
+     * 获取URL访问根地址
+     * @access public
+     * @param  bool     $domain 是否包含域名
+     * @return string|$this
+     */
+    public function root($domain = false)
+    {
+        if (!$this->root) {
+            $file = $this->baseFile();
+            if ($file && 0 !== strpos($this->url(), $file)) {
+                $file = str_replace('\\', '/', dirname($file));
+            }
+            $this->root = rtrim($file, '/');
+        }
+
+        return $domain ? $this->domain() . $this->root : $this->root;
+    }
+
+    /**
+     * 获取URL访问根目录
+     * @access public
+     * @return string
+     */
+    public function rootUrl()
+    {
+        $base = $this->root();
+        $root = strpos($base, '.') ? ltrim(dirname($base), DIRECTORY_SEPARATOR) : $base;
+
+        if ('' != $root) {
+            $root = '/' . ltrim($root, '/');
+        }
+
+        return $root;
+    }
+
+    public function setPathinfo($pathinfo)
+    {
+        $this->pathinfo = $pathinfo;
+        return $this;
+    }
+
+    /**
+     * 获取当前请求URL的pathinfo信息（含URL后缀）
+     * @access public
+     * @return string
+     */
+    public function pathinfo()
+    {
+        if (is_null($this->pathinfo)) {
+            if (isset($_GET[$this->config['var_pathinfo']])) {
+                // 判断URL里面是否有兼容模式参数
+                $pathinfo = $_GET[$this->config['var_pathinfo']];
+                unset($_GET[$this->config['var_pathinfo']]);
+            } elseif ($this->isCli()) {
+                // CLI模式下 index.php module/controller/action/params/...
+                $pathinfo = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : '';
+            } elseif ('cli-server' == PHP_SAPI) {
+                $pathinfo = strpos($this->server('REQUEST_URI'), '?') ? strstr($this->server('REQUEST_URI'), '?', true) : $this->server('REQUEST_URI');
+            } elseif ($this->server('PATH_INFO')) {
+                $pathinfo = $this->server('PATH_INFO');
+            }
+
+            // 分析PATHINFO信息
+            if (!isset($pathinfo)) {
+                foreach ($this->config['pathinfo_fetch'] as $type) {
+                    if ($this->server($type)) {
+                        $pathinfo = (0 === strpos($this->server($type), $this->server('SCRIPT_NAME'))) ?
+                        substr($this->server($type), strlen($this->server('SCRIPT_NAME'))) : $this->server($type);
+                        break;
+                    }
+                }
+            }
+
+            $this->pathinfo = empty($pathinfo) || '/' == $pathinfo ? '' : ltrim($pathinfo, '/');
+        }
+
+        return $this->pathinfo;
+    }
+
+    /**
+     * 获取当前请求URL的pathinfo信息(不含URL后缀)
+     * @access public
+     * @return string
+     */
+    public function path()
+    {
+        if (is_null($this->path)) {
+            $suffix   = $this->config['url_html_suffix'];
+            $pathinfo = $this->pathinfo();
+
+            if (false === $suffix) {
+                // 禁止伪静态访问
+                $this->path = $pathinfo;
+            } elseif ($suffix) {
+                // 去除正常的URL后缀
+                $this->path = preg_replace('/\.(' . ltrim($suffix, '.') . ')$/i', '', $pathinfo);
+            } else {
+                // 允许任何后缀访问
+                $this->path = preg_replace('/\.' . $this->ext() . '$/i', '', $pathinfo);
+            }
+        }
+
+        return $this->path;
+    }
+
+    /**
+     * 当前URL的访问后缀
+     * @access public
+     * @return string
+     */
+    public function ext()
+    {
+        return pathinfo($this->pathinfo(), PATHINFO_EXTENSION);
+    }
+
+    /**
+     * 获取当前请求的时间
+     * @access public
+     * @param  bool $float 是否使用浮点类型
+     * @return integer|float
+     */
+    public function time($float = false)
+    {
+        return $float ? $this->server('REQUEST_TIME_FLOAT') : $this->server('REQUEST_TIME');
+    }
+
+    /**
+     * 当前请求的资源类型
+     * @access public
+     * @return false|string
+     */
+    public function type()
+    {
+        $accept = $this->server('HTTP_ACCEPT');
+
+        if (empty($accept)) {
+            return false;
+        }
+
+        foreach ($this->mimeType as $key => $val) {
+            $array = explode(',', $val);
+            foreach ($array as $k => $v) {
+                if (stristr($accept, $v)) {
+                    return $key;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 设置资源类型
+     * @access public
+     * @param  string|array  $type 资源类型名
+     * @param  string        $val 资源类型
+     * @return void
+     */
+    public function mimeType($type, $val = '')
+    {
+        if (is_array($type)) {
+            $this->mimeType = array_merge($this->mimeType, $type);
+        } else {
+            $this->mimeType[$type] = $val;
+        }
+    }
+
+    /**
+     * 当前的请求类型
+     * @access public
+     * @param  bool $origin  是否获取原始请求类型
+     * @return string
+     */
+    public function method($origin = false)
+    {
+        if ($origin) {
+            // 获取原始请求类型
+            return $this->server('REQUEST_METHOD') ?: 'GET';
+        } elseif (!$this->method) {
+            if (isset($_POST[$this->config['var_method']])) {
+                $this->method    = strtoupper($_POST[$this->config['var_method']]);
+                $method          = strtolower($this->method);
+                $this->{$method} = $_POST;
+            } elseif ($this->server('HTTP_X_HTTP_METHOD_OVERRIDE')) {
+                $this->method = strtoupper($this->server('HTTP_X_HTTP_METHOD_OVERRIDE'));
+            } else {
+                $this->method = $this->server('REQUEST_METHOD') ?: 'GET';
+            }
+        }
+
+        return $this->method;
+    }
+
+    /**
+     * 是否为GET请求
+     * @access public
+     * @return bool
+     */
+    public function isGet()
+    {
+        return $this->method() == 'GET';
+    }
+
+    /**
+     * 是否为POST请求
+     * @access public
+     * @return bool
+     */
+    public function isPost()
+    {
+        return $this->method() == 'POST';
+    }
+
+    /**
+     * 是否为PUT请求
+     * @access public
+     * @return bool
+     */
+    public function isPut()
+    {
+        return $this->method() == 'PUT';
+    }
+
+    /**
+     * 是否为DELTE请求
+     * @access public
+     * @return bool
+     */
+    public function isDelete()
+    {
+        return $this->method() == 'DELETE';
+    }
+
+    /**
+     * 是否为HEAD请求
+     * @access public
+     * @return bool
+     */
+    public function isHead()
+    {
+        return $this->method() == 'HEAD';
+    }
+
+    /**
+     * 是否为PATCH请求
+     * @access public
+     * @return bool
+     */
+    public function isPatch()
+    {
+        return $this->method() == 'PATCH';
+    }
+
+    /**
+     * 是否为OPTIONS请求
+     * @access public
+     * @return bool
+     */
+    public function isOptions()
+    {
+        return $this->method() == 'OPTIONS';
+    }
+
+    /**
+     * 是否为cli
+     * @access public
+     * @return bool
+     */
+    public function isCli()
+    {
+        return PHP_SAPI == 'cli';
+    }
+
+    /**
+     * 是否为cgi
+     * @access public
+     * @return bool
+     */
+    public function isCgi()
+    {
+        return strpos(PHP_SAPI, 'cgi') === 0;
+    }
+
+    /**
+     * 获取当前请求的参数
+     * @access public
+     * @param  mixed         $name 变量名
+     * @param  mixed         $default 默认值
+     * @param  string|array  $filter 过滤方法
+     * @return mixed
+     */
+    public function param($name = '', $default = null, $filter = '')
+    {
+        if (!$this->mergeParam) {
+            $method = $this->method(true);
+
+            // 自动获取请求变量
+            switch ($method) {
+                case 'POST':
+                    $vars = $this->post(false);
+                    break;
+                case 'PUT':
+                case 'DELETE':
+                case 'PATCH':
+                    $vars = $this->put(false);
+                    break;
+                default:
+                    $vars = [];
+            }
+
+            // 当前请求参数和URL地址中的参数合并
+            $this->param = array_merge($this->param, $this->get(false), $vars, $this->route(false));
+
+            $this->mergeParam = true;
+        }
+
+        if (true === $name) {
+            // 获取包含文件上传信息的数组
+            $file = $this->file();
+            $data = is_array($file) ? array_merge($this->param, $file) : $this->param;
+
+            return $this->input($data, '', $default, $filter);
+        }
+
+        return $this->input($this->param, $name, $default, $filter);
+    }
+
+    /**
+     * 设置路由变量
+     * @access public
+     * @param  array         $route 路由变量
+     * @return $this
+     */
+    public function setRouteVars(array $route)
+    {
+        $this->route = array_merge($this->route, $route);
+        return $this;
+    }
+
+    /**
+     * 获取路由参数
+     * @access public
+     * @param  string|false  $name 变量名
+     * @param  mixed         $default 默认值
+     * @param  string|array  $filter 过滤方法
+     * @return mixed
+     */
+    public function route($name = '', $default = null, $filter = '')
+    {
+        return $this->input($this->route, $name, $default, $filter);
+    }
+
+    /**
+     * 获取GET参数
+     * @access public
+     * @param  string|false  $name 变量名
+     * @param  mixed         $default 默认值
+     * @param  string|array  $filter 过滤方法
+     * @return mixed
+     */
+    public function get($name = '', $default = null, $filter = '')
+    {
+        if (empty($this->get)) {
+            $this->get = $_GET;
+        }
+
+        return $this->input($this->get, $name, $default, $filter);
+    }
+
+    /**
+     * 获取POST参数
+     * @access public
+     * @param  string|false  $name 变量名
+     * @param  mixed         $default 默认值
+     * @param  string|array  $filter 过滤方法
+     * @return mixed
+     */
+    public function post($name = '', $default = null, $filter = '')
+    {
+        if (empty($this->post)) {
+            $this->post = !empty($_POST) ? $_POST : $this->getInputData($this->input);
+        }
+
+        return $this->input($this->post, $name, $default, $filter);
+    }
+
+    /**
+     * 获取PUT参数
+     * @access public
+     * @param  string|false      $name 变量名
+     * @param  mixed             $default 默认值
+     * @param  string|array      $filter 过滤方法
+     * @return mixed
+     */
+    public function put($name = '', $default = null, $filter = '')
+    {
+        if (is_null($this->put)) {
+            $this->put = $this->getInputData($this->input);
+        }
+
+        return $this->input($this->put, $name, $default, $filter);
+    }
+
+    protected function getInputData($content)
+    {
+        if (false !== strpos($this->contentType(), 'application/json') || 0 === strpos($content, '{"')) {
+            return (array) json_decode($content, true);
+        } elseif (strpos($content, '=')) {
+            parse_str($content, $data);
+            return $data;
+        }
+
+        return [];
+    }
+
+    /**
+     * 获取DELETE参数
+     * @access public
+     * @param  string|false      $name 变量名
+     * @param  mixed             $default 默认值
+     * @param  string|array      $filter 过滤方法
+     * @return mixed
+     */
+    public function delete($name = '', $default = null, $filter = '')
+    {
+        return $this->put($name, $default, $filter);
+    }
+
+    /**
+     * 获取PATCH参数
+     * @access public
+     * @param  string|false      $name 变量名
+     * @param  mixed             $default 默认值
+     * @param  string|array      $filter 过滤方法
+     * @return mixed
+     */
+    public function patch($name = '', $default = null, $filter = '')
+    {
+        return $this->put($name, $default, $filter);
+    }
+
+    /**
+     * 获取request变量
+     * @access public
+     * @param  string|false  $name 变量名
+     * @param  mixed         $default 默认值
+     * @param  string|array  $filter 过滤方法
+     * @return mixed
+     */
+    public function request($name = '', $default = null, $filter = '')
+    {
+        if (empty($this->request)) {
+            $this->request = $_REQUEST;
+        }
+
+        return $this->input($this->request, $name, $default, $filter);
+    }
+
+    /**
+     * 获取session数据
+     * @access public
+     * @param  string        $name 数据名称
+     * @param  string        $default 默认值
+     * @return mixed
+     */
+    public function session($name = '', $default = null)
+    {
+        if (empty($this->session)) {
+            $this->session = Session::get();
+        }
+
+        if ('' === $name) {
+            return $this->session;
+        }
+
+        $data = $this->getData($this->session, $name);
+
+        return is_null($data) ? $default : $data;
+    }
+
+    /**
+     * 获取cookie参数
+     * @access public
+     * @param  string        $name 变量名
+     * @param  string        $default 默认值
+     * @param  string|array  $filter 过滤方法
+     * @return mixed
+     */
+    public function cookie($name = '', $default = null, $filter = '')
+    {
+        if (empty($this->cookie)) {
+            $this->cookie = Cookie::get();
+        }
+
+        if (!empty($name)) {
+            $data = Cookie::has($name) ? Cookie::get($name) : $default;
+        } else {
+            $data = $this->cookie;
+        }
+
+        // 解析过滤器
+        $filter = $this->getFilter($filter, $default);
+
+        if (is_array($data)) {
+            array_walk_recursive($data, [$this, 'filterValue'], $filter);
+            reset($data);
+        } else {
+            $this->filterValue($data, $name, $filter);
+        }
+
+        return $data;
+    }
+
+    /**
+     * 获取server参数
+     * @access public
+     * @param  string        $name 数据名称
+     * @param  string        $default 默认值
+     * @return mixed
+     */
+    public function server($name = '', $default = null)
+    {
+        if (empty($name)) {
+            return $this->server;
+        } else {
+            $name = strtoupper($name);
+        }
+
+        return isset($this->server[$name]) ? $this->server[$name] : $default;
+    }
+
+    /**
+     * 获取上传的文件信息
+     * @access public
+     * @param  string   $name 名称
+     * @return null|array|\think\File
+     */
+    public function file($name = '')
+    {
+        if (empty($this->file)) {
+            $this->file = isset($_FILES) ? $_FILES : [];
+        }
+
+        $files = $this->file;
+        if (!empty($files)) {
+            // 处理上传文件
+            $array = $this->dealUploadFile($files);
+
+            if (strpos($name, '.')) {
+                list($name, $sub) = explode('.', $name);
+            }
+
+            if ('' === $name) {
+                // 获取全部文件
+                return $array;
+            } elseif (isset($sub) && isset($array[$name][$sub])) {
+                return $array[$name][$sub];
+            } elseif (isset($array[$name])) {
+                return $array[$name];
+            }
+        }
+
+        return;
+    }
+
+    protected function dealUploadFile($files)
+    {
+        $array = [];
+        foreach ($files as $key => $file) {
+            if (is_array($file['name'])) {
+                $item  = [];
+                $keys  = array_keys($file);
+                $count = count($file['name']);
+
+                for ($i = 0; $i < $count; $i++) {
+                    if (empty($file['tmp_name'][$i]) || !is_file($file['tmp_name'][$i])) {
+                        continue;
+                    }
+
+                    $temp['key'] = $key;
+
+                    foreach ($keys as $_key) {
+                        $temp[$_key] = $file[$_key][$i];
+                    }
+
+                    $item[] = (new File($temp['tmp_name']))->setUploadInfo($temp);
+                }
+
+                $array[$key] = $item;
+            } else {
+                if ($file instanceof File) {
+                    $array[$key] = $file;
+                } else {
+                    if (empty($file['tmp_name']) || !is_file($file['tmp_name'])) {
+                        continue;
+                    }
+
+                    $array[$key] = (new File($file['tmp_name']))->setUploadInfo($file);
+                }
+            }
+        }
+
+        return $array;
+    }
+
+    /**
+     * 获取环境变量
+     * @access public
+     * @param  string        $name 数据名称
+     * @param  string        $default 默认值
+     * @return mixed
+     */
+    public function env($name = '', $default = null)
+    {
+        if (empty($name)) {
+            return $this->env;
+        } else {
+            $name = strtoupper($name);
+        }
+
+        return isset($this->env[$name]) ? $this->env[$name] : $default;
+    }
+
+    /**
+     * 获取当前的Header
+     * @access public
+     * @param  string   $name header名称
+     * @param  string   $default 默认值
+     * @return string|array
+     */
+    public function header($name = '', $default = null)
+    {
+        if (empty($this->header)) {
+            $header = [];
+            if (function_exists('apache_request_headers') && $result = apache_request_headers()) {
+                $header = $result;
+            } else {
+                $server = $this->server;
+                foreach ($server as $key => $val) {
+                    if (0 === strpos($key, 'HTTP_')) {
+                        $key          = str_replace('_', '-', strtolower(substr($key, 5)));
+                        $header[$key] = $val;
+                    }
+                }
+                if (isset($server['CONTENT_TYPE'])) {
+                    $header['content-type'] = $server['CONTENT_TYPE'];
+                }
+                if (isset($server['CONTENT_LENGTH'])) {
+                    $header['content-length'] = $server['CONTENT_LENGTH'];
+                }
+            }
+            $this->header = array_change_key_case($header);
+        }
+
+        if ('' === $name) {
+            return $this->header;
+        }
+
+        $name = str_replace('_', '-', strtolower($name));
+
+        return isset($this->header[$name]) ? $this->header[$name] : $default;
+    }
+
+    /**
+     * 获取变量 支持过滤和默认值
+     * @access public
+     * @param  array         $data 数据源
+     * @param  string|false  $name 字段名
+     * @param  mixed         $default 默认值
+     * @param  string|array  $filter 过滤函数
+     * @return mixed
+     */
+    public function input($data = [], $name = '', $default = null, $filter = '')
+    {
+        if (false === $name) {
+            // 获取原始数据
+            return $data;
+        }
+
+        $name = (string) $name;
+        if ('' != $name) {
+            // 解析name
+            if (strpos($name, '/')) {
+                list($name, $type) = explode('/', $name);
+            }
+
+            $data = $this->getData($data, $name);
+
+            if (is_null($data)) {
+                return $default;
+            }
+
+            if (is_object($data)) {
+                return $data;
+            }
+        }
+
+        // 解析过滤器
+        $filter = $this->getFilter($filter, $default);
+
+        if (is_array($data)) {
+            array_walk_recursive($data, [$this, 'filterValue'], $filter);
+            reset($data);
+        } else {
+            $this->filterValue($data, $name, $filter);
+        }
+
+        if (isset($type) && $data !== $default) {
+            // 强制类型转换
+            $this->typeCast($data, $type);
+        }
+
+        return $data;
+    }
+
+    /**
+     * 获取数据
+     * @access public
+     * @param  array         $data 数据源
+     * @param  string|false  $name 字段名
+     * @return mixed
+     */
+    protected function getData(array $data, $name)
+    {
+        foreach (explode('.', $name) as $val) {
+            if (isset($data[$val])) {
+                $data = $data[$val];
+            } else {
+                return;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * 设置或获取当前的过滤规则
+     * @access public
+     * @param  mixed $filter 过滤规则
+     * @return mixed
+     */
+    public function filter($filter = null)
+    {
+        if (is_null($filter)) {
+            return $this->filter;
+        }
+
+        $this->filter = $filter;
+    }
+
+    protected function getFilter($filter, $default)
+    {
+        if (is_null($filter)) {
+            $filter = [];
+        } else {
+            $filter = $filter ?: $this->filter;
+            if (is_string($filter) && false === strpos($filter, '/')) {
+                $filter = explode(',', $filter);
+            } else {
+                $filter = (array) $filter;
+            }
+        }
+
+        $filter[] = $default;
+
+        return $filter;
+    }
+
+    /**
+     * 递归过滤给定的值
+     * @access public
+     * @param  mixed     $value 键值
+     * @param  mixed     $key 键名
+     * @param  array     $filters 过滤方法+默认值
+     * @return mixed
+     */
+    private function filterValue(&$value, $key, $filters)
+    {
+        $default = array_pop($filters);
+
+        foreach ($filters as $filter) {
+            if (is_callable($filter)) {
+                // 调用函数或者方法过滤
+                $value = call_user_func($filter, $value);
+            } elseif (is_scalar($value)) {
+                if (false !== strpos($filter, '/')) {
+                    // 正则过滤
+                    if (!preg_match($filter, $value)) {
+                        // 匹配不成功返回默认值
+                        $value = $default;
+                        break;
+                    }
+                } elseif (!empty($filter)) {
+                    // filter函数不存在时, 则使用filter_var进行过滤
+                    // filter为非整形值时, 调用filter_id取得过滤id
+                    $value = filter_var($value, is_int($filter) ? $filter : filter_id($filter));
+                    if (false === $value) {
+                        $value = $default;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * 强制类型转换
+     * @access public
+     * @param  string $data
+     * @param  string $type
+     * @return mixed
+     */
+    private function typeCast(&$data, $type)
+    {
+        switch (strtolower($type)) {
+            // 数组
+            case 'a':
+                $data = (array) $data;
+                break;
+            // 数字
+            case 'd':
+                $data = (int) $data;
+                break;
+            // 浮点
+            case 'f':
+                $data = (float) $data;
+                break;
+            // 布尔
+            case 'b':
+                $data = (boolean) $data;
+                break;
+            // 字符串
+            case 's':
+                if (is_scalar($data)) {
+                    $data = (string) $data;
+                } else {
+                    throw new \InvalidArgumentException('variable type error：' . gettype($data));
+                }
+                break;
+        }
+    }
+
+    /**
+     * 是否存在某个请求参数
+     * @access public
+     * @param  string    $name 变量名
+     * @param  string    $type 变量类型
+     * @param  bool      $checkEmpty 是否检测空值
+     * @return mixed
+     */
+    public function has($name, $type = 'param', $checkEmpty = false)
+    {
+        if (!in_array($type, ['param', 'get', 'post', 'request', 'put', 'file', 'session', 'cookie', 'env', 'header', 'route'])) {
+            return false;
+        }
+
+        if (empty($this->$type)) {
+            $param = $this->$type();
+        } else {
+            $param = $this->$type;
+        }
+
+        // 按.拆分成多维数组进行判断
+        foreach (explode('.', $name) as $val) {
+            if (isset($param[$val])) {
+                $param = $param[$val];
+            } else {
+                return false;
+            }
+        }
+
+        return ($checkEmpty && '' === $param) ? false : true;
+    }
+
+    /**
+     * 获取指定的参数
+     * @access public
+     * @param  string|array  $name 变量名
+     * @param  string        $type 变量类型
+     * @return mixed
+     */
+    public function only($name, $type = 'param')
+    {
+        $param = $this->$type();
+
+        if (is_string($name)) {
+            $name = explode(',', $name);
+        }
+
+        $item = [];
+        foreach ($name as $key => $val) {
+
+            if (is_int($key)) {
+                $default = null;
+                $key     = $val;
+            } else {
+                $default = $val;
+            }
+
+            if (isset($param[$key])) {
+                $item[$key] = $param[$key];
+            } elseif (isset($default)) {
+                $item[$key] = $default;
+            }
+        }
+
+        return $item;
+    }
+
+    /**
+     * 排除指定参数获取
+     * @access public
+     * @param  string|array  $name 变量名
+     * @param  string        $type 变量类型
+     * @return mixed
+     */
+    public function except($name, $type = 'param')
+    {
+        $param = $this->$type();
+        if (is_string($name)) {
+            $name = explode(',', $name);
+        }
+
+        foreach ($name as $key) {
+            if (isset($param[$key])) {
+                unset($param[$key]);
+            }
+        }
+
+        return $param;
+    }
+
+    /**
+     * 当前是否ssl
+     * @access public
+     * @return bool
+     */
+    public function isSsl()
+    {
+        if ($this->server('HTTPS') && ('1' == $this->server('HTTPS') || 'on' == strtolower($this->server('HTTPS')))) {
+            return true;
+        } elseif ('https' == $this->server('REQUEST_SCHEME')) {
+            return true;
+        } elseif ('443' == $this->server('SERVER_PORT')) {
+            return true;
+        } elseif ('https' == $this->server('HTTP_X_FORWARDED_PROTO')) {
+            return true;
+        } elseif ($this->config['https_agent_name'] && $this->server($this->config['https_agent_name'])) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 当前是否Ajax请求
+     * @access public
+     * @param  bool $ajax  true 获取原始ajax请求
+     * @return bool
+     */
+    public function isAjax($ajax = false)
+    {
+        $value  = $this->server('HTTP_X_REQUESTED_WITH');
+        $result = 'xmlhttprequest' == strtolower($value) ? true : false;
+
+        if (true === $ajax) {
+            return $result;
+        }
+
+        return $this->param($this->config['var_ajax']) ? true : $result;
+    }
+
+    /**
+     * 当前是否Pjax请求
+     * @access public
+     * @param  bool $pjax  true 获取原始pjax请求
+     * @return bool
+     */
+    public function isPjax($pjax = false)
+    {
+        $result = !is_null($this->server('HTTP_X_PJAX')) ? true : false;
+
+        if (true === $pjax) {
+            return $result;
+        }
+
+        return $this->param($this->config['var_pjax']) ? true : $result;
+    }
+
+    /**
+     * 获取客户端IP地址
+     * @access public
+     * @param  integer   $type 返回类型 0 返回IP地址 1 返回IPV4地址数字
+     * @param  boolean   $adv 是否进行高级模式获取（有可能被伪装）
+     * @return mixed
+     */
+    public function ip($type = 0, $adv = true)
+    {
+        $type      = $type ? 1 : 0;
+        static $ip = null;
+
+        if (null !== $ip) {
+            return $ip[$type];
+        }
+
+        $httpAgentIp = $this->config['http_agent_ip'];
+
+        if ($httpAgentIp && $this->server($httpAgentIp)) {
+            $ip = $this->server($httpAgentIp);
+        } elseif ($adv) {
+            if ($this->server('HTTP_X_FORWARDED_FOR')) {
+                $arr = explode(',', $this->server('HTTP_X_FORWARDED_FOR'));
+                $pos = array_search('unknown', $arr);
+                if (false !== $pos) {
+                    unset($arr[$pos]);
+                }
+                $ip = trim(current($arr));
+            } elseif ($this->server('HTTP_CLIENT_IP')) {
+                $ip = $this->server('HTTP_CLIENT_IP');
+            } elseif ($this->server('REMOTE_ADDR')) {
+                $ip = $this->server('REMOTE_ADDR');
+            }
+        } elseif ($this->server('REMOTE_ADDR')) {
+            $ip = $this->server('REMOTE_ADDR');
+        }
+
+        // IP地址类型
+        $ip_mode = (strpos($ip, ':') === false) ? 'ipv4' : 'ipv6';
+
+        // IP地址合法验证
+        if (filter_var($ip, FILTER_VALIDATE_IP) !== $ip) {
+            $ip = ('ipv4' === $ip_mode) ? '0.0.0.0' : '::';
+        }
+
+        // 如果是ipv4地址，则直接使用ip2long返回int类型ip；如果是ipv6地址，暂时不支持，直接返回0
+        $long_ip = ('ipv4' === $ip_mode) ? sprintf("%u", ip2long($ip)) : 0;
+
+        $ip = [$ip, $long_ip];
+
+        return $ip[$type];
+    }
+
+    /**
+     * 检测是否使用手机访问
+     * @access public
+     * @return bool
+     */
+    public function isMobile()
+    {
+        if ($this->server('HTTP_VIA') && stristr($this->server('HTTP_VIA'), "wap")) {
+            return true;
+        } elseif ($this->server('HTTP_ACCEPT') && strpos(strtoupper($this->server('HTTP_ACCEPT')), "VND.WAP.WML")) {
+            return true;
+        } elseif ($this->server('HTTP_X_WAP_PROFILE') || $this->server('HTTP_PROFILE')) {
+            return true;
+        } elseif ($this->server('HTTP_USER_AGENT') && preg_match('/(blackberry|configuration\/cldc|hp |hp-|htc |htc_|htc-|iemobile|kindle|midp|mmp|motorola|mobile|nokia|opera mini|opera |Googlebot-Mobile|YahooSeeker\/M1A1-R2D2|android|iphone|ipod|mobi|palm|palmos|pocket|portalmmm|ppc;|smartphone|sonyericsson|sqh|spv|symbian|treo|up.browser|up.link|vodafone|windows ce|xda |xda_)/i', $this->server('HTTP_USER_AGENT'))) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 当前URL地址中的scheme参数
+     * @access public
+     * @return string
+     */
+    public function scheme()
+    {
+        return $this->isSsl() ? 'https' : 'http';
+    }
+
+    /**
+     * 当前请求URL地址中的query参数
+     * @access public
+     * @return string
+     */
+    public function query()
+    {
+        return $this->server('QUERY_STRING');
+    }
+
+    /**
+     * 设置当前请求的host（包含端口）
+     * @access public
+     * @param  string $host 主机名（含端口）
+     * @return $this
+     */
+    public function setHost($host)
+    {
+        $this->host = $host;
+
+        return $this;
+    }
+
+    /**
+     * 当前请求的host
+     * @access public
+     * @param bool $strict  true 仅仅获取HOST
+     * @return string
+     */
+    public function host($strict = false)
+    {
+        if (!$this->host) {
+            $this->host = $this->server('HTTP_X_REAL_HOST') ?: $this->server('HTTP_HOST');
+        }
+
+        return true === $strict && strpos($this->host, ':') ? strstr($this->host, ':', true) : $this->host;
+    }
+
+    /**
+     * 当前请求URL地址中的port参数
+     * @access public
+     * @return integer
+     */
+    public function port()
+    {
+        return $this->server('SERVER_PORT');
+    }
+
+    /**
+     * 当前请求 SERVER_PROTOCOL
+     * @access public
+     * @return string
+     */
+    public function protocol()
+    {
+        return $this->server('SERVER_PROTOCOL');
+    }
+
+    /**
+     * 当前请求 REMOTE_PORT
+     * @access public
+     * @return integer
+     */
+    public function remotePort()
+    {
+        return $this->server('REMOTE_PORT');
+    }
+
+    /**
+     * 当前请求 HTTP_CONTENT_TYPE
+     * @access public
+     * @return string
+     */
+    public function contentType()
+    {
+        $contentType = $this->server('CONTENT_TYPE');
+
+        if ($contentType) {
+            if (strpos($contentType, ';')) {
+                list($type) = explode(';', $contentType);
+            } else {
+                $type = $contentType;
+            }
+            return trim($type);
+        }
+
+        return '';
+    }
+
+    /**
+     * 获取当前请求的路由信息
+     * @access public
+     * @param  array $route 路由名称
+     * @return array
+     */
+    public function routeInfo(array $route = [])
+    {
+        if (!empty($route)) {
+            $this->routeInfo = $route;
+        }
+
+        return $this->routeInfo;
+    }
+
+    /**
+     * 设置或者获取当前请求的调度信息
+     * @access public
+     * @param  \think\route\Dispatch  $dispatch 调度信息
+     * @return \think\route\Dispatch
+     */
+    public function dispatch($dispatch = null)
+    {
+        if (!is_null($dispatch)) {
+            $this->dispatch = $dispatch;
+        }
+
+        return $this->dispatch;
+    }
+
+    /**
+     * 获取当前请求的安全Key
+     * @access public
+     * @return string
+     */
+    public function secureKey()
+    {
+        if (is_null($this->secureKey)) {
+            $this->secureKey = uniqid('', true);
+        }
+
+        return $this->secureKey;
+    }
+
+    /**
+     * 设置当前的模块名
+     * @access public
+     * @param  string $module 模块名
+     * @return $this
+     */
+    public function setModule($module)
+    {
+        $this->module = $module;
+        return $this;
+    }
+
+    /**
+     * 设置当前的控制器名
+     * @access public
+     * @param  string $controller 控制器名
+     * @return $this
+     */
+    public function setController($controller)
+    {
+        $this->controller = $controller;
+        return $this;
+    }
+
+    /**
+     * 设置当前的操作名
+     * @access public
+     * @param  string $action 操作名
+     * @return $this
+     */
+    public function setAction($action)
+    {
+        $this->action = $action;
+        return $this;
+    }
+
+    /**
+     * 获取当前的模块名
+     * @access public
+     * @return string
+     */
+    public function module()
+    {
+        return $this->module ?: '';
+    }
+
+    /**
+     * 获取当前的控制器名
+     * @access public
+     * @param  bool $convert 转换为小写
+     * @return string
+     */
+    public function controller($convert = false)
+    {
+        $name = $this->controller ?: '';
+        return $convert ? strtolower($name) : $name;
+    }
+
+    /**
+     * 获取当前的操作名
+     * @access public
+     * @param  bool $convert 转换为驼峰
+     * @return string
+     */
+    public function action($convert = false)
+    {
+        $name = $this->action ?: '';
+        return $convert ? $name : strtolower($name);
+    }
+
+    /**
+     * 设置当前的语言
+     * @access public
+     * @param  string $lang 语言名
+     * @return $this
+     */
+    public function setLangset($lang)
+    {
+        $this->langset = $lang;
+        return $this;
+    }
+
+    /**
+     * 获取当前的语言
+     * @access public
+     * @return string
+     */
+    public function langset()
+    {
+        return $this->langset ?: '';
+    }
+
+    /**
+     * 设置或者获取当前请求的content
+     * @access public
+     * @return string
+     */
+    public function getContent()
+    {
+        if (is_null($this->content)) {
+            $this->content = $this->input;
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * 获取当前请求的php://input
+     * @access public
+     * @return string
+     */
+    public function getInput()
+    {
+        return $this->input;
+    }
+
+    /**
+     * 生成请求令牌
+     * @access public
+     * @param  string $name 令牌名称
+     * @param  mixed  $type 令牌生成方法
+     * @return string
+     */
+    public function token($name = '__token__', $type = null)
+    {
+        $type  = is_callable($type) ? $type : 'md5';
+        $token = call_user_func($type, $this->server('REQUEST_TIME_FLOAT'));
+
+        if ($this->isAjax()) {
+            header($name . ': ' . $token);
+        }
+
+        facade\Session::set($name, $token);
+
+        return $token;
+    }
+
+    /**
+     * 设置当前地址的请求缓存
+     * @access public
+     * @param  string $key 缓存标识，支持变量规则 ，例如 item/:name/:id
+     * @param  mixed  $expire 缓存有效期
+     * @param  array  $except 缓存排除
+     * @param  string $tag    缓存标签
+     * @return mixed
+     */
+    public function cache($key, $expire = null, $except = [], $tag = null)
+    {
+        if (!is_array($except)) {
+            $tag    = $except;
+            $except = [];
+        }
+
+        if (false === $key || !$this->isGet() || $this->isCheckCache || false === $expire) {
+            // 关闭当前缓存
+            return;
+        }
+
+        // 标记请求缓存检查
+        $this->isCheckCache = true;
+
+        foreach ($except as $rule) {
+            if (0 === stripos($this->url(), $rule)) {
+                return;
+            }
+        }
+
+        if ($key instanceof \Closure) {
+            $key = call_user_func_array($key, [$this]);
+        } elseif (true === $key) {
+            // 自动缓存功能
+            $key = '__URL__';
+        } elseif (strpos($key, '|')) {
+            list($key, $fun) = explode('|', $key);
+        }
+
+        // 特殊规则替换
+        if (false !== strpos($key, '__')) {
+            $key = str_replace(['__MODULE__', '__CONTROLLER__', '__ACTION__', '__URL__'], [$this->module, $this->controller, $this->action, md5($this->url(true))], $key);
+        }
+
+        if (false !== strpos($key, ':')) {
+            $param = $this->param();
+            foreach ($param as $item => $val) {
+                if (is_string($val) && false !== strpos($key, ':' . $item)) {
+                    $key = str_replace(':' . $item, $val, $key);
+                }
+            }
+        } elseif (strpos($key, ']')) {
+            if ('[' . $this->ext() . ']' == $key) {
+                // 缓存某个后缀的请求
+                $key = md5($this->url());
+            } else {
+                return;
+            }
+        }
+
+        if (isset($fun)) {
+            $key = $fun($key);
+        }
+
+        $this->cache = [$key, $expire, $tag];
+        return $this->cache;
+    }
+
+    /**
+     * 读取请求缓存设置
+     * @access public
+     * @return array
+     */
+    public function getCache()
+    {
+        return $this->cache;
+    }
+
+    /**
+     * 设置GET数据
+     * @access public
+     * @param  array $get 数据
+     * @return $this
+     */
+    public function withGet(array $get)
+    {
+        $this->get = $get;
+        return $this;
+    }
+
+    /**
+     * 设置POST数据
+     * @access public
+     * @param  array $post 数据
+     * @return $this
+     */
+    public function withPost(array $post)
+    {
+        $this->post = $post;
+        return $this;
+    }
+
+    /**
+     * 设置php://input数据
+     * @access public
+     * @param  string $input RAW数据
+     * @return $this
+     */
+    public function withInput($input)
+    {
+        $this->input = $input;
+        return $this;
+    }
+
+    /**
+     * 设置文件上传数据
+     * @access public
+     * @param  array $files 上传信息
+     * @return $this
+     */
+    public function withFiles(array $files)
+    {
+        $this->file = $files;
+        return $this;
+    }
+
+    /**
+     * 设置COOKIE数据
+     * @access public
+     * @param  array $cookie 数据
+     * @return $this
+     */
+    public function withCookie(array $cookie)
+    {
+        $this->cookie = $cookie;
+        return $this;
+    }
+
+    /**
+     * 设置SERVER数据
+     * @access public
+     * @param  array $server 数据
+     * @return $this
+     */
+    public function withServer(array $server)
+    {
+        $this->server = array_change_key_case($server, CASE_UPPER);
+        return $this;
+    }
+
+    /**
+     * 设置HEADER数据
+     * @access public
+     * @param  array $header 数据
+     * @return $this
+     */
+    public function withHeader(array $header)
+    {
+        $this->header = array_change_key_case($header);
+        return $this;
+    }
+
+    /**
+     * 设置ENV数据
+     * @access public
+     * @param  array $env 数据
+     * @return $this
+     */
+    public function withEnv(array $env)
+    {
+        $this->env = $env;
+        return $this;
+    }
+
+    /**
+     * 设置ROUTE变量
+     * @access public
+     * @param  array $route 数据
+     * @return $this
+     */
+    public function withRoute(array $route)
+    {
+        $this->route = $route;
+        return $this;
+    }
+
+    /**
+     * 设置请求数据
+     * @access public
+     * @param  string    $name  参数名
+     * @param  mixed     $value 值
+     */
+    public function __set($name, $value)
+    {
+        return $this->param[$name] = $value;
+    }
+
+    /**
+     * 获取请求数据的值
+     * @access public
+     * @param  string $name 参数名
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        return $this->param($name);
+    }
+
+    /**
+     * 检测请求数据的值
+     * @access public
+     * @param  string $name 名称
+     * @return boolean
+     */
+    public function __isset($name)
+    {
+        return isset($this->param[$name]);
+    }
+}
diff --git a/thinkphp/library/think/Response.php b/thinkphp/library/think/Response.php
new file mode 100644
index 0000000000000000000000000000000000000000..09cb6a9245dca933616104a2d266f99a8507177c
--- /dev/null
+++ b/thinkphp/library/think/Response.php
@@ -0,0 +1,408 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\response\Redirect as RedirectResponse;
+
+class Response
+{
+    /**
+     * 原始数据
+     * @var mixed
+     */
+    protected $data;
+
+    /**
+     * 应用对象实例
+     * @var App
+     */
+    protected $app;
+
+    /**
+     * 当前contentType
+     * @var string
+     */
+    protected $contentType = 'text/html';
+
+    /**
+     * 字符集
+     * @var string
+     */
+    protected $charset = 'utf-8';
+
+    /**
+     * 状态码
+     * @var integer
+     */
+    protected $code = 200;
+
+    /**
+     * 是否允许请求缓存
+     * @var bool
+     */
+    protected $allowCache = true;
+
+    /**
+     * 输出参数
+     * @var array
+     */
+    protected $options = [];
+
+    /**
+     * header参数
+     * @var array
+     */
+    protected $header = [];
+
+    /**
+     * 输出内容
+     * @var string
+     */
+    protected $content = null;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  mixed $data    输出数据
+     * @param  int   $code
+     * @param  array $header
+     * @param  array $options 输出参数
+     */
+    public function __construct($data = '', $code = 200, array $header = [], $options = [])
+    {
+        $this->data($data);
+
+        if (!empty($options)) {
+            $this->options = array_merge($this->options, $options);
+        }
+
+        $this->contentType($this->contentType, $this->charset);
+
+        $this->code   = $code;
+        $this->app    = Container::get('app');
+        $this->header = array_merge($this->header, $header);
+    }
+
+    /**
+     * 创建Response对象
+     * @access public
+     * @param  mixed  $data    输出数据
+     * @param  string $type    输出类型
+     * @param  int    $code
+     * @param  array  $header
+     * @param  array  $options 输出参数
+     * @return Response
+     */
+    public static function create($data = '', $type = '', $code = 200, array $header = [], $options = [])
+    {
+        $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\' . ucfirst(strtolower($type));
+
+        if (class_exists($class)) {
+            return new $class($data, $code, $header, $options);
+        }
+
+        return new static($data, $code, $header, $options);
+    }
+
+    /**
+     * 发送数据到客户端
+     * @access public
+     * @return void
+     * @throws \InvalidArgumentException
+     */
+    public function send()
+    {
+        // 监听response_send
+        $this->app['hook']->listen('response_send', $this);
+
+        // 处理输出数据
+        $data = $this->getContent();
+
+        // Trace调试注入
+        if ('cli' != PHP_SAPI && $this->app['env']->get('app_trace', $this->app->config('app.app_trace'))) {
+            $this->app['debug']->inject($this, $data);
+        }
+
+        if (200 == $this->code && $this->allowCache) {
+            $cache = $this->app['request']->getCache();
+            if ($cache) {
+                $this->header['Cache-Control'] = 'max-age=' . $cache[1] . ',must-revalidate';
+                $this->header['Last-Modified'] = gmdate('D, d M Y H:i:s') . ' GMT';
+                $this->header['Expires']       = gmdate('D, d M Y H:i:s', $_SERVER['REQUEST_TIME'] + $cache[1]) . ' GMT';
+
+                $this->app['cache']->tag($cache[2])->set($cache[0], [$data, $this->header], $cache[1]);
+            }
+        }
+
+        if (!headers_sent() && !empty($this->header)) {
+            // 发送状态码
+            http_response_code($this->code);
+            // 发送头部信息
+            foreach ($this->header as $name => $val) {
+                header($name . (!is_null($val) ? ':' . $val : ''));
+            }
+        }
+
+        $this->sendData($data);
+
+        if (function_exists('fastcgi_finish_request')) {
+            // 提高页面响应
+            fastcgi_finish_request();
+        }
+
+        // 监听response_end
+        $this->app['hook']->listen('response_end', $this);
+
+        // 清空当次请求有效的数据
+        if (!($this instanceof RedirectResponse)) {
+            $this->app['session']->flush();
+        }
+    }
+
+    /**
+     * 处理数据
+     * @access protected
+     * @param  mixed $data 要处理的数据
+     * @return mixed
+     */
+    protected function output($data)
+    {
+        return $data;
+    }
+
+    /**
+     * 输出数据
+     * @access protected
+     * @param string $data 要处理的数据
+     * @return void
+     */
+    protected function sendData($data)
+    {
+        echo $data;
+    }
+
+    /**
+     * 输出的参数
+     * @access public
+     * @param  mixed $options 输出参数
+     * @return $this
+     */
+    public function options($options = [])
+    {
+        $this->options = array_merge($this->options, $options);
+
+        return $this;
+    }
+
+    /**
+     * 输出数据设置
+     * @access public
+     * @param  mixed $data 输出数据
+     * @return $this
+     */
+    public function data($data)
+    {
+        $this->data = $data;
+
+        return $this;
+    }
+
+    /**
+     * 是否允许请求缓存
+     * @access public
+     * @param  bool $cache 允许请求缓存
+     * @return $this
+     */
+    public function allowCache($cache)
+    {
+        $this->allowCache = $cache;
+
+        return $this;
+    }
+
+    /**
+     * 设置响应头
+     * @access public
+     * @param  string|array $name  参数名
+     * @param  string       $value 参数值
+     * @return $this
+     */
+    public function header($name, $value = null)
+    {
+        if (is_array($name)) {
+            $this->header = array_merge($this->header, $name);
+        } else {
+            $this->header[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 设置页面输出内容
+     * @access public
+     * @param  mixed $content
+     * @return $this
+     */
+    public function content($content)
+    {
+        if (null !== $content && !is_string($content) && !is_numeric($content) && !is_callable([
+            $content,
+            '__toString',
+        ])
+        ) {
+            throw new \InvalidArgumentException(sprintf('variable type error： %s', gettype($content)));
+        }
+
+        $this->content = (string) $content;
+
+        return $this;
+    }
+
+    /**
+     * 发送HTTP状态
+     * @access public
+     * @param  integer $code 状态码
+     * @return $this
+     */
+    public function code($code)
+    {
+        $this->code = $code;
+
+        return $this;
+    }
+
+    /**
+     * LastModified
+     * @access public
+     * @param  string $time
+     * @return $this
+     */
+    public function lastModified($time)
+    {
+        $this->header['Last-Modified'] = $time;
+
+        return $this;
+    }
+
+    /**
+     * Expires
+     * @access public
+     * @param  string $time
+     * @return $this
+     */
+    public function expires($time)
+    {
+        $this->header['Expires'] = $time;
+
+        return $this;
+    }
+
+    /**
+     * ETag
+     * @access public
+     * @param  string $eTag
+     * @return $this
+     */
+    public function eTag($eTag)
+    {
+        $this->header['ETag'] = $eTag;
+
+        return $this;
+    }
+
+    /**
+     * 页面缓存控制
+     * @access public
+     * @param  string $cache 状态码
+     * @return $this
+     */
+    public function cacheControl($cache)
+    {
+        $this->header['Cache-control'] = $cache;
+
+        return $this;
+    }
+
+    /**
+     * 页面输出类型
+     * @access public
+     * @param  string $contentType 输出类型
+     * @param  string $charset     输出编码
+     * @return $this
+     */
+    public function contentType($contentType, $charset = 'utf-8')
+    {
+        $this->header['Content-Type'] = $contentType . '; charset=' . $charset;
+
+        return $this;
+    }
+
+    /**
+     * 获取头部信息
+     * @access public
+     * @param  string $name 头部名称
+     * @return mixed
+     */
+    public function getHeader($name = '')
+    {
+        if (!empty($name)) {
+            return isset($this->header[$name]) ? $this->header[$name] : null;
+        }
+
+        return $this->header;
+    }
+
+    /**
+     * 获取原始数据
+     * @access public
+     * @return mixed
+     */
+    public function getData()
+    {
+        return $this->data;
+    }
+
+    /**
+     * 获取输出数据
+     * @access public
+     * @return mixed
+     */
+    public function getContent()
+    {
+        if (null == $this->content) {
+            $content = $this->output($this->data);
+
+            if (null !== $content && !is_string($content) && !is_numeric($content) && !is_callable([
+                $content,
+                '__toString',
+            ])
+            ) {
+                throw new \InvalidArgumentException(sprintf('variable type error： %s', gettype($content)));
+            }
+
+            $this->content = (string) $content;
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * 获取状态码
+     * @access public
+     * @return integer
+     */
+    public function getCode()
+    {
+        return $this->code;
+    }
+}
diff --git a/thinkphp/library/think/Route.php b/thinkphp/library/think/Route.php
new file mode 100644
index 0000000000000000000000000000000000000000..43b7614c54c20395e30971abf93dbe236289eb66
--- /dev/null
+++ b/thinkphp/library/think/Route.php
@@ -0,0 +1,942 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\exception\RouteNotFoundException;
+use think\route\AliasRule;
+use think\route\dispatch\Url as UrlDispatch;
+use think\route\Domain;
+use think\route\Resource;
+use think\route\RuleGroup;
+use think\route\RuleItem;
+
+class Route
+{
+    /**
+     * REST定义
+     * @var array
+     */
+    protected $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'],
+    ];
+
+    /**
+     * 请求方法前缀定义
+     * @var array
+     */
+    protected $methodPrefix = [
+        'get'    => 'get',
+        'post'   => 'post',
+        'put'    => 'put',
+        'delete' => 'delete',
+        'patch'  => 'patch',
+    ];
+
+    /**
+     * 应用对象
+     * @var App
+     */
+    protected $app;
+
+    /**
+     * 请求对象
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * 当前HOST
+     * @var string
+     */
+    protected $host;
+
+    /**
+     * 当前域名
+     * @var string
+     */
+    protected $domain;
+
+    /**
+     * 当前分组对象
+     * @var RuleGroup
+     */
+    protected $group;
+
+    /**
+     * 配置参数
+     * @var array
+     */
+    protected $config = [];
+
+    /**
+     * 路由绑定
+     * @var array
+     */
+    protected $bind = [];
+
+    /**
+     * 域名对象
+     * @var array
+     */
+    protected $domains = [];
+
+    /**
+     * 跨域路由规则
+     * @var RuleGroup
+     */
+    protected $cross;
+
+    /**
+     * 路由别名
+     * @var array
+     */
+    protected $alias = [];
+
+    /**
+     * 路由是否延迟解析
+     * @var bool
+     */
+    protected $lazy = true;
+
+    /**
+     * （分组）路由规则是否合并解析
+     * @var bool
+     */
+    protected $mergeRuleRegex = true;
+
+    /**
+     * 路由解析自动搜索多级控制器
+     * @var bool
+     */
+    protected $autoSearchController = true;
+
+    public function __construct(App $app, array $config = [])
+    {
+        $this->app     = $app;
+        $this->request = $app['request'];
+        $this->config  = $config;
+
+        $this->host = $this->request->host(true) ?: $config['app_host'];
+
+        $this->setDefaultDomain();
+    }
+
+    public function config($name = null)
+    {
+        if (is_null($name)) {
+            return $this->config;
+        }
+
+        return isset($this->config[$name]) ? $this->config[$name] : null;
+    }
+
+    /**
+     * 配置
+     * @access public
+     * @param  array $config
+     * @return void
+     */
+    public function setConfig(array $config = [])
+    {
+        $this->config = array_merge($this->config, array_change_key_case($config));
+    }
+
+    public static function __make(App $app, Config $config)
+    {
+        $config = $config->pull('app');
+        $route  = new static($app, $config);
+
+        $route->lazy($config['url_lazy_route'])
+            ->autoSearchController($config['controller_auto_search'])
+            ->mergeRuleRegex($config['route_rule_merge']);
+
+        return $route;
+    }
+
+    /**
+     * 设置路由的请求对象实例
+     * @access public
+     * @param  Request     $request   请求对象实例
+     * @return void
+     */
+    public function setRequest($request)
+    {
+        $this->request = $request;
+    }
+
+    /**
+     * 设置路由域名及分组（包括资源路由）是否延迟解析
+     * @access public
+     * @param  bool     $lazy   路由是否延迟解析
+     * @return $this
+     */
+    public function lazy($lazy = true)
+    {
+        $this->lazy = $lazy;
+        return $this;
+    }
+
+    /**
+     * 设置路由域名及分组（包括资源路由）是否合并解析
+     * @access public
+     * @param  bool     $merge   路由是否合并解析
+     * @return $this
+     */
+    public function mergeRuleRegex($merge = true)
+    {
+        $this->mergeRuleRegex = $merge;
+        $this->group->mergeRuleRegex($merge);
+
+        return $this;
+    }
+
+    /**
+     * 设置路由自动解析是否搜索多级控制器
+     * @access public
+     * @param  bool     $auto   是否自动搜索多级控制器
+     * @return $this
+     */
+    public function autoSearchController($auto = true)
+    {
+        $this->autoSearchController = $auto;
+        return $this;
+    }
+
+    /**
+     * 初始化默认域名
+     * @access protected
+     * @return void
+     */
+    protected function setDefaultDomain()
+    {
+        // 默认域名
+        $this->domain = $this->host;
+
+        // 注册默认域名
+        $domain = new Domain($this, $this->host);
+
+        $this->domains[$this->host] = $domain;
+
+        // 默认分组
+        $this->group = $domain;
+    }
+
+    /**
+     * 设置当前域名
+     * @access public
+     * @param  RuleGroup    $group 域名
+     * @return void
+     */
+    public function setGroup(RuleGroup $group)
+    {
+        $this->group = $group;
+    }
+
+    /**
+     * 获取当前分组
+     * @access public
+     * @return RuleGroup
+     */
+    public function getGroup()
+    {
+        return $this->group;
+    }
+
+    /**
+     * 注册变量规则
+     * @access public
+     * @param  string|array  $name 变量名
+     * @param  string        $rule 变量规则
+     * @return $this
+     */
+    public function pattern($name, $rule = '')
+    {
+        $this->group->pattern($name, $rule);
+
+        return $this;
+    }
+
+    /**
+     * 注册路由参数
+     * @access public
+     * @param  string|array  $name  参数名
+     * @param  mixed         $value 值
+     * @return $this
+     */
+    public function option($name, $value = '')
+    {
+        $this->group->option($name, $value);
+
+        return $this;
+    }
+
+    /**
+     * 注册域名路由
+     * @access public
+     * @param  string|array  $name 子域名
+     * @param  mixed         $rule 路由规则
+     * @param  array         $option 路由参数
+     * @param  array         $pattern 变量规则
+     * @return Domain
+     */
+    public function domain($name, $rule = '', $option = [], $pattern = [])
+    {
+        // 支持多个域名使用相同路由规则
+        $domainName = is_array($name) ? array_shift($name) : $name;
+
+        if ('*' != $domainName && !strpos($domainName, '.')) {
+            $domainName .= '.' . $this->request->rootDomain();
+        }
+
+        if (!isset($this->domains[$domainName])) {
+            $domain = (new Domain($this, $domainName, $rule, $option, $pattern))
+                ->lazy($this->lazy)
+                ->mergeRuleRegex($this->mergeRuleRegex);
+
+            $this->domains[$domainName] = $domain;
+        } else {
+            $domain = $this->domains[$domainName];
+            $domain->parseGroupRule($rule);
+        }
+
+        if (is_array($name) && !empty($name)) {
+            $root = $this->request->rootDomain();
+            foreach ($name as $item) {
+                if (!strpos($item, '.')) {
+                    $item .= '.' . $root;
+                }
+
+                $this->domains[$item] = $domainName;
+            }
+        }
+
+        // 返回域名对象
+        return $domain;
+    }
+
+    /**
+     * 获取域名
+     * @access public
+     * @return array
+     */
+    public function getDomains()
+    {
+        return $this->domains;
+    }
+
+    /**
+     * 设置路由绑定
+     * @access public
+     * @param  string     $bind 绑定信息
+     * @param  string     $domain 域名
+     * @return $this
+     */
+    public function bind($bind, $domain = null)
+    {
+        $domain = is_null($domain) ? $this->domain : $domain;
+
+        $this->bind[$domain] = $bind;
+
+        return $this;
+    }
+
+    /**
+     * 读取路由绑定
+     * @access public
+     * @param  string    $domain 域名
+     * @return string|null
+     */
+    public function getBind($domain = null)
+    {
+        if (is_null($domain)) {
+            $domain = $this->domain;
+        } elseif (true === $domain) {
+            return $this->bind;
+        } elseif (!strpos($domain, '.')) {
+            $domain .= '.' . $this->request->rootDomain();
+        }
+
+        $subDomain = $this->request->subDomain();
+
+        if (strpos($subDomain, '.')) {
+            $name = '*' . strstr($subDomain, '.');
+        }
+
+        if (isset($this->bind[$domain])) {
+            $result = $this->bind[$domain];
+        } elseif (isset($name) && isset($this->bind[$name])) {
+            $result = $this->bind[$name];
+        } elseif (isset($this->bind['*'])) {
+            $result = $this->bind['*'];
+        } else {
+            $result = null;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 读取路由标识
+     * @access public
+     * @param  string    $name 路由标识
+     * @param  string    $domain 域名
+     * @return mixed
+     */
+    public function getName($name = null, $domain = null)
+    {
+        return $this->app['rule_name']->get($name, $domain);
+    }
+
+    /**
+     * 读取路由
+     * @access public
+     * @param  string    $rule 路由规则
+     * @param  string    $domain 域名
+     * @return array
+     */
+    public function getRule($rule, $domain = null)
+    {
+        if (is_null($domain)) {
+            $domain = $this->domain;
+        }
+
+        return $this->app['rule_name']->getRule($rule, $domain);
+    }
+
+    /**
+     * 读取路由
+     * @access public
+     * @param  string    $domain 域名
+     * @return array
+     */
+    public function getRuleList($domain = null)
+    {
+        return $this->app['rule_name']->getRuleList($domain);
+    }
+
+    /**
+     * 批量导入路由标识
+     * @access public
+     * @param  array    $name 路由标识
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->app['rule_name']->import($name);
+        return $this;
+    }
+
+    /**
+     * 导入配置文件的路由规则
+     * @access public
+     * @param  array     $rules 路由规则
+     * @param  string    $type  请求类型
+     * @return void
+     */
+    public function import(array $rules, $type = '*')
+    {
+        // 检查域名部署
+        if (isset($rules['__domain__'])) {
+            foreach ($rules['__domain__'] as $key => $rule) {
+                $this->domain($key, $rule);
+            }
+            unset($rules['__domain__']);
+        }
+
+        // 检查变量规则
+        if (isset($rules['__pattern__'])) {
+            $this->pattern($rules['__pattern__']);
+            unset($rules['__pattern__']);
+        }
+
+        // 检查路由别名
+        if (isset($rules['__alias__'])) {
+            $this->alias($rules['__alias__']);
+            unset($rules['__alias__']);
+        }
+
+        // 检查资源路由
+        if (isset($rules['__rest__'])) {
+            foreach ($rules['__rest__'] as $key => $rule) {
+                $this->resource($key, $rule);
+            }
+            unset($rules['__rest__']);
+        }
+
+        // 检查路由规则（包含分组）
+        foreach ($rules as $key => $val) {
+            if (is_numeric($key)) {
+                $key = array_shift($val);
+            }
+
+            if (empty($val)) {
+                continue;
+            }
+
+            if (is_string($key) && 0 === strpos($key, '[')) {
+                $key = substr($key, 1, -1);
+                $this->group($key, $val);
+            } elseif (is_array($val)) {
+                $this->rule($key, $val[0], $type, $val[1], isset($val[2]) ? $val[2] : []);
+            } else {
+                $this->rule($key, $val, $type);
+            }
+        }
+    }
+
+    /**
+     * 注册路由规则
+     * @access public
+     * @param  string    $rule       路由规则
+     * @param  mixed     $route      路由地址
+     * @param  string    $method     请求类型
+     * @param  array     $option     路由参数
+     * @param  array     $pattern    变量规则
+     * @return RuleItem
+     */
+    public function rule($rule, $route, $method = '*', array $option = [], array $pattern = [])
+    {
+        return $this->group->addRule($rule, $route, $method, $option, $pattern);
+    }
+
+    /**
+     * 设置跨域有效路由规则
+     * @access public
+     * @param  Rule      $rule      路由规则
+     * @param  string    $method    请求类型
+     * @return $this
+     */
+    public function setCrossDomainRule($rule, $method = '*')
+    {
+        if (!isset($this->cross)) {
+            $this->cross = (new RuleGroup($this))->mergeRuleRegex($this->mergeRuleRegex);
+        }
+
+        $this->cross->addRuleItem($rule, $method);
+
+        return $this;
+    }
+
+    /**
+     * 批量注册路由规则
+     * @access public
+     * @param  array     $rules      路由规则
+     * @param  string    $method     请求类型
+     * @param  array     $option     路由参数
+     * @param  array     $pattern    变量规则
+     * @return void
+     */
+    public function rules($rules, $method = '*', array $option = [], array $pattern = [])
+    {
+        $this->group->addRules($rules, $method, $option, $pattern);
+    }
+
+    /**
+     * 注册路由分组
+     * @access public
+     * @param  string|array      $name       分组名称或者参数
+     * @param  array|\Closure    $route      分组路由
+     * @param  array             $option     路由参数
+     * @param  array             $pattern    变量规则
+     * @return RuleGroup
+     */
+    public function group($name, $route, array $option = [], array $pattern = [])
+    {
+        if (is_array($name)) {
+            $option = $name;
+            $name   = isset($option['name']) ? $option['name'] : '';
+        }
+
+        return (new RuleGroup($this, $this->group, $name, $route, $option, $pattern))
+            ->lazy($this->lazy)
+            ->mergeRuleRegex($this->mergeRuleRegex);
+    }
+
+    /**
+     * 注册路由
+     * @access public
+     * @param  string    $rule 路由规则
+     * @param  mixed     $route 路由地址
+     * @param  array     $option 路由参数
+     * @param  array     $pattern 变量规则
+     * @return RuleItem
+     */
+    public function any($rule, $route = '', array $option = [], array $pattern = [])
+    {
+        return $this->rule($rule, $route, '*', $option, $pattern);
+    }
+
+    /**
+     * 注册GET路由
+     * @access public
+     * @param  string    $rule 路由规则
+     * @param  mixed     $route 路由地址
+     * @param  array     $option 路由参数
+     * @param  array     $pattern 变量规则
+     * @return RuleItem
+     */
+    public function get($rule, $route = '', array $option = [], array $pattern = [])
+    {
+        return $this->rule($rule, $route, 'GET', $option, $pattern);
+    }
+
+    /**
+     * 注册POST路由
+     * @access public
+     * @param  string    $rule 路由规则
+     * @param  mixed     $route 路由地址
+     * @param  array     $option 路由参数
+     * @param  array     $pattern 变量规则
+     * @return RuleItem
+     */
+    public function post($rule, $route = '', array $option = [], array $pattern = [])
+    {
+        return $this->rule($rule, $route, 'POST', $option, $pattern);
+    }
+
+    /**
+     * 注册PUT路由
+     * @access public
+     * @param  string    $rule 路由规则
+     * @param  mixed     $route 路由地址
+     * @param  array     $option 路由参数
+     * @param  array     $pattern 变量规则
+     * @return RuleItem
+     */
+    public function put($rule, $route = '', array $option = [], array $pattern = [])
+    {
+        return $this->rule($rule, $route, 'PUT', $option, $pattern);
+    }
+
+    /**
+     * 注册DELETE路由
+     * @access public
+     * @param  string    $rule 路由规则
+     * @param  mixed     $route 路由地址
+     * @param  array     $option 路由参数
+     * @param  array     $pattern 变量规则
+     * @return RuleItem
+     */
+    public function delete($rule, $route = '', array $option = [], array $pattern = [])
+    {
+        return $this->rule($rule, $route, 'DELETE', $option, $pattern);
+    }
+
+    /**
+     * 注册PATCH路由
+     * @access public
+     * @param  string    $rule 路由规则
+     * @param  mixed     $route 路由地址
+     * @param  array     $option 路由参数
+     * @param  array     $pattern 变量规则
+     * @return RuleItem
+     */
+    public function patch($rule, $route = '', array $option = [], array $pattern = [])
+    {
+        return $this->rule($rule, $route, 'PATCH', $option, $pattern);
+    }
+
+    /**
+     * 注册资源路由
+     * @access public
+     * @param  string    $rule 路由规则
+     * @param  string    $route 路由地址
+     * @param  array     $option 路由参数
+     * @param  array     $pattern 变量规则
+     * @return Resource
+     */
+    public function resource($rule, $route = '', array $option = [], array $pattern = [])
+    {
+        return (new Resource($this, $this->group, $rule, $route, $option, $pattern, $this->rest))
+            ->lazy($this->lazy);
+    }
+
+    /**
+     * 注册控制器路由 操作方法对应不同的请求前缀
+     * @access public
+     * @param  string    $rule 路由规则
+     * @param  string    $route 路由地址
+     * @param  array     $option 路由参数
+     * @param  array     $pattern 变量规则
+     * @return RuleGroup
+     */
+    public function controller($rule, $route = '', array $option = [], array $pattern = [])
+    {
+        $group = new RuleGroup($this, $this->group, $rule, null, $option, $pattern);
+
+        foreach ($this->methodPrefix as $type => $val) {
+            $group->addRule('<action>', $val . '<action>', $type);
+        }
+
+        return $group->prefix($route . '/');
+    }
+
+    /**
+     * 注册视图路由
+     * @access public
+     * @param  string|array $rule 路由规则
+     * @param  string       $template 路由模板地址
+     * @param  array        $vars 模板变量
+     * @param  array        $option 路由参数
+     * @param  array        $pattern 变量规则
+     * @return RuleItem
+     */
+    public function view($rule, $template = '', array $vars = [], array $option = [], array $pattern = [])
+    {
+        return $this->rule($rule, $template, 'GET', $option, $pattern)->view($vars);
+    }
+
+    /**
+     * 注册重定向路由
+     * @access public
+     * @param  string|array $rule 路由规则
+     * @param  string       $route 路由地址
+     * @param  array        $status 状态码
+     * @param  array        $option 路由参数
+     * @param  array        $pattern 变量规则
+     * @return RuleItem
+     */
+    public function redirect($rule, $route = '', $status = 301, array $option = [], array $pattern = [])
+    {
+        return $this->rule($rule, $route, '*', $option, $pattern)->redirect()->status($status);
+    }
+
+    /**
+     * 注册别名路由
+     * @access public
+     * @param  string  $rule 路由别名
+     * @param  string  $route 路由地址
+     * @param  array   $option 路由参数
+     * @return AliasRule
+     */
+    public function alias($rule, $route, array $option = [])
+    {
+        $aliasRule = new AliasRule($this, $this->group, $rule, $route, $option);
+
+        $this->alias[$rule] = $aliasRule;
+
+        return $aliasRule;
+    }
+
+    /**
+     * 获取别名路由定义
+     * @access public
+     * @param  string    $name 路由别名
+     * @return string|array|null
+     */
+    public function getAlias($name = null)
+    {
+        if (is_null($name)) {
+            return $this->alias;
+        }
+
+        return isset($this->alias[$name]) ? $this->alias[$name] : null;
+    }
+
+    /**
+     * 设置不同请求类型下面的方法前缀
+     * @access public
+     * @param  string|array  $method 请求类型
+     * @param  string        $prefix 类型前缀
+     * @return $this
+     */
+    public function setMethodPrefix($method, $prefix = '')
+    {
+        if (is_array($method)) {
+            $this->methodPrefix = array_merge($this->methodPrefix, array_change_key_case($method));
+        } else {
+            $this->methodPrefix[strtolower($method)] = $prefix;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 获取请求类型的方法前缀
+     * @access public
+     * @param  string    $method 请求类型
+     * @param  string    $prefix 类型前缀
+     * @return string|null
+     */
+    public function getMethodPrefix($method)
+    {
+        $method = strtolower($method);
+
+        return isset($this->methodPrefix[$method]) ? $this->methodPrefix[$method] : null;
+    }
+
+    /**
+     * rest方法定义和修改
+     * @access public
+     * @param  string        $name 方法名称
+     * @param  array|bool    $resource 资源
+     * @return $this
+     */
+    public function rest($name, $resource = [])
+    {
+        if (is_array($name)) {
+            $this->rest = $resource ? $name : array_merge($this->rest, $name);
+        } else {
+            $this->rest[$name] = $resource;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 获取rest方法定义的参数
+     * @access public
+     * @param  string        $name 方法名称
+     * @return array|null
+     */
+    public function getRest($name = null)
+    {
+        if (is_null($name)) {
+            return $this->rest;
+        }
+
+        return isset($this->rest[$name]) ? $this->rest[$name] : null;
+    }
+
+    /**
+     * 注册未匹配路由规则后的处理
+     * @access public
+     * @param  string    $route 路由地址
+     * @param  string    $method 请求类型
+     * @param  array     $option 路由参数
+     * @return RuleItem
+     */
+    public function miss($route, $method = '*', array $option = [])
+    {
+        return $this->group->addMissRule($route, $method, $option);
+    }
+
+    /**
+     * 注册一个自动解析的URL路由
+     * @access public
+     * @param  string    $route 路由地址
+     * @return RuleItem
+     */
+    public function auto($route)
+    {
+        return $this->group->addAutoRule($route);
+    }
+
+    /**
+     * 检测URL路由
+     * @access public
+     * @param  string    $url URL地址
+     * @param  bool      $must 是否强制路由
+     * @return Dispatch
+     * @throws RouteNotFoundException
+     */
+    public function check($url, $must = false)
+    {
+        // 自动检测域名路由
+        $domain = $this->checkDomain();
+        $url    = str_replace($this->config['pathinfo_depr'], '|', $url);
+
+        $completeMatch = $this->config['route_complete_match'];
+
+        $result = $domain->check($this->request, $url, $completeMatch);
+
+        if (false === $result && !empty($this->cross)) {
+            // 检测跨域路由
+            $result = $this->cross->check($this->request, $url, $completeMatch);
+        }
+
+        if (false !== $result) {
+            // 路由匹配
+            return $result;
+        } elseif ($must) {
+            // 强制路由不匹配则抛出异常
+            throw new RouteNotFoundException();
+        }
+
+        // 默认路由解析
+        return new UrlDispatch($this->request, $this->group, $url, [
+            'auto_search' => $this->autoSearchController,
+        ]);
+    }
+
+    /**
+     * 检测域名的路由规则
+     * @access protected
+     * @return Domain
+     */
+    protected function checkDomain()
+    {
+        // 获取当前子域名
+        $subDomain = $this->request->subDomain();
+
+        $item = false;
+
+        if ($subDomain && count($this->domains) > 1) {
+            $domain  = explode('.', $subDomain);
+            $domain2 = array_pop($domain);
+
+            if ($domain) {
+                // 存在三级域名
+                $domain3 = array_pop($domain);
+            }
+
+            if ($subDomain && isset($this->domains[$subDomain])) {
+                // 子域名配置
+                $item = $this->domains[$subDomain];
+            } elseif (isset($this->domains['*.' . $domain2]) && !empty($domain3)) {
+                // 泛三级域名
+                $item      = $this->domains['*.' . $domain2];
+                $panDomain = $domain3;
+            } elseif (isset($this->domains['*']) && !empty($domain2)) {
+                // 泛二级域名
+                if ('www' != $domain2) {
+                    $item      = $this->domains['*'];
+                    $panDomain = $domain2;
+                }
+            }
+
+            if (isset($panDomain)) {
+                // 保存当前泛域名
+                $this->request->setPanDomain($panDomain);
+            }
+        }
+
+        if (false === $item) {
+            // 检测当前完整域名
+            $item = $this->domains[$this->host];
+        }
+
+        if (is_string($item)) {
+            $item = $this->domains[$item];
+        }
+
+        return $item;
+    }
+
+    /**
+     * 设置全局的路由分组参数
+     * @access public
+     * @param  string    $method     方法名
+     * @param  array     $args       调用参数
+     * @return RuleGroup
+     */
+    public function __call($method, $args)
+    {
+        return call_user_func_array([$this->group, $method], $args);
+    }
+}
diff --git a/thinkphp/library/think/Session.php b/thinkphp/library/think/Session.php
new file mode 100644
index 0000000000000000000000000000000000000000..f21c93b1e646a9e58b35d2e07e0f09da8907f836
--- /dev/null
+++ b/thinkphp/library/think/Session.php
@@ -0,0 +1,580 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\exception\ClassNotFoundException;
+
+class Session
+{
+    /**
+     * 配置参数
+     * @var array
+     */
+    protected $config = [];
+
+    /**
+     * 前缀
+     * @var string
+     */
+    protected $prefix = '';
+
+    /**
+     * 是否初始化
+     * @var bool
+     */
+    protected $init = null;
+
+    /**
+     * 锁驱动
+     * @var object
+     */
+    protected $lockDriver = null;
+
+    /**
+     * 锁key
+     * @var string
+     */
+    protected $sessKey = 'PHPSESSID';
+
+    /**
+     * 锁超时时间
+     * @var integer
+     */
+    protected $lockTimeout = 3;
+
+    /**
+     * 是否启用锁机制
+     * @var bool
+     */
+    protected $lock = false;
+
+    public function __construct(array $config = [])
+    {
+        $this->config = $config;
+    }
+
+    /**
+     * 设置或者获取session作用域（前缀）
+     * @access public
+     * @param  string $prefix
+     * @return string|void
+     */
+    public function prefix($prefix = '')
+    {
+        empty($this->init) && $this->boot();
+
+        if (empty($prefix) && null !== $prefix) {
+            return $this->prefix;
+        } else {
+            $this->prefix = $prefix;
+        }
+    }
+
+    public static function __make(Config $config)
+    {
+        return new static($config->pull('session'));
+    }
+
+    /**
+     * 配置
+     * @access public
+     * @param  array $config
+     * @return void
+     */
+    public function setConfig(array $config = [])
+    {
+        $this->config = array_merge($this->config, array_change_key_case($config));
+
+        if (isset($config['prefix'])) {
+            $this->prefix = $config['prefix'];
+        }
+
+        if (isset($config['use_lock'])) {
+            $this->lock = $config['use_lock'];
+        }
+    }
+
+    /**
+     * 设置已经初始化
+     * @access public
+     * @return void
+     */
+    public function inited()
+    {
+        $this->init = true;
+    }
+
+    /**
+     * session初始化
+     * @access public
+     * @param  array $config
+     * @return void
+     * @throws \think\Exception
+     */
+    public function init(array $config = [])
+    {
+        $config = $config ?: $this->config;
+
+        $isDoStart = false;
+        if (isset($config['use_trans_sid'])) {
+            ini_set('session.use_trans_sid', $config['use_trans_sid'] ? 1 : 0);
+        }
+
+        // 启动session
+        if (!empty($config['auto_start']) && PHP_SESSION_ACTIVE != session_status()) {
+            ini_set('session.auto_start', 0);
+            $isDoStart = true;
+        }
+
+        if (isset($config['prefix'])) {
+            $this->prefix = $config['prefix'];
+        }
+
+        if (isset($config['use_lock'])) {
+            $this->lock = $config['use_lock'];
+        }
+
+        if (isset($config['var_session_id']) && isset($_REQUEST[$config['var_session_id']])) {
+            session_id($_REQUEST[$config['var_session_id']]);
+        } elseif (isset($config['id']) && !empty($config['id'])) {
+            session_id($config['id']);
+        }
+
+        if (isset($config['name'])) {
+            session_name($config['name']);
+        }
+
+        if (isset($config['path'])) {
+            session_save_path($config['path']);
+        }
+
+        if (isset($config['domain'])) {
+            ini_set('session.cookie_domain', $config['domain']);
+        }
+
+        if (isset($config['expire'])) {
+            ini_set('session.gc_maxlifetime', $config['expire']);
+            ini_set('session.cookie_lifetime', $config['expire']);
+        }
+
+        if (isset($config['secure'])) {
+            ini_set('session.cookie_secure', $config['secure']);
+        }
+
+        if (isset($config['httponly'])) {
+            ini_set('session.cookie_httponly', $config['httponly']);
+        }
+
+        if (isset($config['use_cookies'])) {
+            ini_set('session.use_cookies', $config['use_cookies'] ? 1 : 0);
+        }
+
+        if (isset($config['cache_limiter'])) {
+            session_cache_limiter($config['cache_limiter']);
+        }
+
+        if (isset($config['cache_expire'])) {
+            session_cache_expire($config['cache_expire']);
+        }
+
+        if (!empty($config['type'])) {
+            // 读取session驱动
+            $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\session\\driver\\' . ucwords($config['type']);
+
+            // 检查驱动类
+            if (!class_exists($class) || !session_set_save_handler(new $class($config))) {
+                throw new ClassNotFoundException('error session handler:' . $class, $class);
+            }
+        }
+
+        if ($isDoStart) {
+            session_start();
+            $this->init = true;
+        } else {
+            $this->init = false;
+        }
+
+        return $this;
+    }
+
+    /**
+     * session自动启动或者初始化
+     * @access public
+     * @return void
+     */
+    public function boot()
+    {
+        if (is_null($this->init)) {
+            $this->init();
+        }
+
+        if (false === $this->init) {
+            if (PHP_SESSION_ACTIVE != session_status()) {
+                session_start();
+            }
+            $this->init = true;
+        }
+    }
+
+    /**
+     * session设置
+     * @access public
+     * @param  string        $name session名称
+     * @param  mixed         $value session值
+     * @param  string|null   $prefix 作用域（前缀）
+     * @return void
+     */
+    public function set($name, $value, $prefix = null)
+    {
+        $this->lock();
+
+        empty($this->init) && $this->boot();
+
+        $prefix = !is_null($prefix) ? $prefix : $this->prefix;
+
+        if (strpos($name, '.')) {
+            // 二维数组赋值
+            list($name1, $name2) = explode('.', $name);
+            if ($prefix) {
+                $_SESSION[$prefix][$name1][$name2] = $value;
+            } else {
+                $_SESSION[$name1][$name2] = $value;
+            }
+        } elseif ($prefix) {
+            $_SESSION[$prefix][$name] = $value;
+        } else {
+            $_SESSION[$name] = $value;
+        }
+
+        $this->unlock();
+    }
+
+    /**
+     * session获取
+     * @access public
+     * @param  string        $name session名称
+     * @param  string|null   $prefix 作用域（前缀）
+     * @return mixed
+     */
+    public function get($name = '', $prefix = null)
+    {
+        $this->lock();
+
+        empty($this->init) && $this->boot();
+
+        $prefix = !is_null($prefix) ? $prefix : $this->prefix;
+
+        $value = $prefix ? (!empty($_SESSION[$prefix]) ? $_SESSION[$prefix] : []) : $_SESSION;
+
+        if ('' != $name) {
+            $name = explode('.', $name);
+
+            foreach ($name as $val) {
+                if (isset($value[$val])) {
+                    $value = $value[$val];
+                } else {
+                    $value = null;
+                    break;
+                }
+            }
+        }
+
+        $this->unlock();
+
+        return $value;
+    }
+
+    /**
+     * session 读写锁驱动实例化
+     */
+    protected function initDriver()
+    {
+        $config = $this->config;
+
+        if (!empty($config['type']) && isset($config['use_lock']) && $config['use_lock']) {
+            // 读取session驱动
+            $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\session\\driver\\' . ucwords($config['type']);
+
+            // 检查驱动类及类中是否存在 lock 和 unlock 函数
+            if (class_exists($class) && method_exists($class, 'lock') && method_exists($class, 'unlock')) {
+                $this->lockDriver = new $class($config);
+            }
+        }
+
+        // 通过cookie获得session_id
+        if (isset($config['name']) && $config['name']) {
+            $this->sessKey = $config['name'];
+        }
+
+        if (isset($config['lock_timeout']) && $config['lock_timeout'] > 0) {
+            $this->lockTimeout = $config['lock_timeout'];
+        }
+    }
+
+    /**
+     * session 读写加锁
+     * @access protected
+     * @return void
+     */
+    protected function lock()
+    {
+        if (empty($this->lock)) {
+            return;
+        }
+
+        $this->initDriver();
+
+        if (null !== $this->lockDriver && method_exists($this->lockDriver, 'lock')) {
+            $t = time();
+            // 使用 session_id 作为互斥条件，即只对同一 session_id 的会话互斥。第一次请求没有 session_id
+            $sessID = isset($_COOKIE[$this->sessKey]) ? $_COOKIE[$this->sessKey] : '';
+
+            do {
+                if (time() - $t > $this->lockTimeout) {
+                    $this->unlock();
+                }
+            } while (!$this->lockDriver->lock($sessID, $this->lockTimeout));
+        }
+    }
+
+    /**
+     * session 读写解锁
+     * @access protected
+     * @return void
+     */
+    protected function unlock()
+    {
+        if (empty($this->lock)) {
+            return;
+        }
+
+        $this->pause();
+
+        if ($this->lockDriver && method_exists($this->lockDriver, 'unlock')) {
+            $sessID = isset($_COOKIE[$this->sessKey]) ? $_COOKIE[$this->sessKey] : '';
+            $this->lockDriver->unlock($sessID);
+        }
+    }
+
+    /**
+     * session获取并删除
+     * @access public
+     * @param  string        $name session名称
+     * @param  string|null   $prefix 作用域（前缀）
+     * @return mixed
+     */
+    public function pull($name, $prefix = null)
+    {
+        $result = $this->get($name, $prefix);
+
+        if ($result) {
+            $this->delete($name, $prefix);
+            return $result;
+        } else {
+            return;
+        }
+    }
+
+    /**
+     * session设置 下一次请求有效
+     * @access public
+     * @param  string        $name session名称
+     * @param  mixed         $value session值
+     * @param  string|null   $prefix 作用域（前缀）
+     * @return void
+     */
+    public function flash($name, $value)
+    {
+        $this->set($name, $value);
+
+        if (!$this->has('__flash__.__time__')) {
+            $this->set('__flash__.__time__', $_SERVER['REQUEST_TIME_FLOAT']);
+        }
+
+        $this->push('__flash__', $name);
+    }
+
+    /**
+     * 清空当前请求的session数据
+     * @access public
+     * @return void
+     */
+    public function flush()
+    {
+        if (!$this->init) {
+            return;
+        }
+
+        $item = $this->get('__flash__');
+
+        if (!empty($item)) {
+            $time = $item['__time__'];
+
+            if ($_SERVER['REQUEST_TIME_FLOAT'] > $time) {
+                unset($item['__time__']);
+                $this->delete($item);
+                $this->set('__flash__', []);
+            }
+        }
+    }
+
+    /**
+     * 删除session数据
+     * @access public
+     * @param  string|array  $name session名称
+     * @param  string|null   $prefix 作用域（前缀）
+     * @return void
+     */
+    public function delete($name, $prefix = null)
+    {
+        empty($this->init) && $this->boot();
+
+        $prefix = !is_null($prefix) ? $prefix : $this->prefix;
+
+        if (is_array($name)) {
+            foreach ($name as $key) {
+                $this->delete($key, $prefix);
+            }
+        } elseif (strpos($name, '.')) {
+            list($name1, $name2) = explode('.', $name);
+            if ($prefix) {
+                unset($_SESSION[$prefix][$name1][$name2]);
+            } else {
+                unset($_SESSION[$name1][$name2]);
+            }
+        } else {
+            if ($prefix) {
+                unset($_SESSION[$prefix][$name]);
+            } else {
+                unset($_SESSION[$name]);
+            }
+        }
+    }
+
+    /**
+     * 清空session数据
+     * @access public
+     * @param  string|null   $prefix 作用域（前缀）
+     * @return void
+     */
+    public function clear($prefix = null)
+    {
+        empty($this->init) && $this->boot();
+        $prefix = !is_null($prefix) ? $prefix : $this->prefix;
+
+        if ($prefix) {
+            unset($_SESSION[$prefix]);
+        } else {
+            $_SESSION = [];
+        }
+    }
+
+    /**
+     * 判断session数据
+     * @access public
+     * @param  string        $name session名称
+     * @param  string|null   $prefix
+     * @return bool
+     */
+    public function has($name, $prefix = null)
+    {
+        empty($this->init) && $this->boot();
+
+        $prefix = !is_null($prefix) ? $prefix : $this->prefix;
+        $value  = $prefix ? (!empty($_SESSION[$prefix]) ? $_SESSION[$prefix] : []) : $_SESSION;
+
+        $name = explode('.', $name);
+
+        foreach ($name as $val) {
+            if (!isset($value[$val])) {
+                return false;
+            } else {
+                $value = $value[$val];
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 添加数据到一个session数组
+     * @access public
+     * @param  string  $key
+     * @param  mixed   $value
+     * @return void
+     */
+    public function push($key, $value)
+    {
+        $array = $this->get($key);
+
+        if (is_null($array)) {
+            $array = [];
+        }
+
+        $array[] = $value;
+
+        $this->set($key, $array);
+    }
+
+    /**
+     * 启动session
+     * @access public
+     * @return void
+     */
+    public function start()
+    {
+        session_start();
+
+        $this->init = true;
+    }
+
+    /**
+     * 销毁session
+     * @access public
+     * @return void
+     */
+    public function destroy()
+    {
+        if (!empty($_SESSION)) {
+            $_SESSION = [];
+        }
+
+        session_unset();
+        session_destroy();
+
+        $this->init       = null;
+        $this->lockDriver = null;
+    }
+
+    /**
+     * 重新生成session_id
+     * @access public
+     * @param  bool $delete 是否删除关联会话文件
+     * @return void
+     */
+    public function regenerate($delete = false)
+    {
+        session_regenerate_id($delete);
+    }
+
+    /**
+     * 暂停session
+     * @access public
+     * @return void
+     */
+    public function pause()
+    {
+        // 暂停session
+        session_write_close();
+        $this->init = false;
+    }
+}
diff --git a/thinkphp/library/think/Template.php b/thinkphp/library/think/Template.php
new file mode 100644
index 0000000000000000000000000000000000000000..4892fcbd89099b447d1f74c185a15af65b6b5a8d
--- /dev/null
+++ b/thinkphp/library/think/Template.php
@@ -0,0 +1,1310 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\exception\TemplateNotFoundException;
+
+/**
+ * ThinkPHP分离出来的模板引擎
+ * 支持XML标签和普通标签的模板解析
+ * 编译型模板引擎 支持动态缓存
+ */
+class Template
+{
+    protected $app;
+    /**
+     * 模板变量
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * 模板配置参数
+     * @var array
+     */
+    protected $config = [
+        'view_path'          => '', // 模板路径
+        'view_base'          => '',
+        'view_suffix'        => 'html', // 默认模板文件后缀
+        'view_depr'          => DIRECTORY_SEPARATOR,
+        'cache_suffix'       => 'php', // 默认模板缓存后缀
+        'tpl_deny_func_list' => 'echo,exit', // 模板引擎禁用函数
+        'tpl_deny_php'       => false, // 默认模板引擎是否禁用PHP原生代码
+        'tpl_begin'          => '{', // 模板引擎普通标签开始标记
+        'tpl_end'            => '}', // 模板引擎普通标签结束标记
+        'strip_space'        => false, // 是否去除模板文件里面的html空格与换行
+        'tpl_cache'          => true, // 是否开启模板编译缓存,设为false则每次都会重新编译
+        'compile_type'       => 'file', // 模板编译类型
+        'cache_prefix'       => '', // 模板缓存前缀标识，可以动态改变
+        'cache_time'         => 0, // 模板缓存有效期 0 为永久，(以数字为值，单位:秒)
+        'layout_on'          => false, // 布局模板开关
+        'layout_name'        => 'layout', // 布局模板入口文件
+        'layout_item'        => '{__CONTENT__}', // 布局模板的内容替换标识
+        'taglib_begin'       => '{', // 标签库标签开始标记
+        'taglib_end'         => '}', // 标签库标签结束标记
+        'taglib_load'        => true, // 是否使用内置标签库之外的其它标签库，默认自动检测
+        'taglib_build_in'    => 'cx', // 内置标签库名称(标签使用不必指定标签库名称),以逗号分隔 注意解析顺序
+        'taglib_pre_load'    => '', // 需要额外加载的标签库(须指定标签库名称)，多个以逗号分隔
+        'display_cache'      => false, // 模板渲染缓存
+        'cache_id'           => '', // 模板缓存ID
+        'tpl_replace_string' => [],
+        'tpl_var_identify'   => 'array', // .语法变量识别，array|object|'', 为空时自动识别
+        'default_filter'     => 'htmlentities', // 默认过滤方法 用于普通标签输出
+    ];
+
+    /**
+     * 保留内容信息
+     * @var array
+     */
+    private $literal = [];
+
+    /**
+     * 模板包含信息
+     * @var array
+     */
+    private $includeFile = [];
+
+    /**
+     * 模板存储对象
+     * @var object
+     */
+    protected $storage;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array $config
+     */
+    public function __construct(App $app, array $config = [])
+    {
+        $this->app                  = $app;
+        $this->config['cache_path'] = $app->getRuntimePath() . 'temp/';
+        $this->config               = array_merge($this->config, $config);
+
+        $this->config['taglib_begin_origin'] = $this->config['taglib_begin'];
+        $this->config['taglib_end_origin']   = $this->config['taglib_end'];
+
+        $this->config['taglib_begin'] = preg_quote($this->config['taglib_begin'], '/');
+        $this->config['taglib_end']   = preg_quote($this->config['taglib_end'], '/');
+        $this->config['tpl_begin']    = preg_quote($this->config['tpl_begin'], '/');
+        $this->config['tpl_end']      = preg_quote($this->config['tpl_end'], '/');
+
+        // 初始化模板编译存储器
+        $type = $this->config['compile_type'] ? $this->config['compile_type'] : 'File';
+
+        $this->storage = Loader::factory($type, '\\think\\template\\driver\\', null);
+    }
+
+    public static function __make(Config $config)
+    {
+        return new static($config->pull('template'));
+    }
+
+    /**
+     * 模板变量赋值
+     * @access public
+     * @param  mixed $name
+     * @param  mixed $value
+     * @return void
+     */
+    public function assign($name, $value = '')
+    {
+        if (is_array($name)) {
+            $this->data = array_merge($this->data, $name);
+        } else {
+            $this->data[$name] = $value;
+        }
+    }
+
+    /**
+     * 模板引擎参数赋值
+     * @access public
+     * @param  mixed $name
+     * @param  mixed $value
+     */
+    public function __set($name, $value)
+    {
+        $this->config[$name] = $value;
+    }
+
+    /**
+     * 模板引擎配置项
+     * @access public
+     * @param  array|string $config
+     * @return void|array
+     */
+    public function config($config)
+    {
+        if (is_array($config)) {
+            $this->config = array_merge($this->config, $config);
+        } elseif (isset($this->config[$config])) {
+            return $this->config[$config];
+        }
+    }
+
+    /**
+     * 模板变量获取
+     * @access public
+     * @param  string $name 变量名
+     * @return mixed
+     */
+    public function get($name = '')
+    {
+        if ('' == $name) {
+            return $this->data;
+        }
+
+        $data = $this->data;
+
+        foreach (explode('.', $name) as $key => $val) {
+            if (isset($data[$val])) {
+                $data = $data[$val];
+            } else {
+                $data = null;
+                break;
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * 渲染模板文件
+     * @access public
+     * @param  string    $template 模板文件
+     * @param  array     $vars 模板变量
+     * @param  array     $config 模板参数
+     * @return void
+     */
+    public function fetch($template, $vars = [], $config = [])
+    {
+        if ($vars) {
+            $this->data = $vars;
+        }
+
+        if ($config) {
+            $this->config($config);
+        }
+
+        $cache = $this->app['cache'];
+
+        if (!empty($this->config['cache_id']) && $this->config['display_cache']) {
+            // 读取渲染缓存
+            $cacheContent = $cache->get($this->config['cache_id']);
+
+            if (false !== $cacheContent) {
+                echo $cacheContent;
+                return;
+            }
+        }
+
+        $template = $this->parseTemplateFile($template);
+
+        if ($template) {
+            $cacheFile = $this->config['cache_path'] . $this->config['cache_prefix'] . md5($this->config['layout_on'] . $this->config['layout_name'] . $template) . '.' . ltrim($this->config['cache_suffix'], '.');
+
+            if (!$this->checkCache($cacheFile)) {
+                // 缓存无效 重新模板编译
+                $content = file_get_contents($template);
+                $this->compiler($content, $cacheFile);
+            }
+
+            // 页面缓存
+            ob_start();
+            ob_implicit_flush(0);
+
+            // 读取编译存储
+            $this->storage->read($cacheFile, $this->data);
+
+            // 获取并清空缓存
+            $content = ob_get_clean();
+
+            if (!empty($this->config['cache_id']) && $this->config['display_cache']) {
+                // 缓存页面输出
+                $cache->set($this->config['cache_id'], $content, $this->config['cache_time']);
+            }
+
+            echo $content;
+        }
+    }
+
+    /**
+     * 渲染模板内容
+     * @access public
+     * @param  string    $content 模板内容
+     * @param  array     $vars 模板变量
+     * @param  array     $config 模板参数
+     * @return void
+     */
+    public function display($content, $vars = [], $config = [])
+    {
+        if ($vars) {
+            $this->data = $vars;
+        }
+
+        if ($config) {
+            $this->config($config);
+        }
+
+        $cacheFile = $this->config['cache_path'] . $this->config['cache_prefix'] . md5($content) . '.' . ltrim($this->config['cache_suffix'], '.');
+
+        if (!$this->checkCache($cacheFile)) {
+            // 缓存无效 模板编译
+            $this->compiler($content, $cacheFile);
+        }
+
+        // 读取编译存储
+        $this->storage->read($cacheFile, $this->data);
+    }
+
+    /**
+     * 设置布局
+     * @access public
+     * @param  mixed     $name 布局模板名称 false 则关闭布局
+     * @param  string    $replace 布局模板内容替换标识
+     * @return object
+     */
+    public function layout($name, $replace = '')
+    {
+        if (false === $name) {
+            // 关闭布局
+            $this->config['layout_on'] = false;
+        } else {
+            // 开启布局
+            $this->config['layout_on'] = true;
+
+            // 名称必须为字符串
+            if (is_string($name)) {
+                $this->config['layout_name'] = $name;
+            }
+
+            if (!empty($replace)) {
+                $this->config['layout_item'] = $replace;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 检查编译缓存是否有效
+     * 如果无效则需要重新编译
+     * @access private
+     * @param  string $cacheFile 缓存文件名
+     * @return boolean
+     */
+    private function checkCache($cacheFile)
+    {
+        if (!$this->config['tpl_cache'] || !is_file($cacheFile) || !$handle = @fopen($cacheFile, "r")) {
+            return false;
+        }
+
+        // 读取第一行
+        preg_match('/\/\*(.+?)\*\//', fgets($handle), $matches);
+
+        if (!isset($matches[1])) {
+            return false;
+        }
+
+        $includeFile = unserialize($matches[1]);
+
+        if (!is_array($includeFile)) {
+            return false;
+        }
+
+        // 检查模板文件是否有更新
+        foreach ($includeFile as $path => $time) {
+            if (is_file($path) && filemtime($path) > $time) {
+                // 模板文件如果有更新则缓存需要更新
+                return false;
+            }
+        }
+
+        // 检查编译存储是否有效
+        return $this->storage->check($cacheFile, $this->config['cache_time']);
+    }
+
+    /**
+     * 检查编译缓存是否存在
+     * @access public
+     * @param  string $cacheId 缓存的id
+     * @return boolean
+     */
+    public function isCache($cacheId)
+    {
+        if ($cacheId && $this->config['display_cache']) {
+            // 缓存页面输出
+            return $this->app['cache']->has($cacheId);
+        }
+
+        return false;
+    }
+
+    /**
+     * 编译模板文件内容
+     * @access private
+     * @param  string    $content 模板内容
+     * @param  string    $cacheFile 缓存文件名
+     * @return void
+     */
+    private function compiler(&$content, $cacheFile)
+    {
+        // 判断是否启用布局
+        if ($this->config['layout_on']) {
+            if (false !== strpos($content, '{__NOLAYOUT__}')) {
+                // 可以单独定义不使用布局
+                $content = str_replace('{__NOLAYOUT__}', '', $content);
+            } else {
+                // 读取布局模板
+                $layoutFile = $this->parseTemplateFile($this->config['layout_name']);
+
+                if ($layoutFile) {
+                    // 替换布局的主体内容
+                    $content = str_replace($this->config['layout_item'], $content, file_get_contents($layoutFile));
+                }
+            }
+        } else {
+            $content = str_replace('{__NOLAYOUT__}', '', $content);
+        }
+
+        // 模板解析
+        $this->parse($content);
+
+        if ($this->config['strip_space']) {
+            /* 去除html空格与换行 */
+            $find    = ['~>\s+<~', '~>(\s+\n|\r)~'];
+            $replace = ['><', '>'];
+            $content = preg_replace($find, $replace, $content);
+        }
+
+        // 优化生成的php代码
+        $content = preg_replace('/\?>\s*<\?php\s(?!echo\b)/s', '', $content);
+
+        // 模板过滤输出
+        $replace = $this->config['tpl_replace_string'];
+        $content = str_replace(array_keys($replace), array_values($replace), $content);
+
+        // 添加安全代码及模板引用记录
+        $content = '<?php /*' . serialize($this->includeFile) . '*/ ?>' . "\n" . $content;
+        // 编译存储
+        $this->storage->write($cacheFile, $content);
+
+        $this->includeFile = [];
+    }
+
+    /**
+     * 模板解析入口
+     * 支持普通标签和TagLib解析 支持自定义标签库
+     * @access public
+     * @param  string $content 要解析的模板内容
+     * @return void
+     */
+    public function parse(&$content)
+    {
+        // 内容为空不解析
+        if (empty($content)) {
+            return;
+        }
+
+        // 替换literal标签内容
+        $this->parseLiteral($content);
+
+        // 解析继承
+        $this->parseExtend($content);
+
+        // 解析布局
+        $this->parseLayout($content);
+
+        // 检查include语法
+        $this->parseInclude($content);
+
+        // 替换包含文件中literal标签内容
+        $this->parseLiteral($content);
+
+        // 检查PHP语法
+        $this->parsePhp($content);
+
+        // 获取需要引入的标签库列表
+        // 标签库只需要定义一次，允许引入多个一次
+        // 一般放在文件的最前面
+        // 格式：<taglib name="html,mytag..." />
+        // 当TAGLIB_LOAD配置为true时才会进行检测
+        if ($this->config['taglib_load']) {
+            $tagLibs = $this->getIncludeTagLib($content);
+
+            if (!empty($tagLibs)) {
+                // 对导入的TagLib进行解析
+                foreach ($tagLibs as $tagLibName) {
+                    $this->parseTagLib($tagLibName, $content);
+                }
+            }
+        }
+
+        // 预先加载的标签库 无需在每个模板中使用taglib标签加载 但必须使用标签库XML前缀
+        if ($this->config['taglib_pre_load']) {
+            $tagLibs = explode(',', $this->config['taglib_pre_load']);
+
+            foreach ($tagLibs as $tag) {
+                $this->parseTagLib($tag, $content);
+            }
+        }
+
+        // 内置标签库 无需使用taglib标签导入就可以使用 并且不需使用标签库XML前缀
+        $tagLibs = explode(',', $this->config['taglib_build_in']);
+
+        foreach ($tagLibs as $tag) {
+            $this->parseTagLib($tag, $content, true);
+        }
+
+        // 解析普通模板标签 {$tagName}
+        $this->parseTag($content);
+
+        // 还原被替换的Literal标签
+        $this->parseLiteral($content, true);
+    }
+
+    /**
+     * 检查PHP语法
+     * @access private
+     * @param  string $content 要解析的模板内容
+     * @return void
+     * @throws \think\Exception
+     */
+    private function parsePhp(&$content)
+    {
+        // 短标签的情况要将<?标签用echo方式输出 否则无法正常输出xml标识
+        $content = preg_replace('/(<\?(?!php|=|$))/i', '<?php echo \'\\1\'; ?>' . "\n", $content);
+
+        // PHP语法检查
+        if ($this->config['tpl_deny_php'] && false !== strpos($content, '<?php')) {
+            throw new Exception('not allow php tag');
+        }
+    }
+
+    /**
+     * 解析模板中的布局标签
+     * @access private
+     * @param  string $content 要解析的模板内容
+     * @return void
+     */
+    private function parseLayout(&$content)
+    {
+        // 读取模板中的布局标签
+        if (preg_match($this->getRegex('layout'), $content, $matches)) {
+            // 替换Layout标签
+            $content = str_replace($matches[0], '', $content);
+            // 解析Layout标签
+            $array = $this->parseAttr($matches[0]);
+
+            if (!$this->config['layout_on'] || $this->config['layout_name'] != $array['name']) {
+                // 读取布局模板
+                $layoutFile = $this->parseTemplateFile($array['name']);
+
+                if ($layoutFile) {
+                    $replace = isset($array['replace']) ? $array['replace'] : $this->config['layout_item'];
+                    // 替换布局的主体内容
+                    $content = str_replace($replace, $content, file_get_contents($layoutFile));
+                }
+            }
+        } else {
+            $content = str_replace('{__NOLAYOUT__}', '', $content);
+        }
+    }
+
+    /**
+     * 解析模板中的include标签
+     * @access private
+     * @param  string $content 要解析的模板内容
+     * @return void
+     */
+    private function parseInclude(&$content)
+    {
+        $regex = $this->getRegex('include');
+        $func  = function ($template) use (&$func, &$regex, &$content) {
+            if (preg_match_all($regex, $template, $matches, PREG_SET_ORDER)) {
+                foreach ($matches as $match) {
+                    $array = $this->parseAttr($match[0]);
+                    $file  = $array['file'];
+                    unset($array['file']);
+
+                    // 分析模板文件名并读取内容
+                    $parseStr = $this->parseTemplateName($file);
+
+                    foreach ($array as $k => $v) {
+                        // 以$开头字符串转换成模板变量
+                        if (0 === strpos($v, '$')) {
+                            $v = $this->get(substr($v, 1));
+                        }
+
+                        $parseStr = str_replace('[' . $k . ']', $v, $parseStr);
+                    }
+
+                    $content = str_replace($match[0], $parseStr, $content);
+                    // 再次对包含文件进行模板分析
+                    $func($parseStr);
+                }
+                unset($matches);
+            }
+        };
+
+        // 替换模板中的include标签
+        $func($content);
+    }
+
+    /**
+     * 解析模板中的extend标签
+     * @access private
+     * @param  string $content 要解析的模板内容
+     * @return void
+     */
+    private function parseExtend(&$content)
+    {
+        $regex  = $this->getRegex('extend');
+        $array  = $blocks  = $baseBlocks  = [];
+        $extend = '';
+
+        $func = function ($template) use (&$func, &$regex, &$array, &$extend, &$blocks, &$baseBlocks) {
+            if (preg_match($regex, $template, $matches)) {
+                if (!isset($array[$matches['name']])) {
+                    $array[$matches['name']] = 1;
+                    // 读取继承模板
+                    $extend = $this->parseTemplateName($matches['name']);
+
+                    // 递归检查继承
+                    $func($extend);
+
+                    // 取得block标签内容
+                    $blocks = array_merge($blocks, $this->parseBlock($template));
+
+                    return;
+                }
+            } else {
+                // 取得顶层模板block标签内容
+                $baseBlocks = $this->parseBlock($template, true);
+
+                if (empty($extend)) {
+                    // 无extend标签但有block标签的情况
+                    $extend = $template;
+                }
+            }
+        };
+
+        $func($content);
+
+        if (!empty($extend)) {
+            if ($baseBlocks) {
+                $children = [];
+                foreach ($baseBlocks as $name => $val) {
+                    $replace = $val['content'];
+
+                    if (!empty($children[$name])) {
+                        // 如果包含有子block标签
+                        foreach ($children[$name] as $key) {
+                            $replace = str_replace($baseBlocks[$key]['begin'] . $baseBlocks[$key]['content'] . $baseBlocks[$key]['end'], $blocks[$key]['content'], $replace);
+                        }
+                    }
+
+                    if (isset($blocks[$name])) {
+                        // 带有{__block__}表示与所继承模板的相应标签合并，而不是覆盖
+                        $replace = str_replace(['{__BLOCK__}', '{__block__}'], $replace, $blocks[$name]['content']);
+
+                        if (!empty($val['parent'])) {
+                            // 如果不是最顶层的block标签
+                            $parent = $val['parent'];
+
+                            if (isset($blocks[$parent])) {
+                                $blocks[$parent]['content'] = str_replace($blocks[$name]['begin'] . $blocks[$name]['content'] . $blocks[$name]['end'], $replace, $blocks[$parent]['content']);
+                            }
+
+                            $blocks[$name]['content'] = $replace;
+                            $children[$parent][]      = $name;
+
+                            continue;
+                        }
+                    } elseif (!empty($val['parent'])) {
+                        // 如果子标签没有被继承则用原值
+                        $children[$val['parent']][] = $name;
+                        $blocks[$name]              = $val;
+                    }
+
+                    if (!$val['parent']) {
+                        // 替换模板中的顶级block标签
+                        $extend = str_replace($val['begin'] . $val['content'] . $val['end'], $replace, $extend);
+                    }
+                }
+            }
+
+            $content = $extend;
+            unset($blocks, $baseBlocks);
+        }
+    }
+
+    /**
+     * 替换页面中的literal标签
+     * @access private
+     * @param  string   $content 模板内容
+     * @param  boolean  $restore 是否为还原
+     * @return void
+     */
+    private function parseLiteral(&$content, $restore = false)
+    {
+        $regex = $this->getRegex($restore ? 'restoreliteral' : 'literal');
+
+        if (preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
+            if (!$restore) {
+                $count = count($this->literal);
+
+                // 替换literal标签
+                foreach ($matches as $match) {
+                    $this->literal[] = substr($match[0], strlen($match[1]), -strlen($match[2]));
+                    $content         = str_replace($match[0], "<!--###literal{$count}###-->", $content);
+                    $count++;
+                }
+            } else {
+                // 还原literal标签
+                foreach ($matches as $match) {
+                    $content = str_replace($match[0], $this->literal[$match[1]], $content);
+                }
+
+                // 清空literal记录
+                $this->literal = [];
+            }
+
+            unset($matches);
+        }
+    }
+
+    /**
+     * 获取模板中的block标签
+     * @access private
+     * @param  string   $content 模板内容
+     * @param  boolean  $sort 是否排序
+     * @return array
+     */
+    private function parseBlock(&$content, $sort = false)
+    {
+        $regex  = $this->getRegex('block');
+        $result = [];
+
+        if (preg_match_all($regex, $content, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
+            $right = $keys = [];
+
+            foreach ($matches as $match) {
+                if (empty($match['name'][0])) {
+                    if (count($right) > 0) {
+                        $tag    = array_pop($right);
+                        $start  = $tag['offset'] + strlen($tag['tag']);
+                        $length = $match[0][1] - $start;
+
+                        $result[$tag['name']] = [
+                            'begin'   => $tag['tag'],
+                            'content' => substr($content, $start, $length),
+                            'end'     => $match[0][0],
+                            'parent'  => count($right) ? end($right)['name'] : '',
+                        ];
+
+                        $keys[$tag['name']] = $match[0][1];
+                    }
+                } else {
+                    // 标签头压入栈
+                    $right[] = [
+                        'name'   => $match[2][0],
+                        'offset' => $match[0][1],
+                        'tag'    => $match[0][0],
+                    ];
+                }
+            }
+
+            unset($right, $matches);
+
+            if ($sort) {
+                // 按block标签结束符在模板中的位置排序
+                array_multisort($keys, $result);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * 搜索模板页面中包含的TagLib库
+     * 并返回列表
+     * @access private
+     * @param  string $content 模板内容
+     * @return array|null
+     */
+    private function getIncludeTagLib(&$content)
+    {
+        // 搜索是否有TagLib标签
+        if (preg_match($this->getRegex('taglib'), $content, $matches)) {
+            // 替换TagLib标签
+            $content = str_replace($matches[0], '', $content);
+
+            return explode(',', $matches['name']);
+        }
+    }
+
+    /**
+     * TagLib库解析
+     * @access public
+     * @param  string   $tagLib 要解析的标签库
+     * @param  string   $content 要解析的模板内容
+     * @param  boolean  $hide 是否隐藏标签库前缀
+     * @return void
+     */
+    public function parseTagLib($tagLib, &$content, $hide = false)
+    {
+        if (false !== strpos($tagLib, '\\')) {
+            // 支持指定标签库的命名空间
+            $className = $tagLib;
+            $tagLib    = substr($tagLib, strrpos($tagLib, '\\') + 1);
+        } else {
+            $className = '\\think\\template\\taglib\\' . ucwords($tagLib);
+        }
+
+        $tLib = new $className($this);
+
+        $tLib->parseTag($content, $hide ? '' : $tagLib);
+    }
+
+    /**
+     * 分析标签属性
+     * @access public
+     * @param  string   $str 属性字符串
+     * @param  string   $name 不为空时返回指定的属性名
+     * @return array
+     */
+    public function parseAttr($str, $name = null)
+    {
+        $regex = '/\s+(?>(?P<name>[\w-]+)\s*)=(?>\s*)([\"\'])(?P<value>(?:(?!\\2).)*)\\2/is';
+        $array = [];
+
+        if (preg_match_all($regex, $str, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $array[$match['name']] = $match['value'];
+            }
+            unset($matches);
+        }
+
+        if (!empty($name) && isset($array[$name])) {
+            return $array[$name];
+        }
+
+        return $array;
+    }
+
+    /**
+     * 模板标签解析
+     * 格式： {TagName:args [|content] }
+     * @access private
+     * @param  string $content 要解析的模板内容
+     * @return void
+     */
+    private function parseTag(&$content)
+    {
+        $regex = $this->getRegex('tag');
+
+        if (preg_match_all($regex, $content, $matches, PREG_SET_ORDER)) {
+            foreach ($matches as $match) {
+                $str  = stripslashes($match[1]);
+                $flag = substr($str, 0, 1);
+
+                switch ($flag) {
+                    case '$':
+                        // 解析模板变量 格式 {$varName}
+                        // 是否带有?号
+                        if (false !== $pos = strpos($str, '?')) {
+                            $array = preg_split('/([!=]={1,2}|(?<!-)[><]={0,1})/', substr($str, 0, $pos), 2, PREG_SPLIT_DELIM_CAPTURE);
+                            $name  = $array[0];
+
+                            $this->parseVar($name);
+                            //$this->parseVarFunction($name);
+
+                            $str = trim(substr($str, $pos + 1));
+                            $this->parseVar($str);
+                            $first = substr($str, 0, 1);
+
+                            if (strpos($name, ')')) {
+                                // $name为对象或是自动识别，或者含有函数
+                                if (isset($array[1])) {
+                                    $this->parseVar($array[2]);
+                                    $name .= $array[1] . $array[2];
+                                }
+
+                                switch ($first) {
+                                    case '?':
+                                        $this->parseVarFunction($name);
+                                        $str = '<?php echo (' . $name . ') ? ' . $name . ' : ' . substr($str, 1) . '; ?>';
+                                        break;
+                                    case '=':
+                                        $str = '<?php if(' . $name . ') echo ' . substr($str, 1) . '; ?>';
+                                        break;
+                                    default:
+                                        $str = '<?php echo ' . $name . '?' . $str . '; ?>';
+                                }
+                            } else {
+                                if (isset($array[1])) {
+                                    $express = true;
+                                    $this->parseVar($array[2]);
+                                    $express = $name . $array[1] . $array[2];
+                                } else {
+                                    $express = false;
+                                }
+
+                                if (in_array($first, ['?', '=', ':'])) {
+                                    $str = trim(substr($str, 1));
+                                    if ('$' == substr($str, 0, 1)) {
+                                        $str = $this->parseVarFunction($str);
+                                    }
+                                }
+
+                                // $name为数组
+                                switch ($first) {
+                                    case '?':
+                                        // {$varname??'xxx'} $varname有定义则输出$varname,否则输出xxx
+                                        $str = '<?php echo ' . ($express ?: 'isset(' . $name . ')') . ' ? ' . $this->parseVarFunction($name) . ' : ' . $str . '; ?>';
+                                        break;
+                                    case '=':
+                                        // {$varname?='xxx'} $varname为真时才输出xxx
+                                        $str = '<?php if(' . ($express ?: '!empty(' . $name . ')') . ') echo ' . $str . '; ?>';
+                                        break;
+                                    case ':':
+                                        // {$varname?:'xxx'} $varname为真时输出$varname,否则输出xxx
+                                        $str = '<?php echo ' . ($express ?: '!empty(' . $name . ')') . ' ? ' . $this->parseVarFunction($name) . ' : ' . $str . '; ?>';
+                                        break;
+                                    default:
+                                        if (strpos($str, ':')) {
+                                            // {$varname ? 'a' : 'b'} $varname为真时输出a,否则输出b
+                                            $array = explode(':', $str, 2);
+
+                                            $array[0] = '$' == substr(trim($array[0]), 0, 1) ? $this->parseVarFunction($array[0]) : $array[0];
+                                            $array[1] = '$' == substr(trim($array[1]), 0, 1) ? $this->parseVarFunction($array[1]) : $array[1];
+
+                                            $str = implode(' : ', $array);
+                                        }
+                                        $str = '<?php echo ' . ($express ?: '!empty(' . $name . ')') . ' ? ' . $str . '; ?>';
+                                }
+                            }
+                        } else {
+                            $this->parseVar($str);
+                            $this->parseVarFunction($str);
+                            $str = '<?php echo ' . $str . '; ?>';
+                        }
+                        break;
+                    case ':':
+                        // 输出某个函数的结果
+                        $str = substr($str, 1);
+                        $this->parseVar($str);
+                        $str = '<?php echo ' . $str . '; ?>';
+                        break;
+                    case '~':
+                        // 执行某个函数
+                        $str = substr($str, 1);
+                        $this->parseVar($str);
+                        $str = '<?php ' . $str . '; ?>';
+                        break;
+                    case '-':
+                    case '+':
+                        // 输出计算
+                        $this->parseVar($str);
+                        $str = '<?php echo ' . $str . '; ?>';
+                        break;
+                    case '/':
+                        // 注释标签
+                        $flag2 = substr($str, 1, 1);
+                        if ('/' == $flag2 || ('*' == $flag2 && substr(rtrim($str), -2) == '*/')) {
+                            $str = '';
+                        }
+                        break;
+                    default:
+                        // 未识别的标签直接返回
+                        $str = $this->config['tpl_begin'] . $str . $this->config['tpl_end'];
+                        break;
+                }
+
+                $content = str_replace($match[0], $str, $content);
+            }
+
+            unset($matches);
+        }
+    }
+
+    /**
+     * 模板变量解析,支持使用函数
+     * 格式： {$varname|function1|function2=arg1,arg2}
+     * @access public
+     * @param  string $varStr 变量数据
+     * @return void
+     */
+    public function parseVar(&$varStr)
+    {
+        $varStr = trim($varStr);
+
+        if (preg_match_all('/\$[a-zA-Z_](?>\w*)(?:[:\.][0-9a-zA-Z_](?>\w*))+/', $varStr, $matches, PREG_OFFSET_CAPTURE)) {
+            static $_varParseList = [];
+
+            while ($matches[0]) {
+                $match = array_pop($matches[0]);
+
+                //如果已经解析过该变量字串，则直接返回变量值
+                if (isset($_varParseList[$match[0]])) {
+                    $parseStr = $_varParseList[$match[0]];
+                } else {
+                    if (strpos($match[0], '.')) {
+                        $vars  = explode('.', $match[0]);
+                        $first = array_shift($vars);
+
+                        if ('$Think' == $first) {
+                            // 所有以Think.打头的以特殊变量对待 无需模板赋值就可以输出
+                            $parseStr = $this->parseThinkVar($vars);
+                        } elseif ('$Request' == $first) {
+                            // 获取Request请求对象参数
+                            $method = array_shift($vars);
+                            if (!empty($vars)) {
+                                $params = implode('.', $vars);
+                                if ('true' != $params) {
+                                    $params = '\'' . $params . '\'';
+                                }
+                            } else {
+                                $params = '';
+                            }
+
+                            $parseStr = 'app(\'request\')->' . $method . '(' . $params . ')';
+                        } else {
+                            switch ($this->config['tpl_var_identify']) {
+                                case 'array': // 识别为数组
+                                    $parseStr = $first . '[\'' . implode('\'][\'', $vars) . '\']';
+                                    break;
+                                case 'obj': // 识别为对象
+                                    $parseStr = $first . '->' . implode('->', $vars);
+                                    break;
+                                default: // 自动判断数组或对象
+                                    $parseStr = '(is_array(' . $first . ')?' . $first . '[\'' . implode('\'][\'', $vars) . '\']:' . $first . '->' . implode('->', $vars) . ')';
+                            }
+                        }
+                    } else {
+                        $parseStr = str_replace(':', '->', $match[0]);
+                    }
+
+                    $_varParseList[$match[0]] = $parseStr;
+                }
+
+                $varStr = substr_replace($varStr, $parseStr, $match[1], strlen($match[0]));
+            }
+            unset($matches);
+        }
+    }
+
+    /**
+     * 对模板中使用了函数的变量进行解析
+     * 格式 {$varname|function1|function2=arg1,arg2}
+     * @access public
+     * @param  string    $varStr     变量字符串
+     * @param  bool      $autoescape 自动转义
+     * @return void
+     */
+    public function parseVarFunction(&$varStr, $autoescape = true)
+    {
+        if (!$autoescape && false === strpos($varStr, '|')) {
+            return $varStr;
+        } elseif ($autoescape && !preg_match('/\|(\s)?raw(\||\s)?/i', $varStr)) {
+            $varStr .= '|' . $this->config['default_filter'];
+        }
+
+        static $_varFunctionList = [];
+
+        $_key = md5($varStr);
+
+        //如果已经解析过该变量字串，则直接返回变量值
+        if (isset($_varFunctionList[$_key])) {
+            $varStr = $_varFunctionList[$_key];
+        } else {
+            $varArray = explode('|', $varStr);
+
+            // 取得变量名称
+            $name = trim(array_shift($varArray));
+
+            // 对变量使用函数
+            $length = count($varArray);
+
+            // 取得模板禁止使用函数列表
+            $template_deny_funs = explode(',', $this->config['tpl_deny_func_list']);
+
+            for ($i = 0; $i < $length; $i++) {
+                $args = explode('=', $varArray[$i], 2);
+
+                // 模板函数过滤
+                $fun = trim($args[0]);
+                if (in_array($fun, $template_deny_funs)) {
+                    continue;
+                }
+
+                switch (strtolower($fun)) {
+                    case 'raw':
+                        break;
+                    case 'date':
+                        $name = 'date(' . $args[1] . ',!is_numeric(' . $name . ')? strtotime(' . $name . ') : ' . $name . ')';
+                        break;
+                    case 'first':
+                        $name = 'current(' . $name . ')';
+                        break;
+                    case 'last':
+                        $name = 'end(' . $name . ')';
+                        break;
+                    case 'upper':
+                        $name = 'strtoupper(' . $name . ')';
+                        break;
+                    case 'lower':
+                        $name = 'strtolower(' . $name . ')';
+                        break;
+                    case 'format':
+                        $name = 'sprintf(' . $args[1] . ',' . $name . ')';
+                        break;
+                    case 'default': // 特殊模板函数
+                        if (false === strpos($name, '(')) {
+                            $name = '(isset(' . $name . ') && (' . $name . ' !== \'\')?' . $name . ':' . $args[1] . ')';
+                        } else {
+                            $name = '(' . $name . ' ?: ' . $args[1] . ')';
+                        }
+                        break;
+                    default: // 通用模板函数
+                        if (isset($args[1])) {
+                            if (strstr($args[1], '###')) {
+                                $args[1] = str_replace('###', $name, $args[1]);
+                                $name    = "$fun($args[1])";
+                            } else {
+                                $name = "$fun($name,$args[1])";
+                            }
+                        } else {
+                            if (!empty($args[0])) {
+                                $name = "$fun($name)";
+                            }
+                        }
+                }
+            }
+
+            $_varFunctionList[$_key] = $name;
+            $varStr                  = $name;
+        }
+        return $varStr;
+    }
+
+    /**
+     * 特殊模板变量解析
+     * 格式 以 $Think. 打头的变量属于特殊模板变量
+     * @access public
+     * @param  array $vars 变量数组
+     * @return string
+     */
+    public function parseThinkVar($vars)
+    {
+        $type  = strtoupper(trim(array_shift($vars)));
+        $param = implode('.', $vars);
+
+        if ($vars) {
+            switch ($type) {
+                case 'SERVER':
+                    $parseStr = 'app(\'request\')->server(\'' . $param . '\')';
+                    break;
+                case 'GET':
+                    $parseStr = 'app(\'request\')->get(\'' . $param . '\')';
+                    break;
+                case 'POST':
+                    $parseStr = 'app(\'request\')->post(\'' . $param . '\')';
+                    break;
+                case 'COOKIE':
+                    $parseStr = 'app(\'cookie\')->get(\'' . $param . '\')';
+                    break;
+                case 'SESSION':
+                    $parseStr = 'app(\'session\')->get(\'' . $param . '\')';
+                    break;
+                case 'ENV':
+                    $parseStr = 'app(\'request\')->env(\'' . $param . '\')';
+                    break;
+                case 'REQUEST':
+                    $parseStr = 'app(\'request\')->request(\'' . $param . '\')';
+                    break;
+                case 'CONST':
+                    $parseStr = strtoupper($param);
+                    break;
+                case 'LANG':
+                    $parseStr = 'app(\'lang\')->get(\'' . $param . '\')';
+                    break;
+                case 'CONFIG':
+                    $parseStr = 'app(\'config\')->get(\'' . $param . '\')';
+                    break;
+                default:
+                    $parseStr = '\'\'';
+                    break;
+            }
+        } else {
+            switch ($type) {
+                case 'NOW':
+                    $parseStr = "date('Y-m-d g:i a',time())";
+                    break;
+                case 'VERSION':
+                    $parseStr = 'app()->version()';
+                    break;
+                case 'LDELIM':
+                    $parseStr = '\'' . ltrim($this->config['tpl_begin'], '\\') . '\'';
+                    break;
+                case 'RDELIM':
+                    $parseStr = '\'' . ltrim($this->config['tpl_end'], '\\') . '\'';
+                    break;
+                default:
+                    if (defined($type)) {
+                        $parseStr = $type;
+                    } else {
+                        $parseStr = '';
+                    }
+            }
+        }
+
+        return $parseStr;
+    }
+
+    /**
+     * 分析加载的模板文件并读取内容 支持多个模板文件读取
+     * @access private
+     * @param  string $templateName 模板文件名
+     * @return string
+     */
+    private function parseTemplateName($templateName)
+    {
+        $array    = explode(',', $templateName);
+        $parseStr = '';
+
+        foreach ($array as $templateName) {
+            if (empty($templateName)) {
+                continue;
+            }
+
+            if (0 === strpos($templateName, '$')) {
+                //支持加载变量文件名
+                $templateName = $this->get(substr($templateName, 1));
+            }
+
+            $template = $this->parseTemplateFile($templateName);
+
+            if ($template) {
+                // 获取模板文件内容
+                $parseStr .= file_get_contents($template);
+            }
+        }
+
+        return $parseStr;
+    }
+
+    /**
+     * 解析模板文件名
+     * @access private
+     * @param  string $template 文件名
+     * @return string|false
+     */
+    private function parseTemplateFile($template)
+    {
+        if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
+            if (strpos($template, '@')) {
+                list($module, $template) = explode('@', $template);
+            }
+
+            if (0 !== strpos($template, '/')) {
+                $template = str_replace(['/', ':'], $this->config['view_depr'], $template);
+            } else {
+                $template = str_replace(['/', ':'], $this->config['view_depr'], substr($template, 1));
+            }
+
+            if ($this->config['view_base']) {
+                $module = isset($module) ? $module : $this->app['request']->module();
+                $path   = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : '');
+            } else {
+                $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . basename($this->config['view_path']) . DIRECTORY_SEPARATOR : $this->config['view_path'];
+            }
+
+            $template = $path . $template . '.' . ltrim($this->config['view_suffix'], '.');
+        }
+
+        if (is_file($template)) {
+            // 记录模板文件的更新时间
+            $this->includeFile[$template] = filemtime($template);
+
+            return $template;
+        }
+
+        throw new TemplateNotFoundException('template not exists:' . $template, $template);
+    }
+
+    /**
+     * 按标签生成正则
+     * @access private
+     * @param  string $tagName 标签名
+     * @return string
+     */
+    private function getRegex($tagName)
+    {
+        $regex = '';
+        if ('tag' == $tagName) {
+            $begin = $this->config['tpl_begin'];
+            $end   = $this->config['tpl_end'];
+
+            if (strlen(ltrim($begin, '\\')) == 1 && strlen(ltrim($end, '\\')) == 1) {
+                $regex = $begin . '((?:[\$]{1,2}[a-wA-w_]|[\:\~][\$a-wA-w_]|[+]{2}[\$][a-wA-w_]|[-]{2}[\$][a-wA-w_]|\/[\*\/])(?>[^' . $end . ']*))' . $end;
+            } else {
+                $regex = $begin . '((?:[\$]{1,2}[a-wA-w_]|[\:\~][\$a-wA-w_]|[+]{2}[\$][a-wA-w_]|[-]{2}[\$][a-wA-w_]|\/[\*\/])(?>(?:(?!' . $end . ').)*))' . $end;
+            }
+        } else {
+            $begin  = $this->config['taglib_begin'];
+            $end    = $this->config['taglib_end'];
+            $single = strlen(ltrim($begin, '\\')) == 1 && strlen(ltrim($end, '\\')) == 1 ? true : false;
+
+            switch ($tagName) {
+                case 'block':
+                    if ($single) {
+                        $regex = $begin . '(?:' . $tagName . '\b(?>(?:(?!name=).)*)\bname=([\'\"])(?P<name>[\$\w\-\/\.]+)\\1(?>[^' . $end . ']*)|\/' . $tagName . ')' . $end;
+                    } else {
+                        $regex = $begin . '(?:' . $tagName . '\b(?>(?:(?!name=).)*)\bname=([\'\"])(?P<name>[\$\w\-\/\.]+)\\1(?>(?:(?!' . $end . ').)*)|\/' . $tagName . ')' . $end;
+                    }
+                    break;
+                case 'literal':
+                    if ($single) {
+                        $regex = '(' . $begin . $tagName . '\b(?>[^' . $end . ']*)' . $end . ')';
+                        $regex .= '(?:(?>[^' . $begin . ']*)(?>(?!' . $begin . '(?>' . $tagName . '\b[^' . $end . ']*|\/' . $tagName . ')' . $end . ')' . $begin . '[^' . $begin . ']*)*)';
+                        $regex .= '(' . $begin . '\/' . $tagName . $end . ')';
+                    } else {
+                        $regex = '(' . $begin . $tagName . '\b(?>(?:(?!' . $end . ').)*)' . $end . ')';
+                        $regex .= '(?:(?>(?:(?!' . $begin . ').)*)(?>(?!' . $begin . '(?>' . $tagName . '\b(?>(?:(?!' . $end . ').)*)|\/' . $tagName . ')' . $end . ')' . $begin . '(?>(?:(?!' . $begin . ').)*))*)';
+                        $regex .= '(' . $begin . '\/' . $tagName . $end . ')';
+                    }
+                    break;
+                case 'restoreliteral':
+                    $regex = '<!--###literal(\d+)###-->';
+                    break;
+                case 'include':
+                    $name = 'file';
+                case 'taglib':
+                case 'layout':
+                case 'extend':
+                    if (empty($name)) {
+                        $name = 'name';
+                    }
+                    if ($single) {
+                        $regex = $begin . $tagName . '\b(?>(?:(?!' . $name . '=).)*)\b' . $name . '=([\'\"])(?P<name>[\$\w\-\/\.\:@,\\\\]+)\\1(?>[^' . $end . ']*)' . $end;
+                    } else {
+                        $regex = $begin . $tagName . '\b(?>(?:(?!' . $name . '=).)*)\b' . $name . '=([\'\"])(?P<name>[\$\w\-\/\.\:@,\\\\]+)\\1(?>(?:(?!' . $end . ').)*)' . $end;
+                    }
+                    break;
+            }
+        }
+
+        return '/' . $regex . '/is';
+    }
+}
diff --git a/thinkphp/library/think/Url.php b/thinkphp/library/think/Url.php
new file mode 100644
index 0000000000000000000000000000000000000000..e8159993b01070b5af4b3bc159b0e75acac0bd97
--- /dev/null
+++ b/thinkphp/library/think/Url.php
@@ -0,0 +1,392 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class Url
+{
+    /**
+     * 配置参数
+     * @var array
+     */
+    protected $config = [];
+
+    /**
+     * ROOT地址
+     * @var string
+     */
+    protected $root;
+
+    /**
+     * 绑定检查
+     * @var bool
+     */
+    protected $bindCheck;
+
+    /**
+     * 应用对象
+     * @var App
+     */
+    protected $app;
+
+    public function __construct(App $app, array $config = [])
+    {
+        $this->app    = $app;
+        $this->config = $config;
+
+        if (is_file($app->getRuntimePath() . 'route.php')) {
+            // 读取路由映射文件
+            $app['route']->setName(include $app->getRuntimePath() . 'route.php');
+        }
+    }
+
+    /**
+     * 初始化
+     * @access public
+     * @param  array $config
+     * @return void
+     */
+    public function init(array $config = [])
+    {
+        $this->config = array_merge($this->config, array_change_key_case($config));
+    }
+
+    public static function __make(App $app, Config $config)
+    {
+        return new static($app, $config->pull('app'));
+    }
+
+    /**
+     * URL生成 支持路由反射
+     * @access public
+     * @param  string            $url 路由地址
+     * @param  string|array      $vars 参数（支持数组和字符串）a=val&b=val2... ['a'=>'val1', 'b'=>'val2']
+     * @param  string|bool       $suffix 伪静态后缀，默认为true表示获取配置值
+     * @param  boolean|string    $domain 是否显示域名 或者直接传入域名
+     * @return string
+     */
+    public function build($url = '', $vars = '', $suffix = true, $domain = false)
+    {
+        // 解析URL
+        if (0 === strpos($url, '[') && $pos = strpos($url, ']')) {
+            // [name] 表示使用路由命名标识生成URL
+            $name = substr($url, 1, $pos - 1);
+            $url  = 'name' . substr($url, $pos + 1);
+        }
+
+        if (false === strpos($url, '://') && 0 !== strpos($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, '@') && false === strpos($url, '\\')) {
+                // 解析域名
+                list($url, $domain) = explode('@', $url, 2);
+            }
+        }
+
+        // 解析参数
+        if (is_string($vars)) {
+            // aaa=1&bbb=2 转换成数组
+            parse_str($vars, $vars);
+        }
+
+        if ($url) {
+            $checkName   = isset($name) ? $name : $url . (isset($info['query']) ? '?' . $info['query'] : '');
+            $checkDomain = $domain && is_string($domain) ? $domain : null;
+
+            $rule = $this->app['route']->getName($checkName, $checkDomain);
+
+            if (is_null($rule) && isset($info['query'])) {
+                $rule = $this->app['route']->getName($url);
+                // 解析地址里面参数 合并到vars
+                parse_str($info['query'], $params);
+                $vars = array_merge($params, $vars);
+                unset($info['query']);
+            }
+        }
+
+        if (!empty($rule) && $match = $this->getRuleUrl($rule, $vars, $domain)) {
+            // 匹配路由命名标识
+            $url = $match[0];
+
+            $domain = $match[1];
+
+            if (!is_null($match[2])) {
+                $suffix = $match[2];
+            }
+        } elseif (!empty($rule) && isset($name)) {
+            throw new \InvalidArgumentException('route name not exists:' . $name);
+        } else {
+            // 检查别名路由
+            $alias      = $this->app['route']->getAlias();
+            $matchAlias = false;
+
+            if ($alias) {
+                // 别名路由解析
+                foreach ($alias as $key => $item) {
+                    $val = $item->getRoute();
+
+                    if (0 === strpos($url, $val)) {
+                        $url        = $key . substr($url, strlen($val));
+                        $matchAlias = true;
+                        break;
+                    }
+                }
+            }
+
+            if (!$matchAlias) {
+                // 路由标识不存在 直接解析
+                $url = $this->parseUrl($url);
+            }
+
+            // 检测URL绑定
+            if (!$this->bindCheck) {
+                $bind = $this->app['route']->getBind($domain && is_string($domain) ? $domain : null);
+
+                if ($bind && 0 === strpos($url, $bind)) {
+                    $url = substr($url, strlen($bind) + 1);
+                } else {
+                    $binds = $this->app['route']->getBind(true);
+
+                    foreach ($binds as $key => $val) {
+                        if (is_string($val) && 0 === strpos($url, $val) && substr_count($val, '/') > 1) {
+                            $url    = substr($url, strlen($val) + 1);
+                            $domain = $key;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (isset($info['query'])) {
+                // 解析地址里面参数 合并到vars
+                parse_str($info['query'], $params);
+                $vars = array_merge($params, $vars);
+            }
+        }
+
+        // 还原URL分隔符
+        $depr = $this->config['pathinfo_depr'];
+        $url  = str_replace('/', $depr, $url);
+
+        // URL后缀
+        if ('/' == substr($url, -1) || '' == $url) {
+            $suffix = '';
+        } else {
+            $suffix = $this->parseSuffix($suffix);
+        }
+
+        // 锚点
+        $anchor = !empty($anchor) ? '#' . $anchor : '';
+
+        // 参数组装
+        if (!empty($vars)) {
+            // 添加参数
+            if ($this->config['url_common_param']) {
+                $vars = http_build_query($vars);
+                $url .= $suffix . '?' . $vars . $anchor;
+            } else {
+                $paramType = $this->config['url_param_type'];
+
+                foreach ($vars as $var => $val) {
+                    if ('' !== trim($val)) {
+                        if ($paramType) {
+                            $url .= $depr . urlencode($val);
+                        } else {
+                            $url .= $depr . $var . $depr . urlencode($val);
+                        }
+                    }
+                }
+
+                $url .= $suffix . $anchor;
+            }
+        } else {
+            $url .= $suffix . $anchor;
+        }
+
+        // 检测域名
+        $domain = $this->parseDomain($url, $domain);
+
+        // URL组装
+        $url = $domain . rtrim($this->root ?: $this->app['request']->root(), '/') . '/' . ltrim($url, '/');
+
+        $this->bindCheck = false;
+
+        return $url;
+    }
+
+    // 直接解析URL地址
+    protected function parseUrl($url)
+    {
+        $request = $this->app['request'];
+
+        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) {
+                $action = $request->action();
+            } else {
+                $path       = explode('/', $url);
+                $action     = array_pop($path);
+                $controller = empty($path) ? $controller : array_pop($path);
+                $module     = empty($path) ? $module : array_pop($path) . '/';
+            }
+
+            if ($this->config['url_convert']) {
+                $action     = strtolower($action);
+                $controller = Loader::parseName($controller);
+            }
+
+            $url = $module . $controller . '/' . $action;
+        }
+
+        return $url;
+    }
+
+    // 检测域名
+    protected function parseDomain(&$url, $domain)
+    {
+        if (!$domain) {
+            return '';
+        }
+
+        $rootDomain = $this->app['request']->rootDomain();
+        if (true === $domain) {
+            // 自动判断域名
+            $domain = $this->config['app_host'] ?: $this->app['request']->host(true);
+
+            $domains = $this->app['route']->getDomains();
+
+            if ($domains) {
+                $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 (is_string($rule) && false === strpos($key, '*') && 0 === strpos($url, $rule)) {
+                                $url    = ltrim($url, $rule);
+                                $domain = $key;
+
+                                // 生成对应子域名
+                                if (!empty($rootDomain)) {
+                                    $domain .= $rootDomain;
+                                }
+                                break;
+                            } elseif (false !== strpos($key, '*')) {
+                                if (!empty($rootDomain)) {
+                                    $domain .= $rootDomain;
+                                }
+
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        } elseif (!strpos($domain, '.')) {
+            $domain .= '.' . $rootDomain;
+        }
+
+        if (false !== strpos($domain, '://')) {
+            $scheme = '';
+        } else {
+            $scheme = $this->app['request']->isSsl() || $this->config['is_https'] ? 'https://' : 'http://';
+
+        }
+
+        return $scheme . $domain;
+    }
+
+    // 解析URL后缀
+    protected function parseSuffix($suffix)
+    {
+        if ($suffix) {
+            $suffix = true === $suffix ? $this->config['url_html_suffix'] : $suffix;
+
+            if ($pos = strpos($suffix, '|')) {
+                $suffix = substr($suffix, 0, $pos);
+            }
+        }
+
+        return (empty($suffix) || 0 === strpos($suffix, '.')) ? $suffix : '.' . $suffix;
+    }
+
+    // 匹配路由地址
+    public function getRuleUrl($rule, &$vars = [], $allowDomain = '')
+    {
+        foreach ($rule as $item) {
+            list($url, $pattern, $domain, $suffix) = $item;
+
+            if (is_string($allowDomain) && $domain != $allowDomain) {
+                continue;
+            }
+
+            if (empty($pattern)) {
+                return [rtrim($url, '?/-'), $domain, $suffix];
+            }
+
+            $type = $this->config['url_common_param'];
+
+            foreach ($pattern as $key => $val) {
+                if (isset($vars[$key])) {
+                    $url = str_replace(['[:' . $key . ']', '<' . $key . '?>', ':' . $key, '<' . $key . '>'], $type ? $vars[$key] : urlencode($vars[$key]), $url);
+                    unset($vars[$key]);
+                    $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
+                    $result = [rtrim($url, '?/-'), $domain, $suffix];
+                } elseif (2 == $val) {
+                    $url    = str_replace(['/[:' . $key . ']', '[:' . $key . ']', '<' . $key . '?>'], '', $url);
+                    $url    = str_replace(['/?', '-?'], ['/', '-'], $url);
+                    $result = [rtrim($url, '?/-'), $domain, $suffix];
+                } else {
+                    break;
+                }
+            }
+
+            if (isset($result)) {
+                return $result;
+            }
+        }
+
+        return false;
+    }
+
+    // 指定当前生成URL地址的root
+    public function root($root)
+    {
+        $this->root = $root;
+        $this->app['request']->setRoot($root);
+    }
+}
diff --git a/thinkphp/library/think/Validate.php b/thinkphp/library/think/Validate.php
new file mode 100644
index 0000000000000000000000000000000000000000..de46956cf20b756345d856a0c7091ca1429bfea6
--- /dev/null
+++ b/thinkphp/library/think/Validate.php
@@ -0,0 +1,1492 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+use think\exception\ClassNotFoundException;
+use think\validate\ValidateRule;
+
+class Validate
+{
+
+    /**
+     * 自定义验证类型
+     * @var array
+     */
+    protected static $type = [];
+
+    /**
+     * 验证类型别名
+     * @var array
+     */
+    protected $alias = [
+        '>' => 'gt', '>=' => 'egt', '<' => 'lt', '<=' => 'elt', '=' => 'eq', 'same' => 'eq',
+    ];
+
+    /**
+     * 当前验证规则
+     * @var array
+     */
+    protected $rule = [];
+
+    /**
+     * 验证提示信息
+     * @var array
+     */
+    protected $message = [];
+
+    /**
+     * 验证字段描述
+     * @var array
+     */
+    protected $field = [];
+
+    /**
+     * 默认规则提示
+     * @var array
+     */
+    protected static $typeMsg = [
+        'require'     => ':attribute require',
+        'must'        => ':attribute must',
+        'number'      => ':attribute must be numeric',
+        'integer'     => ':attribute must be integer',
+        'float'       => ':attribute must be float',
+        'boolean'     => ':attribute must be bool',
+        'email'       => ':attribute not a valid email address',
+        'mobile'      => ':attribute not a valid mobile',
+        'array'       => ':attribute must be a array',
+        'accepted'    => ':attribute must be yes,on or 1',
+        'date'        => ':attribute not a valid datetime',
+        'file'        => ':attribute not a valid file',
+        'image'       => ':attribute not a valid image',
+        'alpha'       => ':attribute must be alpha',
+        'alphaNum'    => ':attribute must be alpha-numeric',
+        'alphaDash'   => ':attribute must be alpha-numeric, dash, underscore',
+        'activeUrl'   => ':attribute not a valid domain or ip',
+        'chs'         => ':attribute must be chinese',
+        'chsAlpha'    => ':attribute must be chinese or alpha',
+        'chsAlphaNum' => ':attribute must be chinese,alpha-numeric',
+        'chsDash'     => ':attribute must be chinese,alpha-numeric,underscore, dash',
+        'url'         => ':attribute not a valid url',
+        'ip'          => ':attribute not a valid ip',
+        'dateFormat'  => ':attribute must be dateFormat of :rule',
+        'in'          => ':attribute must be in :rule',
+        'notIn'       => ':attribute be notin :rule',
+        'between'     => ':attribute must between :1 - :2',
+        'notBetween'  => ':attribute not between :1 - :2',
+        'length'      => 'size of :attribute must be :rule',
+        'max'         => 'max size of :attribute must be :rule',
+        'min'         => 'min size of :attribute must be :rule',
+        'after'       => ':attribute cannot be less than :rule',
+        'before'      => ':attribute cannot exceed :rule',
+        'expire'      => ':attribute not within :rule',
+        'allowIp'     => 'access IP is not allowed',
+        'denyIp'      => 'access IP denied',
+        'confirm'     => ':attribute out of accord with :2',
+        'different'   => ':attribute cannot be same with :2',
+        'egt'         => ':attribute must greater than or equal :rule',
+        'gt'          => ':attribute must greater than :rule',
+        'elt'         => ':attribute must less than or equal :rule',
+        'lt'          => ':attribute must less than :rule',
+        'eq'          => ':attribute must equal :rule',
+        'unique'      => ':attribute has exists',
+        'regex'       => ':attribute not conform to the rules',
+        'method'      => 'invalid Request method',
+        'token'       => 'invalid token',
+        'fileSize'    => 'filesize not match',
+        'fileExt'     => 'extensions to upload is not allowed',
+        'fileMime'    => 'mimetype to upload is not allowed',
+    ];
+
+    /**
+     * 当前验证场景
+     * @var array
+     */
+    protected $currentScene = null;
+
+    /**
+     * Filter_var 规则
+     * @var array
+     */
+    protected $filter = [
+        'email'   => FILTER_VALIDATE_EMAIL,
+        'ip'      => [FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6],
+        'integer' => FILTER_VALIDATE_INT,
+        'url'     => FILTER_VALIDATE_URL,
+        'macAddr' => FILTER_VALIDATE_MAC,
+        'float'   => FILTER_VALIDATE_FLOAT,
+    ];
+
+    /**
+     * 内置正则验证规则
+     * @var array
+     */
+    protected $regex = [
+        'alphaDash'   => '/^[A-Za-z0-9\-\_]+$/',
+        'chs'         => '/^[\x{4e00}-\x{9fa5}]+$/u',
+        'chsAlpha'    => '/^[\x{4e00}-\x{9fa5}a-zA-Z]+$/u',
+        'chsAlphaNum' => '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9]+$/u',
+        'chsDash'     => '/^[\x{4e00}-\x{9fa5}a-zA-Z0-9\_\-]+$/u',
+        'mobile'      => '/^1[3-9][0-9]\d{8}$/',
+        'idCard'      => '/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/',
+        'zip'         => '/\d{6}/',
+    ];
+
+    /**
+     * 验证场景定义
+     * @var array
+     */
+    protected $scene = [];
+
+    /**
+     * 验证失败错误信息
+     * @var array
+     */
+    protected $error = [];
+
+    /**
+     * 是否批量验证
+     * @var bool
+     */
+    protected $batch = false;
+
+    /**
+     * 场景需要验证的规则
+     * @var array
+     */
+    protected $only = [];
+
+    /**
+     * 场景需要移除的验证规则
+     * @var array
+     */
+    protected $remove = [];
+
+    /**
+     * 场景需要追加的验证规则
+     * @var array
+     */
+    protected $append = [];
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array $rules 验证规则
+     * @param  array $message 验证提示信息
+     * @param  array $field 验证字段描述信息
+     */
+    public function __construct(array $rules = [], array $message = [], array $field = [])
+    {
+        $this->rule    = $rules + $this->rule;
+        $this->message = array_merge($this->message, $message);
+        $this->field   = array_merge($this->field, $field);
+    }
+
+    /**
+     * 创建一个验证器类
+     * @access public
+     * @param  array $rules 验证规则
+     * @param  array $message 验证提示信息
+     * @param  array $field 验证字段描述信息
+     * @return Validate
+     */
+    public static function make(array $rules = [], array $message = [], array $field = [])
+    {
+        return new self($rules, $message, $field);
+    }
+
+    /**
+     * 添加字段验证规则
+     * @access protected
+     * @param  string|array  $name  字段名称或者规则数组
+     * @param  mixed         $rule  验证规则或者字段描述信息
+     * @return $this
+     */
+    public function rule($name, $rule = '')
+    {
+        if (is_array($name)) {
+            $this->rule = $name + $this->rule;
+            if (is_array($rule)) {
+                $this->field = array_merge($this->field, $rule);
+            }
+        } else {
+            $this->rule[$name] = $rule;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 注册扩展验证（类型）规则
+     * @access public
+     * @param  string    $type  验证规则类型
+     * @param  mixed     $callback callback方法(或闭包)
+     * @return void
+     */
+    public static function extend($type, $callback = null)
+    {
+        if (is_array($type)) {
+            self::$type = array_merge(self::$type, $type);
+        } else {
+            self::$type[$type] = $callback;
+        }
+    }
+
+    /**
+     * 设置验证规则的默认提示信息
+     * @access public
+     * @param  string|array  $type  验证规则类型名称或者数组
+     * @param  string        $msg  验证提示信息
+     * @return void
+     */
+    public static function setTypeMsg($type, $msg = null)
+    {
+        if (is_array($type)) {
+            self::$typeMsg = array_merge(self::$typeMsg, $type);
+        } else {
+            self::$typeMsg[$type] = $msg;
+        }
+    }
+
+    /**
+     * 设置提示信息
+     * @access public
+     * @param  string|array  $name  字段名称
+     * @param  string        $message 提示信息
+     * @return Validate
+     */
+    public function message($name, $message = '')
+    {
+        if (is_array($name)) {
+            $this->message = array_merge($this->message, $name);
+        } else {
+            $this->message[$name] = $message;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 设置验证场景
+     * @access public
+     * @param  string  $name  场景名
+     * @return $this
+     */
+    public function scene($name)
+    {
+        // 设置当前场景
+        $this->currentScene = $name;
+
+        return $this;
+    }
+
+    /**
+     * 判断是否存在某个验证场景
+     * @access public
+     * @param  string $name 场景名
+     * @return bool
+     */
+    public function hasScene($name)
+    {
+        return isset($this->scene[$name]) || method_exists($this, 'scene' . $name);
+    }
+
+    /**
+     * 设置批量验证
+     * @access public
+     * @param  bool $batch  是否批量验证
+     * @return $this
+     */
+    public function batch($batch = true)
+    {
+        $this->batch = $batch;
+
+        return $this;
+    }
+
+    /**
+     * 指定需要验证的字段列表
+     * @access public
+     * @param  array $fields  字段名
+     * @return $this
+     */
+    public function only($fields)
+    {
+        $this->only = $fields;
+
+        return $this;
+    }
+
+    /**
+     * 移除某个字段的验证规则
+     * @access public
+     * @param  string|array  $field  字段名
+     * @param  mixed         $rule   验证规则 true 移除所有规则
+     * @return $this
+     */
+    public function remove($field, $rule = true)
+    {
+        if (is_array($field)) {
+            foreach ($field as $key => $rule) {
+                if (is_int($key)) {
+                    $this->remove($rule);
+                } else {
+                    $this->remove($key, $rule);
+                }
+            }
+        } else {
+            if (is_string($rule)) {
+                $rule = explode('|', $rule);
+            }
+
+            $this->remove[$field] = $rule;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 追加某个字段的验证规则
+     * @access public
+     * @param  string|array  $field  字段名
+     * @param  mixed         $rule   验证规则
+     * @return $this
+     */
+    public function append($field, $rule = null)
+    {
+        if (is_array($field)) {
+            foreach ($field as $key => $rule) {
+                $this->append($key, $rule);
+            }
+        } else {
+            if (is_string($rule)) {
+                $rule = explode('|', $rule);
+            }
+
+            $this->append[$field] = $rule;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 数据自动验证
+     * @access public
+     * @param  array     $data  数据
+     * @param  mixed     $rules  验证规则
+     * @param  string    $scene 验证场景
+     * @return bool
+     */
+    public function check($data, $rules = [], $scene = '')
+    {
+        $this->error = [];
+
+        if (empty($rules)) {
+            // 读取验证规则
+            $rules = $this->rule;
+        }
+
+        // 获取场景定义
+        $this->getScene($scene);
+
+        foreach ($this->append as $key => $rule) {
+            if (!isset($rules[$key])) {
+                $rules[$key] = $rule;
+            }
+        }
+
+        foreach ($rules as $key => $rule) {
+            // field => 'rule1|rule2...' field => ['rule1','rule2',...]
+            if (strpos($key, '|')) {
+                // 字段|描述 用于指定属性名称
+                list($key, $title) = explode('|', $key);
+            } else {
+                $title = isset($this->field[$key]) ? $this->field[$key] : $key;
+            }
+
+            // 场景检测
+            if (!empty($this->only) && !in_array($key, $this->only)) {
+                continue;
+            }
+
+            // 获取数据 支持二维数组
+            $value = $this->getDataValue($data, $key);
+
+            // 字段验证
+            if ($rule instanceof \Closure) {
+                $result = call_user_func_array($rule, [$value, $data]);
+            } elseif ($rule instanceof ValidateRule) {
+                //  验证因子
+                $result = $this->checkItem($key, $value, $rule->getRule(), $data, $rule->getTitle() ?: $title, $rule->getMsg());
+            } else {
+                $result = $this->checkItem($key, $value, $rule, $data, $title);
+            }
+
+            if (true !== $result) {
+                // 没有返回true 则表示验证失败
+                if (!empty($this->batch)) {
+                    // 批量验证
+                    if (is_array($result)) {
+                        $this->error = array_merge($this->error, $result);
+                    } else {
+                        $this->error[$key] = $result;
+                    }
+                } else {
+                    $this->error = $result;
+                    return false;
+                }
+            }
+        }
+
+        return !empty($this->error) ? false : true;
+    }
+
+    /**
+     * 根据验证规则验证数据
+     * @access public
+     * @param  mixed     $value 字段值
+     * @param  mixed     $rules 验证规则
+     * @return bool
+     */
+    public function checkRule($value, $rules)
+    {
+        if ($rules instanceof \Closure) {
+            return call_user_func_array($rules, [$value]);
+        } elseif ($rules instanceof ValidateRule) {
+            $rules = $rules->getRule();
+        } elseif (is_string($rules)) {
+            $rules = explode('|', $rules);
+        }
+
+        foreach ($rules as $key => $rule) {
+            if ($rule instanceof \Closure) {
+                $result = call_user_func_array($rule, [$value]);
+            } else {
+                // 判断验证类型
+                list($type, $rule) = $this->getValidateType($key, $rule);
+
+                $callback = isset(self::$type[$type]) ? self::$type[$type] : [$this, $type];
+
+                $result = call_user_func_array($callback, [$value, $rule]);
+            }
+
+            if (true !== $result) {
+                return $result;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 验证单个字段规则
+     * @access protected
+     * @param  string    $field  字段名
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rules  验证规则
+     * @param  array     $data  数据
+     * @param  string    $title  字段描述
+     * @param  array     $msg  提示信息
+     * @return mixed
+     */
+    protected function checkItem($field, $value, $rules, $data, $title = '', $msg = [])
+    {
+        if (isset($this->remove[$field]) && true === $this->remove[$field] && empty($this->append[$field])) {
+            // 字段已经移除 无需验证
+            return true;
+        }
+
+        // 支持多规则验证 require|in:a,b,c|... 或者 ['require','in'=>'a,b,c',...]
+        if (is_string($rules)) {
+            $rules = explode('|', $rules);
+        }
+
+        if (isset($this->append[$field])) {
+            // 追加额外的验证规则
+            $rules = array_merge($rules, $this->append[$field]);
+        }
+
+        $i = 0;
+        foreach ($rules as $key => $rule) {
+            if ($rule instanceof \Closure) {
+                $result = call_user_func_array($rule, [$value, $data]);
+                $info   = is_numeric($key) ? '' : $key;
+            } else {
+                // 判断验证类型
+                list($type, $rule, $info) = $this->getValidateType($key, $rule);
+
+                if (isset($this->append[$field]) && in_array($info, $this->append[$field])) {
+
+                } elseif (isset($this->remove[$field]) && in_array($info, $this->remove[$field])) {
+                    // 规则已经移除
+                    $i++;
+                    continue;
+                }
+
+                if ('must' == $info || 0 === strpos($info, 'require') || (!is_null($value) && '' !== $value)) {
+                    // 验证类型
+                    $callback = isset(self::$type[$type]) ? self::$type[$type] : [$this, $type];
+                    // 验证数据
+                    $result = call_user_func_array($callback, [$value, $rule, $data, $field, $title]);
+                } else {
+                    $result = true;
+                }
+            }
+
+            if (false === $result) {
+                // 验证失败 返回错误信息
+                if (!empty($msg[$i])) {
+                    $message = $msg[$i];
+                    if (is_string($message) && strpos($message, '{%') === 0) {
+                        $message = Lang::get(substr($message, 2, -1));
+                    }
+                } else {
+                    $message = $this->getRuleMsg($field, $title, $info, $rule);
+                }
+
+                return $message;
+            } elseif (true !== $result) {
+                // 返回自定义错误信息
+                if (is_string($result) && false !== strpos($result, ':')) {
+                    $result = str_replace(
+                        [':attribute', ':rule'],
+                        [$title, (string) $rule],
+                        $result);
+                }
+
+                return $result;
+            }
+            $i++;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 获取当前验证类型及规则
+     * @access public
+     * @param  mixed     $key
+     * @param  mixed     $rule
+     * @return array
+     */
+    protected function getValidateType($key, $rule)
+    {
+        // 判断验证类型
+        if (!is_numeric($key)) {
+            return [$key, $rule, $key];
+        }
+
+        if (strpos($rule, ':')) {
+            list($type, $rule) = explode(':', $rule, 2);
+            if (isset($this->alias[$type])) {
+                // 判断别名
+                $type = $this->alias[$type];
+            }
+            $info = $type;
+        } elseif (method_exists($this, $rule)) {
+            $type = $rule;
+            $info = $rule;
+            $rule = '';
+        } else {
+            $type = 'is';
+            $info = $rule;
+        }
+
+        return [$type, $rule, $info];
+    }
+
+    /**
+     * 验证是否和某个字段的值一致
+     * @access public
+     * @param  mixed     $value 字段值
+     * @param  mixed     $rule  验证规则
+     * @param  array     $data  数据
+     * @param  string    $field 字段名
+     * @return bool
+     */
+    public function confirm($value, $rule, $data = [], $field = '')
+    {
+        if ('' == $rule) {
+            if (strpos($field, '_confirm')) {
+                $rule = strstr($field, '_confirm', true);
+            } else {
+                $rule = $field . '_confirm';
+            }
+        }
+
+        return $this->getDataValue($data, $rule) === $value;
+    }
+
+    /**
+     * 验证是否和某个字段的值是否不同
+     * @access public
+     * @param  mixed $value 字段值
+     * @param  mixed $rule  验证规则
+     * @param  array $data  数据
+     * @return bool
+     */
+    public function different($value, $rule, $data = [])
+    {
+        return $this->getDataValue($data, $rule) != $value;
+    }
+
+    /**
+     * 验证是否大于等于某个值
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @param  array     $data  数据
+     * @return bool
+     */
+    public function egt($value, $rule, $data = [])
+    {
+        return $value >= $this->getDataValue($data, $rule);
+    }
+
+    /**
+     * 验证是否大于某个值
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @param  array     $data  数据
+     * @return bool
+     */
+    public function gt($value, $rule, $data)
+    {
+        return $value > $this->getDataValue($data, $rule);
+    }
+
+    /**
+     * 验证是否小于等于某个值
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @param  array     $data  数据
+     * @return bool
+     */
+    public function elt($value, $rule, $data = [])
+    {
+        return $value <= $this->getDataValue($data, $rule);
+    }
+
+    /**
+     * 验证是否小于某个值
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @param  array     $data  数据
+     * @return bool
+     */
+    public function lt($value, $rule, $data = [])
+    {
+        return $value < $this->getDataValue($data, $rule);
+    }
+
+    /**
+     * 验证是否等于某个值
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function eq($value, $rule)
+    {
+        return $value == $rule;
+    }
+
+    /**
+     * 必须验证
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function must($value, $rule = null)
+    {
+        return !empty($value) || '0' == $value;
+    }
+
+    /**
+     * 验证字段值是否为有效格式
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  string    $rule  验证规则
+     * @param  array     $data  验证数据
+     * @return bool
+     */
+    public function is($value, $rule, $data = [])
+    {
+        switch (Loader::parseName($rule, 1, false)) {
+            case 'require':
+                // 必须
+                $result = !empty($value) || '0' == $value;
+                break;
+            case 'accepted':
+                // 接受
+                $result = in_array($value, ['1', 'on', 'yes']);
+                break;
+            case 'date':
+                // 是否是一个有效日期
+                $result = false !== strtotime($value);
+                break;
+            case 'activeUrl':
+                // 是否为有效的网址
+                $result = checkdnsrr($value);
+                break;
+            case 'boolean':
+            case 'bool':
+                // 是否为布尔值
+                $result = in_array($value, [true, false, 0, 1, '0', '1'], true);
+                break;
+            case 'number':
+                $result = ctype_digit((string) $value);
+                break;
+            case 'alphaNum':
+                $result = ctype_alnum($value);
+                break;
+            case 'array':
+                // 是否为数组
+                $result = is_array($value);
+                break;
+            case 'file':
+                $result = $value instanceof File;
+                break;
+            case 'image':
+                $result = $value instanceof File && in_array($this->getImageType($value->getRealPath()), [1, 2, 3, 6]);
+                break;
+            case 'token':
+                $result = $this->token($value, '__token__', $data);
+                break;
+            default:
+                if (isset(self::$type[$rule])) {
+                    // 注册的验证规则
+                    $result = call_user_func_array(self::$type[$rule], [$value]);
+                } elseif (function_exists('ctype_' . $rule)) {
+                    // ctype验证规则
+                    $ctypeFun = 'ctype_' . $rule;
+                    $result   = $ctypeFun($value);
+                } elseif (isset($this->filter[$rule])) {
+                    // Filter_var验证规则
+                    $result = $this->filter($value, $this->filter[$rule]);
+                } else {
+                    // 正则验证
+                    $result = $this->regex($value, $rule);
+                }
+        }
+
+        return $result;
+    }
+
+    // 判断图像类型
+    protected function getImageType($image)
+    {
+        if (function_exists('exif_imagetype')) {
+            return exif_imagetype($image);
+        }
+
+        try {
+            $info = getimagesize($image);
+            return $info ? $info[2] : false;
+        } catch (\Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * 验证是否为合格的域名或者IP 支持A，MX，NS，SOA，PTR，CNAME，AAAA，A6， SRV，NAPTR，TXT 或者 ANY类型
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function activeUrl($value, $rule = 'MX')
+    {
+        if (!in_array($rule, ['A', 'MX', 'NS', 'SOA', 'PTR', 'CNAME', 'AAAA', 'A6', 'SRV', 'NAPTR', 'TXT', 'ANY'])) {
+            $rule = 'MX';
+        }
+
+        return checkdnsrr($value, $rule);
+    }
+
+    /**
+     * 验证是否有效IP
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则 ipv4 ipv6
+     * @return bool
+     */
+    public function ip($value, $rule = 'ipv4')
+    {
+        if (!in_array($rule, ['ipv4', 'ipv6'])) {
+            $rule = 'ipv4';
+        }
+
+        return $this->filter($value, [FILTER_VALIDATE_IP, 'ipv6' == $rule ? FILTER_FLAG_IPV6 : FILTER_FLAG_IPV4]);
+    }
+
+    /**
+     * 验证上传文件后缀
+     * @access public
+     * @param  mixed     $file  上传文件
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function fileExt($file, $rule)
+    {
+        if (is_array($file)) {
+            foreach ($file as $item) {
+                if (!($item instanceof File) || !$item->checkExt($rule)) {
+                    return false;
+                }
+            }
+            return true;
+        } elseif ($file instanceof File) {
+            return $file->checkExt($rule);
+        }
+
+        return false;
+    }
+
+    /**
+     * 验证上传文件类型
+     * @access public
+     * @param  mixed     $file  上传文件
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function fileMime($file, $rule)
+    {
+        if (is_array($file)) {
+            foreach ($file as $item) {
+                if (!($item instanceof File) || !$item->checkMime($rule)) {
+                    return false;
+                }
+            }
+            return true;
+        } elseif ($file instanceof File) {
+            return $file->checkMime($rule);
+        }
+
+        return false;
+    }
+
+    /**
+     * 验证上传文件大小
+     * @access public
+     * @param  mixed     $file  上传文件
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function fileSize($file, $rule)
+    {
+        if (is_array($file)) {
+            foreach ($file as $item) {
+                if (!($item instanceof File) || !$item->checkSize($rule)) {
+                    return false;
+                }
+            }
+            return true;
+        } elseif ($file instanceof File) {
+            return $file->checkSize($rule);
+        }
+
+        return false;
+    }
+
+    /**
+     * 验证图片的宽高及类型
+     * @access public
+     * @param  mixed     $file  上传文件
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function image($file, $rule)
+    {
+        if (!($file instanceof File)) {
+            return false;
+        }
+
+        if ($rule) {
+            $rule = explode(',', $rule);
+
+            list($width, $height, $type) = getimagesize($file->getRealPath());
+
+            if (isset($rule[2])) {
+                $imageType = strtolower($rule[2]);
+
+                if ('jpeg' == $imageType) {
+                    $imageType = 'jpg';
+                }
+
+                if (image_type_to_extension($type, false) != $imageType) {
+                    return false;
+                }
+            }
+
+            list($w, $h) = $rule;
+
+            return $w == $width && $h == $height;
+        }
+
+        return in_array($this->getImageType($file->getRealPath()), [1, 2, 3, 6]);
+    }
+
+    /**
+     * 验证请求类型
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function method($value, $rule)
+    {
+        $method = Container::get('request')->method();
+        return strtoupper($rule) == $method;
+    }
+
+    /**
+     * 验证时间和日期是否符合指定格式
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function dateFormat($value, $rule)
+    {
+        $info = date_parse_from_format($rule, $value);
+        return 0 == $info['warning_count'] && 0 == $info['error_count'];
+    }
+
+    /**
+     * 验证是否唯一
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则 格式：数据表,字段名,排除ID,主键名
+     * @param  array     $data  数据
+     * @param  string    $field  验证字段名
+     * @return bool
+     */
+    public function unique($value, $rule, $data, $field)
+    {
+        if (is_string($rule)) {
+            $rule = explode(',', $rule);
+        }
+
+        if (false !== strpos($rule[0], '\\')) {
+            // 指定模型类
+            $db = new $rule[0];
+        } else {
+            try {
+                $db = Container::get('app')->model($rule[0]);
+            } catch (ClassNotFoundException $e) {
+                $db = Db::name($rule[0]);
+            }
+        }
+
+        $key = isset($rule[1]) ? $rule[1] : $field;
+
+        if (strpos($key, '^')) {
+            // 支持多个字段验证
+            $fields = explode('^', $key);
+            foreach ($fields as $key) {
+                $map[] = [$key, '=', $data[$key]];
+            }
+        } else {
+            $map[] = [$key, '=', $data[$field]];
+        }
+
+        $pk = !empty($rule[3]) ? $rule[3] : $db->getPk();
+
+        if (is_string($pk)) {
+            if (isset($rule[2])) {
+                $map[] = [$pk, '<>', $rule[2]];
+            } elseif (isset($data[$pk])) {
+                $map[] = [$pk, '<>', $data[$pk]];
+            }
+        }
+
+        if ($db->where($map)->field($pk)->find()) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * 使用行为类验证
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @param  array     $data  数据
+     * @return mixed
+     */
+    public function behavior($value, $rule, $data)
+    {
+        return Container::get('hook')->exec($rule, $data);
+    }
+
+    /**
+     * 使用filter_var方式验证
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function filter($value, $rule)
+    {
+        if (is_string($rule) && strpos($rule, ',')) {
+            list($rule, $param) = explode(',', $rule);
+        } elseif (is_array($rule)) {
+            $param = isset($rule[1]) ? $rule[1] : null;
+            $rule  = $rule[0];
+        } else {
+            $param = null;
+        }
+
+        return false !== filter_var($value, is_int($rule) ? $rule : filter_id($rule), $param);
+    }
+
+    /**
+     * 验证某个字段等于某个值的时候必须
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @param  array     $data  数据
+     * @return bool
+     */
+    public function requireIf($value, $rule, $data)
+    {
+        list($field, $val) = explode(',', $rule);
+
+        if ($this->getDataValue($data, $field) == $val) {
+            return !empty($value) || '0' == $value;
+        }
+
+        return true;
+    }
+
+    /**
+     * 通过回调方法验证某个字段是否必须
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @param  array     $data  数据
+     * @return bool
+     */
+    public function requireCallback($value, $rule, $data)
+    {
+        $result = call_user_func_array([$this, $rule], [$value, $data]);
+
+        if ($result) {
+            return !empty($value) || '0' == $value;
+        }
+
+        return true;
+    }
+
+    /**
+     * 验证某个字段有值的情况下必须
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @param  array     $data  数据
+     * @return bool
+     */
+    public function requireWith($value, $rule, $data)
+    {
+        $val = $this->getDataValue($data, $rule);
+
+        if (!empty($val)) {
+            return !empty($value) || '0' == $value;
+        }
+
+        return true;
+    }
+
+    /**
+     * 验证是否在范围内
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function in($value, $rule)
+    {
+        return in_array($value, is_array($rule) ? $rule : explode(',', $rule));
+    }
+
+    /**
+     * 验证是否不在某个范围
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function notIn($value, $rule)
+    {
+        return !in_array($value, is_array($rule) ? $rule : explode(',', $rule));
+    }
+
+    /**
+     * between验证数据
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function between($value, $rule)
+    {
+        if (is_string($rule)) {
+            $rule = explode(',', $rule);
+        }
+        list($min, $max) = $rule;
+
+        return $value >= $min && $value <= $max;
+    }
+
+    /**
+     * 使用notbetween验证数据
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function notBetween($value, $rule)
+    {
+        if (is_string($rule)) {
+            $rule = explode(',', $rule);
+        }
+        list($min, $max) = $rule;
+
+        return $value < $min || $value > $max;
+    }
+
+    /**
+     * 验证数据长度
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function length($value, $rule)
+    {
+        if (is_array($value)) {
+            $length = count($value);
+        } elseif ($value instanceof File) {
+            $length = $value->getSize();
+        } else {
+            $length = mb_strlen((string) $value);
+        }
+
+        if (strpos($rule, ',')) {
+            // 长度区间
+            list($min, $max) = explode(',', $rule);
+            return $length >= $min && $length <= $max;
+        }
+
+        // 指定长度
+        return $length == $rule;
+    }
+
+    /**
+     * 验证数据最大长度
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function max($value, $rule)
+    {
+        if (is_array($value)) {
+            $length = count($value);
+        } elseif ($value instanceof File) {
+            $length = $value->getSize();
+        } else {
+            $length = mb_strlen((string) $value);
+        }
+
+        return $length <= $rule;
+    }
+
+    /**
+     * 验证数据最小长度
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function min($value, $rule)
+    {
+        if (is_array($value)) {
+            $length = count($value);
+        } elseif ($value instanceof File) {
+            $length = $value->getSize();
+        } else {
+            $length = mb_strlen((string) $value);
+        }
+
+        return $length >= $rule;
+    }
+
+    /**
+     * 验证日期
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function after($value, $rule)
+    {
+        return strtotime($value) >= strtotime($rule);
+    }
+
+    /**
+     * 验证日期
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function before($value, $rule)
+    {
+        return strtotime($value) <= strtotime($rule);
+    }
+
+    /**
+     * 验证有效期
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return bool
+     */
+    public function expire($value, $rule)
+    {
+        if (is_string($rule)) {
+            $rule = explode(',', $rule);
+        }
+
+        list($start, $end) = $rule;
+
+        if (!is_numeric($start)) {
+            $start = strtotime($start);
+        }
+
+        if (!is_numeric($end)) {
+            $end = strtotime($end);
+        }
+
+        return $_SERVER['REQUEST_TIME'] >= $start && $_SERVER['REQUEST_TIME'] <= $end;
+    }
+
+    /**
+     * 验证IP许可
+     * @access public
+     * @param  string    $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return mixed
+     */
+    public function allowIp($value, $rule)
+    {
+        return in_array($value, is_array($rule) ? $rule : explode(',', $rule));
+    }
+
+    /**
+     * 验证IP禁用
+     * @access public
+     * @param  string    $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @return mixed
+     */
+    public function denyIp($value, $rule)
+    {
+        return !in_array($value, is_array($rule) ? $rule : explode(',', $rule));
+    }
+
+    /**
+     * 使用正则验证数据
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则 正则规则或者预定义正则名
+     * @return bool
+     */
+    public function regex($value, $rule)
+    {
+        if (isset($this->regex[$rule])) {
+            $rule = $this->regex[$rule];
+        }
+
+        if (0 !== strpos($rule, '/') && !preg_match('/\/[imsU]{0,4}$/', $rule)) {
+            // 不是正则表达式则两端补上/
+            $rule = '/^' . $rule . '$/';
+        }
+
+        return is_scalar($value) && 1 === preg_match($rule, (string) $value);
+    }
+
+    /**
+     * 验证表单令牌
+     * @access public
+     * @param  mixed     $value  字段值
+     * @param  mixed     $rule  验证规则
+     * @param  array     $data  数据
+     * @return bool
+     */
+    public function token($value, $rule, $data)
+    {
+        $rule    = !empty($rule) ? $rule : '__token__';
+        $session = Container::get('session');
+
+        if (!isset($data[$rule]) || !$session->has($rule)) {
+            // 令牌数据无效
+            return false;
+        }
+
+        // 令牌验证
+        if (isset($data[$rule]) && $session->get($rule) === $data[$rule]) {
+            // 防止重复提交
+            $session->delete($rule); // 验证完成销毁session
+            return true;
+        }
+
+        // 开启TOKEN重置
+        $session->delete($rule);
+
+        return false;
+    }
+
+    // 获取错误信息
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * 获取数据值
+     * @access protected
+     * @param  array     $data  数据
+     * @param  string    $key  数据标识 支持二维
+     * @return mixed
+     */
+    protected function getDataValue($data, $key)
+    {
+        if (is_numeric($key)) {
+            $value = $key;
+        } elseif (strpos($key, '.')) {
+            // 支持二维数组验证
+            list($name1, $name2) = explode('.', $key);
+            $value               = isset($data[$name1][$name2]) ? $data[$name1][$name2] : null;
+        } else {
+            $value = isset($data[$key]) ? $data[$key] : null;
+        }
+
+        return $value;
+    }
+
+    /**
+     * 获取验证规则的错误提示信息
+     * @access protected
+     * @param  string    $attribute  字段英文名
+     * @param  string    $title  字段描述名
+     * @param  string    $type  验证规则名称
+     * @param  mixed     $rule  验证规则数据
+     * @return string
+     */
+    protected function getRuleMsg($attribute, $title, $type, $rule)
+    {
+        $lang = Container::get('lang');
+
+        if (isset($this->message[$attribute . '.' . $type])) {
+            $msg = $this->message[$attribute . '.' . $type];
+        } elseif (isset($this->message[$attribute][$type])) {
+            $msg = $this->message[$attribute][$type];
+        } elseif (isset($this->message[$attribute])) {
+            $msg = $this->message[$attribute];
+        } elseif (isset(self::$typeMsg[$type])) {
+            $msg = self::$typeMsg[$type];
+        } elseif (0 === strpos($type, 'require')) {
+            $msg = self::$typeMsg['require'];
+        } else {
+            $msg = $title . $lang->get('not conform to the rules');
+        }
+
+        if (is_string($msg) && 0 === strpos($msg, '{%')) {
+            $msg = $lang->get(substr($msg, 2, -1));
+        } elseif ($lang->has($msg)) {
+            $msg = $lang->get($msg);
+        }
+
+        if (is_string($msg) && is_scalar($rule) && false !== strpos($msg, ':')) {
+            // 变量替换
+            if (is_string($rule) && strpos($rule, ',')) {
+                $array = array_pad(explode(',', $rule), 3, '');
+            } else {
+                $array = array_pad([], 3, '');
+            }
+            $msg = str_replace(
+                [':attribute', ':rule', ':1', ':2', ':3'],
+                [$title, (string) $rule, $array[0], $array[1], $array[2]],
+                $msg);
+        }
+
+        return $msg;
+    }
+
+    /**
+     * 获取数据验证的场景
+     * @access protected
+     * @param  string $scene  验证场景
+     * @return void
+     */
+    protected function getScene($scene = '')
+    {
+        if (empty($scene)) {
+            // 读取指定场景
+            $scene = $this->currentScene;
+        }
+
+        if (empty($scene)) {
+            return;
+        }
+
+        $this->only = $this->append = $this->remove = [];
+
+        if (method_exists($this, 'scene' . $scene)) {
+            call_user_func([$this, 'scene' . $scene]);
+        } elseif (isset($this->scene[$scene])) {
+            // 如果设置了验证适用场景
+            $scene = $this->scene[$scene];
+
+            if (is_string($scene)) {
+                $scene = explode(',', $scene);
+            }
+
+            $this->only = $scene;
+        }
+    }
+
+    /**
+     * 动态方法 直接调用is方法进行验证
+     * @access public
+     * @param  string $method  方法名
+     * @param  array $args  调用参数
+     * @return bool
+     */
+    public function __call($method, $args)
+    {
+        if ('is' == strtolower(substr($method, 0, 2))) {
+            $method = substr($method, 2);
+        }
+
+        array_push($args, lcfirst($method));
+
+        return call_user_func_array([$this, 'is'], $args);
+    }
+}
diff --git a/thinkphp/library/think/View.php b/thinkphp/library/think/View.php
new file mode 100644
index 0000000000000000000000000000000000000000..17860a6ba15f8651d2f2d1da5643907a004088e9
--- /dev/null
+++ b/thinkphp/library/think/View.php
@@ -0,0 +1,250 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think;
+
+class View
+{
+    /**
+     * 模板引擎实例
+     * @var object
+     */
+    public $engine;
+
+    /**
+     * 模板变量
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * 内容过滤
+     * @var mixed
+     */
+    protected $filter;
+
+    /**
+     * 全局模板变量
+     * @var array
+     */
+    protected static $var = [];
+
+    /**
+     * 初始化
+     * @access public
+     * @param  mixed $engine  模板引擎参数
+     * @return $this
+     */
+    public function init($engine = [])
+    {
+        // 初始化模板引擎
+        $this->engine($engine);
+
+        return $this;
+    }
+
+    public static function __make(Config $config)
+    {
+        return (new static())->init($config->pull('template'));
+    }
+
+    /**
+     * 模板变量静态赋值
+     * @access public
+     * @param  mixed $name  变量名
+     * @param  mixed $value 变量值
+     * @return $this
+     */
+    public function share($name, $value = '')
+    {
+        if (is_array($name)) {
+            self::$var = array_merge(self::$var, $name);
+        } else {
+            self::$var[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 清理模板变量
+     * @access public
+     * @return void
+     */
+    public function clear()
+    {
+        self::$var  = [];
+        $this->data = [];
+    }
+
+    /**
+     * 模板变量赋值
+     * @access public
+     * @param  mixed $name  变量名
+     * @param  mixed $value 变量值
+     * @return $this
+     */
+    public function assign($name, $value = '')
+    {
+        if (is_array($name)) {
+            $this->data = array_merge($this->data, $name);
+        } else {
+            $this->data[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 设置当前模板解析的引擎
+     * @access public
+     * @param  array|string $options 引擎参数
+     * @return $this
+     */
+    public function engine($options = [])
+    {
+        if (is_string($options)) {
+            $type    = $options;
+            $options = [];
+        } else {
+            $type = !empty($options['type']) ? $options['type'] : 'Think';
+        }
+
+        if (isset($options['type'])) {
+            unset($options['type']);
+        }
+
+        $this->engine = Loader::factory($type, '\\think\\view\\driver\\', $options);
+
+        return $this;
+    }
+
+    /**
+     * 配置模板引擎
+     * @access public
+     * @param  string|array  $name 参数名
+     * @param  mixed         $value 参数值
+     * @return $this
+     */
+    public function config($name, $value = null)
+    {
+        $this->engine->config($name, $value);
+
+        return $this;
+    }
+
+    /**
+     * 检查模板是否存在
+     * @access public
+     * @param  string|array  $name 参数名
+     * @return bool
+     */
+    public function exists($name)
+    {
+        return $this->engine->exists($name);
+    }
+
+    /**
+     * 视图过滤
+     * @access public
+     * @param Callable  $filter 过滤方法或闭包
+     * @return $this
+     */
+    public function filter($filter)
+    {
+        $this->filter = $filter;
+        return $this;
+    }
+
+    /**
+     * 解析和获取模板内容 用于输出
+     * @access public
+     * @param  string    $template 模板文件名或者内容
+     * @param  array     $vars     模板输出变量
+     * @param  array     $config     模板参数
+     * @param  bool      $renderContent     是否渲染内容
+     * @return string
+     * @throws \Exception
+     */
+    public function fetch($template = '', $vars = [], $config = [], $renderContent = false)
+    {
+        // 模板变量
+        $vars = array_merge(self::$var, $this->data, $vars);
+
+        // 页面缓存
+        ob_start();
+        ob_implicit_flush(0);
+
+        // 渲染输出
+        try {
+            $method = $renderContent ? 'display' : 'fetch';
+            $this->engine->$method($template, $vars, $config);
+        } catch (\Exception $e) {
+            ob_end_clean();
+            throw $e;
+        }
+
+        // 获取并清空缓存
+        $content = ob_get_clean();
+
+        if ($this->filter) {
+            $content = call_user_func_array($this->filter, [$content]);
+        }
+
+        return $content;
+    }
+
+    /**
+     * 渲染内容输出
+     * @access public
+     * @param  string $content 内容
+     * @param  array  $vars    模板输出变量
+     * @param  array  $config  模板参数
+     * @return mixed
+     */
+    public function display($content, $vars = [], $config = [])
+    {
+        return $this->fetch($content, $vars, $config, true);
+    }
+
+    /**
+     * 模板变量赋值
+     * @access public
+     * @param  string    $name  变量名
+     * @param  mixed     $value 变量值
+     */
+    public function __set($name, $value)
+    {
+        $this->data[$name] = $value;
+    }
+
+    /**
+     * 取得模板显示变量的值
+     * @access protected
+     * @param  string $name 模板变量
+     * @return mixed
+     */
+    public function __get($name)
+    {
+        return $this->data[$name];
+    }
+
+    /**
+     * 检测模板变量是否设置
+     * @access public
+     * @param  string $name 模板变量名
+     * @return bool
+     */
+    public function __isset($name)
+    {
+        return isset($this->data[$name]);
+    }
+}
diff --git a/thinkphp/library/think/cache/Driver.php b/thinkphp/library/think/cache/Driver.php
new file mode 100644
index 0000000000000000000000000000000000000000..f0ec7baf407407b4976fd7dfc1249f29ac7233b6
--- /dev/null
+++ b/thinkphp/library/think/cache/Driver.php
@@ -0,0 +1,353 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\cache;
+
+use think\Container;
+
+/**
+ * 缓存基础类
+ */
+abstract class Driver
+{
+    /**
+     * 驱动句柄
+     * @var object
+     */
+    protected $handler = null;
+
+    /**
+     * 缓存读取次数
+     * @var integer
+     */
+    protected $readTimes = 0;
+
+    /**
+     * 缓存写入次数
+     * @var integer
+     */
+    protected $writeTimes = 0;
+
+    /**
+     * 缓存参数
+     * @var array
+     */
+    protected $options = [];
+
+    /**
+     * 缓存标签
+     * @var string
+     */
+    protected $tag;
+
+    /**
+     * 序列化方法
+     * @var array
+     */
+    protected static $serialize = ['serialize', 'unserialize', 'think_serialize:', 16];
+
+    /**
+     * 判断缓存是否存在
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return bool
+     */
+    abstract public function has($name);
+
+    /**
+     * 读取缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @param  mixed  $default 默认值
+     * @return mixed
+     */
+    abstract public function get($name, $default = false);
+
+    /**
+     * 写入缓存
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  mixed     $value  存储数据
+     * @param  int       $expire  有效时间 0为永久
+     * @return boolean
+     */
+    abstract public function set($name, $value, $expire = null);
+
+    /**
+     * 自增缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    abstract public function inc($name, $step = 1);
+
+    /**
+     * 自减缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    abstract public function dec($name, $step = 1);
+
+    /**
+     * 删除缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return boolean
+     */
+    abstract public function rm($name);
+
+    /**
+     * 清除缓存
+     * @access public
+     * @param  string $tag 标签名
+     * @return boolean
+     */
+    abstract public function clear($tag = null);
+
+    /**
+     * 获取有效期
+     * @access protected
+     * @param  integer|\DateTime $expire 有效期
+     * @return integer
+     */
+    protected function getExpireTime($expire)
+    {
+        if ($expire instanceof \DateTime) {
+            $expire = $expire->getTimestamp() - time();
+        }
+
+        return $expire;
+    }
+
+    /**
+     * 获取实际的缓存标识
+     * @access protected
+     * @param  string $name 缓存名
+     * @return string
+     */
+    protected function getCacheKey($name)
+    {
+        return $this->options['prefix'] . $name;
+    }
+
+    /**
+     * 读取缓存并删除
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return mixed
+     */
+    public function pull($name)
+    {
+        $result = $this->get($name, false);
+
+        if ($result) {
+            $this->rm($name);
+            return $result;
+        } else {
+            return;
+        }
+    }
+
+    /**
+     * 如果不存在则写入缓存
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  mixed     $value  存储数据
+     * @param  int       $expire  有效时间 0为永久
+     * @return mixed
+     */
+    public function remember($name, $value, $expire = null)
+    {
+        if (!$this->has($name)) {
+            $time = time();
+            while ($time + 5 > time() && $this->has($name . '_lock')) {
+                // 存在锁定则等待
+                usleep(200000);
+            }
+
+            try {
+                // 锁定
+                $this->set($name . '_lock', true);
+
+                if ($value instanceof \Closure) {
+                    // 获取缓存数据
+                    $value = Container::getInstance()->invokeFunction($value);
+                }
+
+                // 缓存数据
+                $this->set($name, $value, $expire);
+
+                // 解锁
+                $this->rm($name . '_lock');
+            } catch (\Exception $e) {
+                $this->rm($name . '_lock');
+                throw $e;
+            } catch (\throwable $e) {
+                $this->rm($name . '_lock');
+                throw $e;
+            }
+        } else {
+            $value = $this->get($name);
+        }
+
+        return $value;
+    }
+
+    /**
+     * 缓存标签
+     * @access public
+     * @param  string        $name 标签名
+     * @param  string|array  $keys 缓存标识
+     * @param  bool          $overlay 是否覆盖
+     * @return $this
+     */
+    public function tag($name, $keys = null, $overlay = false)
+    {
+        if (is_null($name)) {
+
+        } elseif (is_null($keys)) {
+            $this->tag = $name;
+        } else {
+            $key = 'tag_' . md5($name);
+
+            if (is_string($keys)) {
+                $keys = explode(',', $keys);
+            }
+
+            $keys = array_map([$this, 'getCacheKey'], $keys);
+
+            if ($overlay) {
+                $value = $keys;
+            } else {
+                $value = array_unique(array_merge($this->getTagItem($name), $keys));
+            }
+
+            $this->set($key, implode(',', $value), 0);
+        }
+
+        return $this;
+    }
+
+    /**
+     * 更新标签
+     * @access protected
+     * @param  string $name 缓存标识
+     * @return void
+     */
+    protected function setTagItem($name)
+    {
+        if ($this->tag) {
+            $key       = 'tag_' . md5($this->tag);
+            $prev      = $this->tag;
+            $this->tag = null;
+
+            if ($this->has($key)) {
+                $value   = explode(',', $this->get($key));
+                $value[] = $name;
+                $value   = implode(',', array_unique($value));
+            } else {
+                $value = $name;
+            }
+
+            $this->set($key, $value, 0);
+            $this->tag = $prev;
+        }
+    }
+
+    /**
+     * 获取标签包含的缓存标识
+     * @access protected
+     * @param  string $tag 缓存标签
+     * @return array
+     */
+    protected function getTagItem($tag)
+    {
+        $key   = 'tag_' . md5($tag);
+        $value = $this->get($key);
+
+        if ($value) {
+            return array_filter(explode(',', $value));
+        } else {
+            return [];
+        }
+    }
+
+    /**
+     * 序列化数据
+     * @access protected
+     * @param  mixed $data
+     * @return string
+     */
+    protected function serialize($data)
+    {
+        if (is_scalar($data) || !$this->options['serialize']) {
+            return $data;
+        }
+
+        $serialize = self::$serialize[0];
+
+        return self::$serialize[2] . $serialize($data);
+    }
+
+    /**
+     * 反序列化数据
+     * @access protected
+     * @param  string $data
+     * @return mixed
+     */
+    protected function unserialize($data)
+    {
+        if ($this->options['serialize'] && 0 === strpos($data, self::$serialize[2])) {
+            $unserialize = self::$serialize[1];
+
+            return $unserialize(substr($data, self::$serialize[3]));
+        } else {
+            return $data;
+        }
+    }
+
+    /**
+     * 注册序列化机制
+     * @access public
+     * @param  callable $serialize      序列化方法
+     * @param  callable $unserialize    反序列化方法
+     * @param  string   $prefix         序列化前缀标识
+     * @return $this
+     */
+    public static function registerSerialize($serialize, $unserialize, $prefix = 'think_serialize:')
+    {
+        self::$serialize = [$serialize, $unserialize, $prefix, strlen($prefix)];
+    }
+
+    /**
+     * 返回句柄对象，可执行其它高级方法
+     *
+     * @access public
+     * @return object
+     */
+    public function handler()
+    {
+        return $this->handler;
+    }
+
+    public function getReadTimes()
+    {
+        return $this->readTimes;
+    }
+
+    public function getWriteTimes()
+    {
+        return $this->writeTimes;
+    }
+}
diff --git a/thinkphp/library/think/cache/driver/File.php b/thinkphp/library/think/cache/driver/File.php
new file mode 100644
index 0000000000000000000000000000000000000000..7c5661e3d7c1e7972bbd7dce12e5cc3c1b2dfe33
--- /dev/null
+++ b/thinkphp/library/think/cache/driver/File.php
@@ -0,0 +1,305 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\cache\driver;
+
+use think\cache\Driver;
+use think\Container;
+
+/**
+ * 文件类型缓存类
+ * @author    liu21st <liu21st@gmail.com>
+ */
+class File extends Driver
+{
+    protected $options = [
+        'expire'        => 0,
+        'cache_subdir'  => true,
+        'prefix'        => '',
+        'path'          => '',
+        'hash_type'     => 'md5',
+        'data_compress' => false,
+        'serialize'     => true,
+    ];
+
+    protected $expire;
+
+    /**
+     * 架构函数
+     * @param array $options
+     */
+    public function __construct($options = [])
+    {
+        if (!empty($options)) {
+            $this->options = array_merge($this->options, $options);
+        }
+
+        if (empty($this->options['path'])) {
+            $this->options['path'] = Container::get('app')->getRuntimePath() . 'cache' . DIRECTORY_SEPARATOR;
+        } elseif (substr($this->options['path'], -1) != DIRECTORY_SEPARATOR) {
+            $this->options['path'] .= DIRECTORY_SEPARATOR;
+        }
+
+        $this->init();
+    }
+
+    /**
+     * 初始化检查
+     * @access private
+     * @return boolean
+     */
+    private function init()
+    {
+        // 创建项目缓存目录
+        try {
+            if (!is_dir($this->options['path']) && mkdir($this->options['path'], 0755, true)) {
+                return true;
+            }
+        } catch (\Exception $e) {
+        }
+
+        return false;
+    }
+
+    /**
+     * 取得变量的存储文件名
+     * @access protected
+     * @param  string $name 缓存变量名
+     * @param  bool   $auto 是否自动创建目录
+     * @return string
+     */
+    protected function getCacheKey($name, $auto = false)
+    {
+        $name = hash($this->options['hash_type'], $name);
+
+        if ($this->options['cache_subdir']) {
+            // 使用子目录
+            $name = substr($name, 0, 2) . DIRECTORY_SEPARATOR . substr($name, 2);
+        }
+
+        if ($this->options['prefix']) {
+            $name = $this->options['prefix'] . DIRECTORY_SEPARATOR . $name;
+        }
+
+        $filename = $this->options['path'] . $name . '.php';
+        $dir      = dirname($filename);
+
+        if ($auto && !is_dir($dir)) {
+            try {
+                mkdir($dir, 0755, true);
+            } catch (\Exception $e) {
+            }
+        }
+
+        return $filename;
+    }
+
+    /**
+     * 判断缓存是否存在
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return bool
+     */
+    public function has($name)
+    {
+        return false !== $this->get($name) ? true : false;
+    }
+
+    /**
+     * 读取缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @param  mixed  $default 默认值
+     * @return mixed
+     */
+    public function get($name, $default = false)
+    {
+        $this->readTimes++;
+
+        $filename = $this->getCacheKey($name);
+
+        if (!is_file($filename)) {
+            return $default;
+        }
+
+        $content      = file_get_contents($filename);
+        $this->expire = null;
+
+        if (false !== $content) {
+            $expire = (int) substr($content, 8, 12);
+            if (0 != $expire && time() > filemtime($filename) + $expire) {
+                //缓存过期删除缓存文件
+                $this->unlink($filename);
+                return $default;
+            }
+
+            $this->expire = $expire;
+            $content      = substr($content, 32);
+
+            if ($this->options['data_compress'] && function_exists('gzcompress')) {
+                //启用数据压缩
+                $content = gzuncompress($content);
+            }
+            return $this->unserialize($content);
+        } else {
+            return $default;
+        }
+    }
+
+    /**
+     * 写入缓存
+     * @access public
+     * @param  string        $name 缓存变量名
+     * @param  mixed         $value  存储数据
+     * @param  int|\DateTime $expire  有效时间 0为永久
+     * @return boolean
+     */
+    public function set($name, $value, $expire = null)
+    {
+        $this->writeTimes++;
+
+        if (is_null($expire)) {
+            $expire = $this->options['expire'];
+        }
+
+        $expire   = $this->getExpireTime($expire);
+        $filename = $this->getCacheKey($name, true);
+
+        if ($this->tag && !is_file($filename)) {
+            $first = true;
+        }
+
+        $data = $this->serialize($value);
+
+        if ($this->options['data_compress'] && function_exists('gzcompress')) {
+            //数据压缩
+            $data = gzcompress($data, 3);
+        }
+
+        $data   = "<?php\n//" . sprintf('%012d', $expire) . "\n exit();?>\n" . $data;
+        $result = file_put_contents($filename, $data);
+
+        if ($result) {
+            isset($first) && $this->setTagItem($filename);
+            clearstatcache();
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * 自增缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function inc($name, $step = 1)
+    {
+        if ($this->has($name)) {
+            $value  = $this->get($name) + $step;
+            $expire = $this->expire;
+        } else {
+            $value  = $step;
+            $expire = 0;
+        }
+
+        return $this->set($name, $value, $expire) ? $value : false;
+    }
+
+    /**
+     * 自减缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function dec($name, $step = 1)
+    {
+        if ($this->has($name)) {
+            $value  = $this->get($name) - $step;
+            $expire = $this->expire;
+        } else {
+            $value  = -$step;
+            $expire = 0;
+        }
+
+        return $this->set($name, $value, $expire) ? $value : false;
+    }
+
+    /**
+     * 删除缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return boolean
+     */
+    public function rm($name)
+    {
+        $this->writeTimes++;
+
+        try {
+            return $this->unlink($this->getCacheKey($name));
+        } catch (\Exception $e) {
+        }
+    }
+
+    /**
+     * 清除缓存
+     * @access public
+     * @param  string $tag 标签名
+     * @return boolean
+     */
+    public function clear($tag = null)
+    {
+        if ($tag) {
+            // 指定标签清除
+            $keys = $this->getTagItem($tag);
+            foreach ($keys as $key) {
+                $this->unlink($key);
+            }
+            $this->rm('tag_' . md5($tag));
+            return true;
+        }
+
+        $this->writeTimes++;
+
+        $files = (array) glob($this->options['path'] . ($this->options['prefix'] ? $this->options['prefix'] . DIRECTORY_SEPARATOR : '') . '*');
+
+        foreach ($files as $path) {
+            if (is_dir($path)) {
+                $matches = glob($path . DIRECTORY_SEPARATOR . '*.php');
+                if (is_array($matches)) {
+                    array_map('unlink', $matches);
+                }
+                rmdir($path);
+            } else {
+                unlink($path);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 判断文件是否存在后，删除
+     * @access private
+     * @param  string $path
+     * @return bool
+     * @author byron sampson <xiaobo.sun@qq.com>
+     * @return boolean
+     */
+    private function unlink($path)
+    {
+        return is_file($path) && unlink($path);
+    }
+
+}
diff --git a/thinkphp/library/think/cache/driver/Lite.php b/thinkphp/library/think/cache/driver/Lite.php
new file mode 100644
index 0000000000000000000000000000000000000000..544663c057ed6ac4ec512260125c6590ca954162
--- /dev/null
+++ b/thinkphp/library/think/cache/driver/Lite.php
@@ -0,0 +1,209 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\cache\driver;
+
+use think\cache\Driver;
+
+/**
+ * 文件类型缓存类
+ * @author    liu21st <liu21st@gmail.com>
+ */
+class Lite extends Driver
+{
+    protected $options = [
+        'prefix' => '',
+        'path'   => '',
+        'expire' => 0, // 等于 10*365*24*3600（10年）
+    ];
+
+    /**
+     * 架构函数
+     * @access public
+     *
+     * @param  array $options
+     */
+    public function __construct($options = [])
+    {
+        if (!empty($options)) {
+            $this->options = array_merge($this->options, $options);
+        }
+
+        if (substr($this->options['path'], -1) != DIRECTORY_SEPARATOR) {
+            $this->options['path'] .= DIRECTORY_SEPARATOR;
+        }
+
+    }
+
+    /**
+     * 取得变量的存储文件名
+     * @access protected
+     * @param  string $name 缓存变量名
+     * @return string
+     */
+    protected function getCacheKey($name)
+    {
+        return $this->options['path'] . $this->options['prefix'] . md5($name) . '.php';
+    }
+
+    /**
+     * 判断缓存是否存在
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return mixed
+     */
+    public function has($name)
+    {
+        return $this->get($name) ? true : false;
+    }
+
+    /**
+     * 读取缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @param  mixed  $default 默认值
+     * @return mixed
+     */
+    public function get($name, $default = false)
+    {
+        $this->readTimes++;
+
+        $filename = $this->getCacheKey($name);
+
+        if (is_file($filename)) {
+            // 判断是否过期
+            $mtime = filemtime($filename);
+
+            if ($mtime < time()) {
+                // 清除已经过期的文件
+                unlink($filename);
+                return $default;
+            }
+
+            return include $filename;
+        } else {
+            return $default;
+        }
+    }
+
+    /**
+     * 写入缓存
+     * @access public
+     * @param  string        $name  缓存变量名
+     * @param  mixed         $value 存储数据
+     * @param  int|\DateTime $expire 有效时间 0为永久
+     * @return bool
+     */
+    public function set($name, $value, $expire = null)
+    {
+        $this->writeTimes++;
+
+        if (is_null($expire)) {
+            $expire = $this->options['expire'];
+        }
+
+        if ($expire instanceof \DateTime) {
+            $expire = $expire->getTimestamp();
+        } else {
+            $expire = 0 === $expire ? 10 * 365 * 24 * 3600 : $expire;
+            $expire = time() + $expire;
+        }
+
+        $filename = $this->getCacheKey($name);
+
+        if ($this->tag && !is_file($filename)) {
+            $first = true;
+        }
+
+        $ret = file_put_contents($filename, ("<?php return " . var_export($value, true) . ";"));
+
+        // 通过设置修改时间实现有效期
+        if ($ret) {
+            isset($first) && $this->setTagItem($filename);
+            touch($filename, $expire);
+        }
+
+        return $ret;
+    }
+
+    /**
+     * 自增缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function inc($name, $step = 1)
+    {
+        if ($this->has($name)) {
+            $value = $this->get($name) + $step;
+        } else {
+            $value = $step;
+        }
+
+        return $this->set($name, $value, 0) ? $value : false;
+    }
+
+    /**
+     * 自减缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function dec($name, $step = 1)
+    {
+        if ($this->has($name)) {
+            $value = $this->get($name) - $step;
+        } else {
+            $value = -$step;
+        }
+
+        return $this->set($name, $value, 0) ? $value : false;
+    }
+
+    /**
+     * 删除缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return boolean
+     */
+    public function rm($name)
+    {
+        $this->writeTimes++;
+
+        return unlink($this->getCacheKey($name));
+    }
+
+    /**
+     * 清除缓存
+     * @access public
+     * @param  string $tag 标签名
+     * @return bool
+     */
+    public function clear($tag = null)
+    {
+        if ($tag) {
+            // 指定标签清除
+            $keys = $this->getTagItem($tag);
+            foreach ($keys as $key) {
+                unlink($key);
+            }
+
+            $this->rm('tag_' . md5($tag));
+            return true;
+        }
+
+        $this->writeTimes++;
+
+        array_map("unlink", glob($this->options['path'] . ($this->options['prefix'] ? $this->options['prefix'] . DIRECTORY_SEPARATOR : '') . '*.php'));
+    }
+}
diff --git a/thinkphp/library/think/cache/driver/Memcache.php b/thinkphp/library/think/cache/driver/Memcache.php
new file mode 100644
index 0000000000000000000000000000000000000000..ea2c0e234e4d6350a415ce5cae138955a54b4484
--- /dev/null
+++ b/thinkphp/library/think/cache/driver/Memcache.php
@@ -0,0 +1,203 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\cache\driver;
+
+use think\cache\Driver;
+
+class Memcache extends Driver
+{
+    protected $options = [
+        'host'       => '127.0.0.1',
+        'port'       => 11211,
+        'expire'     => 0,
+        'timeout'    => 0, // 超时时间（单位：毫秒）
+        'persistent' => true,
+        'prefix'     => '',
+        'serialize'  => true,
+    ];
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array $options 缓存参数
+     * @throws \BadFunctionCallException
+     */
+    public function __construct($options = [])
+    {
+        if (!extension_loaded('memcache')) {
+            throw new \BadFunctionCallException('not support: memcache');
+        }
+
+        if (!empty($options)) {
+            $this->options = array_merge($this->options, $options);
+        }
+
+        $this->handler = new \Memcache;
+
+        // 支持集群
+        $hosts = explode(',', $this->options['host']);
+        $ports = explode(',', $this->options['port']);
+
+        if (empty($ports[0])) {
+            $ports[0] = 11211;
+        }
+
+        // 建立连接
+        foreach ((array) $hosts as $i => $host) {
+            $port = isset($ports[$i]) ? $ports[$i] : $ports[0];
+            $this->options['timeout'] > 0 ?
+            $this->handler->addServer($host, $port, $this->options['persistent'], 1, $this->options['timeout']) :
+            $this->handler->addServer($host, $port, $this->options['persistent'], 1);
+        }
+    }
+
+    /**
+     * 判断缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return bool
+     */
+    public function has($name)
+    {
+        $key = $this->getCacheKey($name);
+
+        return $this->handler->get($key) ? true : false;
+    }
+
+    /**
+     * 读取缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @param  mixed  $default 默认值
+     * @return mixed
+     */
+    public function get($name, $default = false)
+    {
+        $this->readTimes++;
+
+        $result = $this->handler->get($this->getCacheKey($name));
+
+        return false !== $result ? $this->unserialize($result) : $default;
+    }
+
+    /**
+     * 写入缓存
+     * @access public
+     * @param  string        $name 缓存变量名
+     * @param  mixed         $value  存储数据
+     * @param  int|DateTime  $expire  有效时间（秒）
+     * @return bool
+     */
+    public function set($name, $value, $expire = null)
+    {
+        $this->writeTimes++;
+
+        if (is_null($expire)) {
+            $expire = $this->options['expire'];
+        }
+
+        if ($this->tag && !$this->has($name)) {
+            $first = true;
+        }
+
+        $key    = $this->getCacheKey($name);
+        $expire = $this->getExpireTime($expire);
+        $value  = $this->serialize($value);
+
+        if ($this->handler->set($key, $value, 0, $expire)) {
+            isset($first) && $this->setTagItem($key);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 自增缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function inc($name, $step = 1)
+    {
+        $this->writeTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        if ($this->handler->get($key)) {
+            return $this->handler->increment($key, $step);
+        }
+
+        return $this->handler->set($key, $step);
+    }
+
+    /**
+     * 自减缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function dec($name, $step = 1)
+    {
+        $this->writeTimes++;
+
+        $key   = $this->getCacheKey($name);
+        $value = $this->handler->get($key) - $step;
+        $res   = $this->handler->set($key, $value);
+
+        return !$res ? false : $value;
+    }
+
+    /**
+     * 删除缓存
+     * @access public
+     * @param  string       $name 缓存变量名
+     * @param  bool|false   $ttl
+     * @return bool
+     */
+    public function rm($name, $ttl = false)
+    {
+        $this->writeTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return false === $ttl ?
+        $this->handler->delete($key) :
+        $this->handler->delete($key, $ttl);
+    }
+
+    /**
+     * 清除缓存
+     * @access public
+     * @param  string $tag 标签名
+     * @return bool
+     */
+    public function clear($tag = null)
+    {
+        if ($tag) {
+            // 指定标签清除
+            $keys = $this->getTagItem($tag);
+            foreach ($keys as $key) {
+                $this->handler->delete($key);
+            }
+
+            $this->rm('tag_' . md5($tag));
+            return true;
+        }
+
+        $this->writeTimes++;
+
+        return $this->handler->flush();
+    }
+}
diff --git a/thinkphp/library/think/cache/driver/Memcached.php b/thinkphp/library/think/cache/driver/Memcached.php
new file mode 100644
index 0000000000000000000000000000000000000000..d04fac0877796387b5e4eb2eede0320edbf1488f
--- /dev/null
+++ b/thinkphp/library/think/cache/driver/Memcached.php
@@ -0,0 +1,216 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\cache\driver;
+
+use think\cache\Driver;
+
+class Memcached extends Driver
+{
+    protected $options = [
+        'host'      => '127.0.0.1',
+        'port'      => 11211,
+        'expire'    => 0,
+        'timeout'   => 0, // 超时时间（单位：毫秒）
+        'prefix'    => '',
+        'username'  => '', //账号
+        'password'  => '', //密码
+        'option'    => [],
+        'serialize' => true,
+    ];
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array $options 缓存参数
+     */
+    public function __construct($options = [])
+    {
+        if (!extension_loaded('memcached')) {
+            throw new \BadFunctionCallException('not support: memcached');
+        }
+
+        if (!empty($options)) {
+            $this->options = array_merge($this->options, $options);
+        }
+
+        $this->handler = new \Memcached;
+
+        if (!empty($this->options['option'])) {
+            $this->handler->setOptions($this->options['option']);
+        }
+
+        // 设置连接超时时间（单位：毫秒）
+        if ($this->options['timeout'] > 0) {
+            $this->handler->setOption(\Memcached::OPT_CONNECT_TIMEOUT, $this->options['timeout']);
+        }
+
+        // 支持集群
+        $hosts = explode(',', $this->options['host']);
+        $ports = explode(',', $this->options['port']);
+        if (empty($ports[0])) {
+            $ports[0] = 11211;
+        }
+
+        // 建立连接
+        $servers = [];
+        foreach ((array) $hosts as $i => $host) {
+            $servers[] = [$host, (isset($ports[$i]) ? $ports[$i] : $ports[0]), 1];
+        }
+
+        $this->handler->addServers($servers);
+
+        if ('' != $this->options['username']) {
+            $this->handler->setOption(\Memcached::OPT_BINARY_PROTOCOL, true);
+            $this->handler->setSaslAuthData($this->options['username'], $this->options['password']);
+        }
+    }
+
+    /**
+     * 判断缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return bool
+     */
+    public function has($name)
+    {
+        $key = $this->getCacheKey($name);
+
+        return $this->handler->get($key) ? true : false;
+    }
+
+    /**
+     * 读取缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @param  mixed  $default 默认值
+     * @return mixed
+     */
+    public function get($name, $default = false)
+    {
+        $this->readTimes++;
+
+        $result = $this->handler->get($this->getCacheKey($name));
+
+        return false !== $result ? $this->unserialize($result) : $default;
+    }
+
+    /**
+     * 写入缓存
+     * @access public
+     * @param  string            $name 缓存变量名
+     * @param  mixed             $value  存储数据
+     * @param  integer|\DateTime $expire  有效时间（秒）
+     * @return bool
+     */
+    public function set($name, $value, $expire = null)
+    {
+        $this->writeTimes++;
+
+        if (is_null($expire)) {
+            $expire = $this->options['expire'];
+        }
+
+        if ($this->tag && !$this->has($name)) {
+            $first = true;
+        }
+
+        $key    = $this->getCacheKey($name);
+        $expire = $this->getExpireTime($expire);
+        $value  = $this->serialize($value);
+
+        if ($this->handler->set($key, $value, $expire)) {
+            isset($first) && $this->setTagItem($key);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 自增缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function inc($name, $step = 1)
+    {
+        $this->writeTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        if ($this->handler->get($key)) {
+            return $this->handler->increment($key, $step);
+        }
+
+        return $this->handler->set($key, $step);
+    }
+
+    /**
+     * 自减缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function dec($name, $step = 1)
+    {
+        $this->writeTimes++;
+
+        $key   = $this->getCacheKey($name);
+        $value = $this->handler->get($key) - $step;
+        $res   = $this->handler->set($key, $value);
+
+        return !$res ? false : $value;
+    }
+
+    /**
+     * 删除缓存
+     * @access public
+     * @param  string       $name 缓存变量名
+     * @param  bool|false   $ttl
+     * @return bool
+     */
+    public function rm($name, $ttl = false)
+    {
+        $this->writeTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return false === $ttl ?
+        $this->handler->delete($key) :
+        $this->handler->delete($key, $ttl);
+    }
+
+    /**
+     * 清除缓存
+     * @access public
+     * @param  string $tag 标签名
+     * @return bool
+     */
+    public function clear($tag = null)
+    {
+        if ($tag) {
+            // 指定标签清除
+            $keys = $this->getTagItem($tag);
+
+            $this->handler->deleteMulti($keys);
+            $this->rm('tag_' . md5($tag));
+
+            return true;
+        }
+
+        $this->writeTimes++;
+
+        return $this->handler->flush();
+    }
+}
diff --git a/thinkphp/library/think/cache/driver/Redis.php b/thinkphp/library/think/cache/driver/Redis.php
new file mode 100644
index 0000000000000000000000000000000000000000..d20d3b1d18a5598e24d660313a2d78a053a52c94
--- /dev/null
+++ b/thinkphp/library/think/cache/driver/Redis.php
@@ -0,0 +1,215 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\cache\driver;
+
+use think\cache\Driver;
+
+/**
+ * Redis缓存驱动，适合单机部署、有前端代理实现高可用的场景，性能最好
+ * 有需要在业务层实现读写分离、或者使用RedisCluster的需求，请使用Redisd驱动
+ *
+ * 要求安装phpredis扩展：https://github.com/nicolasff/phpredis
+ * @author    尘缘 <130775@qq.com>
+ */
+class Redis extends Driver
+{
+    protected $options = [
+        'host'       => '127.0.0.1',
+        'port'       => 6379,
+        'password'   => '',
+        'select'     => 0,
+        'timeout'    => 0,
+        'expire'     => 0,
+        'persistent' => false,
+        'prefix'     => '',
+        'serialize'  => true,
+    ];
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array $options 缓存参数
+     */
+    public function __construct($options = [])
+    {
+        if (!empty($options)) {
+            $this->options = array_merge($this->options, $options);
+        }
+
+        if (extension_loaded('redis')) {
+            $this->handler = new \Redis;
+
+            if ($this->options['persistent']) {
+                $this->handler->pconnect($this->options['host'], $this->options['port'], $this->options['timeout'], 'persistent_id_' . $this->options['select']);
+            } else {
+                $this->handler->connect($this->options['host'], $this->options['port'], $this->options['timeout']);
+            }
+
+            if ('' != $this->options['password']) {
+                $this->handler->auth($this->options['password']);
+            }
+
+            if (0 != $this->options['select']) {
+                $this->handler->select($this->options['select']);
+            }
+        } elseif (class_exists('\Predis\Client')) {
+            $params = [];
+            foreach ($this->options as $key => $val) {
+                if (in_array($key, ['aggregate', 'cluster', 'connections', 'exceptions', 'prefix', 'profile', 'replication'])) {
+                    $params[$key] = $val;
+                    unset($this->options[$key]);
+                }
+            }
+            $this->handler = new \Predis\Client($this->options, $params);
+        } else {
+            throw new \BadFunctionCallException('not support: redis');
+        }
+    }
+
+    /**
+     * 判断缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return bool
+     */
+    public function has($name)
+    {
+        return $this->handler->exists($this->getCacheKey($name));
+    }
+
+    /**
+     * 读取缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @param  mixed  $default 默认值
+     * @return mixed
+     */
+    public function get($name, $default = false)
+    {
+        $this->readTimes++;
+
+        $value = $this->handler->get($this->getCacheKey($name));
+
+        if (is_null($value) || false === $value) {
+            return $default;
+        }
+
+        return $this->unserialize($value);
+    }
+
+    /**
+     * 写入缓存
+     * @access public
+     * @param  string            $name 缓存变量名
+     * @param  mixed             $value  存储数据
+     * @param  integer|\DateTime $expire  有效时间（秒）
+     * @return boolean
+     */
+    public function set($name, $value, $expire = null)
+    {
+        $this->writeTimes++;
+
+        if (is_null($expire)) {
+            $expire = $this->options['expire'];
+        }
+
+        if ($this->tag && !$this->has($name)) {
+            $first = true;
+        }
+
+        $key    = $this->getCacheKey($name);
+        $expire = $this->getExpireTime($expire);
+
+        $value = $this->serialize($value);
+
+        if ($expire) {
+            $result = $this->handler->setex($key, $expire, $value);
+        } else {
+            $result = $this->handler->set($key, $value);
+        }
+
+        isset($first) && $this->setTagItem($key);
+
+        return $result;
+    }
+
+    /**
+     * 自增缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function inc($name, $step = 1)
+    {
+        $this->writeTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return $this->handler->incrby($key, $step);
+    }
+
+    /**
+     * 自减缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function dec($name, $step = 1)
+    {
+        $this->writeTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return $this->handler->decrby($key, $step);
+    }
+
+    /**
+     * 删除缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return boolean
+     */
+    public function rm($name)
+    {
+        $this->writeTimes++;
+
+        return $this->handler->delete($this->getCacheKey($name));
+    }
+
+    /**
+     * 清除缓存
+     * @access public
+     * @param  string $tag 标签名
+     * @return boolean
+     */
+    public function clear($tag = null)
+    {
+        if ($tag) {
+            // 指定标签清除
+            $keys = $this->getTagItem($tag);
+
+            foreach ($keys as $key) {
+                $this->handler->delete($key);
+            }
+
+            $this->rm('tag_' . md5($tag));
+            return true;
+        }
+
+        $this->writeTimes++;
+
+        return $this->handler->flushDB();
+    }
+
+}
diff --git a/thinkphp/library/think/cache/driver/Sqlite.php b/thinkphp/library/think/cache/driver/Sqlite.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e78ec12d2e72d149b35373550864eafffcb39fc
--- /dev/null
+++ b/thinkphp/library/think/cache/driver/Sqlite.php
@@ -0,0 +1,233 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\cache\driver;
+
+use think\cache\Driver;
+
+/**
+ * Sqlite缓存驱动
+ * @author    liu21st <liu21st@gmail.com>
+ */
+class Sqlite extends Driver
+{
+    protected $options = [
+        'db'         => ':memory:',
+        'table'      => 'sharedmemory',
+        'prefix'     => '',
+        'expire'     => 0,
+        'persistent' => false,
+        'serialize'  => true,
+    ];
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array $options 缓存参数
+     * @throws \BadFunctionCallException
+     */
+    public function __construct($options = [])
+    {
+        if (!extension_loaded('sqlite')) {
+            throw new \BadFunctionCallException('not support: sqlite');
+        }
+
+        if (!empty($options)) {
+            $this->options = array_merge($this->options, $options);
+        }
+
+        $func = $this->options['persistent'] ? 'sqlite_popen' : 'sqlite_open';
+
+        $this->handler = $func($this->options['db']);
+    }
+
+    /**
+     * 获取实际的缓存标识
+     * @access public
+     * @param  string $name 缓存名
+     * @return string
+     */
+    protected function getCacheKey($name)
+    {
+        return $this->options['prefix'] . sqlite_escape_string($name);
+    }
+
+    /**
+     * 判断缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return bool
+     */
+    public function has($name)
+    {
+        $name = $this->getCacheKey($name);
+
+        $sql    = 'SELECT value FROM ' . $this->options['table'] . ' WHERE var=\'' . $name . '\' AND (expire=0 OR expire >' . time() . ') LIMIT 1';
+        $result = sqlite_query($this->handler, $sql);
+
+        return sqlite_num_rows($result);
+    }
+
+    /**
+     * 读取缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @param  mixed  $default 默认值
+     * @return mixed
+     */
+    public function get($name, $default = false)
+    {
+        $this->readTimes++;
+
+        $name = $this->getCacheKey($name);
+
+        $sql = 'SELECT value FROM ' . $this->options['table'] . ' WHERE var=\'' . $name . '\' AND (expire=0 OR expire >' . time() . ') LIMIT 1';
+
+        $result = sqlite_query($this->handler, $sql);
+
+        if (sqlite_num_rows($result)) {
+            $content = sqlite_fetch_single($result);
+            if (function_exists('gzcompress')) {
+                //启用数据压缩
+                $content = gzuncompress($content);
+            }
+
+            return $this->unserialize($content);
+        }
+
+        return $default;
+    }
+
+    /**
+     * 写入缓存
+     * @access public
+     * @param  string            $name 缓存变量名
+     * @param  mixed             $value  存储数据
+     * @param  integer|\DateTime $expire  有效时间（秒）
+     * @return boolean
+     */
+    public function set($name, $value, $expire = null)
+    {
+        $this->writeTimes++;
+
+        $name = $this->getCacheKey($name);
+
+        $value = sqlite_escape_string($this->serialize($value));
+
+        if (is_null($expire)) {
+            $expire = $this->options['expire'];
+        }
+
+        if ($expire instanceof \DateTime) {
+            $expire = $expire->getTimestamp();
+        } else {
+            $expire = (0 == $expire) ? 0 : (time() + $expire); //缓存有效期为0表示永久缓存
+        }
+
+        if (function_exists('gzcompress')) {
+            //数据压缩
+            $value = gzcompress($value, 3);
+        }
+
+        if ($this->tag) {
+            $tag       = $this->tag;
+            $this->tag = null;
+        } else {
+            $tag = '';
+        }
+
+        $sql = 'REPLACE INTO ' . $this->options['table'] . ' (var, value, expire, tag) VALUES (\'' . $name . '\', \'' . $value . '\', \'' . $expire . '\', \'' . $tag . '\')';
+
+        if (sqlite_query($this->handler, $sql)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 自增缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function inc($name, $step = 1)
+    {
+        if ($this->has($name)) {
+            $value = $this->get($name) + $step;
+        } else {
+            $value = $step;
+        }
+
+        return $this->set($name, $value, 0) ? $value : false;
+    }
+
+    /**
+     * 自减缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function dec($name, $step = 1)
+    {
+        if ($this->has($name)) {
+            $value = $this->get($name) - $step;
+        } else {
+            $value = -$step;
+        }
+
+        return $this->set($name, $value, 0) ? $value : false;
+    }
+
+    /**
+     * 删除缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return boolean
+     */
+    public function rm($name)
+    {
+        $this->writeTimes++;
+
+        $name = $this->getCacheKey($name);
+
+        $sql = 'DELETE FROM ' . $this->options['table'] . ' WHERE var=\'' . $name . '\'';
+        sqlite_query($this->handler, $sql);
+
+        return true;
+    }
+
+    /**
+     * 清除缓存
+     * @access public
+     * @param  string $tag 标签名
+     * @return boolean
+     */
+    public function clear($tag = null)
+    {
+        if ($tag) {
+            $name = sqlite_escape_string($tag);
+            $sql  = 'DELETE FROM ' . $this->options['table'] . ' WHERE tag=\'' . $name . '\'';
+            sqlite_query($this->handler, $sql);
+            return true;
+        }
+
+        $this->writeTimes++;
+
+        $sql = 'DELETE FROM ' . $this->options['table'];
+
+        sqlite_query($this->handler, $sql);
+
+        return true;
+    }
+}
diff --git a/thinkphp/library/think/cache/driver/Wincache.php b/thinkphp/library/think/cache/driver/Wincache.php
new file mode 100644
index 0000000000000000000000000000000000000000..10966e786cf8af77ea66c82f35fca7768c05f287
--- /dev/null
+++ b/thinkphp/library/think/cache/driver/Wincache.php
@@ -0,0 +1,174 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\cache\driver;
+
+use think\cache\Driver;
+
+/**
+ * Wincache缓存驱动
+ * @author    liu21st <liu21st@gmail.com>
+ */
+class Wincache extends Driver
+{
+    protected $options = [
+        'prefix'    => '',
+        'expire'    => 0,
+        'serialize' => true,
+    ];
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array $options 缓存参数
+     * @throws \BadFunctionCallException
+     */
+    public function __construct($options = [])
+    {
+        if (!function_exists('wincache_ucache_info')) {
+            throw new \BadFunctionCallException('not support: WinCache');
+        }
+
+        if (!empty($options)) {
+            $this->options = array_merge($this->options, $options);
+        }
+    }
+
+    /**
+     * 判断缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return bool
+     */
+    public function has($name)
+    {
+        $this->readTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return wincache_ucache_exists($key);
+    }
+
+    /**
+     * 读取缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @param  mixed  $default 默认值
+     * @return mixed
+     */
+    public function get($name, $default = false)
+    {
+        $this->readTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return wincache_ucache_exists($key) ? $this->unserialize(wincache_ucache_get($key)) : $default;
+    }
+
+    /**
+     * 写入缓存
+     * @access public
+     * @param  string            $name 缓存变量名
+     * @param  mixed             $value  存储数据
+     * @param  integer|\DateTime $expire  有效时间（秒）
+     * @return boolean
+     */
+    public function set($name, $value, $expire = null)
+    {
+        $this->writeTimes++;
+
+        if (is_null($expire)) {
+            $expire = $this->options['expire'];
+        }
+
+        $key    = $this->getCacheKey($name);
+        $expire = $this->getExpireTime($expire);
+        $value  = $this->serialize($value);
+
+        if ($this->tag && !$this->has($name)) {
+            $first = true;
+        }
+
+        if (wincache_ucache_set($key, $value, $expire)) {
+            isset($first) && $this->setTagItem($key);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 自增缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function inc($name, $step = 1)
+    {
+        $this->writeTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return wincache_ucache_inc($key, $step);
+    }
+
+    /**
+     * 自减缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function dec($name, $step = 1)
+    {
+        $this->writeTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return wincache_ucache_dec($key, $step);
+    }
+
+    /**
+     * 删除缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return boolean
+     */
+    public function rm($name)
+    {
+        $this->writeTimes++;
+
+        return wincache_ucache_delete($this->getCacheKey($name));
+    }
+
+    /**
+     * 清除缓存
+     * @access public
+     * @param  string $tag 标签名
+     * @return boolean
+     */
+    public function clear($tag = null)
+    {
+        if ($tag) {
+            $keys = $this->getTagItem($tag);
+            foreach ($keys as $key) {
+                wincache_ucache_delete($key);
+            }
+            $this->rm('tag_' . md5($tag));
+            return true;
+        } else {
+            $this->writeTimes++;
+            return wincache_ucache_clear();
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/cache/driver/Xcache.php b/thinkphp/library/think/cache/driver/Xcache.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d1bf3f6cf0c047613af49521c271e8950e49877
--- /dev/null
+++ b/thinkphp/library/think/cache/driver/Xcache.php
@@ -0,0 +1,177 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\cache\driver;
+
+use think\cache\Driver;
+
+/**
+ * Xcache缓存驱动
+ * @author    liu21st <liu21st@gmail.com>
+ */
+class Xcache extends Driver
+{
+    protected $options = [
+        'prefix'    => '',
+        'expire'    => 0,
+        'serialize' => true,
+    ];
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array $options 缓存参数
+     * @throws \BadFunctionCallException
+     */
+    public function __construct($options = [])
+    {
+        if (!function_exists('xcache_info')) {
+            throw new \BadFunctionCallException('not support: Xcache');
+        }
+
+        if (!empty($options)) {
+            $this->options = array_merge($this->options, $options);
+        }
+    }
+
+    /**
+     * 判断缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return bool
+     */
+    public function has($name)
+    {
+        $key = $this->getCacheKey($name);
+
+        return xcache_isset($key);
+    }
+
+    /**
+     * 读取缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @param  mixed  $default 默认值
+     * @return mixed
+     */
+    public function get($name, $default = false)
+    {
+        $this->readTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return xcache_isset($key) ? $this->unserialize(xcache_get($key)) : $default;
+    }
+
+    /**
+     * 写入缓存
+     * @access public
+     * @param  string            $name 缓存变量名
+     * @param  mixed             $value  存储数据
+     * @param  integer|\DateTime $expire  有效时间（秒）
+     * @return boolean
+     */
+    public function set($name, $value, $expire = null)
+    {
+        $this->writeTimes++;
+
+        if (is_null($expire)) {
+            $expire = $this->options['expire'];
+        }
+
+        if ($this->tag && !$this->has($name)) {
+            $first = true;
+        }
+
+        $key    = $this->getCacheKey($name);
+        $expire = $this->getExpireTime($expire);
+        $value  = $this->serialize($value);
+
+        if (xcache_set($key, $value, $expire)) {
+            isset($first) && $this->setTagItem($key);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 自增缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function inc($name, $step = 1)
+    {
+        $this->writeTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return xcache_inc($key, $step);
+    }
+
+    /**
+     * 自减缓存（针对数值缓存）
+     * @access public
+     * @param  string    $name 缓存变量名
+     * @param  int       $step 步长
+     * @return false|int
+     */
+    public function dec($name, $step = 1)
+    {
+        $this->writeTimes++;
+
+        $key = $this->getCacheKey($name);
+
+        return xcache_dec($key, $step);
+    }
+
+    /**
+     * 删除缓存
+     * @access public
+     * @param  string $name 缓存变量名
+     * @return boolean
+     */
+    public function rm($name)
+    {
+        $this->writeTimes++;
+
+        return xcache_unset($this->getCacheKey($name));
+    }
+
+    /**
+     * 清除缓存
+     * @access public
+     * @param  string $tag 标签名
+     * @return boolean
+     */
+    public function clear($tag = null)
+    {
+        if ($tag) {
+            // 指定标签清除
+            $keys = $this->getTagItem($tag);
+            foreach ($keys as $key) {
+                xcache_unset($key);
+            }
+            $this->rm('tag_' . md5($tag));
+            return true;
+        }
+
+        $this->writeTimes++;
+
+        if (function_exists('xcache_unset_by_prefix')) {
+            return xcache_unset_by_prefix($this->options['prefix']);
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/thinkphp/library/think/config/driver/Ini.php b/thinkphp/library/think/config/driver/Ini.php
new file mode 100644
index 0000000000000000000000000000000000000000..b2a647d1156e75cb5698e4ba693ccd03b5485c1b
--- /dev/null
+++ b/thinkphp/library/think/config/driver/Ini.php
@@ -0,0 +1,31 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\config\driver;
+
+class Ini
+{
+    protected $config;
+
+    public function __construct($config)
+    {
+        $this->config = $config;
+    }
+
+    public function parse()
+    {
+        if (is_file($this->config)) {
+            return parse_ini_file($this->config, true);
+        } else {
+            return parse_ini_string($this->config, true);
+        }
+    }
+}
diff --git a/thinkphp/library/think/config/driver/Json.php b/thinkphp/library/think/config/driver/Json.php
new file mode 100644
index 0000000000000000000000000000000000000000..0d77c8edc4a94af0cc45aafb4d29c0fc6bcb55d1
--- /dev/null
+++ b/thinkphp/library/think/config/driver/Json.php
@@ -0,0 +1,31 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\config\driver;
+
+class Json
+{
+    protected $config;
+
+    public function __construct($config)
+    {
+        if (is_file($config)) {
+            $config = file_get_contents($config);
+        }
+
+        $this->config = $config;
+    }
+
+    public function parse()
+    {
+        return json_decode($this->config, true);
+    }
+}
diff --git a/thinkphp/library/think/config/driver/Xml.php b/thinkphp/library/think/config/driver/Xml.php
new file mode 100644
index 0000000000000000000000000000000000000000..9d6963384e918417c745cbf75521676c4c75f0c6
--- /dev/null
+++ b/thinkphp/library/think/config/driver/Xml.php
@@ -0,0 +1,40 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\config\driver;
+
+class Xml
+{
+    protected $config;
+
+    public function __construct($config)
+    {
+        $this->config = $config;
+    }
+
+    public function parse()
+    {
+        if (is_file($this->config)) {
+            $content = simplexml_load_file($this->config);
+        } else {
+            $content = simplexml_load_string($this->config);
+        }
+
+        $result = (array) $content;
+        foreach ($result as $key => $val) {
+            if (is_object($val)) {
+                $result[$key] = (array) $val;
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/thinkphp/library/think/console/Command.php b/thinkphp/library/think/console/Command.php
new file mode 100644
index 0000000000000000000000000000000000000000..d0caad2f6b7eb81ff0567811e87c9f395db0b805
--- /dev/null
+++ b/thinkphp/library/think/console/Command.php
@@ -0,0 +1,470 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console;
+
+use think\Console;
+use think\console\input\Argument;
+use think\console\input\Definition;
+use think\console\input\Option;
+
+class Command
+{
+
+    /** @var  Console */
+    private $console;
+    private $name;
+    private $aliases = [];
+    private $definition;
+    private $help;
+    private $description;
+    private $ignoreValidationErrors          = false;
+    private $consoleDefinitionMerged         = false;
+    private $consoleDefinitionMergedWithArgs = false;
+    private $code;
+    private $synopsis = [];
+    private $usages   = [];
+
+    /** @var  Input */
+    protected $input;
+
+    /** @var  Output */
+    protected $output;
+
+    /**
+     * 构造方法
+     * @param string|null $name 命令名称,如果没有设置则比如在 configure() 里设置
+     * @throws \LogicException
+     * @api
+     */
+    public function __construct($name = null)
+    {
+        $this->definition = new Definition();
+
+        if (null !== $name) {
+            $this->setName($name);
+        }
+
+        $this->configure();
+
+        if (!$this->name) {
+            throw new \LogicException(sprintf('The command defined in "%s" cannot have an empty name.', get_class($this)));
+        }
+    }
+
+    /**
+     * 忽略验证错误
+     */
+    public function ignoreValidationErrors()
+    {
+        $this->ignoreValidationErrors = true;
+    }
+
+    /**
+     * 设置控制台
+     * @param Console $console
+     */
+    public function setConsole(Console $console = null)
+    {
+        $this->console = $console;
+    }
+
+    /**
+     * 获取控制台
+     * @return Console
+     * @api
+     */
+    public function getConsole()
+    {
+        return $this->console;
+    }
+
+    /**
+     * 是否有效
+     * @return bool
+     */
+    public function isEnabled()
+    {
+        return true;
+    }
+
+    /**
+     * 配置指令
+     */
+    protected function configure()
+    {
+    }
+
+    /**
+     * 执行指令
+     * @param Input  $input
+     * @param Output $output
+     * @return null|int
+     * @throws \LogicException
+     * @see setCode()
+     */
+    protected function execute(Input $input, Output $output)
+    {
+        throw new \LogicException('You must override the execute() method in the concrete command class.');
+    }
+
+    /**
+     * 用户验证
+     * @param Input  $input
+     * @param Output $output
+     */
+    protected function interact(Input $input, Output $output)
+    {
+    }
+
+    /**
+     * 初始化
+     * @param Input  $input  An InputInterface instance
+     * @param Output $output An OutputInterface instance
+     */
+    protected function initialize(Input $input, Output $output)
+    {
+    }
+
+    /**
+     * 执行
+     * @param Input  $input
+     * @param Output $output
+     * @return int
+     * @throws \Exception
+     * @see setCode()
+     * @see execute()
+     */
+    public function run(Input $input, Output $output)
+    {
+        $this->input  = $input;
+        $this->output = $output;
+
+        $this->getSynopsis(true);
+        $this->getSynopsis(false);
+
+        $this->mergeConsoleDefinition();
+
+        try {
+            $input->bind($this->definition);
+        } catch (\Exception $e) {
+            if (!$this->ignoreValidationErrors) {
+                throw $e;
+            }
+        }
+
+        $this->initialize($input, $output);
+
+        if ($input->isInteractive()) {
+            $this->interact($input, $output);
+        }
+
+        $input->validate();
+
+        if ($this->code) {
+            $statusCode = call_user_func($this->code, $input, $output);
+        } else {
+            $statusCode = $this->execute($input, $output);
+        }
+
+        return is_numeric($statusCode) ? (int) $statusCode : 0;
+    }
+
+    /**
+     * 设置执行代码
+     * @param callable $code callable(InputInterface $input, OutputInterface $output)
+     * @return Command
+     * @throws \InvalidArgumentException
+     * @see execute()
+     */
+    public function setCode(callable $code)
+    {
+        if (!is_callable($code)) {
+            throw new \InvalidArgumentException('Invalid callable provided to Command::setCode.');
+        }
+
+        if (PHP_VERSION_ID >= 50400 && $code instanceof \Closure) {
+            $r = new \ReflectionFunction($code);
+            if (null === $r->getClosureThis()) {
+                $code = \Closure::bind($code, $this);
+            }
+        }
+
+        $this->code = $code;
+
+        return $this;
+    }
+
+    /**
+     * 合并参数定义
+     * @param bool $mergeArgs
+     */
+    public function mergeConsoleDefinition($mergeArgs = true)
+    {
+        if (null === $this->console
+            || (true === $this->consoleDefinitionMerged
+                && ($this->consoleDefinitionMergedWithArgs || !$mergeArgs))
+        ) {
+            return;
+        }
+
+        if ($mergeArgs) {
+            $currentArguments = $this->definition->getArguments();
+            $this->definition->setArguments($this->console->getDefinition()->getArguments());
+            $this->definition->addArguments($currentArguments);
+        }
+
+        $this->definition->addOptions($this->console->getDefinition()->getOptions());
+
+        $this->consoleDefinitionMerged = true;
+        if ($mergeArgs) {
+            $this->consoleDefinitionMergedWithArgs = true;
+        }
+    }
+
+    /**
+     * 设置参数定义
+     * @param array|Definition $definition
+     * @return Command
+     * @api
+     */
+    public function setDefinition($definition)
+    {
+        if ($definition instanceof Definition) {
+            $this->definition = $definition;
+        } else {
+            $this->definition->setDefinition($definition);
+        }
+
+        $this->consoleDefinitionMerged = false;
+
+        return $this;
+    }
+
+    /**
+     * 获取参数定义
+     * @return Definition
+     * @api
+     */
+    public function getDefinition()
+    {
+        return $this->definition;
+    }
+
+    /**
+     * 获取当前指令的参数定义
+     * @return Definition
+     */
+    public function getNativeDefinition()
+    {
+        return $this->getDefinition();
+    }
+
+    /**
+     * 添加参数
+     * @param string $name        名称
+     * @param int    $mode        类型
+     * @param string $description 描述
+     * @param mixed  $default     默认值
+     * @return Command
+     */
+    public function addArgument($name, $mode = null, $description = '', $default = null)
+    {
+        $this->definition->addArgument(new Argument($name, $mode, $description, $default));
+
+        return $this;
+    }
+
+    /**
+     * 添加选项
+     * @param string $name        选项名称
+     * @param string $shortcut    别名
+     * @param int    $mode        类型
+     * @param string $description 描述
+     * @param mixed  $default     默认值
+     * @return Command
+     */
+    public function addOption($name, $shortcut = null, $mode = null, $description = '', $default = null)
+    {
+        $this->definition->addOption(new Option($name, $shortcut, $mode, $description, $default));
+
+        return $this;
+    }
+
+    /**
+     * 设置指令名称
+     * @param string $name
+     * @return Command
+     * @throws \InvalidArgumentException
+     */
+    public function setName($name)
+    {
+        $this->validateName($name);
+
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * 获取指令名称
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * 设置描述
+     * @param string $description
+     * @return Command
+     */
+    public function setDescription($description)
+    {
+        $this->description = $description;
+
+        return $this;
+    }
+
+    /**
+     *  获取描述
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * 设置帮助信息
+     * @param string $help
+     * @return Command
+     */
+    public function setHelp($help)
+    {
+        $this->help = $help;
+
+        return $this;
+    }
+
+    /**
+     * 获取帮助信息
+     * @return string
+     */
+    public function getHelp()
+    {
+        return $this->help;
+    }
+
+    /**
+     * 描述信息
+     * @return string
+     */
+    public function getProcessedHelp()
+    {
+        $name = $this->name;
+
+        $placeholders = [
+            '%command.name%',
+            '%command.full_name%',
+        ];
+        $replacements = [
+            $name,
+            $_SERVER['PHP_SELF'] . ' ' . $name,
+        ];
+
+        return str_replace($placeholders, $replacements, $this->getHelp());
+    }
+
+    /**
+     * 设置别名
+     * @param string[] $aliases
+     * @return Command
+     * @throws \InvalidArgumentException
+     */
+    public function setAliases($aliases)
+    {
+        if (!is_array($aliases) && !$aliases instanceof \Traversable) {
+            throw new \InvalidArgumentException('$aliases must be an array or an instance of \Traversable');
+        }
+
+        foreach ($aliases as $alias) {
+            $this->validateName($alias);
+        }
+
+        $this->aliases = $aliases;
+
+        return $this;
+    }
+
+    /**
+     * 获取别名
+     * @return array
+     */
+    public function getAliases()
+    {
+        return $this->aliases;
+    }
+
+    /**
+     * 获取简介
+     * @param bool $short 是否简单的
+     * @return string
+     */
+    public function getSynopsis($short = false)
+    {
+        $key = $short ? 'short' : 'long';
+
+        if (!isset($this->synopsis[$key])) {
+            $this->synopsis[$key] = trim(sprintf('%s %s', $this->name, $this->definition->getSynopsis($short)));
+        }
+
+        return $this->synopsis[$key];
+    }
+
+    /**
+     * 添加用法介绍
+     * @param string $usage
+     * @return $this
+     */
+    public function addUsage($usage)
+    {
+        if (0 !== strpos($usage, $this->name)) {
+            $usage = sprintf('%s %s', $this->name, $usage);
+        }
+
+        $this->usages[] = $usage;
+
+        return $this;
+    }
+
+    /**
+     * 获取用法介绍
+     * @return array
+     */
+    public function getUsages()
+    {
+        return $this->usages;
+    }
+
+    /**
+     * 验证指令名称
+     * @param string $name
+     * @throws \InvalidArgumentException
+     */
+    private function validateName($name)
+    {
+        if (!preg_match('/^[^\:]++(\:[^\:]++)*$/', $name)) {
+            throw new \InvalidArgumentException(sprintf('Command name "%s" is invalid.', $name));
+        }
+    }
+}
diff --git a/thinkphp/library/think/console/Input.php b/thinkphp/library/think/console/Input.php
new file mode 100644
index 0000000000000000000000000000000000000000..2482dfdc01b8c58fce4a59cefec880416f37eb3e
--- /dev/null
+++ b/thinkphp/library/think/console/Input.php
@@ -0,0 +1,464 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console;
+
+use think\console\input\Argument;
+use think\console\input\Definition;
+use think\console\input\Option;
+
+class Input
+{
+
+    /**
+     * @var Definition
+     */
+    protected $definition;
+
+    /**
+     * @var Option[]
+     */
+    protected $options = [];
+
+    /**
+     * @var Argument[]
+     */
+    protected $arguments = [];
+
+    protected $interactive = true;
+
+    private $tokens;
+    private $parsed;
+
+    public function __construct($argv = null)
+    {
+        if (null === $argv) {
+            $argv = $_SERVER['argv'];
+            // 去除命令名
+            array_shift($argv);
+        }
+
+        $this->tokens = $argv;
+
+        $this->definition = new Definition();
+    }
+
+    protected function setTokens(array $tokens)
+    {
+        $this->tokens = $tokens;
+    }
+
+    /**
+     * 绑定实例
+     * @param Definition $definition A InputDefinition instance
+     */
+    public function bind(Definition $definition)
+    {
+        $this->arguments  = [];
+        $this->options    = [];
+        $this->definition = $definition;
+
+        $this->parse();
+    }
+
+    /**
+     * 解析参数
+     */
+    protected function parse()
+    {
+        $parseOptions = true;
+        $this->parsed = $this->tokens;
+        while (null !== $token = array_shift($this->parsed)) {
+            if ($parseOptions && '' == $token) {
+                $this->parseArgument($token);
+            } elseif ($parseOptions && '--' == $token) {
+                $parseOptions = false;
+            } elseif ($parseOptions && 0 === strpos($token, '--')) {
+                $this->parseLongOption($token);
+            } elseif ($parseOptions && '-' === $token[0] && '-' !== $token) {
+                $this->parseShortOption($token);
+            } else {
+                $this->parseArgument($token);
+            }
+        }
+    }
+
+    /**
+     * 解析短选项
+     * @param string $token 当前的指令.
+     */
+    private function parseShortOption($token)
+    {
+        $name = substr($token, 1);
+
+        if (strlen($name) > 1) {
+            if ($this->definition->hasShortcut($name[0])
+                && $this->definition->getOptionForShortcut($name[0])->acceptValue()
+            ) {
+                $this->addShortOption($name[0], substr($name, 1));
+            } else {
+                $this->parseShortOptionSet($name);
+            }
+        } else {
+            $this->addShortOption($name, null);
+        }
+    }
+
+    /**
+     * 解析短选项
+     * @param string $name 当前指令
+     * @throws \RuntimeException
+     */
+    private function parseShortOptionSet($name)
+    {
+        $len = strlen($name);
+        for ($i = 0; $i < $len; ++$i) {
+            if (!$this->definition->hasShortcut($name[$i])) {
+                throw new \RuntimeException(sprintf('The "-%s" option does not exist.', $name[$i]));
+            }
+
+            $option = $this->definition->getOptionForShortcut($name[$i]);
+            if ($option->acceptValue()) {
+                $this->addLongOption($option->getName(), $i === $len - 1 ? null : substr($name, $i + 1));
+
+                break;
+            } else {
+                $this->addLongOption($option->getName(), null);
+            }
+        }
+    }
+
+    /**
+     * 解析完整选项
+     * @param string $token 当前指令
+     */
+    private function parseLongOption($token)
+    {
+        $name = substr($token, 2);
+
+        if (false !== $pos = strpos($name, '=')) {
+            $this->addLongOption(substr($name, 0, $pos), substr($name, $pos + 1));
+        } else {
+            $this->addLongOption($name, null);
+        }
+    }
+
+    /**
+     * 解析参数
+     * @param string $token 当前指令
+     * @throws \RuntimeException
+     */
+    private function parseArgument($token)
+    {
+        $c = count($this->arguments);
+
+        if ($this->definition->hasArgument($c)) {
+            $arg = $this->definition->getArgument($c);
+
+            $this->arguments[$arg->getName()] = $arg->isArray() ? [$token] : $token;
+
+        } elseif ($this->definition->hasArgument($c - 1) && $this->definition->getArgument($c - 1)->isArray()) {
+            $arg = $this->definition->getArgument($c - 1);
+
+            $this->arguments[$arg->getName()][] = $token;
+        } else {
+            throw new \RuntimeException('Too many arguments.');
+        }
+    }
+
+    /**
+     * 添加一个短选项的值
+     * @param string $shortcut 短名称
+     * @param mixed  $value    值
+     * @throws \RuntimeException
+     */
+    private function addShortOption($shortcut, $value)
+    {
+        if (!$this->definition->hasShortcut($shortcut)) {
+            throw new \RuntimeException(sprintf('The "-%s" option does not exist.', $shortcut));
+        }
+
+        $this->addLongOption($this->definition->getOptionForShortcut($shortcut)->getName(), $value);
+    }
+
+    /**
+     * 添加一个完整选项的值
+     * @param string $name  选项名
+     * @param mixed  $value 值
+     * @throws \RuntimeException
+     */
+    private function addLongOption($name, $value)
+    {
+        if (!$this->definition->hasOption($name)) {
+            throw new \RuntimeException(sprintf('The "--%s" option does not exist.', $name));
+        }
+
+        $option = $this->definition->getOption($name);
+
+        if (false === $value) {
+            $value = null;
+        }
+
+        if (null !== $value && !$option->acceptValue()) {
+            throw new \RuntimeException(sprintf('The "--%s" option does not accept a value.', $name, $value));
+        }
+
+        if (null === $value && $option->acceptValue() && count($this->parsed)) {
+            $next = array_shift($this->parsed);
+            if (isset($next[0]) && '-' !== $next[0]) {
+                $value = $next;
+            } elseif (empty($next)) {
+                $value = '';
+            } else {
+                array_unshift($this->parsed, $next);
+            }
+        }
+
+        if (null === $value) {
+            if ($option->isValueRequired()) {
+                throw new \RuntimeException(sprintf('The "--%s" option requires a value.', $name));
+            }
+
+            if (!$option->isArray()) {
+                $value = $option->isValueOptional() ? $option->getDefault() : true;
+            }
+        }
+
+        if ($option->isArray()) {
+            $this->options[$name][] = $value;
+        } else {
+            $this->options[$name] = $value;
+        }
+    }
+
+    /**
+     * 获取第一个参数
+     * @return string|null
+     */
+    public function getFirstArgument()
+    {
+        foreach ($this->tokens as $token) {
+            if ($token && '-' === $token[0]) {
+                continue;
+            }
+
+            return $token;
+        }
+        return;
+    }
+
+    /**
+     * 检查原始参数是否包含某个值
+     * @param string|array $values 需要检查的值
+     * @return bool
+     */
+    public function hasParameterOption($values)
+    {
+        $values = (array) $values;
+
+        foreach ($this->tokens as $token) {
+            foreach ($values as $value) {
+                if ($token === $value || 0 === strpos($token, $value . '=')) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 获取原始选项的值
+     * @param string|array $values  需要检查的值
+     * @param mixed        $default 默认值
+     * @return mixed The option value
+     */
+    public function getParameterOption($values, $default = false)
+    {
+        $values = (array) $values;
+        $tokens = $this->tokens;
+
+        while (0 < count($tokens)) {
+            $token = array_shift($tokens);
+
+            foreach ($values as $value) {
+                if ($token === $value || 0 === strpos($token, $value . '=')) {
+                    if (false !== $pos = strpos($token, '=')) {
+                        return substr($token, $pos + 1);
+                    }
+
+                    return array_shift($tokens);
+                }
+            }
+        }
+
+        return $default;
+    }
+
+    /**
+     * 验证输入
+     * @throws \RuntimeException
+     */
+    public function validate()
+    {
+        if (count($this->arguments) < $this->definition->getArgumentRequiredCount()) {
+            throw new \RuntimeException('Not enough arguments.');
+        }
+    }
+
+    /**
+     * 检查输入是否是交互的
+     * @return bool
+     */
+    public function isInteractive()
+    {
+        return $this->interactive;
+    }
+
+    /**
+     * 设置输入的交互
+     * @param bool
+     */
+    public function setInteractive($interactive)
+    {
+        $this->interactive = (bool) $interactive;
+    }
+
+    /**
+     * 获取所有的参数
+     * @return Argument[]
+     */
+    public function getArguments()
+    {
+        return array_merge($this->definition->getArgumentDefaults(), $this->arguments);
+    }
+
+    /**
+     * 根据名称获取参数
+     * @param string $name 参数名
+     * @return mixed
+     * @throws \InvalidArgumentException
+     */
+    public function getArgument($name)
+    {
+        if (!$this->definition->hasArgument($name)) {
+            throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
+        }
+
+        return isset($this->arguments[$name]) ? $this->arguments[$name] : $this->definition->getArgument($name)
+            ->getDefault();
+    }
+
+    /**
+     * 设置参数的值
+     * @param string $name  参数名
+     * @param string $value 值
+     * @throws \InvalidArgumentException
+     */
+    public function setArgument($name, $value)
+    {
+        if (!$this->definition->hasArgument($name)) {
+            throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
+        }
+
+        $this->arguments[$name] = $value;
+    }
+
+    /**
+     * 检查是否存在某个参数
+     * @param string|int $name 参数名或位置
+     * @return bool
+     */
+    public function hasArgument($name)
+    {
+        return $this->definition->hasArgument($name);
+    }
+
+    /**
+     * 获取所有的选项
+     * @return Option[]
+     */
+    public function getOptions()
+    {
+        return array_merge($this->definition->getOptionDefaults(), $this->options);
+    }
+
+    /**
+     * 获取选项值
+     * @param string $name 选项名称
+     * @return mixed
+     * @throws \InvalidArgumentException
+     */
+    public function getOption($name)
+    {
+        if (!$this->definition->hasOption($name)) {
+            throw new \InvalidArgumentException(sprintf('The "%s" option does not exist.', $name));
+        }
+
+        return isset($this->options[$name]) ? $this->options[$name] : $this->definition->getOption($name)->getDefault();
+    }
+
+    /**
+     * 设置选项值
+     * @param string      $name  选项名
+     * @param string|bool $value 值
+     * @throws \InvalidArgumentException
+     */
+    public function setOption($name, $value)
+    {
+        if (!$this->definition->hasOption($name)) {
+            throw new \InvalidArgumentException(sprintf('The "%s" option does not exist.', $name));
+        }
+
+        $this->options[$name] = $value;
+    }
+
+    /**
+     * 是否有某个选项
+     * @param string $name 选项名
+     * @return bool
+     */
+    public function hasOption($name)
+    {
+        return $this->definition->hasOption($name) && isset($this->options[$name]);
+    }
+
+    /**
+     * 转义指令
+     * @param string $token
+     * @return string
+     */
+    public function escapeToken($token)
+    {
+        return preg_match('{^[\w-]+$}', $token) ? $token : escapeshellarg($token);
+    }
+
+    /**
+     * 返回传递给命令的参数的字符串
+     * @return string
+     */
+    public function __toString()
+    {
+        $tokens = array_map(function ($token) {
+            if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
+                return $match[1] . $this->escapeToken($match[2]);
+            }
+
+            if ($token && '-' !== $token[0]) {
+                return $this->escapeToken($token);
+            }
+
+            return $token;
+        }, $this->tokens);
+
+        return implode(' ', $tokens);
+    }
+}
diff --git a/thinkphp/library/think/console/LICENSE b/thinkphp/library/think/console/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..0abe056e161ca99f37f88cc47675f79360ad2d49
--- /dev/null
+++ b/thinkphp/library/think/console/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2004-2016 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/thinkphp/library/think/console/Output.php b/thinkphp/library/think/console/Output.php
new file mode 100644
index 0000000000000000000000000000000000000000..65dc9fb814c1d1d9f1c1b88cd7ae27de40e3f8ff
--- /dev/null
+++ b/thinkphp/library/think/console/Output.php
@@ -0,0 +1,222 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console;
+
+use Exception;
+use think\console\output\Ask;
+use think\console\output\Descriptor;
+use think\console\output\driver\Buffer;
+use think\console\output\driver\Console;
+use think\console\output\driver\Nothing;
+use think\console\output\Question;
+use think\console\output\question\Choice;
+use think\console\output\question\Confirmation;
+
+/**
+ * Class Output
+ * @package think\console
+ *
+ * @see     \think\console\output\driver\Console::setDecorated
+ * @method void setDecorated($decorated)
+ *
+ * @see     \think\console\output\driver\Buffer::fetch
+ * @method string fetch()
+ *
+ * @method void info($message)
+ * @method void error($message)
+ * @method void comment($message)
+ * @method void warning($message)
+ * @method void highlight($message)
+ * @method void question($message)
+ */
+class Output
+{
+    const VERBOSITY_QUIET        = 0;
+    const VERBOSITY_NORMAL       = 1;
+    const VERBOSITY_VERBOSE      = 2;
+    const VERBOSITY_VERY_VERBOSE = 3;
+    const VERBOSITY_DEBUG        = 4;
+
+    const OUTPUT_NORMAL = 0;
+    const OUTPUT_RAW    = 1;
+    const OUTPUT_PLAIN  = 2;
+
+    private $verbosity = self::VERBOSITY_NORMAL;
+
+    /** @var Buffer|Console|Nothing */
+    private $handle = null;
+
+    protected $styles = [
+        'info',
+        'error',
+        'comment',
+        'question',
+        'highlight',
+        'warning'
+    ];
+
+    public function __construct($driver = 'console')
+    {
+        $class = '\\think\\console\\output\\driver\\' . ucwords($driver);
+
+        $this->handle = new $class($this);
+    }
+
+    public function ask(Input $input, $question, $default = null, $validator = null)
+    {
+        $question = new Question($question, $default);
+        $question->setValidator($validator);
+
+        return $this->askQuestion($input, $question);
+    }
+
+    public function askHidden(Input $input, $question, $validator = null)
+    {
+        $question = new Question($question);
+
+        $question->setHidden(true);
+        $question->setValidator($validator);
+
+        return $this->askQuestion($input, $question);
+    }
+
+    public function confirm(Input $input, $question, $default = true)
+    {
+        return $this->askQuestion($input, new Confirmation($question, $default));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function choice(Input $input, $question, array $choices, $default = null)
+    {
+        if (null !== $default) {
+            $values  = array_flip($choices);
+            $default = $values[$default];
+        }
+
+        return $this->askQuestion($input, new Choice($question, $choices, $default));
+    }
+
+    protected function askQuestion(Input $input, Question $question)
+    {
+        $ask    = new Ask($input, $this, $question);
+        $answer = $ask->run();
+
+        if ($input->isInteractive()) {
+            $this->newLine();
+        }
+
+        return $answer;
+    }
+
+    protected function block($style, $message)
+    {
+        $this->writeln("<{$style}>{$message}</$style>");
+    }
+
+    /**
+     * 输出空行
+     * @param int $count
+     */
+    public function newLine($count = 1)
+    {
+        $this->write(str_repeat(PHP_EOL, $count));
+    }
+
+    /**
+     * 输出信息并换行
+     * @param string $messages
+     * @param int    $type
+     */
+    public function writeln($messages, $type = self::OUTPUT_NORMAL)
+    {
+        $this->write($messages, true, $type);
+    }
+
+    /**
+     * 输出信息
+     * @param string $messages
+     * @param bool   $newline
+     * @param int    $type
+     */
+    public function write($messages, $newline = false, $type = self::OUTPUT_NORMAL)
+    {
+        $this->handle->write($messages, $newline, $type);
+    }
+
+    public function renderException(\Exception $e)
+    {
+        $this->handle->renderException($e);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setVerbosity($level)
+    {
+        $this->verbosity = (int) $level;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getVerbosity()
+    {
+        return $this->verbosity;
+    }
+
+    public function isQuiet()
+    {
+        return self::VERBOSITY_QUIET === $this->verbosity;
+    }
+
+    public function isVerbose()
+    {
+        return self::VERBOSITY_VERBOSE <= $this->verbosity;
+    }
+
+    public function isVeryVerbose()
+    {
+        return self::VERBOSITY_VERY_VERBOSE <= $this->verbosity;
+    }
+
+    public function isDebug()
+    {
+        return self::VERBOSITY_DEBUG <= $this->verbosity;
+    }
+
+    public function describe($object, array $options = [])
+    {
+        $descriptor = new Descriptor();
+        $options    = array_merge([
+            'raw_text' => false,
+        ], $options);
+
+        $descriptor->describe($this, $object, $options);
+    }
+
+    public function __call($method, $args)
+    {
+        if (in_array($method, $this->styles)) {
+            array_unshift($args, $method);
+            return call_user_func_array([$this, 'block'], $args);
+        }
+
+        if ($this->handle && method_exists($this->handle, $method)) {
+            return call_user_func_array([$this->handle, $method], $args);
+        } else {
+            throw new Exception('method not exists:' . __CLASS__ . '->' . $method);
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/console/command/Build.php b/thinkphp/library/think/console/command/Build.php
new file mode 100644
index 0000000000000000000000000000000000000000..2b83199b1638ccde292d170620fbb798b7881c79
--- /dev/null
+++ b/thinkphp/library/think/console/command/Build.php
@@ -0,0 +1,60 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Option;
+use think\console\Output;
+use think\facade\App;
+use think\facade\Build as AppBuild;
+
+class Build extends Command
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName('build')
+            ->setDefinition([
+                new Option('config', null, Option::VALUE_OPTIONAL, "build.php path"),
+                new Option('module', null, Option::VALUE_OPTIONAL, "module name"),
+            ])
+            ->setDescription('Build Application Dirs');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        if ($input->hasOption('module')) {
+            AppBuild::module($input->getOption('module'));
+            $output->writeln("Successed");
+            return;
+        }
+
+        if ($input->hasOption('config')) {
+            $build = include $input->getOption('config');
+        } else {
+            $build = include App::getAppPath() . 'build.php';
+        }
+
+        if (empty($build)) {
+            $output->writeln("Build Config Is Empty");
+            return;
+        }
+
+        AppBuild::run($build);
+        $output->writeln("Successed");
+
+    }
+}
diff --git a/thinkphp/library/think/console/command/Clear.php b/thinkphp/library/think/console/command/Clear.php
new file mode 100644
index 0000000000000000000000000000000000000000..1442575931741f4117ea5c09fb6d162d594ea531
--- /dev/null
+++ b/thinkphp/library/think/console/command/Clear.php
@@ -0,0 +1,70 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | 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\console\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Option;
+use think\console\Output;
+use think\facade\App;
+use think\facade\Cache;
+
+class Clear extends Command
+{
+    protected function configure()
+    {
+        // 指令配置
+        $this
+            ->setName('clear')
+            ->addOption('path', 'd', Option::VALUE_OPTIONAL, 'path to clear', null)
+            ->addOption('cache', 'c', Option::VALUE_NONE, 'clear cache file')
+            ->addOption('route', 'u', Option::VALUE_NONE, 'clear route cache')
+            ->addOption('log', 'l', Option::VALUE_NONE, 'clear log file')
+            ->addOption('dir', 'r', Option::VALUE_NONE, 'clear empty dir')
+            ->setDescription('Clear runtime file');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        if ($input->getOption('route')) {
+            Cache::clear('route_cache');
+        } else {
+            if ($input->getOption('cache')) {
+                $path = App::getRuntimePath() . 'cache';
+            } elseif ($input->getOption('log')) {
+                $path = App::getRuntimePath() . 'log';
+            } else {
+                $path = $input->getOption('path') ?: App::getRuntimePath();
+            }
+
+            $rmdir = $input->getOption('dir') ? true : false;
+            $this->clear(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR, $rmdir);
+        }
+
+        $output->writeln("<info>Clear Successed</info>");
+    }
+
+    protected function clear($path, $rmdir)
+    {
+        $files = is_dir($path) ? scandir($path) : [];
+
+        foreach ($files as $file) {
+            if ('.' != $file && '..' != $file && is_dir($path . $file)) {
+                array_map('unlink', glob($path . $file . DIRECTORY_SEPARATOR . '*.*'));
+                if ($rmdir) {
+                    rmdir($path . $file);
+                }
+            } elseif ('.gitignore' != $file && is_file($path . $file)) {
+                unlink($path . $file);
+            }
+        }
+    }
+}
diff --git a/thinkphp/library/think/console/command/Help.php b/thinkphp/library/think/console/command/Help.php
new file mode 100644
index 0000000000000000000000000000000000000000..bae2c653312f35f38f72a976d96a7346c621261f
--- /dev/null
+++ b/thinkphp/library/think/console/command/Help.php
@@ -0,0 +1,69 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Argument as InputArgument;
+use think\console\input\Option as InputOption;
+use think\console\Output;
+
+class Help extends Command
+{
+
+    private $command;
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->ignoreValidationErrors();
+
+        $this->setName('help')->setDefinition([
+            new InputArgument('command_name', InputArgument::OPTIONAL, 'The command name', 'help'),
+            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help'),
+        ])->setDescription('Displays help for a command')->setHelp(<<<EOF
+The <info>%command.name%</info> command displays help for a given command:
+
+  <info>php %command.full_name% list</info>
+
+To display the list of available commands, please use the <info>list</info> command.
+EOF
+        );
+    }
+
+    /**
+     * Sets the command.
+     * @param Command $command The command to set
+     */
+    public function setCommand(Command $command)
+    {
+        $this->command = $command;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(Input $input, Output $output)
+    {
+        if (null === $this->command) {
+            $this->command = $this->getConsole()->find($input->getArgument('command_name'));
+        }
+
+        $output->describe($this->command, [
+            'raw_text' => $input->getOption('raw'),
+        ]);
+
+        $this->command = null;
+    }
+}
diff --git a/thinkphp/library/think/console/command/Lists.php b/thinkphp/library/think/console/command/Lists.php
new file mode 100644
index 0000000000000000000000000000000000000000..084ddaa231ce3b1dd8c0b602387b49da80344c74
--- /dev/null
+++ b/thinkphp/library/think/console/command/Lists.php
@@ -0,0 +1,74 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\console\input\Argument as InputArgument;
+use think\console\input\Option as InputOption;
+use think\console\input\Definition as InputDefinition;
+
+class Lists extends Command
+{
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function configure()
+    {
+        $this->setName('list')->setDefinition($this->createDefinition())->setDescription('Lists commands')->setHelp(<<<EOF
+The <info>%command.name%</info> command lists all commands:
+
+  <info>php %command.full_name%</info>
+
+You can also display the commands for a specific namespace:
+
+  <info>php %command.full_name% test</info>
+
+It's also possible to get raw list of commands (useful for embedding command runner):
+
+  <info>php %command.full_name% --raw</info>
+EOF
+        );
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getNativeDefinition()
+    {
+        return $this->createDefinition();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function execute(Input $input, Output $output)
+    {
+        $output->describe($this->getConsole(), [
+            'raw_text'  => $input->getOption('raw'),
+            'namespace' => $input->getArgument('namespace'),
+        ]);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    private function createDefinition()
+    {
+        return new InputDefinition([
+            new InputArgument('namespace', InputArgument::OPTIONAL, 'The namespace name'),
+            new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command list')
+        ]);
+    }
+}
diff --git a/thinkphp/library/think/console/command/Make.php b/thinkphp/library/think/console/command/Make.php
new file mode 100644
index 0000000000000000000000000000000000000000..7474f26684bcf280cfbbc42eccaa71827c5c49c5
--- /dev/null
+++ b/thinkphp/library/think/console/command/Make.php
@@ -0,0 +1,111 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 刘志淳 <chun@engineer.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Argument;
+use think\console\Output;
+use think\facade\App;
+use think\facade\Config;
+use think\facade\Env;
+
+abstract class Make extends Command
+{
+
+    protected $type;
+
+    abstract protected function getStub();
+
+    protected function configure()
+    {
+        $this->addArgument('name', Argument::REQUIRED, "The name of the class");
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+
+        $name = trim($input->getArgument('name'));
+
+        $classname = $this->getClassName($name);
+
+        $pathname = $this->getPathName($classname);
+
+        if (is_file($pathname)) {
+            $output->writeln('<error>' . $this->type . ' already exists!</error>');
+            return false;
+        }
+
+        if (!is_dir(dirname($pathname))) {
+            mkdir(dirname($pathname), 0755, true);
+        }
+
+        file_put_contents($pathname, $this->buildClass($classname));
+
+        $output->writeln('<info>' . $this->type . ' created successfully.</info>');
+
+    }
+
+    protected function buildClass($name)
+    {
+        $stub = file_get_contents($this->getStub());
+
+        $namespace = trim(implode('\\', array_slice(explode('\\', $name), 0, -1)), '\\');
+
+        $class = str_replace($namespace . '\\', '', $name);
+
+        return str_replace(['{%className%}', '{%namespace%}', '{%app_namespace%}'], [
+            $class,
+            $namespace,
+            App::getNamespace(),
+        ], $stub);
+
+    }
+
+    protected function getPathName($name)
+    {
+        $name = str_replace(App::getNamespace() . '\\', '', $name);
+
+        return Env::get('app_path') . ltrim(str_replace('\\', '/', $name), '/') . '.php';
+    }
+
+    protected function getClassName($name)
+    {
+        $appNamespace = App::getNamespace();
+
+        if (strpos($name, $appNamespace . '\\') !== false) {
+            return $name;
+        }
+
+        if (Config::get('app_multi_module')) {
+            if (strpos($name, '/')) {
+                list($module, $name) = explode('/', $name, 2);
+            } else {
+                $module = 'common';
+            }
+        } else {
+            $module = null;
+        }
+
+        if (strpos($name, '/') !== false) {
+            $name = str_replace('/', '\\', $name);
+        }
+
+        return $this->getNamespace($appNamespace, $module) . '\\' . $name;
+    }
+
+    protected function getNamespace($appNamespace, $module)
+    {
+        return $module ? ($appNamespace . '\\' . $module) : $appNamespace;
+    }
+
+}
diff --git a/thinkphp/library/think/console/command/RunServer.php b/thinkphp/library/think/console/command/RunServer.php
new file mode 100644
index 0000000000000000000000000000000000000000..4dd610b6e76d99396c5c194b8c36a846e1e84fbd
--- /dev/null
+++ b/thinkphp/library/think/console/command/RunServer.php
@@ -0,0 +1,54 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: Slince <taosikai@yeah.net>
+// +----------------------------------------------------------------------
+namespace think\console\command;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Option;
+use think\console\Output;
+use think\facade\App;
+
+class RunServer extends Command
+{
+
+    public function configure()
+    {
+        $this->setName('run')
+            ->addOption('host', 'H', Option::VALUE_OPTIONAL,
+                'The host to server the application on', '127.0.0.1')
+            ->addOption('port', 'p', Option::VALUE_OPTIONAL,
+                'The port to server the application on', 8000)
+            ->addOption('root', 'r', Option::VALUE_OPTIONAL,
+                'The document root of the application', App::getRootPath() . 'public')
+            ->setDescription('PHP Built-in Server for ThinkPHP');
+    }
+
+    public function execute(Input $input, Output $output)
+    {
+        $host = $input->getOption('host');
+        $port = $input->getOption('port');
+        $root = $input->getOption('root');
+
+        $command = sprintf(
+            'php -S %s:%d -t %s %s',
+            $host,
+            $port,
+            escapeshellarg($root),
+            escapeshellarg($root . DIRECTORY_SEPARATOR . 'router.php')
+        );
+
+        $output->writeln(sprintf('ThinkPHP Development server is started On <http://%s:%s/>', $host, $port));
+        $output->writeln(sprintf('You can exit with <info>`CTRL-C`</info>'));
+        $output->writeln(sprintf('Document root is: %s', $root));
+        passthru($command);
+    }
+
+}
diff --git a/thinkphp/library/think/console/command/make/Controller.php b/thinkphp/library/think/console/command/make/Controller.php
new file mode 100644
index 0000000000000000000000000000000000000000..e4cc5bb572af841f98771c37ad2ad2684af7c688
--- /dev/null
+++ b/thinkphp/library/think/console/command/make/Controller.php
@@ -0,0 +1,57 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 刘志淳 <chun@engineer.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command\make;
+
+use think\console\command\Make;
+use think\console\input\Option;
+use think\facade\Config;
+
+class Controller extends Make
+{
+
+    protected $type = "Controller";
+
+    protected function configure()
+    {
+        parent::configure();
+        $this->setName('make:controller')
+            ->addOption('api', null, Option::VALUE_NONE, 'Generate an api controller class.')
+            ->addOption('plain', null, Option::VALUE_NONE, 'Generate an empty controller class.')
+            ->setDescription('Create a new resource controller class');
+    }
+
+    protected function getStub()
+    {
+        $stubPath = __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR;
+
+        if ($this->input->getOption('api')) {
+            return $stubPath . 'controller.api.stub';
+        }
+
+        if ($this->input->getOption('plain')) {
+            return $stubPath . 'controller.plain.stub';
+        }
+
+        return $stubPath . 'controller.stub';
+    }
+
+    protected function getClassName($name)
+    {
+        return parent::getClassName($name) . (Config::get('controller_suffix') ? ucfirst(Config::get('url_controller_layer')) : '');
+    }
+
+    protected function getNamespace($appNamespace, $module)
+    {
+        return parent::getNamespace($appNamespace, $module) . '\controller';
+    }
+
+}
diff --git a/thinkphp/library/think/console/command/make/Middleware.php b/thinkphp/library/think/console/command/make/Middleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..bfe821b03a3e73b72902f6fcb93d7516f1077713
--- /dev/null
+++ b/thinkphp/library/think/console/command/make/Middleware.php
@@ -0,0 +1,36 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 刘志淳 <chun@engineer.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command\make;
+
+use think\console\command\Make;
+
+class Middleware extends Make
+{
+    protected $type = "Middleware";
+
+    protected function configure()
+    {
+        parent::configure();
+        $this->setName('make:middleware')
+            ->setDescription('Create a new middleware class');
+    }
+
+    protected function getStub()
+    {
+        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'middleware.stub';
+    }
+
+    protected function getNamespace($appNamespace, $module)
+    {
+        return parent::getNamespace($appNamespace, 'http') . '\middleware';
+    }
+}
diff --git a/thinkphp/library/think/console/command/make/Model.php b/thinkphp/library/think/console/command/make/Model.php
new file mode 100644
index 0000000000000000000000000000000000000000..03e6b3fcd35ae7da3ec4c2eb2e31743e0a5c545e
--- /dev/null
+++ b/thinkphp/library/think/console/command/make/Model.php
@@ -0,0 +1,36 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 刘志淳 <chun@engineer.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command\make;
+
+use think\console\command\Make;
+
+class Model extends Make
+{
+    protected $type = "Model";
+
+    protected function configure()
+    {
+        parent::configure();
+        $this->setName('make:model')
+            ->setDescription('Create a new model class');
+    }
+
+    protected function getStub()
+    {
+        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'model.stub';
+    }
+
+    protected function getNamespace($appNamespace, $module)
+    {
+        return parent::getNamespace($appNamespace, $module) . '\model';
+    }
+}
diff --git a/thinkphp/library/think/console/command/make/Validate.php b/thinkphp/library/think/console/command/make/Validate.php
new file mode 100644
index 0000000000000000000000000000000000000000..e7e39e635b0d91918c8adb25b1789cda78006afc
--- /dev/null
+++ b/thinkphp/library/think/console/command/make/Validate.php
@@ -0,0 +1,40 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 刘志淳 <chun@engineer.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\command\make;
+
+use think\console\command\Make;
+
+class Validate extends Make
+{
+
+    protected $type = "Validate";
+
+    protected function configure()
+    {
+        parent::configure();
+        $this->setName('make:validate')
+            ->setDescription('Create a validate class');
+    }
+
+    protected function getStub()
+    {
+        $stubPath = __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR;
+
+        return $stubPath . 'validate.stub';
+    }
+
+    protected function getNamespace($appNamespace, $module)
+    {
+        return parent::getNamespace($appNamespace, $module) . '\validate';
+    }
+
+}
diff --git a/thinkphp/library/think/console/command/make/stubs/controller.api.stub b/thinkphp/library/think/console/command/make/stubs/controller.api.stub
new file mode 100644
index 0000000000000000000000000000000000000000..aed9edfbd66a830b4d00e5b00dcbe6fce7d7d1f1
--- /dev/null
+++ b/thinkphp/library/think/console/command/make/stubs/controller.api.stub
@@ -0,0 +1,64 @@
+<?php
+
+namespace {%namespace%};
+
+use think\Controller;
+use think\Request;
+
+class {%className%} extends Controller
+{
+    /**
+     * 显示资源列表
+     *
+     * @return \think\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * 保存新建的资源
+     *
+     * @param  \think\Request  $request
+     * @return \think\Response
+     */
+    public function save(Request $request)
+    {
+        //
+    }
+
+    /**
+     * 显示指定的资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function read($id)
+    {
+        //
+    }
+
+    /**
+     * 保存更新的资源
+     *
+     * @param  \think\Request  $request
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * 删除指定资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function delete($id)
+    {
+        //
+    }
+}
diff --git a/thinkphp/library/think/console/command/make/stubs/controller.plain.stub b/thinkphp/library/think/console/command/make/stubs/controller.plain.stub
new file mode 100644
index 0000000000000000000000000000000000000000..b7539dcf679c8c4bfeba5786020845b7686a171f
--- /dev/null
+++ b/thinkphp/library/think/console/command/make/stubs/controller.plain.stub
@@ -0,0 +1,10 @@
+<?php
+
+namespace {%namespace%};
+
+use think\Controller;
+
+class {%className%} extends Controller
+{
+    //
+}
diff --git a/thinkphp/library/think/console/command/make/stubs/controller.stub b/thinkphp/library/think/console/command/make/stubs/controller.stub
new file mode 100644
index 0000000000000000000000000000000000000000..870ce5cfbdbcdb4407f8af8cbf862b53fa68c233
--- /dev/null
+++ b/thinkphp/library/think/console/command/make/stubs/controller.stub
@@ -0,0 +1,85 @@
+<?php
+
+namespace {%namespace%};
+
+use think\Controller;
+use think\Request;
+
+class {%className%} extends Controller
+{
+    /**
+     * 显示资源列表
+     *
+     * @return \think\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * 显示创建资源表单页.
+     *
+     * @return \think\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * 保存新建的资源
+     *
+     * @param  \think\Request  $request
+     * @return \think\Response
+     */
+    public function save(Request $request)
+    {
+        //
+    }
+
+    /**
+     * 显示指定的资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function read($id)
+    {
+        //
+    }
+
+    /**
+     * 显示编辑资源表单页.
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * 保存更新的资源
+     *
+     * @param  \think\Request  $request
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * 删除指定资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function delete($id)
+    {
+        //
+    }
+}
diff --git a/thinkphp/library/think/console/command/make/stubs/middleware.stub b/thinkphp/library/think/console/command/make/stubs/middleware.stub
new file mode 100644
index 0000000000000000000000000000000000000000..8b5f12e8745a32cffd88931bf7ffc415f0ef8afc
--- /dev/null
+++ b/thinkphp/library/think/console/command/make/stubs/middleware.stub
@@ -0,0 +1,10 @@
+<?php
+
+namespace {%namespace%};
+
+class {%className%}
+{
+    public function handle($request, \Closure $next)
+    {
+    }
+}
diff --git a/thinkphp/library/think/console/command/make/stubs/model.stub b/thinkphp/library/think/console/command/make/stubs/model.stub
new file mode 100644
index 0000000000000000000000000000000000000000..2b719ba76e4b939caacd5820c13862d42c3f6ae4
--- /dev/null
+++ b/thinkphp/library/think/console/command/make/stubs/model.stub
@@ -0,0 +1,10 @@
+<?php
+
+namespace {%namespace%};
+
+use think\Model;
+
+class {%className%} extends Model
+{
+    //
+}
diff --git a/thinkphp/library/think/console/command/make/stubs/validate.stub b/thinkphp/library/think/console/command/make/stubs/validate.stub
new file mode 100644
index 0000000000000000000000000000000000000000..0775bfa4404ef7710a187101ff5082a23dc28d6a
--- /dev/null
+++ b/thinkphp/library/think/console/command/make/stubs/validate.stub
@@ -0,0 +1,24 @@
+<?php
+
+namespace {%namespace%};
+
+use think\Validate;
+
+class {%className%} extends Validate
+{
+    /**
+     * 定义验证规则
+     * 格式：'字段名'	=>	['规则1','规则2'...]
+     *
+     * @var array
+     */	
+	protected $rule = [];
+    
+    /**
+     * 定义错误信息
+     * 格式：'字段名.规则名'	=>	'错误信息'
+     *
+     * @var array
+     */	
+    protected $message = [];
+}
diff --git a/thinkphp/library/think/console/command/optimize/Autoload.php b/thinkphp/library/think/console/command/optimize/Autoload.php
new file mode 100644
index 0000000000000000000000000000000000000000..c5eab03ce2114367fbde8ebfdd8cf255b47c3bf9
--- /dev/null
+++ b/thinkphp/library/think/console/command/optimize/Autoload.php
@@ -0,0 +1,280 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+namespace think\console\command\optimize;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\Container;
+
+class Autoload extends Command
+{
+
+    protected function configure()
+    {
+        $this->setName('optimize:autoload')
+            ->setDescription('Optimizes PSR0 and PSR4 packages to be loaded with classmaps too, good for production.');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+
+        $classmapFile = <<<EOF
+<?php
+/**
+ * 类库映射
+ */
+
+return [
+
+EOF;
+        $app              = Container::get('app');
+        $namespacesToScan = [
+            $app->getNamespace() . '\\' => realpath(rtrim($app->getAppPath())),
+            'think\\'                   => $app->getAppPath() . 'library/think',
+            'traits\\'                  => $app->getAppPath() . 'library/traits',
+            ''                          => realpath(rtrim($app->getRootPath() . 'extend')),
+        ];
+
+        krsort($namespacesToScan);
+        $classMap = [];
+        foreach ($namespacesToScan as $namespace => $dir) {
+
+            if (!is_dir($dir)) {
+                continue;
+            }
+
+            $namespaceFilter = '' === $namespace ? null : $namespace;
+            $classMap        = $this->addClassMapCode($dir, $namespaceFilter, $classMap);
+        }
+
+        ksort($classMap);
+        foreach ($classMap as $class => $code) {
+            $classmapFile .= '    ' . var_export($class, true) . ' => ' . $code;
+        }
+        $classmapFile .= "];\n";
+        $runtimePath = $app->getRuntimePath();
+        if (!is_dir($runtimePath)) {
+            @mkdir($runtimePath, 0755, true);
+        }
+
+        file_put_contents($runtimePath . 'classmap.php', $classmapFile);
+
+        $output->writeln('<info>Succeed!</info>');
+    }
+
+    protected function addClassMapCode($dir, $namespace, $classMap)
+    {
+        foreach ($this->createMap($dir, $namespace) as $class => $path) {
+
+            $pathCode = $this->getPathCode($path) . ",\n";
+
+            if (!isset($classMap[$class])) {
+                $classMap[$class] = $pathCode;
+            } elseif ($classMap[$class] !== $pathCode && !preg_match('{/(test|fixture|example|stub)s?/}i', strtr($classMap[$class] . ' ' . $path, '\\', '/'))) {
+                $this->output->writeln(
+                    '<warning>Warning: Ambiguous class resolution, "' . $class . '"' .
+                    ' was found in both "' . str_replace(["',\n"], [
+                        '',
+                    ], $classMap[$class]) . '" and "' . $path . '", the first will be used.</warning>'
+                );
+            }
+        }
+        return $classMap;
+    }
+
+    protected function getPathCode($path)
+    {
+        $baseDir    = '';
+        $app        = Container::get('app');
+        $appPath    = $this->normalizePath(realpath($app->getAppPath()));
+        $libPath    = $this->normalizePath(realpath($app->getThinkPath() . 'library'));
+        $extendPath = $this->normalizePath(realpath($app->getRootPath() . 'extend'));
+        $path       = $this->normalizePath($path);
+
+        if (strpos($path, $libPath . '/') === 0) {
+            $path    = substr($path, strlen($app->getThinkPath() . 'library'));
+            $baseDir = "'" . $libPath . "/'";
+        } elseif (strpos($path, $appPath . '/') === 0) {
+            $path    = substr($path, strlen($appPath) + 1);
+            $baseDir = "'" . $appPath . "/'";
+        } elseif (strpos($path, $extendPath . '/') === 0) {
+            $path    = substr($path, strlen($extendPath) + 1);
+            $baseDir = "'" . $extendPath . "/'";
+        }
+
+        if (false !== $path) {
+            $baseDir .= " . ";
+        }
+
+        return $baseDir . ((false !== $path) ? var_export($path, true) : "");
+    }
+
+    protected function normalizePath($path)
+    {
+        $parts    = [];
+        $path     = strtr($path, '\\', '/');
+        $prefix   = '';
+        $absolute = false;
+
+        if (preg_match('{^([0-9a-z]+:(?://(?:[a-z]:)?)?)}i', $path, $match)) {
+            $prefix = $match[1];
+            $path   = substr($path, strlen($prefix));
+        }
+
+        if (substr($path, 0, 1) === '/') {
+            $absolute = true;
+            $path     = substr($path, 1);
+        }
+
+        $up = false;
+        foreach (explode('/', $path) as $chunk) {
+            if ('..' === $chunk && ($absolute || $up)) {
+                array_pop($parts);
+                $up = !(empty($parts) || '..' === end($parts));
+            } elseif ('.' !== $chunk && '' !== $chunk) {
+                $parts[] = $chunk;
+                $up      = '..' !== $chunk;
+            }
+        }
+
+        return $prefix . ($absolute ? '/' : '') . implode('/', $parts);
+    }
+
+    protected function createMap($path, $namespace = null)
+    {
+        if (is_string($path)) {
+            if (is_file($path)) {
+                $path = [new \SplFileInfo($path)];
+            } elseif (is_dir($path)) {
+
+                $objects = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path), \RecursiveIteratorIterator::SELF_FIRST);
+
+                $path = [];
+
+                /** @var \SplFileInfo $object */
+                foreach ($objects as $object) {
+                    if ($object->isFile() && $object->getExtension() == 'php') {
+                        $path[] = $object;
+                    }
+                }
+            } else {
+                throw new \RuntimeException(
+                    'Could not scan for classes inside "' . $path .
+                    '" which does not appear to be a file nor a folder'
+                );
+            }
+        }
+
+        $map = [];
+
+        /** @var \SplFileInfo $file */
+        foreach ($path as $file) {
+            $filePath = $file->getRealPath();
+
+            if (pathinfo($filePath, PATHINFO_EXTENSION) != 'php') {
+                continue;
+            }
+
+            $classes = $this->findClasses($filePath);
+
+            foreach ($classes as $class) {
+                if (null !== $namespace && 0 !== strpos($class, $namespace)) {
+                    continue;
+                }
+
+                if (!isset($map[$class])) {
+                    $map[$class] = $filePath;
+                } elseif ($map[$class] !== $filePath && !preg_match('{/(test|fixture|example|stub)s?/}i', strtr($map[$class] . ' ' . $filePath, '\\', '/'))) {
+                    $this->output->writeln(
+                        '<warning>Warning: Ambiguous class resolution, "' . $class . '"' .
+                        ' was found in both "' . $map[$class] . '" and "' . $filePath . '", the first will be used.</warning>'
+                    );
+                }
+            }
+        }
+
+        return $map;
+    }
+
+    protected function findClasses($path)
+    {
+        $extraTypes = '|trait';
+
+        $contents = @php_strip_whitespace($path);
+        if (!$contents) {
+            if (!file_exists($path)) {
+                $message = 'File at "%s" does not exist, check your classmap definitions';
+            } elseif (!is_readable($path)) {
+                $message = 'File at "%s" is not readable, check its permissions';
+            } elseif ('' === trim(file_get_contents($path))) {
+                return [];
+            } else {
+                $message = 'File at "%s" could not be parsed as PHP, it may be binary or corrupted';
+            }
+            $error = error_get_last();
+            if (isset($error['message'])) {
+                $message .= PHP_EOL . 'The following message may be helpful:' . PHP_EOL . $error['message'];
+            }
+            throw new \RuntimeException(sprintf($message, $path));
+        }
+
+        if (!preg_match('{\b(?:class|interface' . $extraTypes . ')\s}i', $contents)) {
+            return [];
+        }
+
+        // strip heredocs/nowdocs
+        $contents = preg_replace('{<<<\s*(\'?)(\w+)\\1(?:\r\n|\n|\r)(?:.*?)(?:\r\n|\n|\r)\\2(?=\r\n|\n|\r|;)}s', 'null', $contents);
+        // strip strings
+        $contents = preg_replace('{"[^"\\\\]*+(\\\\.[^"\\\\]*+)*+"|\'[^\'\\\\]*+(\\\\.[^\'\\\\]*+)*+\'}s', 'null', $contents);
+        // strip leading non-php code if needed
+        if (substr($contents, 0, 2) !== '<?') {
+            $contents = preg_replace('{^.+?<\?}s', '<?', $contents, 1, $replacements);
+            if (0 === $replacements) {
+                return [];
+            }
+        }
+        // strip non-php blocks in the file
+        $contents = preg_replace('{\?>.+<\?}s', '?><?', $contents);
+        // strip trailing non-php code if needed
+        $pos = strrpos($contents, '?>');
+        if (false !== $pos && false === strpos(substr($contents, $pos), '<?')) {
+            $contents = substr($contents, 0, $pos);
+        }
+
+        preg_match_all('{
+            (?:
+                 \b(?<![\$:>])(?P<type>class|interface' . $extraTypes . ') \s++ (?P<name>[a-zA-Z_\x7f-\xff:][a-zA-Z0-9_\x7f-\xff:\-]*+)
+               | \b(?<![\$:>])(?P<ns>namespace) (?P<nsname>\s++[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\s*+\\\\\s*+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+)? \s*+ [\{;]
+            )
+        }ix', $contents, $matches);
+
+        $classes   = [];
+        $namespace = '';
+
+        for ($i = 0, $len = count($matches['type']); $i < $len; $i++) {
+            if (!empty($matches['ns'][$i])) {
+                $namespace = str_replace([' ', "\t", "\r", "\n"], '', $matches['nsname'][$i]) . '\\';
+            } else {
+                $name = $matches['name'][$i];
+                if (':' === $name[0]) {
+                    $name = 'xhp' . substr(str_replace(['-', ':'], ['_', '__'], $name), 1);
+                } elseif ('enum' === $matches['type'][$i]) {
+                    $name = rtrim($name, ':');
+                }
+                $classes[] = ltrim($namespace . $name, '\\');
+            }
+        }
+
+        return $classes;
+    }
+
+}
diff --git a/thinkphp/library/think/console/command/optimize/Config.php b/thinkphp/library/think/console/command/optimize/Config.php
new file mode 100644
index 0000000000000000000000000000000000000000..1be4e3a2d72e5f302f3d18151aa9775cce1f0d18
--- /dev/null
+++ b/thinkphp/library/think/console/command/optimize/Config.php
@@ -0,0 +1,110 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2017 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+namespace think\console\command\optimize;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Argument;
+use think\console\Output;
+use think\Container;
+use think\facade\App;
+
+class Config extends Command
+{
+    /** @var  Output */
+    protected $output;
+
+    protected function configure()
+    {
+        $this->setName('optimize:config')
+            ->addArgument('module', Argument::OPTIONAL, 'Build module config cache .')
+            ->setDescription('Build config and common file cache.');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        if ($input->getArgument('module')) {
+            $module = $input->getArgument('module') . DIRECTORY_SEPARATOR;
+        } else {
+            $module = '';
+        }
+
+        $content     = '<?php ' . PHP_EOL . $this->buildCacheContent($module);
+        $runtimePath = App::getRuntimePath();
+        if (!is_dir($runtimePath . $module)) {
+            @mkdir($runtimePath . $module, 0755, true);
+        }
+
+        file_put_contents($runtimePath . $module . 'init.php', $content);
+
+        $output->writeln('<info>Succeed!</info>');
+    }
+
+    protected function buildCacheContent($module)
+    {
+        $content = '// This cache file is automatically generated at:' . date('Y-m-d H:i:s') . PHP_EOL;
+        $path    = realpath(App::getAppPath() . $module) . DIRECTORY_SEPARATOR;
+        if ($module) {
+            $configPath = is_dir($path . 'config') ? $path . 'config' : App::getConfigPath() . $module;
+        } else {
+            $configPath = App::getConfigPath();
+        }
+        $ext    = App::getConfigExt();
+        $config = Container::get('config');
+
+        $files = is_dir($configPath) ? scandir($configPath) : [];
+
+        foreach ($files as $file) {
+            if ('.' . pathinfo($file, PATHINFO_EXTENSION) === $ext) {
+                $filename = $configPath . DIRECTORY_SEPARATOR . $file;
+                $config->load($filename, pathinfo($file, PATHINFO_FILENAME));
+            }
+        }
+
+        // 加载行为扩展文件
+        if (is_file($path . 'tags.php')) {
+            $tags = include $path . 'tags.php';
+            if (is_array($tags)) {
+                $content .= PHP_EOL . '\think\facade\Hook::import(' . (var_export($tags, true)) . ');' . PHP_EOL;
+            }
+        }
+
+        // 加载公共文件
+        if (is_file($path . 'common.php')) {
+            $common = substr(php_strip_whitespace($path . 'common.php'), 6);
+            if ($common) {
+                $content .= PHP_EOL . $common . PHP_EOL;
+            }
+        }
+
+        if ('' == $module) {
+            $content .= PHP_EOL . substr(php_strip_whitespace(App::getThinkPath() . 'helper.php'), 6) . PHP_EOL;
+
+            if (is_file($path . 'middleware.php')) {
+                $middleware = include $path . 'middleware.php';
+                if (is_array($middleware)) {
+                    $content .= PHP_EOL . '\think\Container::get("middleware")->import(' . var_export($middleware, true) . ');' . PHP_EOL;
+                }
+            }
+        }
+
+        if (is_file($path . 'provider.php')) {
+            $provider = include $path . 'provider.php';
+            if (is_array($provider)) {
+                $content .= PHP_EOL . '\think\Container::getInstance()->bindTo(' . var_export($provider, true) . ');' . PHP_EOL;
+            }
+        }
+
+        $content .= PHP_EOL . '\think\facade\Config::set(' . var_export($config->get(), true) . ');' . PHP_EOL;
+
+        return $content;
+    }
+}
diff --git a/thinkphp/library/think/console/command/optimize/Route.php b/thinkphp/library/think/console/command/optimize/Route.php
new file mode 100644
index 0000000000000000000000000000000000000000..b6ad5b52de9c32928f865e8be286a800bd3ddf27
--- /dev/null
+++ b/thinkphp/library/think/console/command/optimize/Route.php
@@ -0,0 +1,68 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+namespace think\console\command\optimize;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\Output;
+use think\Container;
+
+class Route extends Command
+{
+    /** @var  Output */
+    protected $output;
+
+    protected function configure()
+    {
+        $this->setName('optimize:route')
+            ->setDescription('Build route cache.');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        $filename = Container::get('app')->getRuntimePath() . 'route.php';
+        if (is_file($filename)) {
+            unlink($filename);
+        }
+        file_put_contents($filename, $this->buildRouteCache());
+        $output->writeln('<info>Succeed!</info>');
+    }
+
+    protected function buildRouteCache()
+    {
+        Container::get('route')->setName([]);
+        Container::get('route')->lazy(false);
+        // 路由检测
+        $path = Container::get('app')->getRoutePath();
+
+        $files = is_dir($path) ? scandir($path) : [];
+
+        foreach ($files as $file) {
+            if (strpos($file, '.php')) {
+                $filename = $path . DIRECTORY_SEPARATOR . $file;
+                // 导入路由配置
+                $rules = include $filename;
+                if (is_array($rules)) {
+                    Container::get('route')->import($rules);
+                }
+            }
+        }
+
+        if (Container::get('config')->get('route_annotation')) {
+            include Container::get('build')->buildRoute();
+        }
+
+        $content = '<?php ' . PHP_EOL . 'return ';
+        $content .= var_export(Container::get('route')->getName(), true) . ';';
+        return $content;
+    }
+
+}
diff --git a/thinkphp/library/think/console/command/optimize/Schema.php b/thinkphp/library/think/console/command/optimize/Schema.php
new file mode 100644
index 0000000000000000000000000000000000000000..61620badd69740b240d89545a51feb4dcf69c336
--- /dev/null
+++ b/thinkphp/library/think/console/command/optimize/Schema.php
@@ -0,0 +1,121 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+namespace think\console\command\optimize;
+
+use think\console\Command;
+use think\console\Input;
+use think\console\input\Option;
+use think\console\Output;
+use think\Db;
+use think\facade\App;
+
+class Schema extends Command
+{
+    /** @var  Output */
+    protected $output;
+
+    protected function configure()
+    {
+        $this->setName('optimize:schema')
+            ->addOption('db', null, Option::VALUE_REQUIRED, 'db name .')
+            ->addOption('table', null, Option::VALUE_REQUIRED, 'table name .')
+            ->addOption('module', null, Option::VALUE_REQUIRED, 'module name .')
+            ->setDescription('Build database schema cache.');
+    }
+
+    protected function execute(Input $input, Output $output)
+    {
+        if (!is_dir(App::getRuntimePath() . 'schema')) {
+            @mkdir(App::getRuntimePath() . 'schema', 0755, true);
+        }
+
+        if ($input->hasOption('module')) {
+            $module = $input->getOption('module');
+            // 读取模型
+            $path      = App::getAppPath() . $module . DIRECTORY_SEPARATOR . 'model';
+            $list      = is_dir($path) ? scandir($path) : [];
+            $namespace = App::getNamespace();
+
+            foreach ($list as $file) {
+                if (0 === strpos($file, '.')) {
+                    continue;
+                }
+                $class = '\\' . $namespace . '\\' . $module . '\\model\\' . pathinfo($file, PATHINFO_FILENAME);
+                $this->buildModelSchema($class);
+            }
+
+            $output->writeln('<info>Succeed!</info>');
+            return;
+        } elseif ($input->hasOption('table')) {
+            $table = $input->getOption('table');
+            if (!strpos($table, '.')) {
+                $dbName = Db::getConfig('database');
+            }
+
+            $tables[] = $table;
+        } elseif ($input->hasOption('db')) {
+            $dbName = $input->getOption('db');
+            $tables = Db::getConnection()->getTables($dbName);
+        } elseif (!\think\facade\Config::get('app_multi_module')) {
+            $namespace = App::getNamespace();
+            $path      = App::getAppPath() . 'model';
+            $list      = is_dir($path) ? scandir($path) : [];
+
+            foreach ($list as $file) {
+                if (0 === strpos($file, '.')) {
+                    continue;
+                }
+                $class = '\\' . $namespace . '\\model\\' . pathinfo($file, PATHINFO_FILENAME);
+                $this->buildModelSchema($class);
+            }
+
+            $output->writeln('<info>Succeed!</info>');
+            return;
+        } else {
+            $tables = Db::getConnection()->getTables();
+        }
+
+        $db = isset($dbName) ? $dbName . '.' : '';
+        $this->buildDataBaseSchema($tables, $db);
+
+        $output->writeln('<info>Succeed!</info>');
+    }
+
+    protected function buildModelSchema($class)
+    {
+        $reflect = new \ReflectionClass($class);
+        if (!$reflect->isAbstract() && $reflect->isSubclassOf('\think\Model')) {
+            $table   = $class::getTable();
+            $dbName  = $class::getConfig('database');
+            $content = '<?php ' . PHP_EOL . 'return ';
+            $info    = $class::getConnection()->getFields($table);
+            $content .= var_export($info, true) . ';';
+
+            file_put_contents(App::getRuntimePath() . 'schema' . DIRECTORY_SEPARATOR . $dbName . '.' . $table . '.php', $content);
+        }
+    }
+
+    protected function buildDataBaseSchema($tables, $db)
+    {
+        if ('' == $db) {
+            $dbName = Db::getConfig('database') . '.';
+        } else {
+            $dbName = $db;
+        }
+
+        foreach ($tables as $table) {
+            $content = '<?php ' . PHP_EOL . 'return ';
+            $info    = Db::getConnection()->getFields($db . $table);
+            $content .= var_export($info, true) . ';';
+            file_put_contents(App::getRuntimePath() . 'schema' . DIRECTORY_SEPARATOR . $dbName . $table . '.php', $content);
+        }
+    }
+}
diff --git a/thinkphp/library/think/console/input/Argument.php b/thinkphp/library/think/console/input/Argument.php
new file mode 100644
index 0000000000000000000000000000000000000000..16223bbeb5cf5559e69fcc56b22a4e9ffceabdf2
--- /dev/null
+++ b/thinkphp/library/think/console/input/Argument.php
@@ -0,0 +1,115 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\input;
+
+class Argument
+{
+
+    const REQUIRED = 1;
+    const OPTIONAL = 2;
+    const IS_ARRAY = 4;
+
+    private $name;
+    private $mode;
+    private $default;
+    private $description;
+
+    /**
+     * 构造方法
+     * @param string $name        参数名
+     * @param int    $mode        参数类型: self::REQUIRED 或者 self::OPTIONAL
+     * @param string $description 描述
+     * @param mixed  $default     默认值 (仅 self::OPTIONAL 类型有效)
+     * @throws \InvalidArgumentException
+     */
+    public function __construct($name, $mode = null, $description = '', $default = null)
+    {
+        if (null === $mode) {
+            $mode = self::OPTIONAL;
+        } elseif (!is_int($mode) || $mode > 7 || $mode < 1) {
+            throw new \InvalidArgumentException(sprintf('Argument mode "%s" is not valid.', $mode));
+        }
+
+        $this->name        = $name;
+        $this->mode        = $mode;
+        $this->description = $description;
+
+        $this->setDefault($default);
+    }
+
+    /**
+     * 获取参数名
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * 是否必须
+     * @return bool
+     */
+    public function isRequired()
+    {
+        return self::REQUIRED === (self::REQUIRED & $this->mode);
+    }
+
+    /**
+     * 该参数是否接受数组
+     * @return bool
+     */
+    public function isArray()
+    {
+        return self::IS_ARRAY === (self::IS_ARRAY & $this->mode);
+    }
+
+    /**
+     * 设置默认值
+     * @param mixed $default 默认值
+     * @throws \LogicException
+     */
+    public function setDefault($default = null)
+    {
+        if (self::REQUIRED === $this->mode && null !== $default) {
+            throw new \LogicException('Cannot set a default value except for InputArgument::OPTIONAL mode.');
+        }
+
+        if ($this->isArray()) {
+            if (null === $default) {
+                $default = [];
+            } elseif (!is_array($default)) {
+                throw new \LogicException('A default value for an array argument must be an array.');
+            }
+        }
+
+        $this->default = $default;
+    }
+
+    /**
+     * 获取默认值
+     * @return mixed
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * 获取描述
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+}
diff --git a/thinkphp/library/think/console/input/Definition.php b/thinkphp/library/think/console/input/Definition.php
new file mode 100644
index 0000000000000000000000000000000000000000..c71977ec330e92950e716efb46b58ffb09727885
--- /dev/null
+++ b/thinkphp/library/think/console/input/Definition.php
@@ -0,0 +1,375 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\input;
+
+class Definition
+{
+
+    /**
+     * @var Argument[]
+     */
+    private $arguments;
+
+    private $requiredCount;
+    private $hasAnArrayArgument = false;
+    private $hasOptional;
+
+    /**
+     * @var Option[]
+     */
+    private $options;
+    private $shortcuts;
+
+    /**
+     * 构造方法
+     * @param array $definition
+     * @api
+     */
+    public function __construct(array $definition = [])
+    {
+        $this->setDefinition($definition);
+    }
+
+    /**
+     * 设置指令的定义
+     * @param array $definition 定义的数组
+     */
+    public function setDefinition(array $definition)
+    {
+        $arguments = [];
+        $options   = [];
+        foreach ($definition as $item) {
+            if ($item instanceof Option) {
+                $options[] = $item;
+            } else {
+                $arguments[] = $item;
+            }
+        }
+
+        $this->setArguments($arguments);
+        $this->setOptions($options);
+    }
+
+    /**
+     * 设置参数
+     * @param Argument[] $arguments 参数数组
+     */
+    public function setArguments($arguments = [])
+    {
+        $this->arguments          = [];
+        $this->requiredCount      = 0;
+        $this->hasOptional        = false;
+        $this->hasAnArrayArgument = false;
+        $this->addArguments($arguments);
+    }
+
+    /**
+     * 添加参数
+     * @param Argument[] $arguments 参数数组
+     * @api
+     */
+    public function addArguments($arguments = [])
+    {
+        if (null !== $arguments) {
+            foreach ($arguments as $argument) {
+                $this->addArgument($argument);
+            }
+        }
+    }
+
+    /**
+     * 添加一个参数
+     * @param Argument $argument 参数
+     * @throws \LogicException
+     */
+    public function addArgument(Argument $argument)
+    {
+        if (isset($this->arguments[$argument->getName()])) {
+            throw new \LogicException(sprintf('An argument with name "%s" already exists.', $argument->getName()));
+        }
+
+        if ($this->hasAnArrayArgument) {
+            throw new \LogicException('Cannot add an argument after an array argument.');
+        }
+
+        if ($argument->isRequired() && $this->hasOptional) {
+            throw new \LogicException('Cannot add a required argument after an optional one.');
+        }
+
+        if ($argument->isArray()) {
+            $this->hasAnArrayArgument = true;
+        }
+
+        if ($argument->isRequired()) {
+            ++$this->requiredCount;
+        } else {
+            $this->hasOptional = true;
+        }
+
+        $this->arguments[$argument->getName()] = $argument;
+    }
+
+    /**
+     * 根据名称或者位置获取参数
+     * @param string|int $name 参数名或者位置
+     * @return Argument 参数
+     * @throws \InvalidArgumentException
+     */
+    public function getArgument($name)
+    {
+        if (!$this->hasArgument($name)) {
+            throw new \InvalidArgumentException(sprintf('The "%s" argument does not exist.', $name));
+        }
+
+        $arguments = is_int($name) ? array_values($this->arguments) : $this->arguments;
+
+        return $arguments[$name];
+    }
+
+    /**
+     * 根据名称或位置检查是否具有某个参数
+     * @param string|int $name 参数名或者位置
+     * @return bool
+     * @api
+     */
+    public function hasArgument($name)
+    {
+        $arguments = is_int($name) ? array_values($this->arguments) : $this->arguments;
+
+        return isset($arguments[$name]);
+    }
+
+    /**
+     * 获取所有的参数
+     * @return Argument[] 参数数组
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * 获取参数数量
+     * @return int
+     */
+    public function getArgumentCount()
+    {
+        return $this->hasAnArrayArgument ? PHP_INT_MAX : count($this->arguments);
+    }
+
+    /**
+     * 获取必填的参数的数量
+     * @return int
+     */
+    public function getArgumentRequiredCount()
+    {
+        return $this->requiredCount;
+    }
+
+    /**
+     * 获取参数默认值
+     * @return array
+     */
+    public function getArgumentDefaults()
+    {
+        $values = [];
+        foreach ($this->arguments as $argument) {
+            $values[$argument->getName()] = $argument->getDefault();
+        }
+
+        return $values;
+    }
+
+    /**
+     * 设置选项
+     * @param Option[] $options 选项数组
+     */
+    public function setOptions($options = [])
+    {
+        $this->options   = [];
+        $this->shortcuts = [];
+        $this->addOptions($options);
+    }
+
+    /**
+     * 添加选项
+     * @param Option[] $options 选项数组
+     * @api
+     */
+    public function addOptions($options = [])
+    {
+        foreach ($options as $option) {
+            $this->addOption($option);
+        }
+    }
+
+    /**
+     * 添加一个选项
+     * @param Option $option 选项
+     * @throws \LogicException
+     * @api
+     */
+    public function addOption(Option $option)
+    {
+        if (isset($this->options[$option->getName()]) && !$option->equals($this->options[$option->getName()])) {
+            throw new \LogicException(sprintf('An option named "%s" already exists.', $option->getName()));
+        }
+
+        if ($option->getShortcut()) {
+            foreach (explode('|', $option->getShortcut()) as $shortcut) {
+                if (isset($this->shortcuts[$shortcut])
+                    && !$option->equals($this->options[$this->shortcuts[$shortcut]])
+                ) {
+                    throw new \LogicException(sprintf('An option with shortcut "%s" already exists.', $shortcut));
+                }
+            }
+        }
+
+        $this->options[$option->getName()] = $option;
+        if ($option->getShortcut()) {
+            foreach (explode('|', $option->getShortcut()) as $shortcut) {
+                $this->shortcuts[$shortcut] = $option->getName();
+            }
+        }
+    }
+
+    /**
+     * 根据名称获取选项
+     * @param string $name 选项名
+     * @return Option
+     * @throws \InvalidArgumentException
+     * @api
+     */
+    public function getOption($name)
+    {
+        if (!$this->hasOption($name)) {
+            throw new \InvalidArgumentException(sprintf('The "--%s" option does not exist.', $name));
+        }
+
+        return $this->options[$name];
+    }
+
+    /**
+     * 根据名称检查是否有这个选项
+     * @param string $name 选项名
+     * @return bool
+     * @api
+     */
+    public function hasOption($name)
+    {
+        return isset($this->options[$name]);
+    }
+
+    /**
+     * 获取所有选项
+     * @return Option[]
+     * @api
+     */
+    public function getOptions()
+    {
+        return $this->options;
+    }
+
+    /**
+     * 根据名称检查某个选项是否有短名称
+     * @param string $name 短名称
+     * @return bool
+     */
+    public function hasShortcut($name)
+    {
+        return isset($this->shortcuts[$name]);
+    }
+
+    /**
+     * 根据短名称获取选项
+     * @param string $shortcut 短名称
+     * @return Option
+     */
+    public function getOptionForShortcut($shortcut)
+    {
+        return $this->getOption($this->shortcutToName($shortcut));
+    }
+
+    /**
+     * 获取所有选项的默认值
+     * @return array
+     */
+    public function getOptionDefaults()
+    {
+        $values = [];
+        foreach ($this->options as $option) {
+            $values[$option->getName()] = $option->getDefault();
+        }
+
+        return $values;
+    }
+
+    /**
+     * 根据短名称获取选项名
+     * @param string $shortcut 短名称
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    private function shortcutToName($shortcut)
+    {
+        if (!isset($this->shortcuts[$shortcut])) {
+            throw new \InvalidArgumentException(sprintf('The "-%s" option does not exist.', $shortcut));
+        }
+
+        return $this->shortcuts[$shortcut];
+    }
+
+    /**
+     * 获取该指令的介绍
+     * @param bool $short 是否简洁介绍
+     * @return string
+     */
+    public function getSynopsis($short = false)
+    {
+        $elements = [];
+
+        if ($short && $this->getOptions()) {
+            $elements[] = '[options]';
+        } elseif (!$short) {
+            foreach ($this->getOptions() as $option) {
+                $value = '';
+                if ($option->acceptValue()) {
+                    $value = sprintf(' %s%s%s', $option->isValueOptional() ? '[' : '', strtoupper($option->getName()), $option->isValueOptional() ? ']' : '');
+                }
+
+                $shortcut   = $option->getShortcut() ? sprintf('-%s|', $option->getShortcut()) : '';
+                $elements[] = sprintf('[%s--%s%s]', $shortcut, $option->getName(), $value);
+            }
+        }
+
+        if (count($elements) && $this->getArguments()) {
+            $elements[] = '[--]';
+        }
+
+        foreach ($this->getArguments() as $argument) {
+            $element = '<' . $argument->getName() . '>';
+            if (!$argument->isRequired()) {
+                $element = '[' . $element . ']';
+            } elseif ($argument->isArray()) {
+                $element .= ' (' . $element . ')';
+            }
+
+            if ($argument->isArray()) {
+                $element .= '...';
+            }
+
+            $elements[] = $element;
+        }
+
+        return implode(' ', $elements);
+    }
+}
diff --git a/thinkphp/library/think/console/input/Option.php b/thinkphp/library/think/console/input/Option.php
new file mode 100644
index 0000000000000000000000000000000000000000..e5707c9ae254081363433135cf1c44ff555de348
--- /dev/null
+++ b/thinkphp/library/think/console/input/Option.php
@@ -0,0 +1,190 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\input;
+
+class Option
+{
+
+    const VALUE_NONE     = 1;
+    const VALUE_REQUIRED = 2;
+    const VALUE_OPTIONAL = 4;
+    const VALUE_IS_ARRAY = 8;
+
+    private $name;
+    private $shortcut;
+    private $mode;
+    private $default;
+    private $description;
+
+    /**
+     * 构造方法
+     * @param string       $name        选项名
+     * @param string|array $shortcut    短名称,多个用|隔开或者使用数组
+     * @param int          $mode        选项类型(可选类型为 self::VALUE_*)
+     * @param string       $description 描述
+     * @param mixed        $default     默认值 (类型为 self::VALUE_REQUIRED 或者 self::VALUE_NONE 的时候必须为null)
+     * @throws \InvalidArgumentException
+     */
+    public function __construct($name, $shortcut = null, $mode = null, $description = '', $default = null)
+    {
+        if (0 === strpos($name, '--')) {
+            $name = substr($name, 2);
+        }
+
+        if (empty($name)) {
+            throw new \InvalidArgumentException('An option name cannot be empty.');
+        }
+
+        if (empty($shortcut)) {
+            $shortcut = null;
+        }
+
+        if (null !== $shortcut) {
+            if (is_array($shortcut)) {
+                $shortcut = implode('|', $shortcut);
+            }
+            $shortcuts = preg_split('{(\|)-?}', ltrim($shortcut, '-'));
+            $shortcuts = array_filter($shortcuts);
+            $shortcut  = implode('|', $shortcuts);
+
+            if (empty($shortcut)) {
+                throw new \InvalidArgumentException('An option shortcut cannot be empty.');
+            }
+        }
+
+        if (null === $mode) {
+            $mode = self::VALUE_NONE;
+        } elseif (!is_int($mode) || $mode > 15 || $mode < 1) {
+            throw new \InvalidArgumentException(sprintf('Option mode "%s" is not valid.', $mode));
+        }
+
+        $this->name        = $name;
+        $this->shortcut    = $shortcut;
+        $this->mode        = $mode;
+        $this->description = $description;
+
+        if ($this->isArray() && !$this->acceptValue()) {
+            throw new \InvalidArgumentException('Impossible to have an option mode VALUE_IS_ARRAY if the option does not accept a value.');
+        }
+
+        $this->setDefault($default);
+    }
+
+    /**
+     * 获取短名称
+     * @return string
+     */
+    public function getShortcut()
+    {
+        return $this->shortcut;
+    }
+
+    /**
+     * 获取选项名
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * 是否可以设置值
+     * @return bool 类型不是 self::VALUE_NONE 的时候返回true,其他均返回false
+     */
+    public function acceptValue()
+    {
+        return $this->isValueRequired() || $this->isValueOptional();
+    }
+
+    /**
+     * 是否必须
+     * @return bool 类型是 self::VALUE_REQUIRED 的时候返回true,其他均返回false
+     */
+    public function isValueRequired()
+    {
+        return self::VALUE_REQUIRED === (self::VALUE_REQUIRED & $this->mode);
+    }
+
+    /**
+     * 是否可选
+     * @return bool 类型是 self::VALUE_OPTIONAL 的时候返回true,其他均返回false
+     */
+    public function isValueOptional()
+    {
+        return self::VALUE_OPTIONAL === (self::VALUE_OPTIONAL & $this->mode);
+    }
+
+    /**
+     * 选项值是否接受数组
+     * @return bool 类型是 self::VALUE_IS_ARRAY 的时候返回true,其他均返回false
+     */
+    public function isArray()
+    {
+        return self::VALUE_IS_ARRAY === (self::VALUE_IS_ARRAY & $this->mode);
+    }
+
+    /**
+     * 设置默认值
+     * @param mixed $default 默认值
+     * @throws \LogicException
+     */
+    public function setDefault($default = null)
+    {
+        if (self::VALUE_NONE === (self::VALUE_NONE & $this->mode) && null !== $default) {
+            throw new \LogicException('Cannot set a default value when using InputOption::VALUE_NONE mode.');
+        }
+
+        if ($this->isArray()) {
+            if (null === $default) {
+                $default = [];
+            } elseif (!is_array($default)) {
+                throw new \LogicException('A default value for an array option must be an array.');
+            }
+        }
+
+        $this->default = $this->acceptValue() ? $default : false;
+    }
+
+    /**
+     * 获取默认值
+     * @return mixed
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * 获取描述文字
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->description;
+    }
+
+    /**
+     * 检查所给选项是否是当前这个
+     * @param Option $option
+     * @return bool
+     */
+    public function equals(Option $option)
+    {
+        return $option->getName() === $this->getName()
+        && $option->getShortcut() === $this->getShortcut()
+        && $option->getDefault() === $this->getDefault()
+        && $option->isArray() === $this->isArray()
+        && $option->isValueRequired() === $this->isValueRequired()
+        && $option->isValueOptional() === $this->isValueOptional();
+    }
+}
diff --git a/thinkphp/library/think/console/output/Ask.php b/thinkphp/library/think/console/output/Ask.php
new file mode 100644
index 0000000000000000000000000000000000000000..3933eb296b33364547da562fdecb48974df7181d
--- /dev/null
+++ b/thinkphp/library/think/console/output/Ask.php
@@ -0,0 +1,340 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output;
+
+use think\console\Input;
+use think\console\Output;
+use think\console\output\question\Choice;
+use think\console\output\question\Confirmation;
+
+class Ask
+{
+    private static $stty;
+
+    private static $shell;
+
+    /** @var  Input */
+    protected $input;
+
+    /** @var  Output */
+    protected $output;
+
+    /** @var  Question */
+    protected $question;
+
+    public function __construct(Input $input, Output $output, Question $question)
+    {
+        $this->input    = $input;
+        $this->output   = $output;
+        $this->question = $question;
+    }
+
+    public function run()
+    {
+        if (!$this->input->isInteractive()) {
+            return $this->question->getDefault();
+        }
+
+        if (!$this->question->getValidator()) {
+            return $this->doAsk();
+        }
+
+        $that = $this;
+
+        $interviewer = function () use ($that) {
+            return $that->doAsk();
+        };
+
+        return $this->validateAttempts($interviewer);
+    }
+
+    protected function doAsk()
+    {
+        $this->writePrompt();
+
+        $inputStream  = STDIN;
+        $autocomplete = $this->question->getAutocompleterValues();
+
+        if (null === $autocomplete || !$this->hasSttyAvailable()) {
+            $ret = false;
+            if ($this->question->isHidden()) {
+                try {
+                    $ret = trim($this->getHiddenResponse($inputStream));
+                } catch (\RuntimeException $e) {
+                    if (!$this->question->isHiddenFallback()) {
+                        throw $e;
+                    }
+                }
+            }
+
+            if (false === $ret) {
+                $ret = fgets($inputStream, 4096);
+                if (false === $ret) {
+                    throw new \RuntimeException('Aborted');
+                }
+                $ret = trim($ret);
+            }
+        } else {
+            $ret = trim($this->autocomplete($inputStream));
+        }
+
+        $ret = strlen($ret) > 0 ? $ret : $this->question->getDefault();
+
+        if ($normalizer = $this->question->getNormalizer()) {
+            return $normalizer($ret);
+        }
+
+        return $ret;
+    }
+
+    private function autocomplete($inputStream)
+    {
+        $autocomplete = $this->question->getAutocompleterValues();
+        $ret          = '';
+
+        $i          = 0;
+        $ofs        = -1;
+        $matches    = $autocomplete;
+        $numMatches = count($matches);
+
+        $sttyMode = shell_exec('stty -g');
+
+        shell_exec('stty -icanon -echo');
+
+        while (!feof($inputStream)) {
+            $c = fread($inputStream, 1);
+
+            if ("\177" === $c) {
+                if (0 === $numMatches && 0 !== $i) {
+                    --$i;
+                    $this->output->write("\033[1D");
+                }
+
+                if ($i === 0) {
+                    $ofs        = -1;
+                    $matches    = $autocomplete;
+                    $numMatches = count($matches);
+                } else {
+                    $numMatches = 0;
+                }
+
+                $ret = substr($ret, 0, $i);
+            } elseif ("\033" === $c) {
+                $c .= fread($inputStream, 2);
+
+                if (isset($c[2]) && ('A' === $c[2] || 'B' === $c[2])) {
+                    if ('A' === $c[2] && -1 === $ofs) {
+                        $ofs = 0;
+                    }
+
+                    if (0 === $numMatches) {
+                        continue;
+                    }
+
+                    $ofs += ('A' === $c[2]) ? -1 : 1;
+                    $ofs = ($numMatches + $ofs) % $numMatches;
+                }
+            } elseif (ord($c) < 32) {
+                if ("\t" === $c || "\n" === $c) {
+                    if ($numMatches > 0 && -1 !== $ofs) {
+                        $ret = $matches[$ofs];
+                        $this->output->write(substr($ret, $i));
+                        $i = strlen($ret);
+                    }
+
+                    if ("\n" === $c) {
+                        $this->output->write($c);
+                        break;
+                    }
+
+                    $numMatches = 0;
+                }
+
+                continue;
+            } else {
+                $this->output->write($c);
+                $ret .= $c;
+                ++$i;
+
+                $numMatches = 0;
+                $ofs        = 0;
+
+                foreach ($autocomplete as $value) {
+                    if (0 === strpos($value, $ret) && $i !== strlen($value)) {
+                        $matches[$numMatches++] = $value;
+                    }
+                }
+            }
+
+            $this->output->write("\033[K");
+
+            if ($numMatches > 0 && -1 !== $ofs) {
+                $this->output->write("\0337");
+                $this->output->highlight(substr($matches[$ofs], $i));
+                $this->output->write("\0338");
+            }
+        }
+
+        shell_exec(sprintf('stty %s', $sttyMode));
+
+        return $ret;
+    }
+
+    protected function getHiddenResponse($inputStream)
+    {
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            $exe = __DIR__ . '/../bin/hiddeninput.exe';
+
+            $value = rtrim(shell_exec($exe));
+            $this->output->writeln('');
+
+            if (isset($tmpExe)) {
+                unlink($tmpExe);
+            }
+
+            return $value;
+        }
+
+        if ($this->hasSttyAvailable()) {
+            $sttyMode = shell_exec('stty -g');
+
+            shell_exec('stty -echo');
+            $value = fgets($inputStream, 4096);
+            shell_exec(sprintf('stty %s', $sttyMode));
+
+            if (false === $value) {
+                throw new \RuntimeException('Aborted');
+            }
+
+            $value = trim($value);
+            $this->output->writeln('');
+
+            return $value;
+        }
+
+        if (false !== $shell = $this->getShell()) {
+            $readCmd = $shell === 'csh' ? 'set mypassword = $<' : 'read -r mypassword';
+            $command = sprintf("/usr/bin/env %s -c 'stty -echo; %s; stty echo; echo \$mypassword'", $shell, $readCmd);
+            $value   = rtrim(shell_exec($command));
+            $this->output->writeln('');
+
+            return $value;
+        }
+
+        throw new \RuntimeException('Unable to hide the response.');
+    }
+
+    protected function validateAttempts($interviewer)
+    {
+        /** @var \Exception $error */
+        $error    = null;
+        $attempts = $this->question->getMaxAttempts();
+        while (null === $attempts || $attempts--) {
+            if (null !== $error) {
+                $this->output->error($error->getMessage());
+            }
+
+            try {
+                return call_user_func($this->question->getValidator(), $interviewer());
+            } catch (\Exception $error) {
+            }
+        }
+
+        throw $error;
+    }
+
+    /**
+     * 显示问题的提示信息
+     */
+    protected function writePrompt()
+    {
+        $text    = $this->question->getQuestion();
+        $default = $this->question->getDefault();
+
+        switch (true) {
+            case null === $default:
+                $text = sprintf(' <info>%s</info>:', $text);
+
+                break;
+
+            case $this->question instanceof Confirmation:
+                $text = sprintf(' <info>%s (yes/no)</info> [<comment>%s</comment>]:', $text, $default ? 'yes' : 'no');
+
+                break;
+
+            case $this->question instanceof Choice && $this->question->isMultiselect():
+                $choices = $this->question->getChoices();
+                $default = explode(',', $default);
+
+                foreach ($default as $key => $value) {
+                    $default[$key] = $choices[trim($value)];
+                }
+
+                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, implode(', ', $default));
+
+                break;
+
+            case $this->question instanceof Choice:
+                $choices = $this->question->getChoices();
+                $text    = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, $choices[$default]);
+
+                break;
+
+            default:
+                $text = sprintf(' <info>%s</info> [<comment>%s</comment>]:', $text, $default);
+        }
+
+        $this->output->writeln($text);
+
+        if ($this->question instanceof Choice) {
+            $width = max(array_map('strlen', array_keys($this->question->getChoices())));
+
+            foreach ($this->question->getChoices() as $key => $value) {
+                $this->output->writeln(sprintf("  [<comment>%-${width}s</comment>] %s", $key, $value));
+            }
+        }
+
+        $this->output->write(' > ');
+    }
+
+    private function getShell()
+    {
+        if (null !== self::$shell) {
+            return self::$shell;
+        }
+
+        self::$shell = false;
+
+        if (file_exists('/usr/bin/env')) {
+            $test = "/usr/bin/env %s -c 'echo OK' 2> /dev/null";
+            foreach (['bash', 'zsh', 'ksh', 'csh'] as $sh) {
+                if ('OK' === rtrim(shell_exec(sprintf($test, $sh)))) {
+                    self::$shell = $sh;
+                    break;
+                }
+            }
+        }
+
+        return self::$shell;
+    }
+
+    private function hasSttyAvailable()
+    {
+        if (null !== self::$stty) {
+            return self::$stty;
+        }
+
+        exec('stty 2>&1', $output, $exitcode);
+
+        return self::$stty = $exitcode === 0;
+    }
+}
diff --git a/thinkphp/library/think/console/output/Descriptor.php b/thinkphp/library/think/console/output/Descriptor.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d98d53c78437bae6d8a888242d6cd83cd9b3859
--- /dev/null
+++ b/thinkphp/library/think/console/output/Descriptor.php
@@ -0,0 +1,319 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output;
+
+use think\Console;
+use think\console\Command;
+use think\console\input\Argument as InputArgument;
+use think\console\input\Definition as InputDefinition;
+use think\console\input\Option as InputOption;
+use think\console\Output;
+use think\console\output\descriptor\Console as ConsoleDescription;
+
+class Descriptor
+{
+
+    /**
+     * @var Output
+     */
+    protected $output;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function describe(Output $output, $object, array $options = [])
+    {
+        $this->output = $output;
+
+        switch (true) {
+            case $object instanceof InputArgument:
+                $this->describeInputArgument($object, $options);
+                break;
+            case $object instanceof InputOption:
+                $this->describeInputOption($object, $options);
+                break;
+            case $object instanceof InputDefinition:
+                $this->describeInputDefinition($object, $options);
+                break;
+            case $object instanceof Command:
+                $this->describeCommand($object, $options);
+                break;
+            case $object instanceof Console:
+                $this->describeConsole($object, $options);
+                break;
+            default:
+                throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_class($object)));
+        }
+    }
+
+    /**
+     * 输出内容
+     * @param string $content
+     * @param bool   $decorated
+     */
+    protected function write($content, $decorated = false)
+    {
+        $this->output->write($content, false, $decorated ? Output::OUTPUT_NORMAL : Output::OUTPUT_RAW);
+    }
+
+    /**
+     * 描述参数
+     * @param InputArgument $argument
+     * @param array         $options
+     * @return string|mixed
+     */
+    protected function describeInputArgument(InputArgument $argument, array $options = [])
+    {
+        if (null !== $argument->getDefault()
+            && (!is_array($argument->getDefault())
+                || count($argument->getDefault()))
+        ) {
+            $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($argument->getDefault()));
+        } else {
+            $default = '';
+        }
+
+        $totalWidth   = isset($options['total_width']) ? $options['total_width'] : strlen($argument->getName());
+        $spacingWidth = $totalWidth - strlen($argument->getName()) + 2;
+
+        $this->writeText(sprintf("  <info>%s</info>%s%s%s", $argument->getName(), str_repeat(' ', $spacingWidth), // + 17 = 2 spaces + <info> + </info> + 2 spaces
+            preg_replace('/\s*\R\s*/', PHP_EOL . str_repeat(' ', $totalWidth + 17), $argument->getDescription()), $default), $options);
+    }
+
+    /**
+     * 描述选项
+     * @param InputOption $option
+     * @param array       $options
+     * @return string|mixed
+     */
+    protected function describeInputOption(InputOption $option, array $options = [])
+    {
+        if ($option->acceptValue() && null !== $option->getDefault()
+            && (!is_array($option->getDefault())
+                || count($option->getDefault()))
+        ) {
+            $default = sprintf('<comment> [default: %s]</comment>', $this->formatDefaultValue($option->getDefault()));
+        } else {
+            $default = '';
+        }
+
+        $value = '';
+        if ($option->acceptValue()) {
+            $value = '=' . strtoupper($option->getName());
+
+            if ($option->isValueOptional()) {
+                $value = '[' . $value . ']';
+            }
+        }
+
+        $totalWidth = isset($options['total_width']) ? $options['total_width'] : $this->calculateTotalWidthForOptions([$option]);
+        $synopsis   = sprintf('%s%s', $option->getShortcut() ? sprintf('-%s, ', $option->getShortcut()) : '    ', sprintf('--%s%s', $option->getName(), $value));
+
+        $spacingWidth = $totalWidth - strlen($synopsis) + 2;
+
+        $this->writeText(sprintf("  <info>%s</info>%s%s%s%s", $synopsis, str_repeat(' ', $spacingWidth), // + 17 = 2 spaces + <info> + </info> + 2 spaces
+            preg_replace('/\s*\R\s*/', "\n" . str_repeat(' ', $totalWidth + 17), $option->getDescription()), $default, $option->isArray() ? '<comment> (multiple values allowed)</comment>' : ''), $options);
+    }
+
+    /**
+     * 描述输入
+     * @param InputDefinition $definition
+     * @param array           $options
+     * @return string|mixed
+     */
+    protected function describeInputDefinition(InputDefinition $definition, array $options = [])
+    {
+        $totalWidth = $this->calculateTotalWidthForOptions($definition->getOptions());
+        foreach ($definition->getArguments() as $argument) {
+            $totalWidth = max($totalWidth, strlen($argument->getName()));
+        }
+
+        if ($definition->getArguments()) {
+            $this->writeText('<comment>Arguments:</comment>', $options);
+            $this->writeText("\n");
+            foreach ($definition->getArguments() as $argument) {
+                $this->describeInputArgument($argument, array_merge($options, ['total_width' => $totalWidth]));
+                $this->writeText("\n");
+            }
+        }
+
+        if ($definition->getArguments() && $definition->getOptions()) {
+            $this->writeText("\n");
+        }
+
+        if ($definition->getOptions()) {
+            $laterOptions = [];
+
+            $this->writeText('<comment>Options:</comment>', $options);
+            foreach ($definition->getOptions() as $option) {
+                if (strlen($option->getShortcut()) > 1) {
+                    $laterOptions[] = $option;
+                    continue;
+                }
+                $this->writeText("\n");
+                $this->describeInputOption($option, array_merge($options, ['total_width' => $totalWidth]));
+            }
+            foreach ($laterOptions as $option) {
+                $this->writeText("\n");
+                $this->describeInputOption($option, array_merge($options, ['total_width' => $totalWidth]));
+            }
+        }
+    }
+
+    /**
+     * 描述指令
+     * @param Command $command
+     * @param array   $options
+     * @return string|mixed
+     */
+    protected function describeCommand(Command $command, array $options = [])
+    {
+        $command->getSynopsis(true);
+        $command->getSynopsis(false);
+        $command->mergeConsoleDefinition(false);
+
+        $this->writeText('<comment>Usage:</comment>', $options);
+        foreach (array_merge([$command->getSynopsis(true)], $command->getAliases(), $command->getUsages()) as $usage) {
+            $this->writeText("\n");
+            $this->writeText('  ' . $usage, $options);
+        }
+        $this->writeText("\n");
+
+        $definition = $command->getNativeDefinition();
+        if ($definition->getOptions() || $definition->getArguments()) {
+            $this->writeText("\n");
+            $this->describeInputDefinition($definition, $options);
+            $this->writeText("\n");
+        }
+
+        if ($help = $command->getProcessedHelp()) {
+            $this->writeText("\n");
+            $this->writeText('<comment>Help:</comment>', $options);
+            $this->writeText("\n");
+            $this->writeText(' ' . str_replace("\n", "\n ", $help), $options);
+            $this->writeText("\n");
+        }
+    }
+
+    /**
+     * 描述控制台
+     * @param Console $console
+     * @param array   $options
+     * @return string|mixed
+     */
+    protected function describeConsole(Console $console, array $options = [])
+    {
+        $describedNamespace = isset($options['namespace']) ? $options['namespace'] : null;
+        $description        = new ConsoleDescription($console, $describedNamespace);
+
+        if (isset($options['raw_text']) && $options['raw_text']) {
+            $width = $this->getColumnWidth($description->getCommands());
+
+            foreach ($description->getCommands() as $command) {
+                $this->writeText(sprintf("%-${width}s %s", $command->getName(), $command->getDescription()), $options);
+                $this->writeText("\n");
+            }
+        } else {
+            if ('' != $help = $console->getHelp()) {
+                $this->writeText("$help\n\n", $options);
+            }
+
+            $this->writeText("<comment>Usage:</comment>\n", $options);
+            $this->writeText("  command [options] [arguments]\n\n", $options);
+
+            $this->describeInputDefinition(new InputDefinition($console->getDefinition()->getOptions()), $options);
+
+            $this->writeText("\n");
+            $this->writeText("\n");
+
+            $width = $this->getColumnWidth($description->getCommands());
+
+            if ($describedNamespace) {
+                $this->writeText(sprintf('<comment>Available commands for the "%s" namespace:</comment>', $describedNamespace), $options);
+            } else {
+                $this->writeText('<comment>Available commands:</comment>', $options);
+            }
+
+            // add commands by namespace
+            foreach ($description->getNamespaces() as $namespace) {
+                if (!$describedNamespace && ConsoleDescription::GLOBAL_NAMESPACE !== $namespace['id']) {
+                    $this->writeText("\n");
+                    $this->writeText(' <comment>' . $namespace['id'] . '</comment>', $options);
+                }
+
+                foreach ($namespace['commands'] as $name) {
+                    $this->writeText("\n");
+                    $spacingWidth = $width - strlen($name);
+                    $this->writeText(sprintf("  <info>%s</info>%s%s", $name, str_repeat(' ', $spacingWidth), $description->getCommand($name)
+                            ->getDescription()), $options);
+                }
+            }
+
+            $this->writeText("\n");
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    private function writeText($content, array $options = [])
+    {
+        $this->write(isset($options['raw_text'])
+            && $options['raw_text'] ? strip_tags($content) : $content, isset($options['raw_output']) ? !$options['raw_output'] : true);
+    }
+
+    /**
+     * 格式化
+     * @param mixed $default
+     * @return string
+     */
+    private function formatDefaultValue($default)
+    {
+        return json_encode($default, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+    }
+
+    /**
+     * @param Command[] $commands
+     * @return int
+     */
+    private function getColumnWidth(array $commands)
+    {
+        $width = 0;
+        foreach ($commands as $command) {
+            $width = strlen($command->getName()) > $width ? strlen($command->getName()) : $width;
+        }
+
+        return $width + 2;
+    }
+
+    /**
+     * @param InputOption[] $options
+     * @return int
+     */
+    private function calculateTotalWidthForOptions($options)
+    {
+        $totalWidth = 0;
+        foreach ($options as $option) {
+            $nameLength = 4 + strlen($option->getName()) + 2; // - + shortcut + , + whitespace + name + --
+
+            if ($option->acceptValue()) {
+                $valueLength = 1 + strlen($option->getName()); // = + value
+                $valueLength += $option->isValueOptional() ? 2 : 0; // [ + ]
+
+                $nameLength += $valueLength;
+            }
+            $totalWidth = max($totalWidth, $nameLength);
+        }
+
+        return $totalWidth;
+    }
+}
diff --git a/thinkphp/library/think/console/output/Formatter.php b/thinkphp/library/think/console/output/Formatter.php
new file mode 100644
index 0000000000000000000000000000000000000000..f8bee5527c4299dc1a0a7d7880d653cabb234f92
--- /dev/null
+++ b/thinkphp/library/think/console/output/Formatter.php
@@ -0,0 +1,198 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+namespace think\console\output;
+
+use think\console\output\formatter\Stack as StyleStack;
+use think\console\output\formatter\Style;
+
+class Formatter
+{
+
+    private $decorated = false;
+    private $styles    = [];
+    private $styleStack;
+
+    /**
+     * 转义
+     * @param string $text
+     * @return string
+     */
+    public static function escape($text)
+    {
+        return preg_replace('/([^\\\\]?)</is', '$1\\<', $text);
+    }
+
+    /**
+     * 初始化命令行输出格式
+     */
+    public function __construct()
+    {
+        $this->setStyle('error', new Style('white', 'red'));
+        $this->setStyle('info', new Style('green'));
+        $this->setStyle('comment', new Style('yellow'));
+        $this->setStyle('question', new Style('black', 'cyan'));
+        $this->setStyle('highlight', new Style('red'));
+        $this->setStyle('warning', new Style('black', 'yellow'));
+
+        $this->styleStack = new StyleStack();
+    }
+
+    /**
+     * 设置外观标识
+     * @param bool $decorated 是否美化文字
+     */
+    public function setDecorated($decorated)
+    {
+        $this->decorated = (bool) $decorated;
+    }
+
+    /**
+     * 获取外观标识
+     * @return bool
+     */
+    public function isDecorated()
+    {
+        return $this->decorated;
+    }
+
+    /**
+     * 添加一个新样式
+     * @param string $name  样式名
+     * @param Style  $style 样式实例
+     */
+    public function setStyle($name, Style $style)
+    {
+        $this->styles[strtolower($name)] = $style;
+    }
+
+    /**
+     * 是否有这个样式
+     * @param string $name
+     * @return bool
+     */
+    public function hasStyle($name)
+    {
+        return isset($this->styles[strtolower($name)]);
+    }
+
+    /**
+     * 获取样式
+     * @param string $name
+     * @return Style
+     * @throws \InvalidArgumentException
+     */
+    public function getStyle($name)
+    {
+        if (!$this->hasStyle($name)) {
+            throw new \InvalidArgumentException(sprintf('Undefined style: %s', $name));
+        }
+
+        return $this->styles[strtolower($name)];
+    }
+
+    /**
+     * 使用所给的样式格式化文字
+     * @param string $message 文字
+     * @return string
+     */
+    public function format($message)
+    {
+        $offset   = 0;
+        $output   = '';
+        $tagRegex = '[a-z][a-z0-9_=;-]*';
+        preg_match_all("#<(($tagRegex) | /($tagRegex)?)>#isx", $message, $matches, PREG_OFFSET_CAPTURE);
+        foreach ($matches[0] as $i => $match) {
+            $pos  = $match[1];
+            $text = $match[0];
+
+            if (0 != $pos && '\\' == $message[$pos - 1]) {
+                continue;
+            }
+
+            $output .= $this->applyCurrentStyle(substr($message, $offset, $pos - $offset));
+            $offset = $pos + strlen($text);
+
+            if ($open = '/' != $text[1]) {
+                $tag = $matches[1][$i][0];
+            } else {
+                $tag = isset($matches[3][$i][0]) ? $matches[3][$i][0] : '';
+            }
+
+            if (!$open && !$tag) {
+                // </>
+                $this->styleStack->pop();
+            } elseif (false === $style = $this->createStyleFromString(strtolower($tag))) {
+                $output .= $this->applyCurrentStyle($text);
+            } elseif ($open) {
+                $this->styleStack->push($style);
+            } else {
+                $this->styleStack->pop($style);
+            }
+        }
+
+        $output .= $this->applyCurrentStyle(substr($message, $offset));
+
+        return str_replace('\\<', '<', $output);
+    }
+
+    /**
+     * @return StyleStack
+     */
+    public function getStyleStack()
+    {
+        return $this->styleStack;
+    }
+
+    /**
+     * 根据字符串创建新的样式实例
+     * @param string $string
+     * @return Style|bool
+     */
+    private function createStyleFromString($string)
+    {
+        if (isset($this->styles[$string])) {
+            return $this->styles[$string];
+        }
+
+        if (!preg_match_all('/([^=]+)=([^;]+)(;|$)/', strtolower($string), $matches, PREG_SET_ORDER)) {
+            return false;
+        }
+
+        $style = new Style();
+        foreach ($matches as $match) {
+            array_shift($match);
+
+            if ('fg' == $match[0]) {
+                $style->setForeground($match[1]);
+            } elseif ('bg' == $match[0]) {
+                $style->setBackground($match[1]);
+            } else {
+                try {
+                    $style->setOption($match[1]);
+                } catch (\InvalidArgumentException $e) {
+                    return false;
+                }
+            }
+        }
+
+        return $style;
+    }
+
+    /**
+     * 从堆栈应用样式到文字
+     * @param string $text 文字
+     * @return string
+     */
+    private function applyCurrentStyle($text)
+    {
+        return $this->isDecorated() && strlen($text) > 0 ? $this->styleStack->getCurrent()->apply($text) : $text;
+    }
+}
diff --git a/thinkphp/library/think/console/output/Question.php b/thinkphp/library/think/console/output/Question.php
new file mode 100644
index 0000000000000000000000000000000000000000..03975f2748298d79c75fb63b443264240d6a7e26
--- /dev/null
+++ b/thinkphp/library/think/console/output/Question.php
@@ -0,0 +1,211 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output;
+
+class Question
+{
+
+    private $question;
+    private $attempts;
+    private $hidden         = false;
+    private $hiddenFallback = true;
+    private $autocompleterValues;
+    private $validator;
+    private $default;
+    private $normalizer;
+
+    /**
+     * 构造方法
+     * @param string $question 问题
+     * @param mixed  $default  默认答案
+     */
+    public function __construct($question, $default = null)
+    {
+        $this->question = $question;
+        $this->default  = $default;
+    }
+
+    /**
+     * 获取问题
+     * @return string
+     */
+    public function getQuestion()
+    {
+        return $this->question;
+    }
+
+    /**
+     * 获取默认答案
+     * @return mixed
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
+     * 是否隐藏答案
+     * @return bool
+     */
+    public function isHidden()
+    {
+        return $this->hidden;
+    }
+
+    /**
+     * 隐藏答案
+     * @param bool $hidden
+     * @return Question
+     */
+    public function setHidden($hidden)
+    {
+        if ($this->autocompleterValues) {
+            throw new \LogicException('A hidden question cannot use the autocompleter.');
+        }
+
+        $this->hidden = (bool) $hidden;
+
+        return $this;
+    }
+
+    /**
+     * 不能被隐藏是否撤销
+     * @return bool
+     */
+    public function isHiddenFallback()
+    {
+        return $this->hiddenFallback;
+    }
+
+    /**
+     * 设置不能被隐藏的时候的操作
+     * @param bool $fallback
+     * @return Question
+     */
+    public function setHiddenFallback($fallback)
+    {
+        $this->hiddenFallback = (bool) $fallback;
+
+        return $this;
+    }
+
+    /**
+     * 获取自动完成
+     * @return null|array|\Traversable
+     */
+    public function getAutocompleterValues()
+    {
+        return $this->autocompleterValues;
+    }
+
+    /**
+     * 设置自动完成的值
+     * @param null|array|\Traversable $values
+     * @return Question
+     * @throws \InvalidArgumentException
+     * @throws \LogicException
+     */
+    public function setAutocompleterValues($values)
+    {
+        if (is_array($values) && $this->isAssoc($values)) {
+            $values = array_merge(array_keys($values), array_values($values));
+        }
+
+        if (null !== $values && !is_array($values)) {
+            if (!$values instanceof \Traversable || $values instanceof \Countable) {
+                throw new \InvalidArgumentException('Autocompleter values can be either an array, `null` or an object implementing both `Countable` and `Traversable` interfaces.');
+            }
+        }
+
+        if ($this->hidden) {
+            throw new \LogicException('A hidden question cannot use the autocompleter.');
+        }
+
+        $this->autocompleterValues = $values;
+
+        return $this;
+    }
+
+    /**
+     * 设置答案的验证器
+     * @param null|callable $validator
+     * @return Question The current instance
+     */
+    public function setValidator($validator)
+    {
+        $this->validator = $validator;
+
+        return $this;
+    }
+
+    /**
+     * 获取验证器
+     * @return null|callable
+     */
+    public function getValidator()
+    {
+        return $this->validator;
+    }
+
+    /**
+     * 设置最大重试次数
+     * @param null|int $attempts
+     * @return Question
+     * @throws \InvalidArgumentException
+     */
+    public function setMaxAttempts($attempts)
+    {
+        if (null !== $attempts && $attempts < 1) {
+            throw new \InvalidArgumentException('Maximum number of attempts must be a positive value.');
+        }
+
+        $this->attempts = $attempts;
+
+        return $this;
+    }
+
+    /**
+     * 获取最大重试次数
+     * @return null|int
+     */
+    public function getMaxAttempts()
+    {
+        return $this->attempts;
+    }
+
+    /**
+     * 设置响应的回调
+     * @param string|\Closure $normalizer
+     * @return Question
+     */
+    public function setNormalizer($normalizer)
+    {
+        $this->normalizer = $normalizer;
+
+        return $this;
+    }
+
+    /**
+     * 获取响应回调
+     * The normalizer can ba a callable (a string), a closure or a class implementing __invoke.
+     * @return string|\Closure
+     */
+    public function getNormalizer()
+    {
+        return $this->normalizer;
+    }
+
+    protected function isAssoc($array)
+    {
+        return (bool) count(array_filter(array_keys($array), 'is_string'));
+    }
+}
diff --git a/thinkphp/library/think/console/output/descriptor/Console.php b/thinkphp/library/think/console/output/descriptor/Console.php
new file mode 100644
index 0000000000000000000000000000000000000000..4648b68e665ec9aa87512c8da4ff8461035ea8b8
--- /dev/null
+++ b/thinkphp/library/think/console/output/descriptor/Console.php
@@ -0,0 +1,149 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output\descriptor;
+
+use think\Console as ThinkConsole;
+use think\console\Command;
+
+class Console
+{
+
+    const GLOBAL_NAMESPACE = '_global';
+
+    /**
+     * @var ThinkConsole
+     */
+    private $console;
+
+    /**
+     * @var null|string
+     */
+    private $namespace;
+
+    /**
+     * @var array
+     */
+    private $namespaces;
+
+    /**
+     * @var Command[]
+     */
+    private $commands;
+
+    /**
+     * @var Command[]
+     */
+    private $aliases;
+
+    /**
+     * 构造方法
+     * @param ThinkConsole $console
+     * @param string|null  $namespace
+     */
+    public function __construct(ThinkConsole $console, $namespace = null)
+    {
+        $this->console   = $console;
+        $this->namespace = $namespace;
+    }
+
+    /**
+     * @return array
+     */
+    public function getNamespaces()
+    {
+        if (null === $this->namespaces) {
+            $this->inspectConsole();
+        }
+
+        return $this->namespaces;
+    }
+
+    /**
+     * @return Command[]
+     */
+    public function getCommands()
+    {
+        if (null === $this->commands) {
+            $this->inspectConsole();
+        }
+
+        return $this->commands;
+    }
+
+    /**
+     * @param string $name
+     * @return Command
+     * @throws \InvalidArgumentException
+     */
+    public function getCommand($name)
+    {
+        if (!isset($this->commands[$name]) && !isset($this->aliases[$name])) {
+            throw new \InvalidArgumentException(sprintf('Command %s does not exist.', $name));
+        }
+
+        return isset($this->commands[$name]) ? $this->commands[$name] : $this->aliases[$name];
+    }
+
+    private function inspectConsole()
+    {
+        $this->commands   = [];
+        $this->namespaces = [];
+
+        $all = $this->console->all($this->namespace ? $this->console->findNamespace($this->namespace) : null);
+        foreach ($this->sortCommands($all) as $namespace => $commands) {
+            $names = [];
+
+            /** @var Command $command */
+            foreach ($commands as $name => $command) {
+                if (!$command->getName()) {
+                    continue;
+                }
+
+                if ($command->getName() === $name) {
+                    $this->commands[$name] = $command;
+                } else {
+                    $this->aliases[$name] = $command;
+                }
+
+                $names[] = $name;
+            }
+
+            $this->namespaces[$namespace] = ['id' => $namespace, 'commands' => $names];
+        }
+    }
+
+    /**
+     * @param array $commands
+     * @return array
+     */
+    private function sortCommands(array $commands)
+    {
+        $namespacedCommands = [];
+        foreach ($commands as $name => $command) {
+            $key = $this->console->extractNamespace($name, 1);
+            if (!$key) {
+                $key = self::GLOBAL_NAMESPACE;
+            }
+
+            $namespacedCommands[$key][$name] = $command;
+        }
+        ksort($namespacedCommands);
+
+        foreach ($namespacedCommands as &$commandsSet) {
+            ksort($commandsSet);
+        }
+        // unset reference to keep scope clear
+        unset($commandsSet);
+
+        return $namespacedCommands;
+    }
+}
diff --git a/thinkphp/library/think/console/output/driver/Buffer.php b/thinkphp/library/think/console/output/driver/Buffer.php
new file mode 100644
index 0000000000000000000000000000000000000000..c77a2ec4ba20dfbc27aefba0c45fc40784cbfba7
--- /dev/null
+++ b/thinkphp/library/think/console/output/driver/Buffer.php
@@ -0,0 +1,52 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output\driver;
+
+use think\console\Output;
+
+class Buffer
+{
+    /**
+     * @var string
+     */
+    private $buffer = '';
+
+    public function __construct(Output $output)
+    {
+        // do nothing
+    }
+
+    public function fetch()
+    {
+        $content      = $this->buffer;
+        $this->buffer = '';
+        return $content;
+    }
+
+    public function write($messages, $newline = false, $options = Output::OUTPUT_NORMAL)
+    {
+        $messages = (array) $messages;
+
+        foreach ($messages as $message) {
+            $this->buffer .= $message;
+        }
+        if ($newline) {
+            $this->buffer .= "\n";
+        }
+    }
+
+    public function renderException(\Exception $e)
+    {
+        // do nothing
+    }
+
+}
diff --git a/thinkphp/library/think/console/output/driver/Console.php b/thinkphp/library/think/console/output/driver/Console.php
new file mode 100644
index 0000000000000000000000000000000000000000..e041b5250dfc458c6fa6842db2d800e3a5218afc
--- /dev/null
+++ b/thinkphp/library/think/console/output/driver/Console.php
@@ -0,0 +1,368 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output\driver;
+
+use think\console\Output;
+use think\console\output\Formatter;
+
+class Console
+{
+
+    /** @var  Resource */
+    private $stdout;
+
+    /** @var  Formatter */
+    private $formatter;
+
+    private $terminalDimensions;
+
+    /** @var  Output */
+    private $output;
+
+    public function __construct(Output $output)
+    {
+        $this->output    = $output;
+        $this->formatter = new Formatter();
+        $this->stdout    = $this->openOutputStream();
+        $decorated       = $this->hasColorSupport($this->stdout);
+        $this->formatter->setDecorated($decorated);
+    }
+
+    public function setDecorated($decorated)
+    {
+        $this->formatter->setDecorated($decorated);
+    }
+
+    public function write($messages, $newline = false, $type = Output::OUTPUT_NORMAL, $stream = null)
+    {
+        if (Output::VERBOSITY_QUIET === $this->output->getVerbosity()) {
+            return;
+        }
+
+        $messages = (array) $messages;
+
+        foreach ($messages as $message) {
+            switch ($type) {
+                case Output::OUTPUT_NORMAL:
+                    $message = $this->formatter->format($message);
+                    break;
+                case Output::OUTPUT_RAW:
+                    break;
+                case Output::OUTPUT_PLAIN:
+                    $message = strip_tags($this->formatter->format($message));
+                    break;
+                default:
+                    throw new \InvalidArgumentException(sprintf('Unknown output type given (%s)', $type));
+            }
+
+            $this->doWrite($message, $newline, $stream);
+        }
+    }
+
+    public function renderException(\Exception $e)
+    {
+        $stderr    = $this->openErrorStream();
+        $decorated = $this->hasColorSupport($stderr);
+        $this->formatter->setDecorated($decorated);
+
+        do {
+            $title = sprintf('  [%s]  ', get_class($e));
+
+            $len = $this->stringWidth($title);
+
+            $width = $this->getTerminalWidth() ? $this->getTerminalWidth() - 1 : PHP_INT_MAX;
+
+            if (defined('HHVM_VERSION') && $width > 1 << 31) {
+                $width = 1 << 31;
+            }
+            $lines = [];
+            foreach (preg_split('/\r?\n/', $e->getMessage()) as $line) {
+                foreach ($this->splitStringByWidth($line, $width - 4) as $line) {
+
+                    $lineLength = $this->stringWidth(preg_replace('/\[[^m]*m/', '', $line)) + 4;
+                    $lines[]    = [$line, $lineLength];
+
+                    $len = max($lineLength, $len);
+                }
+            }
+
+            $messages   = ['', ''];
+            $messages[] = $emptyLine = sprintf('<error>%s</error>', str_repeat(' ', $len));
+            $messages[] = sprintf('<error>%s%s</error>', $title, str_repeat(' ', max(0, $len - $this->stringWidth($title))));
+            foreach ($lines as $line) {
+                $messages[] = sprintf('<error>  %s  %s</error>', $line[0], str_repeat(' ', $len - $line[1]));
+            }
+            $messages[] = $emptyLine;
+            $messages[] = '';
+            $messages[] = '';
+
+            $this->write($messages, true, Output::OUTPUT_NORMAL, $stderr);
+
+            if (Output::VERBOSITY_VERBOSE <= $this->output->getVerbosity()) {
+                $this->write('<comment>Exception trace:</comment>', true, Output::OUTPUT_NORMAL, $stderr);
+
+                // exception related properties
+                $trace = $e->getTrace();
+                array_unshift($trace, [
+                    'function' => '',
+                    'file'     => $e->getFile() !== null ? $e->getFile() : 'n/a',
+                    'line'     => $e->getLine() !== null ? $e->getLine() : 'n/a',
+                    'args'     => [],
+                ]);
+
+                for ($i = 0, $count = count($trace); $i < $count; ++$i) {
+                    $class    = isset($trace[$i]['class']) ? $trace[$i]['class'] : '';
+                    $type     = isset($trace[$i]['type']) ? $trace[$i]['type'] : '';
+                    $function = $trace[$i]['function'];
+                    $file     = isset($trace[$i]['file']) ? $trace[$i]['file'] : 'n/a';
+                    $line     = isset($trace[$i]['line']) ? $trace[$i]['line'] : 'n/a';
+
+                    $this->write(sprintf(' %s%s%s() at <info>%s:%s</info>', $class, $type, $function, $file, $line), true, Output::OUTPUT_NORMAL, $stderr);
+                }
+
+                $this->write('', true, Output::OUTPUT_NORMAL, $stderr);
+                $this->write('', true, Output::OUTPUT_NORMAL, $stderr);
+            }
+        } while ($e = $e->getPrevious());
+
+    }
+
+    /**
+     * 获取终端宽度
+     * @return int|null
+     */
+    protected function getTerminalWidth()
+    {
+        $dimensions = $this->getTerminalDimensions();
+
+        return $dimensions[0];
+    }
+
+    /**
+     * 获取终端高度
+     * @return int|null
+     */
+    protected function getTerminalHeight()
+    {
+        $dimensions = $this->getTerminalDimensions();
+
+        return $dimensions[1];
+    }
+
+    /**
+     * 获取当前终端的尺寸
+     * @return array
+     */
+    public function getTerminalDimensions()
+    {
+        if ($this->terminalDimensions) {
+            return $this->terminalDimensions;
+        }
+
+        if ('\\' === DIRECTORY_SEPARATOR) {
+            if (preg_match('/^(\d+)x\d+ \(\d+x(\d+)\)$/', trim(getenv('ANSICON')), $matches)) {
+                return [(int) $matches[1], (int) $matches[2]];
+            }
+            if (preg_match('/^(\d+)x(\d+)$/', $this->getMode(), $matches)) {
+                return [(int) $matches[1], (int) $matches[2]];
+            }
+        }
+
+        if ($sttyString = $this->getSttyColumns()) {
+            if (preg_match('/rows.(\d+);.columns.(\d+);/i', $sttyString, $matches)) {
+                return [(int) $matches[2], (int) $matches[1]];
+            }
+            if (preg_match('/;.(\d+).rows;.(\d+).columns/i', $sttyString, $matches)) {
+                return [(int) $matches[2], (int) $matches[1]];
+            }
+        }
+
+        return [null, null];
+    }
+
+    /**
+     * 获取stty列数
+     * @return string
+     */
+    private function getSttyColumns()
+    {
+        if (!function_exists('proc_open')) {
+            return;
+        }
+
+        $descriptorspec = [1 => ['pipe', 'w'], 2 => ['pipe', 'w']];
+        $process        = proc_open('stty -a | grep columns', $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
+        if (is_resource($process)) {
+            $info = stream_get_contents($pipes[1]);
+            fclose($pipes[1]);
+            fclose($pipes[2]);
+            proc_close($process);
+
+            return $info;
+        }
+        return;
+    }
+
+    /**
+     * 获取终端模式
+     * @return string <width>x<height> 或 null
+     */
+    private function getMode()
+    {
+        if (!function_exists('proc_open')) {
+            return;
+        }
+
+        $descriptorspec = [1 => ['pipe', 'w'], 2 => ['pipe', 'w']];
+        $process        = proc_open('mode CON', $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
+        if (is_resource($process)) {
+            $info = stream_get_contents($pipes[1]);
+            fclose($pipes[1]);
+            fclose($pipes[2]);
+            proc_close($process);
+
+            if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
+                return $matches[2] . 'x' . $matches[1];
+            }
+        }
+        return;
+    }
+
+    private function stringWidth($string)
+    {
+        if (!function_exists('mb_strwidth')) {
+            return strlen($string);
+        }
+
+        if (false === $encoding = mb_detect_encoding($string)) {
+            return strlen($string);
+        }
+
+        return mb_strwidth($string, $encoding);
+    }
+
+    private function splitStringByWidth($string, $width)
+    {
+        if (!function_exists('mb_strwidth')) {
+            return str_split($string, $width);
+        }
+
+        if (false === $encoding = mb_detect_encoding($string)) {
+            return str_split($string, $width);
+        }
+
+        $utf8String = mb_convert_encoding($string, 'utf8', $encoding);
+        $lines      = [];
+        $line       = '';
+        foreach (preg_split('//u', $utf8String) as $char) {
+            if (mb_strwidth($line . $char, 'utf8') <= $width) {
+                $line .= $char;
+                continue;
+            }
+            $lines[] = str_pad($line, $width);
+            $line    = $char;
+        }
+        if (strlen($line)) {
+            $lines[] = count($lines) ? str_pad($line, $width) : $line;
+        }
+
+        mb_convert_variables($encoding, 'utf8', $lines);
+
+        return $lines;
+    }
+
+    private function isRunningOS400()
+    {
+        $checks = [
+            function_exists('php_uname') ? php_uname('s') : '',
+            getenv('OSTYPE'),
+            PHP_OS,
+        ];
+        return false !== stripos(implode(';', $checks), 'OS400');
+    }
+
+    /**
+     * 当前环境是否支持写入控制台输出到stdout.
+     *
+     * @return bool
+     */
+    protected function hasStdoutSupport()
+    {
+        return false === $this->isRunningOS400();
+    }
+
+    /**
+     * 当前环境是否支持写入控制台输出到stderr.
+     *
+     * @return bool
+     */
+    protected function hasStderrSupport()
+    {
+        return false === $this->isRunningOS400();
+    }
+
+    /**
+     * @return resource
+     */
+    private function openOutputStream()
+    {
+        if (!$this->hasStdoutSupport()) {
+            return fopen('php://output', 'w');
+        }
+        return @fopen('php://stdout', 'w') ?: fopen('php://output', 'w');
+    }
+
+    /**
+     * @return resource
+     */
+    private function openErrorStream()
+    {
+        return fopen($this->hasStderrSupport() ? 'php://stderr' : 'php://output', 'w');
+    }
+
+    /**
+     * 将消息写入到输出。
+     * @param string $message 消息
+     * @param bool   $newline 是否另起一行
+     * @param null   $stream
+     */
+    protected function doWrite($message, $newline, $stream = null)
+    {
+        if (null === $stream) {
+            $stream = $this->stdout;
+        }
+        if (false === @fwrite($stream, $message . ($newline ? PHP_EOL : ''))) {
+            throw new \RuntimeException('Unable to write output.');
+        }
+
+        fflush($stream);
+    }
+
+    /**
+     * 是否支持着色
+     * @param $stream
+     * @return bool
+     */
+    protected function hasColorSupport($stream)
+    {
+        if (DIRECTORY_SEPARATOR === '\\') {
+            return
+            '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR . '.' . PHP_WINDOWS_VERSION_MINOR . '.' . PHP_WINDOWS_VERSION_BUILD
+            || false !== getenv('ANSICON')
+            || 'ON' === getenv('ConEmuANSI')
+            || 'xterm' === getenv('TERM');
+        }
+
+        return function_exists('posix_isatty') && @posix_isatty($stream);
+    }
+
+}
diff --git a/thinkphp/library/think/console/output/driver/Nothing.php b/thinkphp/library/think/console/output/driver/Nothing.php
new file mode 100644
index 0000000000000000000000000000000000000000..9a55f77798e8d53aa6288e2b698d65dc1ceeda46
--- /dev/null
+++ b/thinkphp/library/think/console/output/driver/Nothing.php
@@ -0,0 +1,33 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output\driver;
+
+use think\console\Output;
+
+class Nothing
+{
+
+    public function __construct(Output $output)
+    {
+        // do nothing
+    }
+
+    public function write($messages, $newline = false, $options = Output::OUTPUT_NORMAL)
+    {
+        // do nothing
+    }
+
+    public function renderException(\Exception $e)
+    {
+        // do nothing
+    }
+}
diff --git a/thinkphp/library/think/console/output/formatter/Stack.php b/thinkphp/library/think/console/output/formatter/Stack.php
new file mode 100644
index 0000000000000000000000000000000000000000..4864a3f298097403a4c2939dd20acefb79b700b2
--- /dev/null
+++ b/thinkphp/library/think/console/output/formatter/Stack.php
@@ -0,0 +1,116 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output\formatter;
+
+class Stack
+{
+
+    /**
+     * @var Style[]
+     */
+    private $styles;
+
+    /**
+     * @var Style
+     */
+    private $emptyStyle;
+
+    /**
+     * 构造方法
+     * @param Style|null $emptyStyle
+     */
+    public function __construct(Style $emptyStyle = null)
+    {
+        $this->emptyStyle = $emptyStyle ?: new Style();
+        $this->reset();
+    }
+
+    /**
+     * 重置堆栈
+     */
+    public function reset()
+    {
+        $this->styles = [];
+    }
+
+    /**
+     * 推一个样式进入堆栈
+     * @param Style $style
+     */
+    public function push(Style $style)
+    {
+        $this->styles[] = $style;
+    }
+
+    /**
+     * 从堆栈中弹出一个样式
+     * @param Style|null $style
+     * @return Style
+     * @throws \InvalidArgumentException
+     */
+    public function pop(Style $style = null)
+    {
+        if (empty($this->styles)) {
+            return $this->emptyStyle;
+        }
+
+        if (null === $style) {
+            return array_pop($this->styles);
+        }
+
+        /**
+         * @var int   $index
+         * @var Style $stackedStyle
+         */
+        foreach (array_reverse($this->styles, true) as $index => $stackedStyle) {
+            if ($style->apply('') === $stackedStyle->apply('')) {
+                $this->styles = array_slice($this->styles, 0, $index);
+
+                return $stackedStyle;
+            }
+        }
+
+        throw new \InvalidArgumentException('Incorrectly nested style tag found.');
+    }
+
+    /**
+     * 计算堆栈的当前样式。
+     * @return Style
+     */
+    public function getCurrent()
+    {
+        if (empty($this->styles)) {
+            return $this->emptyStyle;
+        }
+
+        return $this->styles[count($this->styles) - 1];
+    }
+
+    /**
+     * @param Style $emptyStyle
+     * @return Stack
+     */
+    public function setEmptyStyle(Style $emptyStyle)
+    {
+        $this->emptyStyle = $emptyStyle;
+
+        return $this;
+    }
+
+    /**
+     * @return Style
+     */
+    public function getEmptyStyle()
+    {
+        return $this->emptyStyle;
+    }
+}
diff --git a/thinkphp/library/think/console/output/formatter/Style.php b/thinkphp/library/think/console/output/formatter/Style.php
new file mode 100644
index 0000000000000000000000000000000000000000..d9b0999870632e1011c149e0d0986c353abf1887
--- /dev/null
+++ b/thinkphp/library/think/console/output/formatter/Style.php
@@ -0,0 +1,189 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output\formatter;
+
+class Style
+{
+
+    private static $availableForegroundColors = [
+        'black'   => ['set' => 30, 'unset' => 39],
+        'red'     => ['set' => 31, 'unset' => 39],
+        'green'   => ['set' => 32, 'unset' => 39],
+        'yellow'  => ['set' => 33, 'unset' => 39],
+        'blue'    => ['set' => 34, 'unset' => 39],
+        'magenta' => ['set' => 35, 'unset' => 39],
+        'cyan'    => ['set' => 36, 'unset' => 39],
+        'white'   => ['set' => 37, 'unset' => 39],
+    ];
+    private static $availableBackgroundColors = [
+        'black'   => ['set' => 40, 'unset' => 49],
+        'red'     => ['set' => 41, 'unset' => 49],
+        'green'   => ['set' => 42, 'unset' => 49],
+        'yellow'  => ['set' => 43, 'unset' => 49],
+        'blue'    => ['set' => 44, 'unset' => 49],
+        'magenta' => ['set' => 45, 'unset' => 49],
+        'cyan'    => ['set' => 46, 'unset' => 49],
+        'white'   => ['set' => 47, 'unset' => 49],
+    ];
+    private static $availableOptions = [
+        'bold'       => ['set' => 1, 'unset' => 22],
+        'underscore' => ['set' => 4, 'unset' => 24],
+        'blink'      => ['set' => 5, 'unset' => 25],
+        'reverse'    => ['set' => 7, 'unset' => 27],
+        'conceal'    => ['set' => 8, 'unset' => 28],
+    ];
+
+    private $foreground;
+    private $background;
+    private $options = [];
+
+    /**
+     * 初始化输出的样式
+     * @param string|null $foreground 字体颜色
+     * @param string|null $background 背景色
+     * @param array       $options    格式
+     * @api
+     */
+    public function __construct($foreground = null, $background = null, array $options = [])
+    {
+        if (null !== $foreground) {
+            $this->setForeground($foreground);
+        }
+        if (null !== $background) {
+            $this->setBackground($background);
+        }
+        if (count($options)) {
+            $this->setOptions($options);
+        }
+    }
+
+    /**
+     * 设置字体颜色
+     * @param string|null $color 颜色名
+     * @throws \InvalidArgumentException
+     * @api
+     */
+    public function setForeground($color = null)
+    {
+        if (null === $color) {
+            $this->foreground = null;
+
+            return;
+        }
+
+        if (!isset(static::$availableForegroundColors[$color])) {
+            throw new \InvalidArgumentException(sprintf('Invalid foreground color specified: "%s". Expected one of (%s)', $color, implode(', ', array_keys(static::$availableForegroundColors))));
+        }
+
+        $this->foreground = static::$availableForegroundColors[$color];
+    }
+
+    /**
+     * 设置背景色
+     * @param string|null $color 颜色名
+     * @throws \InvalidArgumentException
+     * @api
+     */
+    public function setBackground($color = null)
+    {
+        if (null === $color) {
+            $this->background = null;
+
+            return;
+        }
+
+        if (!isset(static::$availableBackgroundColors[$color])) {
+            throw new \InvalidArgumentException(sprintf('Invalid background color specified: "%s". Expected one of (%s)', $color, implode(', ', array_keys(static::$availableBackgroundColors))));
+        }
+
+        $this->background = static::$availableBackgroundColors[$color];
+    }
+
+    /**
+     * 设置字体格式
+     * @param string $option 格式名
+     * @throws \InvalidArgumentException When the option name isn't defined
+     * @api
+     */
+    public function setOption($option)
+    {
+        if (!isset(static::$availableOptions[$option])) {
+            throw new \InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s)', $option, implode(', ', array_keys(static::$availableOptions))));
+        }
+
+        if (!in_array(static::$availableOptions[$option], $this->options)) {
+            $this->options[] = static::$availableOptions[$option];
+        }
+    }
+
+    /**
+     * 重置字体格式
+     * @param string $option 格式名
+     * @throws \InvalidArgumentException
+     */
+    public function unsetOption($option)
+    {
+        if (!isset(static::$availableOptions[$option])) {
+            throw new \InvalidArgumentException(sprintf('Invalid option specified: "%s". Expected one of (%s)', $option, implode(', ', array_keys(static::$availableOptions))));
+        }
+
+        $pos = array_search(static::$availableOptions[$option], $this->options);
+        if (false !== $pos) {
+            unset($this->options[$pos]);
+        }
+    }
+
+    /**
+     * 批量设置字体格式
+     * @param array $options
+     */
+    public function setOptions(array $options)
+    {
+        $this->options = [];
+
+        foreach ($options as $option) {
+            $this->setOption($option);
+        }
+    }
+
+    /**
+     * 应用样式到文字
+     * @param string $text 文字
+     * @return string
+     */
+    public function apply($text)
+    {
+        $setCodes   = [];
+        $unsetCodes = [];
+
+        if (null !== $this->foreground) {
+            $setCodes[]   = $this->foreground['set'];
+            $unsetCodes[] = $this->foreground['unset'];
+        }
+        if (null !== $this->background) {
+            $setCodes[]   = $this->background['set'];
+            $unsetCodes[] = $this->background['unset'];
+        }
+        if (count($this->options)) {
+            foreach ($this->options as $option) {
+                $setCodes[]   = $option['set'];
+                $unsetCodes[] = $option['unset'];
+            }
+        }
+
+        if (0 === count($setCodes)) {
+            return $text;
+        }
+
+        return sprintf("\033[%sm%s\033[%sm", implode(';', $setCodes), $text, implode(';', $unsetCodes));
+    }
+}
diff --git a/thinkphp/library/think/console/output/question/Choice.php b/thinkphp/library/think/console/output/question/Choice.php
new file mode 100644
index 0000000000000000000000000000000000000000..f6760e5ef3fc46ec705041a044c3cb8c18f4a120
--- /dev/null
+++ b/thinkphp/library/think/console/output/question/Choice.php
@@ -0,0 +1,163 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output\question;
+
+use think\console\output\Question;
+
+class Choice extends Question
+{
+
+    private $choices;
+    private $multiselect  = false;
+    private $prompt       = ' > ';
+    private $errorMessage = 'Value "%s" is invalid';
+
+    /**
+     * 构造方法
+     * @param string $question 问题
+     * @param array  $choices  选项
+     * @param mixed  $default  默认答案
+     */
+    public function __construct($question, array $choices, $default = null)
+    {
+        parent::__construct($question, $default);
+
+        $this->choices = $choices;
+        $this->setValidator($this->getDefaultValidator());
+        $this->setAutocompleterValues($choices);
+    }
+
+    /**
+     * 可选项
+     * @return array
+     */
+    public function getChoices()
+    {
+        return $this->choices;
+    }
+
+    /**
+     * 设置可否多选
+     * @param bool $multiselect
+     * @return self
+     */
+    public function setMultiselect($multiselect)
+    {
+        $this->multiselect = $multiselect;
+        $this->setValidator($this->getDefaultValidator());
+
+        return $this;
+    }
+
+    public function isMultiselect()
+    {
+        return $this->multiselect;
+    }
+
+    /**
+     * 获取提示
+     * @return string
+     */
+    public function getPrompt()
+    {
+        return $this->prompt;
+    }
+
+    /**
+     * 设置提示
+     * @param string $prompt
+     * @return self
+     */
+    public function setPrompt($prompt)
+    {
+        $this->prompt = $prompt;
+
+        return $this;
+    }
+
+    /**
+     * 设置错误提示信息
+     * @param string $errorMessage
+     * @return self
+     */
+    public function setErrorMessage($errorMessage)
+    {
+        $this->errorMessage = $errorMessage;
+        $this->setValidator($this->getDefaultValidator());
+
+        return $this;
+    }
+
+    /**
+     * 获取默认的验证方法
+     * @return callable
+     */
+    private function getDefaultValidator()
+    {
+        $choices      = $this->choices;
+        $errorMessage = $this->errorMessage;
+        $multiselect  = $this->multiselect;
+        $isAssoc      = $this->isAssoc($choices);
+
+        return function ($selected) use ($choices, $errorMessage, $multiselect, $isAssoc) {
+            // Collapse all spaces.
+            $selectedChoices = str_replace(' ', '', $selected);
+
+            if ($multiselect) {
+                // Check for a separated comma values
+                if (!preg_match('/^[a-zA-Z0-9_-]+(?:,[a-zA-Z0-9_-]+)*$/', $selectedChoices, $matches)) {
+                    throw new \InvalidArgumentException(sprintf($errorMessage, $selected));
+                }
+                $selectedChoices = explode(',', $selectedChoices);
+            } else {
+                $selectedChoices = [$selected];
+            }
+
+            $multiselectChoices = [];
+            foreach ($selectedChoices as $value) {
+                $results = [];
+                foreach ($choices as $key => $choice) {
+                    if ($choice === $value) {
+                        $results[] = $key;
+                    }
+                }
+
+                if (count($results) > 1) {
+                    throw new \InvalidArgumentException(sprintf('The provided answer is ambiguous. Value should be one of %s.', implode(' or ', $results)));
+                }
+
+                $result = array_search($value, $choices);
+
+                if (!$isAssoc) {
+                    if (!empty($result)) {
+                        $result = $choices[$result];
+                    } elseif (isset($choices[$value])) {
+                        $result = $choices[$value];
+                    }
+                } elseif (empty($result) && array_key_exists($value, $choices)) {
+                    $result = $value;
+                }
+
+                if (empty($result)) {
+                    throw new \InvalidArgumentException(sprintf($errorMessage, $value));
+                }
+                array_push($multiselectChoices, $result);
+            }
+
+            if ($multiselect) {
+                return $multiselectChoices;
+            }
+
+            return current($multiselectChoices);
+        };
+    }
+}
diff --git a/thinkphp/library/think/console/output/question/Confirmation.php b/thinkphp/library/think/console/output/question/Confirmation.php
new file mode 100644
index 0000000000000000000000000000000000000000..6598f9b3e506f7bae651a38fa311de402a822ae9
--- /dev/null
+++ b/thinkphp/library/think/console/output/question/Confirmation.php
@@ -0,0 +1,57 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\console\output\question;
+
+use think\console\output\Question;
+
+class Confirmation extends Question
+{
+
+    private $trueAnswerRegex;
+
+    /**
+     * 构造方法
+     * @param string $question        问题
+     * @param bool   $default         默认答案
+     * @param string $trueAnswerRegex 验证正则
+     */
+    public function __construct($question, $default = true, $trueAnswerRegex = '/^y/i')
+    {
+        parent::__construct($question, (bool) $default);
+
+        $this->trueAnswerRegex = $trueAnswerRegex;
+        $this->setNormalizer($this->getDefaultNormalizer());
+    }
+
+    /**
+     * 获取默认的答案回调
+     * @return callable
+     */
+    private function getDefaultNormalizer()
+    {
+        $default = $this->getDefault();
+        $regex   = $this->trueAnswerRegex;
+
+        return function ($answer) use ($default, $regex) {
+            if (is_bool($answer)) {
+                return $answer;
+            }
+
+            $answerIsTrue = (bool) preg_match($regex, $answer);
+            if (false === $default) {
+                return $answer && $answerIsTrue;
+            }
+
+            return !$answer || $answerIsTrue;
+        };
+    }
+}
diff --git a/thinkphp/library/think/db/Builder.php b/thinkphp/library/think/db/Builder.php
new file mode 100644
index 0000000000000000000000000000000000000000..0d30267b10bcc1743b2d9c3f9138d24722f0615a
--- /dev/null
+++ b/thinkphp/library/think/db/Builder.php
@@ -0,0 +1,1224 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db;
+
+use PDO;
+use think\Exception;
+
+abstract class Builder
+{
+    // connection对象实例
+    protected $connection;
+
+    // 查询表达式映射
+    protected $exp = ['EQ' => '=', 'NEQ' => '<>', 'GT' => '>', 'EGT' => '>=', 'LT' => '<', 'ELT' => '<=', 'NOTLIKE' => 'NOT LIKE', 'NOTIN' => 'NOT IN', 'NOTBETWEEN' => 'NOT BETWEEN', 'NOTEXISTS' => 'NOT EXISTS', 'NOTNULL' => 'NOT NULL', 'NOTBETWEEN TIME' => 'NOT BETWEEN TIME'];
+
+    // 查询表达式解析
+    protected $parser = [
+        'parseCompare'     => ['=', '<>', '>', '>=', '<', '<='],
+        'parseLike'        => ['LIKE', 'NOT LIKE'],
+        'parseBetween'     => ['NOT BETWEEN', 'BETWEEN'],
+        'parseIn'          => ['NOT IN', 'IN'],
+        'parseExp'         => ['EXP'],
+        'parseNull'        => ['NOT NULL', 'NULL'],
+        'parseBetweenTime' => ['BETWEEN TIME', 'NOT BETWEEN TIME'],
+        'parseTime'        => ['< TIME', '> TIME', '<= TIME', '>= TIME'],
+        'parseExists'      => ['NOT EXISTS', 'EXISTS'],
+        'parseColumn'      => ['COLUMN'],
+    ];
+
+    // SQL表达式
+    protected $selectSql = 'SELECT%DISTINCT% %FIELD% FROM %TABLE%%FORCE%%JOIN%%WHERE%%GROUP%%HAVING%%UNION%%ORDER%%LIMIT% %LOCK%%COMMENT%';
+
+    protected $insertSql = '%INSERT% INTO %TABLE% (%FIELD%) VALUES (%DATA%) %COMMENT%';
+
+    protected $insertAllSql = '%INSERT% INTO %TABLE% (%FIELD%) %DATA% %COMMENT%';
+
+    protected $updateSql = 'UPDATE %TABLE% SET %SET%%JOIN%%WHERE%%ORDER%%LIMIT% %LOCK%%COMMENT%';
+
+    protected $deleteSql = 'DELETE FROM %TABLE%%USING%%JOIN%%WHERE%%ORDER%%LIMIT% %LOCK%%COMMENT%';
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  Connection    $connection 数据库连接对象实例
+     */
+    public function __construct(Connection $connection)
+    {
+        $this->connection = $connection;
+    }
+
+    /**
+     * 获取当前的连接对象实例
+     * @access public
+     * @return Connection
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * 注册查询表达式解析
+     * @access public
+     * @param  string    $name   解析方法
+     * @param  array     $parser 匹配表达式数据
+     * @return $this
+     */
+    public function bindParser($name, $parser)
+    {
+        $this->parser[$name] = $parser;
+        return $this;
+    }
+
+    /**
+     * 数据分析
+     * @access protected
+     * @param  Query     $query     查询对象
+     * @param  array     $data      数据
+     * @param  array     $fields    字段信息
+     * @param  array     $bind      参数绑定
+     * @param  string    $suffix    参数绑定后缀
+     * @return array
+     */
+    protected function parseData(Query $query, $data = [], $fields = [], $bind = [], $suffix = '')
+    {
+        if (empty($data)) {
+            return [];
+        }
+
+        $options = $query->getOptions();
+
+        // 获取绑定信息
+        if (empty($bind)) {
+            $bind = $this->connection->getFieldsBind($options['table']);
+        }
+
+        if (empty($fields)) {
+            if ('*' == $options['field']) {
+                $fields = array_keys($bind);
+            } else {
+                $fields = $options['field'];
+            }
+        }
+
+        $result = [];
+
+        foreach ($data as $key => $val) {
+            $item = $this->parseKey($query, $key, true);
+
+            if ($val instanceof Expression) {
+                $result[$item] = $val->getValue();
+                continue;
+            } elseif (!is_scalar($val) && (in_array($key, (array) $query->getOptions('json')) || 'json' == $this->connection->getFieldsType($options['table'], $key))) {
+                $val = json_encode($val);
+            } elseif (is_object($val) && method_exists($val, '__toString')) {
+                // 对象数据写入
+                $val = $val->__toString();
+            }
+
+            if (false !== strpos($key, '->')) {
+                list($key, $name) = explode('->', $key);
+                $item             = $this->parseKey($query, $key);
+                $result[$item]    = 'json_set(' . $item . ', \'$.' . $name . '\', ' . $this->parseDataBind($query, $key, $val, $bind, $suffix) . ')';
+            } elseif (false === strpos($key, '.') && !in_array($key, $fields, true)) {
+                if ($options['strict']) {
+                    throw new Exception('fields not exists:[' . $key . ']');
+                }
+            } elseif (is_null($val)) {
+                $result[$item] = 'NULL';
+            } elseif (is_array($val) && !empty($val)) {
+                switch (strtoupper($val[0])) {
+                    case 'INC':
+                        $result[$item] = $item . ' + ' . floatval($val[1]);
+                        break;
+                    case 'DEC':
+                        $result[$item] = $item . ' - ' . floatval($val[1]);
+                        break;
+                    case 'EXP':
+                        throw new Exception('not support data:[' . $val[0] . ']');
+                }
+            } elseif (is_scalar($val)) {
+                // 过滤非标量数据
+                $result[$item] = $this->parseDataBind($query, $key, $val, $bind, $suffix);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * 数据绑定处理
+     * @access protected
+     * @param  Query     $query     查询对象
+     * @param  string    $key       字段名
+     * @param  mixed     $data      数据
+     * @param  array     $bind      绑定数据
+     * @param  string    $suffix    绑定后缀
+     * @return string
+     */
+    protected function parseDataBind(Query $query, $key, $data, $bind = [], $suffix = '')
+    {
+        // 过滤非标量数据
+        if (0 === strpos($data, ':') && $query->isBind(substr($data, 1))) {
+            return $data;
+        }
+
+        $key  = str_replace(['.', '->'], '_', $key);
+        $name = 'data__' . $key . $suffix;
+
+        $query->bind($name, $data, isset($bind[$key]) ? $bind[$key] : PDO::PARAM_STR);
+
+        return ':' . $name;
+    }
+
+    /**
+     * 字段名分析
+     * @access public
+     * @param  Query  $query    查询对象
+     * @param  mixed  $key      字段名
+     * @param  bool   $strict   严格检测
+     * @return string
+     */
+    public function parseKey(Query $query, $key, $strict = false)
+    {
+        return $key instanceof Expression ? $key->getValue() : $key;
+    }
+
+    /**
+     * field分析
+     * @access protected
+     * @param  Query     $query     查询对象
+     * @param  mixed     $fields    字段名
+     * @return string
+     */
+    protected function parseField(Query $query, $fields)
+    {
+        if ('*' == $fields || empty($fields)) {
+            $fieldsStr = '*';
+        } elseif (is_array($fields)) {
+            // 支持 'field1'=>'field2' 这样的字段别名定义
+            $array = [];
+
+            foreach ($fields as $key => $field) {
+                if (!is_numeric($key)) {
+                    $array[] = $this->parseKey($query, $key) . ' AS ' . $this->parseKey($query, $field, true);
+                } else {
+                    $array[] = $this->parseKey($query, $field);
+                }
+            }
+
+            $fieldsStr = implode(',', $array);
+        }
+
+        return $fieldsStr;
+    }
+
+    /**
+     * table分析
+     * @access protected
+     * @param  Query     $query     查询对象
+     * @param  mixed     $tables    表名
+     * @return string
+     */
+    protected function parseTable(Query $query, $tables)
+    {
+        $item    = [];
+        $options = $query->getOptions();
+
+        foreach ((array) $tables as $key => $table) {
+            if (!is_numeric($key)) {
+                $key    = $this->connection->parseSqlTable($key);
+                $item[] = $this->parseKey($query, $key) . ' ' . $this->parseKey($query, $table);
+            } else {
+                $table = $this->connection->parseSqlTable($table);
+
+                if (isset($options['alias'][$table])) {
+                    $item[] = $this->parseKey($query, $table) . ' ' . $this->parseKey($query, $options['alias'][$table]);
+                } else {
+                    $item[] = $this->parseKey($query, $table);
+                }
+            }
+        }
+
+        return implode(',', $item);
+    }
+
+    /**
+     * where分析
+     * @access protected
+     * @param  Query     $query   查询对象
+     * @param  mixed     $where   查询条件
+     * @return string
+     */
+    protected function parseWhere(Query $query, $where)
+    {
+        $options  = $query->getOptions();
+        $whereStr = $this->buildWhere($query, $where);
+
+        if (!empty($options['soft_delete'])) {
+            // 附加软删除条件
+            list($field, $condition) = $options['soft_delete'];
+
+            $binds    = $this->connection->getFieldsBind($options['table']);
+            $whereStr = $whereStr ? '( ' . $whereStr . ' ) AND ' : '';
+            $whereStr = $whereStr . $this->parseWhereItem($query, $field, $condition, '', $binds);
+        }
+
+        return empty($whereStr) ? '' : ' WHERE ' . $whereStr;
+    }
+
+    /**
+     * 生成查询条件SQL
+     * @access public
+     * @param  Query     $query     查询对象
+     * @param  mixed     $where     查询条件
+     * @return string
+     */
+    public function buildWhere(Query $query, $where)
+    {
+        if (empty($where)) {
+            $where = [];
+        }
+
+        $whereStr = '';
+        $binds    = $this->connection->getFieldsBind($query->getOptions('table'));
+
+        foreach ($where as $logic => $val) {
+            $str = [];
+
+            foreach ($val as $value) {
+                if ($value instanceof Expression) {
+                    $str[] = ' ' . $logic . ' ( ' . $value->getValue() . ' )';
+                    continue;
+                }
+
+                if (is_array($value)) {
+                    if (key($value) !== 0) {
+                        throw new Exception('where express error:' . var_export($value, true));
+                    }
+                    $field = array_shift($value);
+                } elseif (!($value instanceof \Closure)) {
+                    throw new Exception('where express error:' . var_export($value, true));
+                }
+
+                if ($value instanceof \Closure) {
+                    // 使用闭包查询
+                    $newQuery = $query->newQuery()->setConnection($this->connection);
+                    $value($newQuery);
+                    $whereClause = $this->buildWhere($query, $newQuery->getOptions('where'));
+
+                    if (!empty($whereClause)) {
+                        $str[] = ' ' . $logic . ' ( ' . $whereClause . ' )';
+                    }
+                } elseif (is_array($field)) {
+                    array_unshift($value, $field);
+                    $str2 = [];
+                    foreach ($value as $item) {
+                        $str2[] = $this->parseWhereItem($query, array_shift($item), $item, $logic, $binds);
+                    }
+
+                    $str[] = ' ' . $logic . ' ( ' . implode(' AND ', $str2) . ' )';
+                } elseif (strpos($field, '|')) {
+                    // 不同字段使用相同查询条件（OR）
+                    $array = explode('|', $field);
+                    $item  = [];
+
+                    foreach ($array as $k) {
+                        $item[] = $this->parseWhereItem($query, $k, $value, '', $binds);
+                    }
+
+                    $str[] = ' ' . $logic . ' ( ' . implode(' OR ', $item) . ' )';
+                } elseif (strpos($field, '&')) {
+                    // 不同字段使用相同查询条件（AND）
+                    $array = explode('&', $field);
+                    $item  = [];
+
+                    foreach ($array as $k) {
+                        $item[] = $this->parseWhereItem($query, $k, $value, '', $binds);
+                    }
+
+                    $str[] = ' ' . $logic . ' ( ' . implode(' AND ', $item) . ' )';
+                } else {
+                    // 对字段使用表达式查询
+                    $field = is_string($field) ? $field : '';
+                    $str[] = ' ' . $logic . ' ' . $this->parseWhereItem($query, $field, $value, $logic, $binds);
+                }
+            }
+
+            $whereStr .= empty($whereStr) ? substr(implode(' ', $str), strlen($logic) + 1) : implode(' ', $str);
+        }
+
+        return $whereStr;
+    }
+
+    // where子单元分析
+    protected function parseWhereItem(Query $query, $field, $val, $rule = '', $binds = [], $bindName = null)
+    {
+        // 字段分析
+        $key = $field ? $this->parseKey($query, $field, true) : '';
+
+        // 查询规则和条件
+        if (!is_array($val)) {
+            $val = is_null($val) ? ['NULL', ''] : ['=', $val];
+        }
+
+        list($exp, $value) = $val;
+
+        // 对一个字段使用多个查询条件
+        if (is_array($exp)) {
+            $item = array_pop($val);
+
+            // 传入 or 或者 and
+            if (is_string($item) && in_array($item, ['AND', 'and', 'OR', 'or'])) {
+                $rule = $item;
+            } else {
+                array_push($val, $item);
+            }
+
+            foreach ($val as $k => $item) {
+                $bindName = 'where_' . str_replace('.', '_', $field) . '_' . $k;
+                $str[]    = $this->parseWhereItem($query, $field, $item, $rule, $binds, $bindName);
+            }
+
+            return '( ' . implode(' ' . $rule . ' ', $str) . ' )';
+        }
+
+        // 检测操作符
+        $exp = strtoupper($exp);
+        if (isset($this->exp[$exp])) {
+            $exp = $this->exp[$exp];
+        }
+
+        $bindName = $bindName ?: 'where_' . $rule . '_' . str_replace(['.', '-'], '_', $field);
+
+        if (preg_match('/\W/', $bindName)) {
+            // 处理带非单词字符的字段名
+            $bindName = md5($bindName);
+        }
+
+        if ($value instanceof Expression) {
+
+        } elseif (is_object($value) && method_exists($value, '__toString')) {
+            // 对象数据写入
+            $value = $value->__toString();
+        }
+
+        if (strpos($field, '->')) {
+            $jsonType = $query->getJsonFieldType($field);
+            $bindType = $this->connection->getFieldBindType($jsonType);
+        } else {
+            $bindType = isset($binds[$field]) ? $binds[$field] : PDO::PARAM_STR;
+        }
+
+        if (is_scalar($value) && !in_array($exp, ['EXP', 'NOT NULL', 'NULL', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN']) && strpos($exp, 'TIME') === false) {
+            if (strpos($value, ':') !== 0 || !$query->isBind(substr($value, 1))) {
+                if ($query->isBind($bindName)) {
+                    $bindName .= '_' . str_replace('.', '_', uniqid('', true));
+                }
+
+                $query->bind($bindName, $value, $bindType);
+                $value = ':' . $bindName;
+            }
+        }
+
+        // 解析查询表达式
+        foreach ($this->parser as $fun => $parse) {
+            if (in_array($exp, $parse)) {
+                $whereStr = $this->$fun($query, $key, $exp, $value, $field, $bindName, $bindType, isset($val[2]) ? $val[2] : 'AND');
+                break;
+            }
+        }
+
+        if (!isset($whereStr)) {
+            throw new Exception('where express error:' . $exp);
+        }
+
+        return $whereStr;
+    }
+
+    /**
+     * 模糊查询
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  string    $key
+     * @param  string    $exp
+     * @param  mixed     $value
+     * @param  string    $field
+     * @param  string    $bindName
+     * @param  integer   $bindType
+     * @param  string    $logic
+     * @return string
+     */
+    protected function parseLike(Query $query, $key, $exp, $value, $field, $bindName, $bindType, $logic)
+    {
+        // 模糊匹配
+        if (is_array($value)) {
+            foreach ($value as $k => $item) {
+                $bindKey        = $bindName . '_' . intval($k);
+                $bind[$bindKey] = [$item, $bindType];
+                $array[]        = $key . ' ' . $exp . ' :' . $bindKey;
+            }
+
+            $query->bind($bind);
+
+            $whereStr = '(' . implode($array, ' ' . strtoupper($logic) . ' ') . ')';
+        } else {
+            $whereStr = $key . ' ' . $exp . ' ' . $value;
+        }
+
+        return $whereStr;
+    }
+
+    /**
+     * 表达式查询
+     * @access protected
+     * @param  Query        $query        查询对象
+     * @param  string       $key
+     * @param  string       $exp
+     * @param  array        $value
+     * @param  string       $field
+     * @param  string       $bindName
+     * @param  integer      $bindType
+     * @return string
+     */
+    protected function parseColumn(Query $query, $key, $exp, array $value, $field, $bindName, $bindType)
+    {
+        // 字段比较查询
+        list($op, $field2) = $value;
+
+        if (!in_array($op, ['=', '<>', '>', '>=', '<', '<='])) {
+            throw new Exception('where express error:' . var_export($value, true));
+        }
+
+        return '( ' . $key . ' ' . $op . ' ' . $this->parseKey($query, $field2, true) . ' )';
+    }
+
+    /**
+     * 表达式查询
+     * @access protected
+     * @param  Query        $query        查询对象
+     * @param  string       $key
+     * @param  string       $exp
+     * @param  Expression   $value
+     * @param  string       $field
+     * @param  string       $bindName
+     * @param  integer      $bindType
+     * @return string
+     */
+    protected function parseExp(Query $query, $key, $exp, Expression $value, $field, $bindName, $bindType)
+    {
+        // 表达式查询
+        return '( ' . $key . ' ' . $value->getValue() . ' )';
+    }
+
+    /**
+     * Null查询
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  string    $key
+     * @param  string    $exp
+     * @param  mixed     $value
+     * @param  string    $field
+     * @param  string    $bindName
+     * @param  integer   $bindType
+     * @return string
+     */
+    protected function parseNull(Query $query, $key, $exp, $value, $field, $bindName, $bindType)
+    {
+        // NULL 查询
+        return $key . ' IS ' . $exp;
+    }
+
+    /**
+     * 范围查询
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  string    $key
+     * @param  string    $exp
+     * @param  mixed     $value
+     * @param  string    $field
+     * @param  string    $bindName
+     * @param  integer   $bindType
+     * @return string
+     */
+    protected function parseBetween(Query $query, $key, $exp, $value, $field, $bindName, $bindType)
+    {
+        // BETWEEN 查询
+        $data = is_array($value) ? $value : explode(',', $value);
+
+        if ($query->isBind($bindName . '_between_1')) {
+            $bindKey1 = $bindName . '_between_1' . uniqid();
+            $bindKey2 = $bindName . '_between_2' . uniqid();
+        } else {
+            $bindKey1 = $bindName . '_between_1';
+            $bindKey2 = $bindName . '_between_2';
+        }
+
+        $bind = [
+            $bindKey1 => [$data[0], $bindType],
+            $bindKey2 => [$data[1], $bindType],
+        ];
+
+        $query->bind($bind);
+
+        $between = ':' . $bindKey1 . ' AND :' . $bindKey2;
+
+        return $key . ' ' . $exp . ' ' . $between;
+    }
+
+    /**
+     * Exists查询
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  string    $key
+     * @param  string    $exp
+     * @param  mixed     $value
+     * @param  string    $field
+     * @param  string    $bindName
+     * @param  integer   $bindType
+     * @return string
+     */
+    protected function parseExists(Query $query, $key, $exp, $value, $field, $bindName, $bindType)
+    {
+        // EXISTS 查询
+        if ($value instanceof \Closure) {
+            $value = $this->parseClosure($query, $value, false);
+        } elseif ($value instanceof Expression) {
+            $value = $value->getValue();
+        } else {
+            throw new Exception('where express error:' . $value);
+        }
+
+        return $exp . ' (' . $value . ')';
+    }
+
+    /**
+     * 时间比较查询
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  string    $key
+     * @param  string    $exp
+     * @param  mixed     $value
+     * @param  string    $field
+     * @param  string    $bindName
+     * @param  integer   $bindType
+     * @return string
+     */
+    protected function parseTime(Query $query, $key, $exp, $value, $field, $bindName, $bindType)
+    {
+        return $key . ' ' . substr($exp, 0, 2) . ' ' . $this->parseDateTime($query, $value, $field, $bindName, $bindType);
+    }
+
+    /**
+     * 大小比较查询
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  string    $key
+     * @param  string    $exp
+     * @param  mixed     $value
+     * @param  string    $field
+     * @param  string    $bindName
+     * @param  integer   $bindType
+     * @return string
+     */
+    protected function parseCompare(Query $query, $key, $exp, $value, $field, $bindName, $bindType)
+    {
+        if (is_array($value)) {
+            throw new Exception('where express error:' . $exp . var_export($value, true));
+        }
+
+        // 比较运算
+        if ($value instanceof \Closure) {
+            $value = $this->parseClosure($query, $value);
+        }
+
+        return $key . ' ' . $exp . ' ' . $value;
+    }
+
+    /**
+     * 时间范围查询
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  string    $key
+     * @param  string    $exp
+     * @param  mixed     $value
+     * @param  string    $field
+     * @param  string    $bindName
+     * @param  integer   $bindType
+     * @return string
+     */
+    protected function parseBetweenTime(Query $query, $key, $exp, $value, $field, $bindName, $bindType)
+    {
+        if (is_string($value)) {
+            $value = explode(',', $value);
+        }
+
+        return $key . ' ' . substr($exp, 0, -4)
+        . $this->parseDateTime($query, $value[0], $field, $bindName . '_between_1', $bindType)
+        . ' AND '
+        . $this->parseDateTime($query, $value[1], $field, $bindName . '_between_2', $bindType);
+
+    }
+
+    /**
+     * IN查询
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  string    $key
+     * @param  string    $exp
+     * @param  mixed     $value
+     * @param  string    $field
+     * @param  string    $bindName
+     * @param  integer   $bindType
+     * @return string
+     */
+    protected function parseIn(Query $query, $key, $exp, $value, $field, $bindName, $bindType)
+    {
+        // IN 查询
+        if ($value instanceof \Closure) {
+            $value = $this->parseClosure($query, $value, false);
+        } else {
+            $value = array_unique(is_array($value) ? $value : explode(',', $value));
+
+            $bind  = [];
+            $array = [];
+            $i     = 0;
+
+            foreach ($value as $k => $v) {
+                $i++;
+                if ($query->isBind($bindName . '_in_' . $i)) {
+                    $bindKey = $bindName . '_in_' . uniqid() . '_' . $i;
+                } else {
+                    $bindKey = $bindName . '_in_' . $i;
+                }
+                $bind[$bindKey] = [$v, $bindType];
+                $array[]        = ':' . $bindKey;
+            }
+
+            $zone = implode(',', $array);
+            $query->bind($bind);
+
+            $value = empty($zone) ? "''" : $zone;
+        }
+
+        return $key . ' ' . $exp . ' (' . $value . ')';
+    }
+
+    /**
+     * 闭包子查询
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  \Closure  $call
+     * @param  bool      $show
+     * @return string
+     */
+    protected function parseClosure(Query $query, $call, $show = true)
+    {
+        $newQuery = $query->newQuery()->setConnection($this->connection);
+        $call($newQuery);
+
+        return $newQuery->buildSql($show);
+    }
+
+    /**
+     * 日期时间条件解析
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  string    $value
+     * @param  string    $key
+     * @param  array     $options
+     * @param  string    $bindName
+     * @param  integer   $bindType
+     * @return string
+     */
+    protected function parseDateTime(Query $query, $value, $key, $bindName = null, $bindType = null)
+    {
+        $options = $query->getOptions();
+
+        // 获取时间字段类型
+        if (strpos($key, '.')) {
+            list($table, $key) = explode('.', $key);
+
+            if (isset($options['alias']) && $pos = array_search($table, $options['alias'])) {
+                $table = $pos;
+            }
+        } else {
+            $table = $options['table'];
+        }
+
+        $type = $this->connection->getTableInfo($table, 'type');
+
+        if (isset($type[$key])) {
+            $info = $type[$key];
+        }
+
+        if (isset($info)) {
+            if (is_string($value)) {
+                $value = strtotime($value) ?: $value;
+            }
+
+            if (preg_match('/(datetime|timestamp)/is', $info)) {
+                // 日期及时间戳类型
+                $value = date('Y-m-d H:i:s', $value);
+            } elseif (preg_match('/(date)/is', $info)) {
+                // 日期及时间戳类型
+                $value = date('Y-m-d', $value);
+            }
+        }
+
+        $bindName = $bindName ?: $key;
+
+        if ($query->isBind($bindName)) {
+            $bindName .= '_' . str_replace('.', '_', uniqid('', true));
+        }
+
+        $query->bind($bindName, $value, $bindType);
+
+        return ':' . $bindName;
+    }
+
+    /**
+     * limit分析
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  mixed     $limit
+     * @return string
+     */
+    protected function parseLimit(Query $query, $limit)
+    {
+        return (!empty($limit) && false === strpos($limit, '(')) ? ' LIMIT ' . $limit . ' ' : '';
+    }
+
+    /**
+     * join分析
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  array     $join
+     * @return string
+     */
+    protected function parseJoin(Query $query, $join)
+    {
+        $joinStr = '';
+
+        if (!empty($join)) {
+            foreach ($join as $item) {
+                list($table, $type, $on) = $item;
+
+                $condition = [];
+
+                foreach ((array) $on as $val) {
+                    if ($val instanceof Expression) {
+                        $condition[] = $val->getValue();
+                    } elseif (strpos($val, '=')) {
+                        list($val1, $val2) = explode('=', $val, 2);
+
+                        $condition[] = $this->parseKey($query, $val1) . '=' . $this->parseKey($query, $val2);
+                    } else {
+                        $condition[] = $val;
+                    }
+                }
+
+                $table = $this->parseTable($query, $table);
+
+                $joinStr .= ' ' . $type . ' JOIN ' . $table . ' ON ' . implode(' AND ', $condition);
+            }
+        }
+
+        return $joinStr;
+    }
+
+    /**
+     * order分析
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  mixed     $order
+     * @return string
+     */
+    protected function parseOrder(Query $query, $order)
+    {
+        if (empty($order)) {
+            return '';
+        }
+
+        $array = [];
+
+        foreach ($order as $key => $val) {
+            if ($val instanceof Expression) {
+                $array[] = $val->getValue();
+            } elseif (is_array($val)) {
+                $array[] = $this->parseOrderField($query, $key, $val);
+            } elseif ('[rand]' == $val) {
+                $array[] = $this->parseRand($query);
+            } else {
+                if (is_numeric($key)) {
+                    list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val . ' ');
+                } else {
+                    $sort = $val;
+                }
+
+                $sort    = strtoupper($sort);
+                $sort    = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
+                $array[] = $this->parseKey($query, $key, true) . $sort;
+            }
+        }
+
+        return ' ORDER BY ' . implode(',', $array);
+    }
+
+    /**
+     * orderField分析
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  mixed     $key
+     * @param  array     $val
+     * @return string
+     */
+    protected function parseOrderField($query, $key, $val)
+    {
+        if (isset($val['sort'])) {
+            $sort = $val['sort'];
+            unset($val['sort']);
+        } else {
+            $sort = '';
+        }
+
+        $sort = strtoupper($sort);
+        $sort = in_array($sort, ['ASC', 'DESC'], true) ? ' ' . $sort : '';
+
+        $options = $query->getOptions();
+        $bind    = $this->connection->getFieldsBind($options['table']);
+
+        foreach ($val as $k => $item) {
+            $val[$k] = $this->parseDataBind($query, $key, $item, $bind, $k);
+        }
+
+        return 'field(' . $this->parseKey($query, $key, true) . ',' . implode(',', $val) . ')' . $sort;
+    }
+
+    /**
+     * group分析
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  mixed     $group
+     * @return string
+     */
+    protected function parseGroup(Query $query, $group)
+    {
+        if (empty($group)) {
+            return '';
+        }
+
+        if (is_string($group)) {
+            $group = explode(',', $group);
+        }
+
+        foreach ($group as $key) {
+            $val[] = $this->parseKey($query, $key);
+        }
+
+        return ' GROUP BY ' . implode(',', $val);
+    }
+
+    /**
+     * having分析
+     * @access protected
+     * @param  Query  $query        查询对象
+     * @param  string $having
+     * @return string
+     */
+    protected function parseHaving(Query $query, $having)
+    {
+        return !empty($having) ? ' HAVING ' . $having : '';
+    }
+
+    /**
+     * comment分析
+     * @access protected
+     * @param  Query  $query        查询对象
+     * @param  string $comment
+     * @return string
+     */
+    protected function parseComment(Query $query, $comment)
+    {
+        if (false !== strpos($comment, '*/')) {
+            $comment = strstr($comment, '*/', true);
+        }
+
+        return !empty($comment) ? ' /* ' . $comment . ' */' : '';
+    }
+
+    /**
+     * distinct分析
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  mixed     $distinct
+     * @return string
+     */
+    protected function parseDistinct(Query $query, $distinct)
+    {
+        return !empty($distinct) ? ' DISTINCT ' : '';
+    }
+
+    /**
+     * union分析
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  mixed     $union
+     * @return string
+     */
+    protected function parseUnion(Query $query, $union)
+    {
+        if (empty($union)) {
+            return '';
+        }
+
+        $type = $union['type'];
+        unset($union['type']);
+
+        foreach ($union as $u) {
+            if ($u instanceof \Closure) {
+                $sql[] = $type . ' ' . $this->parseClosure($query, $u);
+            } elseif (is_string($u)) {
+                $sql[] = $type . ' ( ' . $this->connection->parseSqlTable($u) . ' )';
+            }
+        }
+
+        return ' ' . implode(' ', $sql);
+    }
+
+    /**
+     * index分析，可在操作链中指定需要强制使用的索引
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  mixed     $index
+     * @return string
+     */
+    protected function parseForce(Query $query, $index)
+    {
+        if (empty($index)) {
+            return '';
+        }
+
+        return sprintf(" FORCE INDEX ( %s ) ", is_array($index) ? implode(',', $index) : $index);
+    }
+
+    /**
+     * 设置锁机制
+     * @access protected
+     * @param  Query         $query        查询对象
+     * @param  bool|string   $lock
+     * @return string
+     */
+    protected function parseLock(Query $query, $lock = false)
+    {
+        if (is_bool($lock)) {
+            return $lock ? ' FOR UPDATE ' : '';
+        } elseif (is_string($lock) && !empty($lock)) {
+            return ' ' . trim($lock) . ' ';
+        }
+    }
+
+    /**
+     * 生成查询SQL
+     * @access public
+     * @param  Query  $query  查询对象
+     * @return string
+     */
+    public function select(Query $query)
+    {
+        $options = $query->getOptions();
+
+        return str_replace(
+            ['%TABLE%', '%DISTINCT%', '%FIELD%', '%JOIN%', '%WHERE%', '%GROUP%', '%HAVING%', '%ORDER%', '%LIMIT%', '%UNION%', '%LOCK%', '%COMMENT%', '%FORCE%'],
+            [
+                $this->parseTable($query, $options['table']),
+                $this->parseDistinct($query, $options['distinct']),
+                $this->parseField($query, $options['field']),
+                $this->parseJoin($query, $options['join']),
+                $this->parseWhere($query, $options['where']),
+                $this->parseGroup($query, $options['group']),
+                $this->parseHaving($query, $options['having']),
+                $this->parseOrder($query, $options['order']),
+                $this->parseLimit($query, $options['limit']),
+                $this->parseUnion($query, $options['union']),
+                $this->parseLock($query, $options['lock']),
+                $this->parseComment($query, $options['comment']),
+                $this->parseForce($query, $options['force']),
+            ],
+            $this->selectSql);
+    }
+
+    /**
+     * 生成Insert SQL
+     * @access public
+     * @param  Query     $query   查询对象
+     * @param  bool      $replace 是否replace
+     * @return string
+     */
+    public function insert(Query $query, $replace = false)
+    {
+        $options = $query->getOptions();
+
+        // 分析并处理数据
+        $data = $this->parseData($query, $options['data']);
+        if (empty($data)) {
+            return '';
+        }
+
+        $fields = array_keys($data);
+        $values = array_values($data);
+
+        return str_replace(
+            ['%INSERT%', '%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'],
+            [
+                $replace ? 'REPLACE' : 'INSERT',
+                $this->parseTable($query, $options['table']),
+                implode(' , ', $fields),
+                implode(' , ', $values),
+                $this->parseComment($query, $options['comment']),
+            ],
+            $this->insertSql);
+    }
+
+    /**
+     * 生成insertall SQL
+     * @access public
+     * @param  Query     $query   查询对象
+     * @param  array     $dataSet 数据集
+     * @param  bool      $replace 是否replace
+     * @return string
+     */
+    public function insertAll(Query $query, $dataSet, $replace = false)
+    {
+        $options = $query->getOptions();
+
+        // 获取合法的字段
+        if ('*' == $options['field']) {
+            $allowFields = $this->connection->getTableFields($options['table']);
+        } else {
+            $allowFields = $options['field'];
+        }
+
+        // 获取绑定信息
+        $bind = $this->connection->getFieldsBind($options['table']);
+
+        foreach ($dataSet as $k => $data) {
+            $data = $this->parseData($query, $data, $allowFields, $bind, '_' . $k);
+
+            $values[] = 'SELECT ' . implode(',', array_values($data));
+
+            if (!isset($insertFields)) {
+                $insertFields = array_keys($data);
+            }
+        }
+
+        $fields = [];
+
+        foreach ($insertFields as $field) {
+            $fields[] = $this->parseKey($query, $field);
+        }
+
+        return str_replace(
+            ['%INSERT%', '%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'],
+            [
+                $replace ? 'REPLACE' : 'INSERT',
+                $this->parseTable($query, $options['table']),
+                implode(' , ', $fields),
+                implode(' UNION ALL ', $values),
+                $this->parseComment($query, $options['comment']),
+            ],
+            $this->insertAllSql);
+    }
+
+    /**
+     * 生成slect insert SQL
+     * @access public
+     * @param  Query     $query  查询对象
+     * @param  array     $fields 数据
+     * @param  string    $table  数据表
+     * @return string
+     */
+    public function selectInsert(Query $query, $fields, $table)
+    {
+        if (is_string($fields)) {
+            $fields = explode(',', $fields);
+        }
+
+        foreach ($fields as &$field) {
+            $field = $this->parseKey($query, $field, true);
+        }
+
+        return 'INSERT INTO ' . $this->parseTable($query, $table) . ' (' . implode(',', $fields) . ') ' . $this->select($query);
+    }
+
+    /**
+     * 生成update SQL
+     * @access public
+     * @param  Query     $query  查询对象
+     * @return string
+     */
+    public function update(Query $query)
+    {
+        $options = $query->getOptions();
+
+        $table = $this->parseTable($query, $options['table']);
+        $data  = $this->parseData($query, $options['data']);
+
+        if (empty($data)) {
+            return '';
+        }
+
+        foreach ($data as $key => $val) {
+            $set[] = $key . ' = ' . $val;
+        }
+
+        return str_replace(
+            ['%TABLE%', '%SET%', '%JOIN%', '%WHERE%', '%ORDER%', '%LIMIT%', '%LOCK%', '%COMMENT%'],
+            [
+                $this->parseTable($query, $options['table']),
+                implode(' , ', $set),
+                $this->parseJoin($query, $options['join']),
+                $this->parseWhere($query, $options['where']),
+                $this->parseOrder($query, $options['order']),
+                $this->parseLimit($query, $options['limit']),
+                $this->parseLock($query, $options['lock']),
+                $this->parseComment($query, $options['comment']),
+            ],
+            $this->updateSql);
+    }
+
+    /**
+     * 生成delete SQL
+     * @access public
+     * @param  Query  $query  查询对象
+     * @return string
+     */
+    public function delete(Query $query)
+    {
+        $options = $query->getOptions();
+
+        return str_replace(
+            ['%TABLE%', '%USING%', '%JOIN%', '%WHERE%', '%ORDER%', '%LIMIT%', '%LOCK%', '%COMMENT%'],
+            [
+                $this->parseTable($query, $options['table']),
+                !empty($options['using']) ? ' USING ' . $this->parseTable($query, $options['using']) . ' ' : '',
+                $this->parseJoin($query, $options['join']),
+                $this->parseWhere($query, $options['where']),
+                $this->parseOrder($query, $options['order']),
+                $this->parseLimit($query, $options['limit']),
+                $this->parseLock($query, $options['lock']),
+                $this->parseComment($query, $options['comment']),
+            ],
+            $this->deleteSql);
+    }
+}
diff --git a/thinkphp/library/think/db/Connection.php b/thinkphp/library/think/db/Connection.php
new file mode 100644
index 0000000000000000000000000000000000000000..72722362bbcd4171c3d38c4a6dd706b67e61de35
--- /dev/null
+++ b/thinkphp/library/think/db/Connection.php
@@ -0,0 +1,2146 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db;
+
+use InvalidArgumentException;
+use PDO;
+use PDOStatement;
+use think\Container;
+use think\Db;
+use think\db\exception\BindParamException;
+use think\Debug;
+use think\Exception;
+use think\exception\PDOException;
+use think\Loader;
+
+abstract class Connection
+{
+    protected static $instance = [];
+    /** @var PDOStatement PDO操作实例 */
+    protected $PDOStatement;
+
+    /** @var string 当前SQL指令 */
+    protected $queryStr = '';
+    // 返回或者影响记录数
+    protected $numRows = 0;
+    // 事务指令数
+    protected $transTimes = 0;
+    // 错误信息
+    protected $error = '';
+
+    /** @var PDO[] 数据库连接ID 支持多个连接 */
+    protected $links = [];
+
+    /** @var PDO 当前连接ID */
+    protected $linkID;
+    protected $linkRead;
+    protected $linkWrite;
+
+    // 查询结果类型
+    protected $fetchType = PDO::FETCH_ASSOC;
+    // 字段属性大小写
+    protected $attrCase = PDO::CASE_LOWER;
+    // 监听回调
+    protected static $event = [];
+
+    // 数据表信息
+    protected static $info = [];
+
+    // 使用Builder类
+    protected $builderClassName;
+    // Builder对象
+    protected $builder;
+    // 数据库连接参数配置
+    protected $config = [
+        // 数据库类型
+        'type'            => '',
+        // 服务器地址
+        'hostname'        => '',
+        // 数据库名
+        'database'        => '',
+        // 用户名
+        'username'        => '',
+        // 密码
+        'password'        => '',
+        // 端口
+        'hostport'        => '',
+        // 连接dsn
+        'dsn'             => '',
+        // 数据库连接参数
+        'params'          => [],
+        // 数据库编码默认采用utf8
+        'charset'         => 'utf8',
+        // 数据库表前缀
+        'prefix'          => '',
+        // 数据库调试模式
+        'debug'           => false,
+        // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
+        'deploy'          => 0,
+        // 数据库读写是否分离 主从式有效
+        'rw_separate'     => false,
+        // 读写分离后 主服务器数量
+        'master_num'      => 1,
+        // 指定从服务器序号
+        'slave_no'        => '',
+        // 模型写入后自动读取主服务器
+        'read_master'     => false,
+        // 是否严格检查字段是否存在
+        'fields_strict'   => true,
+        // 数据集返回类型
+        'resultset_type'  => '',
+        // 自动写入时间戳字段
+        'auto_timestamp'  => false,
+        // 时间字段取出后的默认时间格式
+        'datetime_format' => 'Y-m-d H:i:s',
+        // 是否需要进行SQL性能分析
+        'sql_explain'     => false,
+        // Builder类
+        'builder'         => '',
+        // Query类
+        'query'           => '\\think\\db\\Query',
+        // 是否需要断线重连
+        'break_reconnect' => false,
+        // 断线标识字符串
+        'break_match_str' => [],
+    ];
+
+    // PDO连接参数
+    protected $params = [
+        PDO::ATTR_CASE              => PDO::CASE_NATURAL,
+        PDO::ATTR_ERRMODE           => PDO::ERRMODE_EXCEPTION,
+        PDO::ATTR_ORACLE_NULLS      => PDO::NULL_NATURAL,
+        PDO::ATTR_STRINGIFY_FETCHES => false,
+        PDO::ATTR_EMULATE_PREPARES  => false,
+    ];
+
+    // 服务器断线标识字符
+    protected $breakMatchStr = [
+        'server has gone away',
+        'no connection to the server',
+        'Lost connection',
+        'is dead or not enabled',
+        'Error while sending',
+        'decryption failed or bad record mac',
+        'server closed the connection unexpectedly',
+        'SSL connection has been closed unexpectedly',
+        'Error writing data to the connection',
+        'Resource deadlock avoided',
+        'failed with errno',
+    ];
+
+    // 绑定参数
+    protected $bind = [];
+
+    /**
+     * 架构函数 读取数据库配置信息
+     * @access public
+     * @param  array $config 数据库配置数组
+     */
+    public function __construct(array $config = [])
+    {
+        if (!empty($config)) {
+            $this->config = array_merge($this->config, $config);
+        }
+
+        // 创建Builder对象
+        $class = $this->getBuilderClass();
+
+        $this->builder = new $class($this);
+
+        // 执行初始化操作
+        $this->initialize();
+    }
+
+    /**
+     * 初始化
+     * @access protected
+     * @return void
+     */
+    protected function initialize()
+    {}
+
+    /**
+     * 取得数据库连接类实例
+     * @access public
+     * @param  mixed         $config 连接配置
+     * @param  bool|string   $name 连接标识 true 强制重新连接
+     * @return Connection
+     * @throws Exception
+     */
+    public static function instance($config = [], $name = false)
+    {
+        if (false === $name) {
+            $name = md5(serialize($config));
+        }
+
+        if (true === $name || !isset(self::$instance[$name])) {
+            if (empty($config['type'])) {
+                throw new InvalidArgumentException('Undefined db type');
+            }
+
+            // 记录初始化信息
+            Container::get('app')->log('[ DB ] INIT ' . $config['type']);
+
+            if (true === $name) {
+                $name = md5(serialize($config));
+            }
+
+            self::$instance[$name] = Loader::factory($config['type'], '\\think\\db\\connector\\', $config);
+        }
+
+        return self::$instance[$name];
+    }
+
+    /**
+     * 获取当前连接器类对应的Builder类
+     * @access public
+     * @return string
+     */
+    public function getBuilderClass()
+    {
+        if (!empty($this->builderClassName)) {
+            return $this->builderClassName;
+        }
+
+        return $this->getConfig('builder') ?: '\\think\\db\\builder\\' . ucfirst($this->getConfig('type'));
+    }
+
+    /**
+     * 设置当前的数据库Builder对象
+     * @access protected
+     * @param  Builder    $builder
+     * @return void
+     */
+    protected function setBuilder(Builder $builder)
+    {
+        $this->builder = $builder;
+
+        return $this;
+    }
+
+    /**
+     * 获取当前的builder实例对象
+     * @access public
+     * @return Builder
+     */
+    public function getBuilder()
+    {
+        return $this->builder;
+    }
+
+    /**
+     * 解析pdo连接的dsn信息
+     * @access protected
+     * @param  array $config 连接信息
+     * @return string
+     */
+    abstract protected function parseDsn($config);
+
+    /**
+     * 取得数据表的字段信息
+     * @access public
+     * @param  string $tableName
+     * @return array
+     */
+    abstract public function getFields($tableName);
+
+    /**
+     * 取得数据库的表信息
+     * @access public
+     * @param string $dbName
+     * @return array
+     */
+    abstract public function getTables($dbName);
+
+    /**
+     * SQL性能分析
+     * @access protected
+     * @param  string $sql
+     * @return array
+     */
+    abstract protected function getExplain($sql);
+
+    /**
+     * 对返数据表字段信息进行大小写转换出来
+     * @access public
+     * @param  array $info 字段信息
+     * @return array
+     */
+    public function fieldCase($info)
+    {
+        // 字段大小写转换
+        switch ($this->attrCase) {
+            case PDO::CASE_LOWER:
+                $info = array_change_key_case($info);
+                break;
+            case PDO::CASE_UPPER:
+                $info = array_change_key_case($info, CASE_UPPER);
+                break;
+            case PDO::CASE_NATURAL:
+            default:
+                // 不做转换
+        }
+
+        return $info;
+    }
+
+    /**
+     * 获取字段绑定类型
+     * @access public
+     * @param  string $type 字段类型
+     * @return integer
+     */
+    public function getFieldBindType($type)
+    {
+        if (0 === strpos($type, 'set') || 0 === strpos($type, 'enum')) {
+            $bind = PDO::PARAM_STR;
+        } elseif (preg_match('/(int|double|float|decimal|real|numeric|serial|bit)/is', $type)) {
+            $bind = PDO::PARAM_INT;
+        } elseif (preg_match('/bool/is', $type)) {
+            $bind = PDO::PARAM_BOOL;
+        } else {
+            $bind = PDO::PARAM_STR;
+        }
+
+        return $bind;
+    }
+
+    /**
+     * 将SQL语句中的__TABLE_NAME__字符串替换成带前缀的表名（小写）
+     * @access public
+     * @param  string $sql sql语句
+     * @return string
+     */
+    public function parseSqlTable($sql)
+    {
+        if (false !== strpos($sql, '__')) {
+            $prefix = $this->getConfig('prefix');
+            $sql    = preg_replace_callback("/__([A-Z0-9_-]+)__/sU", function ($match) use ($prefix) {
+                return $prefix . strtolower($match[1]);
+            }, $sql);
+        }
+
+        return $sql;
+    }
+
+    /**
+     * 获取数据表信息
+     * @access public
+     * @param  mixed  $tableName 数据表名 留空自动获取
+     * @param  string $fetch     获取信息类型 包括 fields type bind pk
+     * @return mixed
+     */
+    public function getTableInfo($tableName, $fetch = '')
+    {
+        if (is_array($tableName)) {
+            $tableName = key($tableName) ?: current($tableName);
+        }
+
+        if (strpos($tableName, ',')) {
+            // 多表不获取字段信息
+            return false;
+        } else {
+            $tableName = $this->parseSqlTable($tableName);
+        }
+
+        // 修正子查询作为表名的问题
+        if (strpos($tableName, ')')) {
+            return [];
+        }
+
+        list($tableName) = explode(' ', $tableName);
+
+        if (!strpos($tableName, '.')) {
+            $schema = $this->getConfig('database') . '.' . $tableName;
+        } else {
+            $schema = $tableName;
+        }
+
+        if (!isset(self::$info[$schema])) {
+            // 读取缓存
+            $cacheFile = Container::get('app')->getRuntimePath() . 'schema' . DIRECTORY_SEPARATOR . $schema . '.php';
+
+            if (!$this->config['debug'] && is_file($cacheFile)) {
+                $info = include $cacheFile;
+            } else {
+                $info = $this->getFields($tableName);
+            }
+
+            $fields = array_keys($info);
+            $bind   = $type   = [];
+
+            foreach ($info as $key => $val) {
+                // 记录字段类型
+                $type[$key] = $val['type'];
+                $bind[$key] = $this->getFieldBindType($val['type']);
+
+                if (!empty($val['primary'])) {
+                    $pk[] = $key;
+                }
+            }
+
+            if (isset($pk)) {
+                // 设置主键
+                $pk = count($pk) > 1 ? $pk : $pk[0];
+            } else {
+                $pk = null;
+            }
+
+            self::$info[$schema] = ['fields' => $fields, 'type' => $type, 'bind' => $bind, 'pk' => $pk];
+        }
+
+        return $fetch ? self::$info[$schema][$fetch] : self::$info[$schema];
+    }
+
+    /**
+     * 获取数据表的主键
+     * @access public
+     * @param  string $tableName 数据表名
+     * @return string|array
+     */
+    public function getPk($tableName)
+    {
+        return $this->getTableInfo($tableName, 'pk');
+    }
+
+    /**
+     * 获取数据表字段信息
+     * @access public
+     * @param  string $tableName 数据表名
+     * @return array
+     */
+    public function getTableFields($tableName)
+    {
+        return $this->getTableInfo($tableName, 'fields');
+    }
+
+    /**
+     * 获取数据表字段类型
+     * @access public
+     * @param  string $tableName 数据表名
+     * @param  string $field    字段名
+     * @return array|string
+     */
+    public function getFieldsType($tableName, $field = null)
+    {
+        $result = $this->getTableInfo($tableName, 'type');
+
+        if ($field && isset($result[$field])) {
+            return $result[$field];
+        }
+
+        return $result;
+    }
+
+    /**
+     * 获取数据表绑定信息
+     * @access public
+     * @param  string $tableName 数据表名
+     * @return array
+     */
+    public function getFieldsBind($tableName)
+    {
+        return $this->getTableInfo($tableName, 'bind');
+    }
+
+    /**
+     * 获取数据库的配置参数
+     * @access public
+     * @param  string $config 配置名称
+     * @return mixed
+     */
+    public function getConfig($config = '')
+    {
+        return $config ? $this->config[$config] : $this->config;
+    }
+
+    /**
+     * 设置数据库的配置参数
+     * @access public
+     * @param  string|array      $config 配置名称
+     * @param  mixed             $value 配置值
+     * @return void
+     */
+    public function setConfig($config, $value = '')
+    {
+        if (is_array($config)) {
+            $this->config = array_merge($this->config, $config);
+        } else {
+            $this->config[$config] = $value;
+        }
+    }
+
+    /**
+     * 连接数据库方法
+     * @access public
+     * @param  array         $config 连接参数
+     * @param  integer       $linkNum 连接序号
+     * @param  array|bool    $autoConnection 是否自动连接主数据库（用于分布式）
+     * @return PDO
+     * @throws Exception
+     */
+    public function connect(array $config = [], $linkNum = 0, $autoConnection = false)
+    {
+        if (isset($this->links[$linkNum])) {
+            return $this->links[$linkNum];
+        }
+
+        if (!$config) {
+            $config = $this->config;
+        } else {
+            $config = array_merge($this->config, $config);
+        }
+
+        // 连接参数
+        if (isset($config['params']) && is_array($config['params'])) {
+            $params = $config['params'] + $this->params;
+        } else {
+            $params = $this->params;
+        }
+
+        // 记录当前字段属性大小写设置
+        $this->attrCase = $params[PDO::ATTR_CASE];
+
+        if (!empty($config['break_match_str'])) {
+            $this->breakMatchStr = array_merge($this->breakMatchStr, (array) $config['break_match_str']);
+        }
+
+        try {
+            if (empty($config['dsn'])) {
+                $config['dsn'] = $this->parseDsn($config);
+            }
+
+            if ($config['debug']) {
+                $startTime = microtime(true);
+            }
+
+            $this->links[$linkNum] = new PDO($config['dsn'], $config['username'], $config['password'], $params);
+
+            if ($config['debug']) {
+                // 记录数据库连接信息
+                $this->log('[ DB ] CONNECT:[ UseTime:' . number_format(microtime(true) - $startTime, 6) . 's ] ' . $config['dsn']);
+            }
+
+            return $this->links[$linkNum];
+        } catch (\PDOException $e) {
+            if ($autoConnection) {
+                $this->log($e->getMessage(), 'error');
+                return $this->connect($autoConnection, $linkNum);
+            } else {
+                throw $e;
+            }
+        }
+    }
+
+    /**
+     * 释放查询结果
+     * @access public
+     */
+    public function free()
+    {
+        $this->PDOStatement = null;
+    }
+
+    /**
+     * 获取PDO对象
+     * @access public
+     * @return \PDO|false
+     */
+    public function getPdo()
+    {
+        if (!$this->linkID) {
+            return false;
+        }
+
+        return $this->linkID;
+    }
+
+    /**
+     * 执行查询 使用生成器返回数据
+     * @access public
+     * @param  string    $sql sql指令
+     * @param  array     $bind 参数绑定
+     * @param  bool      $master 是否在主服务器读操作
+     * @param  Model     $model 模型对象实例
+     * @param  array     $condition 查询条件
+     * @param  mixed     $relation 关联查询
+     * @return \Generator
+     */
+    public function getCursor($sql, $bind = [], $master = false, $model = null, $condition = null, $relation = null)
+    {
+        $this->initConnect($master);
+
+        // 记录SQL语句
+        $this->queryStr = $sql;
+
+        $this->bind = $bind;
+
+        // 释放前次的查询结果
+        if (!empty($this->PDOStatement)) {
+            $this->free();
+        }
+
+        Db::$queryTimes++;
+
+        // 调试开始
+        $this->debug(true);
+
+        // 预处理
+        if (empty($this->PDOStatement)) {
+            $this->PDOStatement = $this->linkID->prepare($sql);
+        }
+
+        // 是否为存储过程调用
+        $procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']);
+
+        // 参数绑定
+        if ($procedure) {
+            $this->bindParam($bind);
+        } else {
+            $this->bindValue($bind);
+        }
+
+        // 执行查询
+        $this->PDOStatement->execute();
+
+        // 调试结束
+        $this->debug(false, '', $master);
+
+        // 返回结果集
+        while ($result = $this->PDOStatement->fetch($this->fetchType)) {
+            if ($model) {
+                $instance = $model->newInstance($result, $condition);
+
+                if ($relation) {
+                    $instance->relationQuery($relation);
+                }
+
+                yield $instance;
+            } else {
+                yield $result;
+            }
+        }
+    }
+
+    /**
+     * 执行查询 返回数据集
+     * @access public
+     * @param  string    $sql sql指令
+     * @param  array     $bind 参数绑定
+     * @param  bool      $master 是否在主服务器读操作
+     * @param  bool      $pdo 是否返回PDO对象
+     * @return array
+     * @throws BindParamException
+     * @throws \PDOException
+     * @throws \Exception
+     * @throws \Throwable
+     */
+    public function query($sql, $bind = [], $master = false, $pdo = false)
+    {
+        $this->initConnect($master);
+
+        if (!$this->linkID) {
+            return false;
+        }
+
+        // 记录SQL语句
+        $this->queryStr = $sql;
+
+        $this->bind = $bind;
+
+        Db::$queryTimes++;
+
+        try {
+            // 调试开始
+            $this->debug(true);
+
+            // 释放前次的查询结果
+            if (!empty($this->PDOStatement)) {
+                $this->free();
+            }
+
+            // 预处理
+            if (empty($this->PDOStatement)) {
+                $this->PDOStatement = $this->linkID->prepare($sql);
+            }
+
+            // 是否为存储过程调用
+            $procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']);
+
+            // 参数绑定
+            if ($procedure) {
+                $this->bindParam($bind);
+            } else {
+                $this->bindValue($bind);
+            }
+
+            // 执行查询
+            $this->PDOStatement->execute();
+
+            // 调试结束
+            $this->debug(false, '', $master);
+
+            // 返回结果集
+            return $this->getResult($pdo, $procedure);
+        } catch (\PDOException $e) {
+            if ($this->isBreak($e)) {
+                return $this->close()->query($sql, $bind, $master, $pdo);
+            }
+
+            throw new PDOException($e, $this->config, $this->getLastsql());
+        } catch (\Throwable $e) {
+            if ($this->isBreak($e)) {
+                return $this->close()->query($sql, $bind, $master, $pdo);
+            }
+
+            throw $e;
+        } catch (\Exception $e) {
+            if ($this->isBreak($e)) {
+                return $this->close()->query($sql, $bind, $master, $pdo);
+            }
+
+            throw $e;
+        }
+    }
+
+    /**
+     * 执行语句
+     * @access public
+     * @param  string        $sql sql指令
+     * @param  array         $bind 参数绑定
+     * @param  Query         $query 查询对象
+     * @return int
+     * @throws BindParamException
+     * @throws \PDOException
+     * @throws \Exception
+     * @throws \Throwable
+     */
+    public function execute($sql, $bind = [], Query $query = null)
+    {
+        $this->initConnect(true);
+
+        if (!$this->linkID) {
+            return false;
+        }
+
+        // 记录SQL语句
+        $this->queryStr = $sql;
+
+        $this->bind = $bind;
+
+        Db::$executeTimes++;
+        try {
+            // 调试开始
+            $this->debug(true);
+
+            //释放前次的查询结果
+            if (!empty($this->PDOStatement) && $this->PDOStatement->queryString != $sql) {
+                $this->free();
+            }
+
+            // 预处理
+            if (empty($this->PDOStatement)) {
+                $this->PDOStatement = $this->linkID->prepare($sql);
+            }
+
+            // 是否为存储过程调用
+            $procedure = in_array(strtolower(substr(trim($sql), 0, 4)), ['call', 'exec']);
+
+            // 参数绑定
+            if ($procedure) {
+                $this->bindParam($bind);
+            } else {
+                $this->bindValue($bind);
+            }
+
+            // 执行语句
+            $this->PDOStatement->execute();
+
+            // 调试结束
+            $this->debug(false, '', true);
+
+            if ($query && !empty($this->config['deploy']) && !empty($this->config['read_master'])) {
+                $query->readMaster();
+            }
+
+            $this->numRows = $this->PDOStatement->rowCount();
+
+            return $this->numRows;
+        } catch (\PDOException $e) {
+            if ($this->isBreak($e)) {
+                return $this->close()->execute($sql, $bind, $query);
+            }
+
+            throw new PDOException($e, $this->config, $this->getLastsql());
+        } catch (\Throwable $e) {
+            if ($this->isBreak($e)) {
+                return $this->close()->execute($sql, $bind, $query);
+            }
+
+            throw $e;
+        } catch (\Exception $e) {
+            if ($this->isBreak($e)) {
+                return $this->close()->execute($sql, $bind, $query);
+            }
+
+            throw $e;
+        }
+    }
+
+    /**
+     * 查找单条记录
+     * @access public
+     * @param  Query  $query        查询对象
+     * @return array|null|\PDOStatement|string
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws DataNotFoundException
+     */
+    public function find(Query $query)
+    {
+        // 分析查询表达式
+        $options = $query->getOptions();
+        $pk      = $query->getPk($options);
+
+        $data = $options['data'];
+        $query->setOption('limit', 1);
+
+        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
+            // 判断查询缓存
+            $cache = $options['cache'];
+
+            if (is_string($cache['key'])) {
+                $key = $cache['key'];
+            } else {
+                $key = $this->getCacheKey($query, $data);
+            }
+
+            $result = Container::get('cache')->get($key);
+
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
+        if (is_string($pk) && !is_array($data)) {
+            if (isset($key) && strpos($key, '|')) {
+                list($a, $val) = explode('|', $key);
+                $item[$pk]     = $val;
+            } else {
+                $item[$pk] = $data;
+            }
+            $data = $item;
+        }
+
+        $query->setOption('data', $data);
+
+        // 生成查询SQL
+        $sql = $this->builder->select($query);
+
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            // 获取实际执行的SQL语句
+            return $this->getRealSql($sql, $bind);
+        }
+
+        // 事件回调
+        $result = $query->trigger('before_find');
+
+        if (!$result) {
+            // 执行查询
+            $resultSet = $this->query($sql, $bind, $options['master'], $options['fetch_pdo']);
+
+            if ($resultSet instanceof \PDOStatement) {
+                // 返回PDOStatement对象
+                return $resultSet;
+            }
+
+            $result = isset($resultSet[0]) ? $resultSet[0] : null;
+        }
+
+        if (isset($cache) && $result) {
+            // 缓存数据
+            $this->cacheData($key, $result, $cache);
+        }
+
+        return $result;
+    }
+
+    /**
+     * 使用游标查询记录
+     * @access public
+     * @param  Query   $query        查询对象
+     * @return \Generator
+     */
+    public function cursor(Query $query)
+    {
+        // 分析查询表达式
+        $options = $query->getOptions();
+
+        // 生成查询SQL
+        $sql = $this->builder->select($query);
+
+        $bind = $query->getBind();
+
+        $condition = isset($options['where']['AND']) ? $options['where']['AND'] : null;
+        $relation  = isset($options['relaltion']) ? $options['relation'] : null;
+
+        // 执行查询操作
+        return $this->getCursor($sql, $bind, $options['master'], $query->getModel(), $condition, $relation);
+    }
+
+    /**
+     * 查找记录
+     * @access public
+     * @param  Query   $query        查询对象
+     * @return array|\PDOStatement|string
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws DataNotFoundException
+     */
+    public function select(Query $query)
+    {
+        // 分析查询表达式
+        $options = $query->getOptions();
+
+        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
+            $resultSet = $this->getCacheData($query, $options['cache'], null, $key);
+
+            if (false !== $resultSet) {
+                return $resultSet;
+            }
+        }
+
+        // 生成查询SQL
+        $sql = $this->builder->select($query);
+
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            // 获取实际执行的SQL语句
+            return $this->getRealSql($sql, $bind);
+        }
+
+        $resultSet = $query->trigger('before_select');
+
+        if (!$resultSet) {
+            // 执行查询操作
+            $resultSet = $this->query($sql, $bind, $options['master'], $options['fetch_pdo']);
+
+            if ($resultSet instanceof \PDOStatement) {
+                // 返回PDOStatement对象
+                return $resultSet;
+            }
+        }
+
+        if (!empty($options['cache']) && false !== $resultSet) {
+            // 缓存数据集
+            $this->cacheData($key, $resultSet, $options['cache']);
+        }
+
+        return $resultSet;
+    }
+
+    /**
+     * 插入记录
+     * @access public
+     * @param  Query   $query        查询对象
+     * @param  boolean $replace      是否replace
+     * @param  boolean $getLastInsID 返回自增主键
+     * @param  string  $sequence     自增序列名
+     * @return integer|string
+     */
+    public function insert(Query $query, $replace = false, $getLastInsID = false, $sequence = null)
+    {
+        // 分析查询表达式
+        $options = $query->getOptions();
+
+        // 生成SQL语句
+        $sql = $this->builder->insert($query, $replace);
+
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            // 获取实际执行的SQL语句
+            return $this->getRealSql($sql, $bind);
+        }
+
+        // 执行操作
+        $result = '' == $sql ? 0 : $this->execute($sql, $bind, $query);
+
+        if ($result) {
+            $sequence  = $sequence ?: (isset($options['sequence']) ? $options['sequence'] : null);
+            $lastInsId = $this->getLastInsID($sequence);
+
+            $data = $options['data'];
+
+            if ($lastInsId) {
+                $pk = $query->getPk($options);
+                if (is_string($pk)) {
+                    $data[$pk] = $lastInsId;
+                }
+            }
+
+            $query->setOption('data', $data);
+
+            $query->trigger('after_insert');
+
+            if ($getLastInsID) {
+                return $lastInsId;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * 批量插入记录
+     * @access public
+     * @param  Query     $query      查询对象
+     * @param  mixed     $dataSet    数据集
+     * @param  bool      $replace    是否replace
+     * @param  integer   $limit      每次写入数据限制
+     * @return integer|string
+     * @throws \Exception
+     * @throws \Throwable
+     */
+    public function insertAll(Query $query, $dataSet = [], $replace = false, $limit = null)
+    {
+        if (!is_array(reset($dataSet))) {
+            return false;
+        }
+
+        $options = $query->getOptions();
+
+        if ($limit) {
+            // 分批写入 自动启动事务支持
+            $this->startTrans();
+
+            try {
+                $array = array_chunk($dataSet, $limit, true);
+                $count = 0;
+
+                foreach ($array as $item) {
+                    $sql  = $this->builder->insertAll($query, $item, $replace);
+                    $bind = $query->getBind();
+
+                    if (!empty($options['fetch_sql'])) {
+                        $fetchSql[] = $this->getRealSql($sql, $bind);
+                    } else {
+                        $count += $this->execute($sql, $bind, $query);
+                    }
+                }
+
+                // 提交事务
+                $this->commit();
+            } catch (\Exception $e) {
+                $this->rollback();
+                throw $e;
+            } catch (\Throwable $e) {
+                $this->rollback();
+                throw $e;
+            }
+
+            return isset($fetchSql) ? implode(';', $fetchSql) : $count;
+        }
+
+        $sql  = $this->builder->insertAll($query, $dataSet, $replace);
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            return $this->getRealSql($sql, $bind);
+        }
+
+        return $this->execute($sql, $bind, $query);
+    }
+
+    /**
+     * 通过Select方式插入记录
+     * @access public
+     * @param  Query     $query      查询对象
+     * @param  string    $fields     要插入的数据表字段名
+     * @param  string    $table      要插入的数据表名
+     * @return integer|string
+     * @throws PDOException
+     */
+    public function selectInsert(Query $query, $fields, $table)
+    {
+        // 分析查询表达式
+        $options = $query->getOptions();
+
+        $table = $this->parseSqlTable($table);
+
+        $sql = $this->builder->selectInsert($query, $fields, $table);
+
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            return $this->getRealSql($sql, $bind);
+        }
+
+        return $this->execute($sql, $bind, $query);
+    }
+
+    /**
+     * 更新记录
+     * @access public
+     * @param  Query     $query  查询对象
+     * @return integer|string
+     * @throws Exception
+     * @throws PDOException
+     */
+    public function update(Query $query)
+    {
+        $options = $query->getOptions();
+
+        if (isset($options['cache']) && is_string($options['cache']['key'])) {
+            $key = $options['cache']['key'];
+        }
+
+        $pk   = $query->getPk($options);
+        $data = $options['data'];
+
+        if (empty($options['where'])) {
+            // 如果存在主键数据 则自动作为更新条件
+            if (is_string($pk) && isset($data[$pk])) {
+                $where[$pk] = [$pk, '=', $data[$pk]];
+                if (!isset($key)) {
+                    $key = $this->getCacheKey($query, $data[$pk]);
+                }
+                unset($data[$pk]);
+            } elseif (is_array($pk)) {
+                // 增加复合主键支持
+                foreach ($pk as $field) {
+                    if (isset($data[$field])) {
+                        $where[$field] = [$field, '=', $data[$field]];
+                    } else {
+                        // 如果缺少复合主键数据则不执行
+                        throw new Exception('miss complex primary data');
+                    }
+                    unset($data[$field]);
+                }
+            }
+
+            if (!isset($where)) {
+                // 如果没有任何更新条件则不执行
+                throw new Exception('miss update condition');
+            } else {
+                $options['where']['AND'] = $where;
+                $query->setOption('where', ['AND' => $where]);
+            }
+        } elseif (!isset($key) && is_string($pk) && isset($options['where']['AND'])) {
+            foreach ($options['where']['AND'] as $val) {
+                if (is_array($val) && $val[0] == $pk) {
+                    $key = $this->getCacheKey($query, $val);
+                }
+            }
+        }
+
+        // 更新数据
+        $query->setOption('data', $data);
+
+        // 生成UPDATE SQL语句
+        $sql  = $this->builder->update($query);
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            // 获取实际执行的SQL语句
+            return $this->getRealSql($sql, $bind);
+        }
+
+        // 检测缓存
+        $cache = Container::get('cache');
+
+        if (isset($key) && $cache->get($key)) {
+            // 删除缓存
+            $cache->rm($key);
+        } elseif (!empty($options['cache']['tag'])) {
+            $cache->clear($options['cache']['tag']);
+        }
+
+        // 执行操作
+        $result = '' == $sql ? 0 : $this->execute($sql, $bind, $query);
+
+        if ($result) {
+            if (is_string($pk) && isset($where[$pk])) {
+                $data[$pk] = $where[$pk];
+            } elseif (is_string($pk) && isset($key) && strpos($key, '|')) {
+                list($a, $val) = explode('|', $key);
+                $data[$pk]     = $val;
+            }
+
+            $query->setOption('data', $data);
+            $query->trigger('after_update');
+        }
+
+        return $result;
+    }
+
+    /**
+     * 删除记录
+     * @access public
+     * @param  Query $query 查询对象
+     * @return int
+     * @throws Exception
+     * @throws PDOException
+     */
+    public function delete(Query $query)
+    {
+        // 分析查询表达式
+        $options = $query->getOptions();
+        $pk      = $query->getPk($options);
+        $data    = $options['data'];
+
+        if (isset($options['cache']) && is_string($options['cache']['key'])) {
+            $key = $options['cache']['key'];
+        } elseif (!is_null($data) && true !== $data && !is_array($data)) {
+            $key = $this->getCacheKey($query, $data);
+        } elseif (is_string($pk) && isset($options['where']['AND'])) {
+            foreach ($options['where']['AND'] as $val) {
+                if (is_array($val) && $val[0] == $pk) {
+                    $key = $this->getCacheKey($query, $val);
+                }
+            }
+        }
+
+        if (true !== $data && empty($options['where'])) {
+            // 如果条件为空 不进行删除操作 除非设置 1=1
+            throw new Exception('delete without condition');
+        }
+
+        // 生成删除SQL语句
+        $sql = $this->builder->delete($query);
+
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            // 获取实际执行的SQL语句
+            return $this->getRealSql($sql, $bind);
+        }
+
+        // 检测缓存
+        $cache = Container::get('cache');
+
+        if (isset($key) && $cache->get($key)) {
+            // 删除缓存
+            $cache->rm($key);
+        } elseif (!empty($options['cache']['tag'])) {
+            $cache->clear($options['cache']['tag']);
+        }
+
+        // 执行操作
+        $result = $this->execute($sql, $bind, $query);
+
+        if ($result) {
+            if (!is_array($data) && is_string($pk) && isset($key) && strpos($key, '|')) {
+                list($a, $val) = explode('|', $key);
+                $item[$pk]     = $val;
+                $data          = $item;
+            }
+
+            $options['data'] = $data;
+
+            $query->trigger('after_delete');
+        }
+
+        return $result;
+    }
+
+    /**
+     * 得到某个字段的值
+     * @access public
+     * @param  Query     $query 查询对象
+     * @param  string    $field   字段名
+     * @param  bool      $default   默认值
+     * @return mixed
+     */
+    public function value(Query $query, $field, $default = null)
+    {
+        $options = $query->getOptions();
+
+        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
+            $cache  = $options['cache'];
+            $result = $this->getCacheData($query, $cache, null, $key);
+
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
+        if (isset($options['field'])) {
+            $query->removeOption('field');
+        }
+
+        if (is_string($field)) {
+            $field = array_map('trim', explode(',', $field));
+        }
+
+        $query->setOption('field', $field);
+        $query->setOption('limit', 1);
+
+        // 生成查询SQL
+        $sql = $this->builder->select($query);
+
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            // 获取实际执行的SQL语句
+            return $this->getRealSql($sql, $bind);
+        }
+
+        // 执行查询操作
+        $pdo = $this->query($sql, $bind, $options['master'], true);
+
+        $result = $pdo->fetchColumn();
+
+        if (isset($cache) && false !== $result) {
+            // 缓存数据
+            $this->cacheData($key, $result, $cache);
+        }
+
+        return false !== $result ? $result : $default;
+    }
+
+    /**
+     * 得到某个字段的值
+     * @access public
+     * @param  Query     $query     查询对象
+     * @param  string    $aggregate 聚合方法
+     * @param  string    $field     字段名
+     * @return mixed
+     */
+    public function aggregate(Query $query, $aggregate, $field)
+    {
+        $field = $aggregate . '(' . $this->builder->parseKey($query, $field, true) . ') AS tp_' . strtolower($aggregate);
+
+        return $this->value($query, $field, 0);
+    }
+
+    /**
+     * 得到某个列的数组
+     * @access public
+     * @param  Query     $query 查询对象
+     * @param  string    $field 字段名 多个字段用逗号分隔
+     * @param  string    $key   索引
+     * @return array
+     */
+    public function column(Query $query, $field, $key = '')
+    {
+        $options = $query->getOptions();
+
+        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
+            // 判断查询缓存
+            $cache  = $options['cache'];
+            $result = $this->getCacheData($query, $cache, null, $guid);
+
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
+        if (isset($options['field'])) {
+            $query->removeOption('field');
+        }
+
+        if (is_null($field)) {
+            $field = '*';
+        } elseif ($key && '*' != $field) {
+            $field = $key . ',' . $field;
+        }
+
+        if (is_string($field)) {
+            $field = array_map('trim', explode(',', $field));
+        }
+
+        $query->setOption('field', $field);
+
+        // 生成查询SQL
+        $sql = $this->builder->select($query);
+
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            // 获取实际执行的SQL语句
+            return $this->getRealSql($sql, $bind);
+        }
+
+        // 执行查询操作
+        $pdo = $this->query($sql, $bind, $options['master'], true);
+
+        if (1 == $pdo->columnCount()) {
+            $result = $pdo->fetchAll(PDO::FETCH_COLUMN);
+        } else {
+            $resultSet = $pdo->fetchAll(PDO::FETCH_ASSOC);
+
+            if ('*' == $field && $key) {
+                $result = array_column($resultSet, null, $key);
+            } elseif ($resultSet) {
+                $fields = array_keys($resultSet[0]);
+                $count  = count($fields);
+                $key1   = array_shift($fields);
+                $key2   = $fields ? array_shift($fields) : '';
+                $key    = $key ?: $key1;
+
+                if (strpos($key, '.')) {
+                    list($alias, $key) = explode('.', $key);
+                }
+
+                if (2 == $count) {
+                    $column = $key2;
+                } elseif (1 == $count) {
+                    $column = $key1;
+                } else {
+                    $column = null;
+                }
+
+                $result = array_column($resultSet, $column, $key);
+            } else {
+                $result = [];
+            }
+        }
+
+        if (isset($cache) && isset($guid)) {
+            // 缓存数据
+            $this->cacheData($guid, $result, $cache);
+        }
+
+        return $result;
+    }
+
+    /**
+     * 执行查询但只返回PDOStatement对象
+     * @access public
+     * @return \PDOStatement|string
+     */
+    public function pdo(Query $query)
+    {
+        // 分析查询表达式
+        $options = $query->getOptions();
+
+        // 生成查询SQL
+        $sql = $this->builder->select($query);
+
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            // 获取实际执行的SQL语句
+            return $this->getRealSql($sql, $bind);
+        }
+
+        // 执行查询操作
+        return $this->query($sql, $bind, $options['master'], true);
+    }
+
+    /**
+     * 根据参数绑定组装最终的SQL语句 便于调试
+     * @access public
+     * @param  string    $sql 带参数绑定的sql语句
+     * @param  array     $bind 参数绑定列表
+     * @return string
+     */
+    public function getRealSql($sql, array $bind = [])
+    {
+        if (is_array($sql)) {
+            $sql = implode(';', $sql);
+        }
+
+        foreach ($bind as $key => $val) {
+            $value = is_array($val) ? $val[0] : $val;
+            $type  = is_array($val) ? $val[1] : PDO::PARAM_STR;
+
+            if (PDO::PARAM_STR == $type) {
+                $value = '\'' . addslashes($value) . '\'';
+            } elseif (PDO::PARAM_INT == $type) {
+                $value = (float) $value;
+            }
+
+            // 判断占位符
+            $sql = is_numeric($key) ?
+            substr_replace($sql, $value, strpos($sql, '?'), 1) :
+            str_replace(
+                [':' . $key . ')', ':' . $key . ',', ':' . $key . ' ', ':' . $key . PHP_EOL],
+                [$value . ')', $value . ',', $value . ' ', $value . PHP_EOL],
+                $sql . ' ');
+        }
+
+        return rtrim($sql);
+    }
+
+    /**
+     * 参数绑定
+     * 支持 ['name'=>'value','id'=>123] 对应命名占位符
+     * 或者 ['value',123] 对应问号占位符
+     * @access public
+     * @param  array $bind 要绑定的参数列表
+     * @return void
+     * @throws BindParamException
+     */
+    protected function bindValue(array $bind = [])
+    {
+        foreach ($bind as $key => $val) {
+            // 占位符
+            $param = is_numeric($key) ? $key + 1 : ':' . $key;
+
+            if (is_array($val)) {
+                if (PDO::PARAM_INT == $val[1] && '' === $val[0]) {
+                    $val[0] = 0;
+                }
+                $result = $this->PDOStatement->bindValue($param, $val[0], $val[1]);
+            } else {
+                $result = $this->PDOStatement->bindValue($param, $val);
+            }
+
+            if (!$result) {
+                throw new BindParamException(
+                    "Error occurred  when binding parameters '{$param}'",
+                    $this->config,
+                    $this->getLastsql(),
+                    $bind
+                );
+            }
+        }
+    }
+
+    /**
+     * 存储过程的输入输出参数绑定
+     * @access public
+     * @param  array $bind 要绑定的参数列表
+     * @return void
+     * @throws BindParamException
+     */
+    protected function bindParam($bind)
+    {
+        foreach ($bind as $key => $val) {
+            $param = is_numeric($key) ? $key + 1 : ':' . $key;
+
+            if (is_array($val)) {
+                array_unshift($val, $param);
+                $result = call_user_func_array([$this->PDOStatement, 'bindParam'], $val);
+            } else {
+                $result = $this->PDOStatement->bindValue($param, $val);
+            }
+
+            if (!$result) {
+                $param = array_shift($val);
+
+                throw new BindParamException(
+                    "Error occurred  when binding parameters '{$param}'",
+                    $this->config,
+                    $this->getLastsql(),
+                    $bind
+                );
+            }
+        }
+    }
+
+    /**
+     * 获得数据集数组
+     * @access protected
+     * @param  bool   $pdo 是否返回PDOStatement
+     * @param  bool   $procedure 是否存储过程
+     * @return array
+     */
+    protected function getResult($pdo = false, $procedure = false)
+    {
+        if ($pdo) {
+            // 返回PDOStatement对象处理
+            return $this->PDOStatement;
+        }
+
+        if ($procedure) {
+            // 存储过程返回结果
+            return $this->procedure();
+        }
+
+        $result = $this->PDOStatement->fetchAll($this->fetchType);
+
+        $this->numRows = count($result);
+
+        return $result;
+    }
+
+    /**
+     * 获得存储过程数据集
+     * @access protected
+     * @return array
+     */
+    protected function procedure()
+    {
+        $item = [];
+
+        do {
+            $result = $this->getResult();
+            if ($result) {
+                $item[] = $result;
+            }
+        } while ($this->PDOStatement->nextRowset());
+
+        $this->numRows = count($item);
+
+        return $item;
+    }
+
+    /**
+     * 执行数据库事务
+     * @access public
+     * @param  callable $callback 数据操作方法回调
+     * @return mixed
+     * @throws PDOException
+     * @throws \Exception
+     * @throws \Throwable
+     */
+    public function transaction($callback)
+    {
+        $this->startTrans();
+
+        try {
+            $result = null;
+            if (is_callable($callback)) {
+                $result = call_user_func_array($callback, [$this]);
+            }
+
+            $this->commit();
+            return $result;
+        } catch (\Exception $e) {
+            $this->rollback();
+            throw $e;
+        } catch (\Throwable $e) {
+            $this->rollback();
+            throw $e;
+        }
+    }
+
+    /**
+     * 启动XA事务
+     * @access public
+     * @param  string $xid XA事务id
+     * @return void
+     */
+    public function startTransXa($xid)
+    {}
+
+    /**
+     * 预编译XA事务
+     * @access public
+     * @param  string $xid XA事务id
+     * @return void
+     */
+    public function prepareXa($xid)
+    {}
+
+    /**
+     * 提交XA事务
+     * @access public
+     * @param  string $xid XA事务id
+     * @return void
+     */
+    public function commitXa($xid)
+    {}
+
+    /**
+     * 回滚XA事务
+     * @access public
+     * @param  string $xid XA事务id
+     * @return void
+     */
+    public function rollbackXa($xid)
+    {}
+
+    /**
+     * 启动事务
+     * @access public
+     * @return void
+     * @throws \PDOException
+     * @throws \Exception
+     */
+    public function startTrans()
+    {
+        $this->initConnect(true);
+        if (!$this->linkID) {
+            return false;
+        }
+
+        ++$this->transTimes;
+
+        try {
+            if (1 == $this->transTimes) {
+                $this->linkID->beginTransaction();
+            } elseif ($this->transTimes > 1 && $this->supportSavepoint()) {
+                $this->linkID->exec(
+                    $this->parseSavepoint('trans' . $this->transTimes)
+                );
+            }
+        } catch (\PDOException $e) {
+            if ($this->isBreak($e)) {
+                return $this->close()->startTrans();
+            }
+            throw $e;
+        } catch (\Exception $e) {
+            if ($this->isBreak($e)) {
+                return $this->close()->startTrans();
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * 用于非自动提交状态下面的查询提交
+     * @access public
+     * @return void
+     * @throws PDOException
+     */
+    public function commit()
+    {
+        $this->initConnect(true);
+
+        if (1 == $this->transTimes) {
+            $this->linkID->commit();
+        }
+
+        --$this->transTimes;
+    }
+
+    /**
+     * 事务回滚
+     * @access public
+     * @return void
+     * @throws PDOException
+     */
+    public function rollback()
+    {
+        $this->initConnect(true);
+
+        if (1 == $this->transTimes) {
+            $this->linkID->rollBack();
+        } elseif ($this->transTimes > 1 && $this->supportSavepoint()) {
+            $this->linkID->exec(
+                $this->parseSavepointRollBack('trans' . $this->transTimes)
+            );
+        }
+
+        $this->transTimes = max(0, $this->transTimes - 1);
+    }
+
+    /**
+     * 是否支持事务嵌套
+     * @return bool
+     */
+    protected function supportSavepoint()
+    {
+        return false;
+    }
+
+    /**
+     * 生成定义保存点的SQL
+     * @access protected
+     * @param  $name
+     * @return string
+     */
+    protected function parseSavepoint($name)
+    {
+        return 'SAVEPOINT ' . $name;
+    }
+
+    /**
+     * 生成回滚到保存点的SQL
+     * @access protected
+     * @param  $name
+     * @return string
+     */
+    protected function parseSavepointRollBack($name)
+    {
+        return 'ROLLBACK TO SAVEPOINT ' . $name;
+    }
+
+    /**
+     * 批处理执行SQL语句
+     * 批处理的指令都认为是execute操作
+     * @access public
+     * @param  array $sqlArray   SQL批处理指令
+     * @param  array $bind       参数绑定
+     * @return boolean
+     */
+    public function batchQuery($sqlArray = [], $bind = [])
+    {
+        if (!is_array($sqlArray)) {
+            return false;
+        }
+
+        // 自动启动事务支持
+        $this->startTrans();
+
+        try {
+            foreach ($sqlArray as $sql) {
+                $this->execute($sql, $bind);
+            }
+            // 提交事务
+            $this->commit();
+        } catch (\Exception $e) {
+            $this->rollback();
+            throw $e;
+        }
+
+        return true;
+    }
+
+    /**
+     * 获得查询次数
+     * @access public
+     * @param  boolean $execute 是否包含所有查询
+     * @return integer
+     */
+    public function getQueryTimes($execute = false)
+    {
+        return $execute ? Db::$queryTimes + Db::$executeTimes : Db::$queryTimes;
+    }
+
+    /**
+     * 获得执行次数
+     * @access public
+     * @return integer
+     */
+    public function getExecuteTimes()
+    {
+        return Db::$executeTimes;
+    }
+
+    /**
+     * 关闭数据库（或者重新连接）
+     * @access public
+     * @return $this
+     */
+    public function close()
+    {
+        $this->linkID    = null;
+        $this->linkWrite = null;
+        $this->linkRead  = null;
+        $this->links     = [];
+
+        return $this;
+    }
+
+    /**
+     * 是否断线
+     * @access protected
+     * @param  \PDOException|\Exception  $e 异常对象
+     * @return bool
+     */
+    protected function isBreak($e)
+    {
+        if (!$this->config['break_reconnect']) {
+            return false;
+        }
+
+        $error = $e->getMessage();
+
+        foreach ($this->breakMatchStr as $msg) {
+            if (false !== stripos($error, $msg)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 获取最近一次查询的sql语句
+     * @access public
+     * @return string
+     */
+    public function getLastSql()
+    {
+        return $this->getRealSql($this->queryStr, $this->bind);
+    }
+
+    /**
+     * 获取最近插入的ID
+     * @access public
+     * @param  string  $sequence     自增序列名
+     * @return string
+     */
+    public function getLastInsID($sequence = null)
+    {
+        return $this->linkID->lastInsertId($sequence);
+    }
+
+    /**
+     * 获取返回或者影响的记录数
+     * @access public
+     * @return integer
+     */
+    public function getNumRows()
+    {
+        return $this->numRows;
+    }
+
+    /**
+     * 获取最近的错误信息
+     * @access public
+     * @return string
+     */
+    public function getError()
+    {
+        if ($this->PDOStatement) {
+            $error = $this->PDOStatement->errorInfo();
+            $error = $error[1] . ':' . $error[2];
+        } else {
+            $error = '';
+        }
+
+        if ('' != $this->queryStr) {
+            $error .= "\n [ SQL语句 ] : " . $this->getLastsql();
+        }
+
+        return $error;
+    }
+
+    /**
+     * 数据库调试 记录当前SQL及分析性能
+     * @access protected
+     * @param  boolean $start 调试开始标记 true 开始 false 结束
+     * @param  string  $sql 执行的SQL语句 留空自动获取
+     * @param  bool    $master 主从标记
+     * @return void
+     */
+    protected function debug($start, $sql = '', $master = false)
+    {
+        if (!empty($this->config['debug'])) {
+            // 开启数据库调试模式
+            $debug = Container::get('debug');
+
+            if ($start) {
+                $debug->remark('queryStartTime', 'time');
+            } else {
+                // 记录操作结束时间
+                $debug->remark('queryEndTime', 'time');
+                $runtime = $debug->getRangeTime('queryStartTime', 'queryEndTime');
+                $sql     = $sql ?: $this->getLastsql();
+                $result  = [];
+
+                // SQL性能分析
+                if ($this->config['sql_explain'] && 0 === stripos(trim($sql), 'select')) {
+                    $result = $this->getExplain($sql);
+                }
+
+                // SQL监听
+                $this->triggerSql($sql, $runtime, $result, $master);
+            }
+        }
+    }
+
+    /**
+     * 监听SQL执行
+     * @access public
+     * @param  callable $callback 回调方法
+     * @return void
+     */
+    public function listen($callback)
+    {
+        self::$event[] = $callback;
+    }
+
+    /**
+     * 触发SQL事件
+     * @access protected
+     * @param  string    $sql SQL语句
+     * @param  float     $runtime SQL运行时间
+     * @param  mixed     $explain SQL分析
+     * @param  bool      $master 主从标记
+     * @return void
+     */
+    protected function triggerSql($sql, $runtime, $explain = [], $master = false)
+    {
+        if (!empty(self::$event)) {
+            foreach (self::$event as $callback) {
+                if (is_callable($callback)) {
+                    call_user_func_array($callback, [$sql, $runtime, $explain, $master]);
+                }
+            }
+        } else {
+            if ($this->config['deploy']) {
+                // 分布式记录当前操作的主从
+                $master = $master ? 'master|' : 'slave|';
+            } else {
+                $master = '';
+            }
+
+            // 未注册监听则记录到日志中
+            $this->log('[ SQL ] ' . $sql . ' [ ' . $master . 'RunTime:' . $runtime . 's ]');
+
+            if (!empty($explain)) {
+                $this->log('[ EXPLAIN : ' . var_export($explain, true) . ' ]');
+            }
+        }
+    }
+
+    public function log($log, $type = 'sql')
+    {
+        $this->config['debug'] && Container::get('log')->record($log, $type);
+    }
+
+    /**
+     * 初始化数据库连接
+     * @access protected
+     * @param  boolean $master 是否主服务器
+     * @return void
+     */
+    protected function initConnect($master = true)
+    {
+        if (!empty($this->config['deploy'])) {
+            // 采用分布式数据库
+            if ($master || $this->transTimes) {
+                if (!$this->linkWrite) {
+                    $this->linkWrite = $this->multiConnect(true);
+                }
+
+                $this->linkID = $this->linkWrite;
+            } else {
+                if (!$this->linkRead) {
+                    $this->linkRead = $this->multiConnect(false);
+                }
+
+                $this->linkID = $this->linkRead;
+            }
+        } elseif (!$this->linkID) {
+            // 默认单数据库
+            $this->linkID = $this->connect();
+        }
+    }
+
+    /**
+     * 连接分布式服务器
+     * @access protected
+     * @param  boolean $master 主服务器
+     * @return PDO
+     */
+    protected function multiConnect($master = false)
+    {
+        $_config = [];
+
+        // 分布式数据库配置解析
+        foreach (['username', 'password', 'hostname', 'hostport', 'database', 'dsn', 'charset'] as $name) {
+            $_config[$name] = explode(',', $this->config[$name]);
+        }
+
+        // 主服务器序号
+        $m = floor(mt_rand(0, $this->config['master_num'] - 1));
+
+        if ($this->config['rw_separate']) {
+            // 主从式采用读写分离
+            if ($master) // 主服务器写入
+            {
+                $r = $m;
+            } elseif (is_numeric($this->config['slave_no'])) {
+                // 指定服务器读
+                $r = $this->config['slave_no'];
+            } else {
+                // 读操作连接从服务器 每次随机连接的数据库
+                $r = floor(mt_rand($this->config['master_num'], count($_config['hostname']) - 1));
+            }
+        } else {
+            // 读写操作不区分服务器 每次随机连接的数据库
+            $r = floor(mt_rand(0, count($_config['hostname']) - 1));
+        }
+        $dbMaster = false;
+
+        if ($m != $r) {
+            $dbMaster = [];
+            foreach (['username', 'password', 'hostname', 'hostport', 'database', 'dsn', 'charset'] as $name) {
+                $dbMaster[$name] = isset($_config[$name][$m]) ? $_config[$name][$m] : $_config[$name][0];
+            }
+        }
+
+        $dbConfig = [];
+
+        foreach (['username', 'password', 'hostname', 'hostport', 'database', 'dsn', 'charset'] as $name) {
+            $dbConfig[$name] = isset($_config[$name][$r]) ? $_config[$name][$r] : $_config[$name][0];
+        }
+
+        return $this->connect($dbConfig, $r, $r == $m ? false : $dbMaster);
+    }
+
+    /**
+     * 析构方法
+     * @access public
+     */
+    public function __destruct()
+    {
+        // 释放查询
+        $this->free();
+
+        // 关闭连接
+        $this->close();
+    }
+
+    /**
+     * 缓存数据
+     * @access protected
+     * @param  string    $key    缓存标识
+     * @param  mixed     $data   缓存数据
+     * @param  array     $config 缓存参数
+     */
+    protected function cacheData($key, $data, $config = [])
+    {
+        $cache = Container::get('cache');
+
+        if (isset($config['tag'])) {
+            $cache->tag($config['tag'])->set($key, $data, $config['expire']);
+        } else {
+            $cache->set($key, $data, $config['expire']);
+        }
+    }
+
+    /**
+     * 获取缓存数据
+     * @access protected
+     * @param  Query     $query   查询对象
+     * @param  mixed     $cache   缓存设置
+     * @param  array     $options 缓存
+     * @return mixed
+     */
+    protected function getCacheData(Query $query, $cache, $data, &$key = null)
+    {
+        // 判断查询缓存
+        $key = is_string($cache['key']) ? $cache['key'] : $this->getCacheKey($query, $data);
+
+        return Container::get('cache')->get($key);
+    }
+
+    /**
+     * 生成缓存标识
+     * @access protected
+     * @param  Query     $query   查询对象
+     * @param  mixed     $value   缓存数据
+     * @return string
+     */
+    protected function getCacheKey(Query $query, $value)
+    {
+        if (is_scalar($value)) {
+            $data = $value;
+        } elseif (is_array($value) && isset($value[1], $value[2]) && in_array($value[1], ['=', 'eq'], true) && is_scalar($value[2])) {
+            $data = $value[2];
+        }
+
+        $prefix = 'think:' . $this->getConfig('database') . '.';
+
+        if (isset($data)) {
+            return $prefix . $query->getTable() . '|' . $data;
+        }
+
+        try {
+            return md5($prefix . serialize($query->getOptions()) . serialize($query->getBind(false)));
+        } catch (\Exception $e) {
+            throw new Exception('closure not support cache(true)');
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/db/Expression.php b/thinkphp/library/think/db/Expression.php
new file mode 100644
index 0000000000000000000000000000000000000000..f1b92abd7b93116c0c9b681f45c3d8e15c0b8596
--- /dev/null
+++ b/thinkphp/library/think/db/Expression.php
@@ -0,0 +1,48 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db;
+
+class Expression
+{
+    /**
+     * 查询表达式
+     *
+     * @var string
+     */
+    protected $value;
+
+    /**
+     * 创建一个查询表达式
+     *
+     * @param  string  $value
+     * @return void
+     */
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * 获取表达式
+     *
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    public function __toString()
+    {
+        return (string) $this->value;
+    }
+}
diff --git a/thinkphp/library/think/db/Query.php b/thinkphp/library/think/db/Query.php
new file mode 100644
index 0000000000000000000000000000000000000000..fcc11900dc3367671be25ab8344c8a2037df2874
--- /dev/null
+++ b/thinkphp/library/think/db/Query.php
@@ -0,0 +1,3279 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db;
+
+use PDO;
+use think\Collection;
+use think\Container;
+use think\Db;
+use think\db\exception\BindParamException;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\ModelNotFoundException;
+use think\Exception;
+use think\exception\DbException;
+use think\exception\PDOException;
+use think\Loader;
+use think\Model;
+use think\model\Relation;
+use think\model\relation\OneToOne;
+use think\Paginator;
+
+class Query
+{
+    /**
+     * 当前数据库连接对象
+     * @var Connection
+     */
+    protected $connection;
+
+    /**
+     * 当前模型对象
+     * @var Model
+     */
+    protected $model;
+
+    /**
+     * 当前数据表名称（不含前缀）
+     * @var string
+     */
+    protected $name = '';
+
+    /**
+     * 当前数据表主键
+     * @var string|array
+     */
+    protected $pk;
+
+    /**
+     * 当前数据表前缀
+     * @var string
+     */
+    protected $prefix = '';
+
+    /**
+     * 当前查询参数
+     * @var array
+     */
+    protected $options = [];
+
+    /**
+     * 当前参数绑定
+     * @var array
+     */
+    protected $bind = [];
+
+    /**
+     * 事件回调
+     * @var array
+     */
+    private static $event = [];
+
+    /**
+     * 扩展查询方法
+     * @var array
+     */
+    private static $extend = [];
+
+    /**
+     * 读取主库的表
+     * @var array
+     */
+    protected static $readMaster = [];
+
+    /**
+     * 日期查询表达式
+     * @var array
+     */
+    protected $timeRule = [
+        'today'      => ['today', 'tomorrow'],
+        'yesterday'  => ['yesterday', 'today'],
+        'week'       => ['this week 00:00:00', 'next week 00:00:00'],
+        'last week'  => ['last week 00:00:00', 'this week 00:00:00'],
+        'month'      => ['first Day of this month 00:00:00', 'first Day of next month 00:00:00'],
+        'last month' => ['first Day of last month 00:00:00', 'first Day of this month 00:00:00'],
+        'year'       => ['this year 1/1', 'next year 1/1'],
+        'last year'  => ['last year 1/1', 'this year 1/1'],
+    ];
+
+    /**
+     * 日期查询快捷定义
+     * @var array
+     */
+    protected $timeExp = ['d' => 'today', 'w' => 'week', 'm' => 'month', 'y' => 'year'];
+
+    /**
+     * 架构函数
+     * @access public
+     */
+    public function __construct(Connection $connection = null)
+    {
+        if (is_null($connection)) {
+            $this->connection = Db::connect();
+        } else {
+            $this->connection = $connection;
+        }
+
+        $this->prefix = $this->connection->getConfig('prefix');
+    }
+
+    /**
+     * 创建一个新的查询对象
+     * @access public
+     * @return Query
+     */
+    public function newQuery()
+    {
+        return new static($this->connection);
+    }
+
+    /**
+     * 利用__call方法实现一些特殊的Model方法
+     * @access public
+     * @param  string $method 方法名称
+     * @param  array  $args   调用参数
+     * @return mixed
+     * @throws DbException
+     * @throws Exception
+     */
+    public function __call($method, $args)
+    {
+        if (isset(self::$extend[strtolower($method)])) {
+            // 调用扩展查询方法
+            array_unshift($args, $this);
+
+            return Container::getInstance()->invoke(self::$extend[strtolower($method)], $args);
+        } elseif (strtolower(substr($method, 0, 5)) == 'getby') {
+            // 根据某个字段获取记录
+            $field = Loader::parseName(substr($method, 5));
+            return $this->where($field, '=', $args[0])->find();
+        } elseif (strtolower(substr($method, 0, 10)) == 'getfieldby') {
+            // 根据某个字段获取记录的某个值
+            $name = Loader::parseName(substr($method, 10));
+            return $this->where($name, '=', $args[0])->value($args[1]);
+        } elseif (strtolower(substr($method, 0, 7)) == 'whereor') {
+            $name = Loader::parseName(substr($method, 7));
+            array_unshift($args, $name);
+            return call_user_func_array([$this, 'whereOr'], $args);
+        } elseif (strtolower(substr($method, 0, 5)) == 'where') {
+            $name = Loader::parseName(substr($method, 5));
+            array_unshift($args, $name);
+            return call_user_func_array([$this, 'where'], $args);
+        } elseif ($this->model && method_exists($this->model, 'scope' . $method)) {
+            // 动态调用命名范围
+            $method = 'scope' . $method;
+            array_unshift($args, $this);
+
+            call_user_func_array([$this->model, $method], $args);
+            return $this;
+        } else {
+            throw new Exception('method not exist:' . static::class . '->' . $method);
+        }
+    }
+
+    /**
+     * 扩展查询方法
+     * @access public
+     * @param  string|array  $method     查询方法名
+     * @param  callable      $callback
+     * @return void
+     */
+    public static function extend($method, $callback = null)
+    {
+        if (is_array($method)) {
+            foreach ($method as $key => $val) {
+                self::$extend[strtolower($key)] = $val;
+            }
+        } else {
+            self::$extend[strtolower($method)] = $callback;
+        }
+    }
+
+    /**
+     * 设置当前的数据库Connection对象
+     * @access public
+     * @param  Connection      $connection
+     * @return $this
+     */
+    public function setConnection(Connection $connection)
+    {
+        $this->connection = $connection;
+        $this->prefix     = $this->connection->getConfig('prefix');
+
+        return $this;
+    }
+
+    /**
+     * 获取当前的数据库Connection对象
+     * @access public
+     * @return Connection
+     */
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+
+    /**
+     * 指定模型
+     * @access public
+     * @param  Model $model 模型对象实例
+     * @return $this
+     */
+    public function model(Model $model)
+    {
+        $this->model = $model;
+        return $this;
+    }
+
+    /**
+     * 获取当前的模型对象
+     * @access public
+     * @return Model|null
+     */
+    public function getModel()
+    {
+        return $this->model ? $this->model->setQuery($this) : null;
+    }
+
+    /**
+     * 设置从主库读取数据
+     * @access public
+     * @param  bool $all 是否所有表有效
+     * @return $this
+     */
+    public function readMaster($all = false)
+    {
+        $table = $all ? '*' : $this->getTable();
+
+        static::$readMaster[$table] = true;
+
+        return $this;
+    }
+
+    /**
+     * 指定当前数据表名（不含前缀）
+     * @access public
+     * @param  string $name
+     * @return $this
+     */
+    public function name($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * 获取当前的数据表名称
+     * @access public
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name ?: $this->model->getName();
+    }
+
+    /**
+     * 得到当前或者指定名称的数据表
+     * @access public
+     * @param  string $name
+     * @return string
+     */
+    public function getTable($name = '')
+    {
+        if (empty($name) && isset($this->options['table'])) {
+            return $this->options['table'];
+        }
+
+        $name = $name ?: $this->name;
+
+        return $this->prefix . Loader::parseName($name);
+    }
+
+    /**
+     * 执行查询 返回数据集
+     * @access public
+     * @param  string      $sql    sql指令
+     * @param  array       $bind   参数绑定
+     * @param  boolean     $master 是否在主服务器读操作
+     * @param  bool|string $class  指定返回的数据集对象
+     * @return mixed
+     * @throws BindParamException
+     * @throws PDOException
+     */
+    public function query($sql, $bind = [], $master = false, $class = false)
+    {
+        return $this->connection->query($sql, $bind, $master, $class);
+    }
+
+    /**
+     * 执行语句
+     * @access public
+     * @param  string $sql  sql指令
+     * @param  array  $bind 参数绑定
+     * @return int
+     * @throws BindParamException
+     * @throws PDOException
+     */
+    public function execute($sql, $bind = [])
+    {
+        return $this->connection->execute($sql, $bind);
+    }
+
+    /**
+     * 监听SQL执行
+     * @access public
+     * @param  callable $callback 回调方法
+     * @return void
+     */
+    public function listen($callback)
+    {
+        $this->connection->listen($callback);
+    }
+
+    /**
+     * 获取最近插入的ID
+     * @access public
+     * @param  string $sequence 自增序列名
+     * @return string
+     */
+    public function getLastInsID($sequence = null)
+    {
+        return $this->connection->getLastInsID($sequence);
+    }
+
+    /**
+     * 获取返回或者影响的记录数
+     * @access public
+     * @return integer
+     */
+    public function getNumRows()
+    {
+        return $this->connection->getNumRows();
+    }
+
+    /**
+     * 获取最近一次查询的sql语句
+     * @access public
+     * @return string
+     */
+    public function getLastSql()
+    {
+        return $this->connection->getLastSql();
+    }
+
+    /**
+     * 执行数据库Xa事务
+     * @access public
+     * @param  callable $callback 数据操作方法回调
+     * @param  array    $dbs      多个查询对象或者连接对象
+     * @return mixed
+     * @throws PDOException
+     * @throws \Exception
+     * @throws \Throwable
+     */
+    public function transactionXa($callback, array $dbs = [])
+    {
+        $xid = uniqid('xa');
+
+        if (empty($dbs)) {
+            $dbs[] = $this->getConnection();
+        }
+
+        foreach ($dbs as $key => $db) {
+            if ($db instanceof Query) {
+                $db = $db->getConnection();
+
+                $dbs[$key] = $db;
+            }
+
+            $db->startTransXa($xid);
+        }
+
+        try {
+            $result = null;
+            if (is_callable($callback)) {
+                $result = call_user_func_array($callback, [$this]);
+            }
+
+            foreach ($dbs as $db) {
+                $db->prepareXa($xid);
+            }
+
+            foreach ($dbs as $db) {
+                $db->commitXa($xid);
+            }
+
+            return $result;
+        } catch (\Exception $e) {
+            foreach ($dbs as $db) {
+                $db->rollbackXa($xid);
+            }
+            throw $e;
+        } catch (\Throwable $e) {
+            foreach ($dbs as $db) {
+                $db->rollbackXa($xid);
+            }
+            throw $e;
+        }
+    }
+
+    /**
+     * 执行数据库事务
+     * @access public
+     * @param  callable $callback 数据操作方法回调
+     * @return mixed
+     */
+    public function transaction($callback)
+    {
+        return $this->connection->transaction($callback);
+    }
+
+    /**
+     * 启动事务
+     * @access public
+     * @return void
+     */
+    public function startTrans()
+    {
+        $this->connection->startTrans();
+    }
+
+    /**
+     * 用于非自动提交状态下面的查询提交
+     * @access public
+     * @return void
+     * @throws PDOException
+     */
+    public function commit()
+    {
+        $this->connection->commit();
+    }
+
+    /**
+     * 事务回滚
+     * @access public
+     * @return void
+     * @throws PDOException
+     */
+    public function rollback()
+    {
+        $this->connection->rollback();
+    }
+
+    /**
+     * 批处理执行SQL语句
+     * 批处理的指令都认为是execute操作
+     * @access public
+     * @param  array $sql SQL批处理指令
+     * @return boolean
+     */
+    public function batchQuery($sql = [])
+    {
+        return $this->connection->batchQuery($sql);
+    }
+
+    /**
+     * 获取数据库的配置参数
+     * @access public
+     * @param  string $name 参数名称
+     * @return mixed
+     */
+    public function getConfig($name = '')
+    {
+        return $this->connection->getConfig($name);
+    }
+
+    /**
+     * 获取数据表字段信息
+     * @access public
+     * @param  string $tableName 数据表名
+     * @return array
+     */
+    public function getTableFields($tableName = '')
+    {
+        if ('' == $tableName) {
+            $tableName = isset($this->options['table']) ? $this->options['table'] : $this->getTable();
+        }
+
+        return $this->connection->getTableFields($tableName);
+    }
+
+    /**
+     * 获取数据表字段类型
+     * @access public
+     * @param  string $tableName 数据表名
+     * @param  string $field    字段名
+     * @return array|string
+     */
+    public function getFieldsType($tableName = '', $field = null)
+    {
+        if ('' == $tableName) {
+            $tableName = isset($this->options['table']) ? $this->options['table'] : $this->getTable();
+        }
+
+        return $this->connection->getFieldsType($tableName, $field);
+    }
+
+    /**
+     * 得到分表的的数据表名
+     * @access public
+     * @param  array  $data  操作的数据
+     * @param  string $field 分表依据的字段
+     * @param  array  $rule  分表规则
+     * @return array
+     */
+    public function getPartitionTableName($data, $field, $rule = [])
+    {
+        // 对数据表进行分区
+        if ($field && isset($data[$field])) {
+            $value = $data[$field];
+            $type  = $rule['type'];
+            switch ($type) {
+                case 'id':
+                    // 按照id范围分表
+                    $step = $rule['expr'];
+                    $seq  = floor($value / $step) + 1;
+                    break;
+                case 'year':
+                    // 按照年份分表
+                    if (!is_numeric($value)) {
+                        $value = strtotime($value);
+                    }
+                    $seq = date('Y', $value) - $rule['expr'] + 1;
+                    break;
+                case 'mod':
+                    // 按照id的模数分表
+                    $seq = ($value % $rule['num']) + 1;
+                    break;
+                case 'md5':
+                    // 按照md5的序列分表
+                    $seq = (ord(substr(md5($value), 0, 1)) % $rule['num']) + 1;
+                    break;
+                default:
+                    if (function_exists($type)) {
+                        // 支持指定函数哈希
+                        $seq = (ord(substr($type($value), 0, 1)) % $rule['num']) + 1;
+                    } else {
+                        // 按照字段的首字母的值分表
+                        $seq = (ord($value[0]) % $rule['num']) + 1;
+                    }
+            }
+            return $this->getTable() . '_' . $seq;
+        }
+        // 当设置的分表字段不在查询条件或者数据中
+        // 进行联合查询，必须设定 partition['num']
+        $tableName = [];
+        for ($i = 0; $i < $rule['num']; $i++) {
+            $tableName[] = 'SELECT * FROM ' . $this->getTable() . '_' . ($i + 1);
+        }
+
+        return ['( ' . implode(" UNION ", $tableName) . ' )' => $this->name];
+    }
+
+    /**
+     * 得到某个字段的值
+     * @access public
+     * @param  string $field   字段名
+     * @param  mixed  $default 默认值
+     * @return mixed
+     */
+    public function value($field, $default = null)
+    {
+        $this->parseOptions();
+
+        return $this->connection->value($this, $field, $default);
+    }
+
+    /**
+     * 得到某个列的数组
+     * @access public
+     * @param  string $field 字段名 多个字段用逗号分隔
+     * @param  string $key   索引
+     * @return array
+     */
+    public function column($field, $key = '')
+    {
+        $this->parseOptions();
+
+        return $this->connection->column($this, $field, $key);
+    }
+
+    /**
+     * 聚合查询
+     * @access public
+     * @param  string $aggregate    聚合方法
+     * @param  string $field        字段名
+     * @param  bool   $force        强制转为数字类型
+     * @return mixed
+     */
+    public function aggregate($aggregate, $field, $force = false)
+    {
+        $this->parseOptions();
+
+        $result = $this->connection->aggregate($this, $aggregate, $field);
+
+        if (!empty($this->options['fetch_sql'])) {
+            return $result;
+        } elseif ($force) {
+            $result = (float) $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * COUNT查询
+     * @access public
+     * @param  string $field 字段名
+     * @return float|string
+     */
+    public function count($field = '*')
+    {
+        if (!empty($this->options['group'])) {
+            // 支持GROUP
+            $options = $this->getOptions();
+            $subSql  = $this->options($options)->field('count(' . $field . ') AS think_count')->bind($this->bind)->buildSql();
+
+            $query = $this->newQuery()->table([$subSql => '_group_count_']);
+
+            if (!empty($options['fetch_sql'])) {
+                $query->fetchSql(true);
+            }
+
+            return $query->aggregate('COUNT', '*', true);
+        }
+
+        return $this->aggregate('COUNT', $field, true);
+    }
+
+    /**
+     * SUM查询
+     * @access public
+     * @param  string $field 字段名
+     * @return float
+     */
+    public function sum($field)
+    {
+        return $this->aggregate('SUM', $field, true);
+    }
+
+    /**
+     * MIN查询
+     * @access public
+     * @param  string $field    字段名
+     * @param  bool   $force    强制转为数字类型
+     * @return mixed
+     */
+    public function min($field, $force = true)
+    {
+        return $this->aggregate('MIN', $field, $force);
+    }
+
+    /**
+     * MAX查询
+     * @access public
+     * @param  string $field    字段名
+     * @param  bool   $force    强制转为数字类型
+     * @return mixed
+     */
+    public function max($field, $force = true)
+    {
+        return $this->aggregate('MAX', $field, $force);
+    }
+
+    /**
+     * AVG查询
+     * @access public
+     * @param  string $field 字段名
+     * @return float
+     */
+    public function avg($field)
+    {
+        return $this->aggregate('AVG', $field, true);
+    }
+
+    /**
+     * 设置记录的某个字段值
+     * 支持使用数据库字段和方法
+     * @access public
+     * @param  string|array $field 字段名
+     * @param  mixed        $value 字段值
+     * @return integer
+     */
+    public function setField($field, $value = '')
+    {
+        if (is_array($field)) {
+            $data = $field;
+        } else {
+            $data[$field] = $value;
+        }
+
+        return $this->update($data);
+    }
+
+    /**
+     * 字段值(延迟)增长
+     * @access public
+     * @param  string  $field    字段名
+     * @param  integer $step     增长值
+     * @param  integer $lazyTime 延时时间(s)
+     * @return integer|true
+     * @throws Exception
+     */
+    public function setInc($field, $step = 1, $lazyTime = 0)
+    {
+        $condition = !empty($this->options['where']) ? $this->options['where'] : [];
+
+        if (empty($condition)) {
+            // 没有条件不做任何更新
+            throw new Exception('no data to update');
+        }
+
+        if ($lazyTime > 0) {
+            // 延迟写入
+            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $step = $this->lazyWrite('inc', $guid, $step, $lazyTime);
+
+            if (false === $step) {
+                // 清空查询条件
+                $this->options = [];
+                return true;
+            }
+        }
+
+        return $this->setField($field, ['INC', $step]);
+    }
+
+    /**
+     * 字段值（延迟）减少
+     * @access public
+     * @param  string  $field    字段名
+     * @param  integer $step     减少值
+     * @param  integer $lazyTime 延时时间(s)
+     * @return integer|true
+     * @throws Exception
+     */
+    public function setDec($field, $step = 1, $lazyTime = 0)
+    {
+        $condition = !empty($this->options['where']) ? $this->options['where'] : [];
+
+        if (empty($condition)) {
+            // 没有条件不做任何更新
+            throw new Exception('no data to update');
+        }
+
+        if ($lazyTime > 0) {
+            // 延迟写入
+            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $step = $this->lazyWrite('dec', $guid, $step, $lazyTime);
+
+            if (false === $step) {
+                // 清空查询条件
+                $this->options = [];
+                return true;
+            }
+
+            $value = ['INC', $step];
+        } else {
+            $value = ['DEC', $step];
+        }
+
+        return $this->setField($field, $value);
+    }
+
+    /**
+     * 延时更新检查 返回false表示需要延时
+     * 否则返回实际写入的数值
+     * @access protected
+     * @param  string  $type     自增或者自减
+     * @param  string  $guid     写入标识
+     * @param  integer $step     写入步进值
+     * @param  integer $lazyTime 延时时间(s)
+     * @return false|integer
+     */
+    protected function lazyWrite($type, $guid, $step, $lazyTime)
+    {
+        $cache = Container::get('cache');
+
+        if (!$cache->has($guid . '_time')) {
+            // 计时开始
+            $cache->set($guid . '_time', time(), 0);
+            $cache->$type($guid, $step);
+        } elseif (time() > $cache->get($guid . '_time') + $lazyTime) {
+            // 删除缓存
+            $value = $cache->$type($guid, $step);
+            $cache->rm($guid);
+            $cache->rm($guid . '_time');
+            return 0 === $value ? false : $value;
+        } else {
+            // 更新缓存
+            $cache->$type($guid, $step);
+        }
+
+        return false;
+    }
+
+    /**
+     * 查询SQL组装 join
+     * @access public
+     * @param  mixed  $join      关联的表名
+     * @param  mixed  $condition 条件
+     * @param  string $type      JOIN类型
+     * @return $this
+     */
+    public function join($join, $condition = null, $type = 'INNER')
+    {
+        if (empty($condition)) {
+            // 如果为组数，则循环调用join
+            foreach ($join as $key => $value) {
+                if (is_array($value) && 2 <= count($value)) {
+                    $this->join($value[0], $value[1], isset($value[2]) ? $value[2] : $type);
+                }
+            }
+        } else {
+            $table = $this->getJoinTable($join);
+
+            $this->options['join'][] = [$table, strtoupper($type), $condition];
+        }
+
+        return $this;
+    }
+
+    /**
+     * LEFT JOIN
+     * @access public
+     * @param  mixed  $join      关联的表名
+     * @param  mixed  $condition 条件
+     * @return $this
+     */
+    public function leftJoin($join, $condition = null)
+    {
+        return $this->join($join, $condition, 'LEFT');
+    }
+
+    /**
+     * RIGHT JOIN
+     * @access public
+     * @param  mixed  $join      关联的表名
+     * @param  mixed  $condition 条件
+     * @return $this
+     */
+    public function rightJoin($join, $condition = null)
+    {
+        return $this->join($join, $condition, 'RIGHT');
+    }
+
+    /**
+     * FULL JOIN
+     * @access public
+     * @param  mixed  $join      关联的表名
+     * @param  mixed  $condition 条件
+     * @return $this
+     */
+    public function fullJoin($join, $condition = null)
+    {
+        return $this->join($join, $condition, 'FULL');
+    }
+
+    /**
+     * 获取Join表名及别名 支持
+     * ['prefix_table或者子查询'=>'alias'] 'table alias'
+     * @access protected
+     * @param  array|string $join
+     * @param  string       $alias
+     * @return string
+     */
+    protected function getJoinTable($join, &$alias = null)
+    {
+        if (is_array($join)) {
+            $table = $join;
+            $alias = array_shift($join);
+        } else {
+            $join = trim($join);
+
+            if (false !== strpos($join, '(')) {
+                // 使用子查询
+                $table = $join;
+            } else {
+                $prefix = $this->prefix;
+                if (strpos($join, ' ')) {
+                    // 使用别名
+                    list($table, $alias) = explode(' ', $join);
+                } else {
+                    $table = $join;
+                    if (false === strpos($join, '.') && 0 !== strpos($join, '__')) {
+                        $alias = $join;
+                    }
+                }
+
+                if ($prefix && false === strpos($table, '.') && 0 !== strpos($table, $prefix) && 0 !== strpos($table, '__')) {
+                    $table = $this->getTable($table);
+                }
+            }
+
+            if (isset($alias) && $table != $alias) {
+                $table = [$table => $alias];
+            }
+        }
+
+        return $table;
+    }
+
+    /**
+     * 查询SQL组装 union
+     * @access public
+     * @param  mixed   $union
+     * @param  boolean $all
+     * @return $this
+     */
+    public function union($union, $all = false)
+    {
+        $this->options['union']['type'] = $all ? 'UNION ALL' : 'UNION';
+
+        if (is_array($union)) {
+            $this->options['union'] = array_merge($this->options['union'], $union);
+        } else {
+            $this->options['union'][] = $union;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 查询SQL组装 union all
+     * @access public
+     * @param  mixed   $union
+     * @return $this
+     */
+    public function unionAll($union)
+    {
+        return $this->union($union, true);
+    }
+
+    /**
+     * 指定查询字段 支持字段排除和指定数据表
+     * @access public
+     * @param  mixed   $field
+     * @param  boolean $except    是否排除
+     * @param  string  $tableName 数据表名
+     * @param  string  $prefix    字段前缀
+     * @param  string  $alias     别名前缀
+     * @return $this
+     */
+    public function field($field, $except = false, $tableName = '', $prefix = '', $alias = '')
+    {
+        if (empty($field)) {
+            return $this;
+        } elseif ($field instanceof Expression) {
+            $this->options['field'][] = $field;
+            return $this;
+        }
+
+        if (is_string($field)) {
+            if (preg_match('/[\<\'\"\(]/', $field)) {
+                return $this->fieldRaw($field);
+            }
+
+            $field = array_map('trim', explode(',', $field));
+        }
+
+        if (true === $field) {
+            // 获取全部字段
+            $fields = $this->getTableFields($tableName);
+            $field  = $fields ?: ['*'];
+        } elseif ($except) {
+            // 字段排除
+            $fields = $this->getTableFields($tableName);
+            $field  = $fields ? array_diff($fields, $field) : $field;
+        }
+
+        if ($tableName) {
+            // 添加统一的前缀
+            $prefix = $prefix ?: $tableName;
+            foreach ($field as $key => $val) {
+                if (is_numeric($key)) {
+                    $val = $prefix . '.' . $val . ($alias ? ' AS ' . $alias . $val : '');
+                }
+                $field[$key] = $val;
+            }
+        }
+
+        if (isset($this->options['field'])) {
+            $field = array_merge((array) $this->options['field'], $field);
+        }
+
+        $this->options['field'] = array_unique($field);
+
+        return $this;
+    }
+
+    /**
+     * 表达式方式指定查询字段
+     * @access public
+     * @param  string $field    字段名
+     * @param  array  $bind     参数绑定
+     * @return $this
+     */
+    public function fieldRaw($field, array $bind = [])
+    {
+        $this->options['field'][] = $this->raw($field);
+
+        if ($bind) {
+            $this->bind($bind);
+        }
+
+        return $this;
+    }
+
+    /**
+     * 设置数据排除字段
+     * @access public
+     * @param  mixed $field 字段名或者数据
+     * @return $this
+     */
+    public function hidden($field)
+    {
+        return $this->field($field, true);
+    }
+
+    /**
+     * 设置数据
+     * @access public
+     * @param  mixed $field 字段名或者数据
+     * @param  mixed $value 字段值
+     * @return $this
+     */
+    public function data($field, $value = null)
+    {
+        if (is_array($field)) {
+            $this->options['data'] = isset($this->options['data']) ? array_merge($this->options['data'], $field) : $field;
+        } else {
+            $this->options['data'][$field] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 字段值增长
+     * @access public
+     * @param  string|array $field 字段名
+     * @param  integer      $step  增长值
+     * @return $this
+     */
+    public function inc($field, $step = 1, $op = 'INC')
+    {
+        $fields = is_string($field) ? explode(',', $field) : $field;
+
+        foreach ($fields as $field => $val) {
+            if (is_numeric($field)) {
+                $field = $val;
+            } else {
+                $step = $val;
+            }
+
+            $this->data($field, [$op, $step]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * 字段值减少
+     * @access public
+     * @param  string|array $field 字段名
+     * @param  integer      $step  增长值
+     * @return $this
+     */
+    public function dec($field, $step = 1)
+    {
+        return $this->inc($field, $step, 'DEC');
+    }
+
+    /**
+     * 使用表达式设置数据
+     * @access public
+     * @param  string $field 字段名
+     * @param  string $value 字段值
+     * @return $this
+     */
+    public function exp($field, $value)
+    {
+        $this->data($field, $this->raw($value));
+        return $this;
+    }
+
+    /**
+     * 使用表达式设置数据
+     * @access public
+     * @param  mixed $value 表达式
+     * @return Expression
+     */
+    public function raw($value)
+    {
+        return new Expression($value);
+    }
+
+    /**
+     * 指定JOIN查询字段
+     * @access public
+     * @param  string|array $table 数据表
+     * @param  string|array $field 查询字段
+     * @param  mixed        $on    JOIN条件
+     * @param  string       $type  JOIN类型
+     * @return $this
+     */
+    public function view($join, $field = true, $on = null, $type = 'INNER')
+    {
+        $this->options['view'] = true;
+
+        if (is_array($join) && key($join) === 0) {
+            foreach ($join as $key => $val) {
+                $this->view($val[0], $val[1], isset($val[2]) ? $val[2] : null, isset($val[3]) ? $val[3] : 'INNER');
+            }
+        } else {
+            $fields = [];
+            $table  = $this->getJoinTable($join, $alias);
+
+            if (true === $field) {
+                $fields = $alias . '.*';
+            } else {
+                if (is_string($field)) {
+                    $field = explode(',', $field);
+                }
+
+                foreach ($field as $key => $val) {
+                    if (is_numeric($key)) {
+                        $fields[] = $alias . '.' . $val;
+
+                        $this->options['map'][$val] = $alias . '.' . $val;
+                    } else {
+                        if (preg_match('/[,=\.\'\"\(\s]/', $key)) {
+                            $name = $key;
+                        } else {
+                            $name = $alias . '.' . $key;
+                        }
+
+                        $fields[] = $name . ' AS ' . $val;
+
+                        $this->options['map'][$val] = $name;
+                    }
+                }
+            }
+
+            $this->field($fields);
+
+            if ($on) {
+                $this->join($table, $on, $type);
+            } else {
+                $this->table($table);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 设置分表规则
+     * @access public
+     * @param  array  $data  操作的数据
+     * @param  string $field 分表依据的字段
+     * @param  array  $rule  分表规则
+     * @return $this
+     */
+    public function partition($data, $field, $rule = [])
+    {
+        $this->options['table'] = $this->getPartitionTableName($data, $field, $rule);
+
+        return $this;
+    }
+
+    /**
+     * 指定AND查询条件
+     * @access public
+     * @param  mixed $field     查询字段
+     * @param  mixed $op        查询表达式
+     * @param  mixed $condition 查询条件
+     * @return $this
+     */
+    public function where($field, $op = null, $condition = null)
+    {
+        $param = func_get_args();
+        array_shift($param);
+        return $this->parseWhereExp('AND', $field, $op, $condition, $param);
+    }
+
+    /**
+     * 指定OR查询条件
+     * @access public
+     * @param  mixed $field     查询字段
+     * @param  mixed $op        查询表达式
+     * @param  mixed $condition 查询条件
+     * @return $this
+     */
+    public function whereOr($field, $op = null, $condition = null)
+    {
+        $param = func_get_args();
+        array_shift($param);
+        return $this->parseWhereExp('OR', $field, $op, $condition, $param);
+    }
+
+    /**
+     * 指定XOR查询条件
+     * @access public
+     * @param  mixed $field     查询字段
+     * @param  mixed $op        查询表达式
+     * @param  mixed $condition 查询条件
+     * @return $this
+     */
+    public function whereXor($field, $op = null, $condition = null)
+    {
+        $param = func_get_args();
+        array_shift($param);
+        return $this->parseWhereExp('XOR', $field, $op, $condition, $param);
+    }
+
+    /**
+     * 指定Null查询条件
+     * @access public
+     * @param  mixed  $field 查询字段
+     * @param  string $logic 查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereNull($field, $logic = 'AND')
+    {
+        return $this->parseWhereExp($logic, $field, 'NULL', null, [], true);
+    }
+
+    /**
+     * 指定NotNull查询条件
+     * @access public
+     * @param  mixed  $field 查询字段
+     * @param  string $logic 查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereNotNull($field, $logic = 'AND')
+    {
+        return $this->parseWhereExp($logic, $field, 'NOTNULL', null, [], true);
+    }
+
+    /**
+     * 指定Exists查询条件
+     * @access public
+     * @param  mixed  $condition 查询条件
+     * @param  string $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereExists($condition, $logic = 'AND')
+    {
+        if (is_string($condition)) {
+            $condition = $this->raw($condition);
+        }
+
+        $this->options['where'][strtoupper($logic)][] = ['', 'EXISTS', $condition];
+        return $this;
+    }
+
+    /**
+     * 指定NotExists查询条件
+     * @access public
+     * @param  mixed  $condition 查询条件
+     * @param  string $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereNotExists($condition, $logic = 'AND')
+    {
+        if (is_string($condition)) {
+            $condition = $this->raw($condition);
+        }
+
+        $this->options['where'][strtoupper($logic)][] = ['', 'NOT EXISTS', $condition];
+        return $this;
+    }
+
+    /**
+     * 指定In查询条件
+     * @access public
+     * @param  mixed  $field     查询字段
+     * @param  mixed  $condition 查询条件
+     * @param  string $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereIn($field, $condition, $logic = 'AND')
+    {
+        return $this->parseWhereExp($logic, $field, 'IN', $condition, [], true);
+    }
+
+    /**
+     * 指定NotIn查询条件
+     * @access public
+     * @param  mixed  $field     查询字段
+     * @param  mixed  $condition 查询条件
+     * @param  string $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereNotIn($field, $condition, $logic = 'AND')
+    {
+        return $this->parseWhereExp($logic, $field, 'NOT IN', $condition, [], true);
+    }
+
+    /**
+     * 指定Like查询条件
+     * @access public
+     * @param  mixed  $field     查询字段
+     * @param  mixed  $condition 查询条件
+     * @param  string $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereLike($field, $condition, $logic = 'AND')
+    {
+        return $this->parseWhereExp($logic, $field, 'LIKE', $condition, [], true);
+    }
+
+    /**
+     * 指定NotLike查询条件
+     * @access public
+     * @param  mixed  $field     查询字段
+     * @param  mixed  $condition 查询条件
+     * @param  string $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereNotLike($field, $condition, $logic = 'AND')
+    {
+        return $this->parseWhereExp($logic, $field, 'NOT LIKE', $condition, [], true);
+    }
+
+    /**
+     * 指定Between查询条件
+     * @access public
+     * @param  mixed  $field     查询字段
+     * @param  mixed  $condition 查询条件
+     * @param  string $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereBetween($field, $condition, $logic = 'AND')
+    {
+        return $this->parseWhereExp($logic, $field, 'BETWEEN', $condition, [], true);
+    }
+
+    /**
+     * 指定NotBetween查询条件
+     * @access public
+     * @param  mixed  $field     查询字段
+     * @param  mixed  $condition 查询条件
+     * @param  string $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereNotBetween($field, $condition, $logic = 'AND')
+    {
+        return $this->parseWhereExp($logic, $field, 'NOT BETWEEN', $condition, [], true);
+    }
+
+    /**
+     * 比较两个字段
+     * @access public
+     * @param  string|array $field1     查询字段
+     * @param  string       $operator   比较操作符
+     * @param  string       $field2     比较字段
+     * @param  string       $logic      查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereColumn($field1, $operator = null, $field2 = null, $logic = 'AND')
+    {
+        if (is_array($field1)) {
+            foreach ($field1 as $item) {
+                $this->whereColumn($item[0], $item[1], isset($item[2]) ? $item[2] : null);
+            }
+            return $this;
+        }
+
+        if (is_null($field2)) {
+            $field2   = $operator;
+            $operator = '=';
+        }
+
+        return $this->parseWhereExp($logic, $field1, 'COLUMN', [$operator, $field2], [], true);
+    }
+
+    /**
+     * 设置软删除字段及条件
+     * @access public
+     * @param  false|string  $field     查询字段
+     * @param  mixed         $condition 查询条件
+     * @return $this
+     */
+    public function useSoftDelete($field, $condition = null)
+    {
+        if ($field) {
+            $this->options['soft_delete'] = [$field, $condition];
+        }
+
+        return $this;
+    }
+
+    /**
+     * 指定Exp查询条件
+     * @access public
+     * @param  mixed  $field     查询字段
+     * @param  string $condition 查询条件
+     * @param  array  $bind      参数绑定
+     * @param  string $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereExp($field, $condition, $bind = [], $logic = 'AND')
+    {
+        $this->options['where'][$logic][] = [$field, 'EXP', $this->raw($condition)];
+
+        if ($bind) {
+            $this->bind($bind);
+        }
+        return $this;
+    }
+
+    /**
+     * 指定表达式查询条件
+     * @access public
+     * @param  string $where  查询条件
+     * @param  array  $bind   参数绑定
+     * @param  string $logic  查询逻辑 and or xor
+     * @return $this
+     */
+    public function whereRaw($where, $bind = [], $logic = 'AND')
+    {
+        $this->options['where'][$logic][] = $this->raw($where);
+
+        if ($bind) {
+            $this->bind($bind);
+        }
+
+        return $this;
+    }
+
+    /**
+     * 指定表达式查询条件 OR
+     * @access public
+     * @param  string $where  查询条件
+     * @param  array  $bind   参数绑定
+     * @return $this
+     */
+    public function whereOrRaw($where, $bind = [])
+    {
+        return $this->whereRaw($where, $bind, 'OR');
+    }
+
+    /**
+     * 分析查询表达式
+     * @access protected
+     * @param  string   $logic     查询逻辑 and or xor
+     * @param  mixed    $field     查询字段
+     * @param  mixed    $op        查询表达式
+     * @param  mixed    $condition 查询条件
+     * @param  array    $param     查询参数
+     * @param  bool     $strict    严格模式
+     * @return $this
+     */
+    protected function parseWhereExp($logic, $field, $op, $condition, array $param = [], $strict = false)
+    {
+        if ($field instanceof $this) {
+            $this->options['where'] = $field->getOptions('where');
+            return $this;
+        }
+
+        $logic = strtoupper($logic);
+
+        if (is_string($field) && !empty($this->options['via']) && !strpos($field, '.')) {
+            $field = $this->options['via'] . '.' . $field;
+        }
+
+        if ($field instanceof Expression) {
+            return $this->whereRaw($field, is_array($op) ? $op : []);
+        } elseif ($strict) {
+            // 使用严格模式查询
+            $where = [$field, $op, $condition];
+        } elseif (is_array($field)) {
+            // 解析数组批量查询
+            return $this->parseArrayWhereItems($field, $logic);
+        } elseif ($field instanceof \Closure) {
+            $where = $field;
+        } elseif (is_string($field)) {
+            if (preg_match('/[,=\<\'\"\(\s]/', $field)) {
+                return $this->whereRaw($field, $op);
+            } elseif (is_string($op) && strtolower($op) == 'exp') {
+                $bind = isset($param[2]) && is_array($param[2]) ? $param[2] : null;
+                return $this->whereExp($field, $condition, $bind, $logic);
+            }
+
+            $where = $this->parseWhereItem($logic, $field, $op, $condition, $param);
+        }
+
+        if (!empty($where)) {
+            $this->options['where'][$logic][] = $where;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 分析查询表达式
+     * @access protected
+     * @param  string   $logic     查询逻辑 and or xor
+     * @param  mixed    $field     查询字段
+     * @param  mixed    $op        查询表达式
+     * @param  mixed    $condition 查询条件
+     * @param  array    $param     查询参数
+     * @return mixed
+     */
+    protected function parseWhereItem($logic, $field, $op, $condition, $param = [])
+    {
+        if (is_array($op)) {
+            // 同一字段多条件查询
+            array_unshift($param, $field);
+            $where = $param;
+        } elseif ($field && is_null($condition)) {
+            if (in_array(strtoupper($op), ['NULL', 'NOTNULL', 'NOT NULL'], true)) {
+                // null查询
+                $where = [$field, $op, ''];
+            } elseif (in_array($op, ['=', 'eq', 'EQ', null], true)) {
+                $where = [$field, 'NULL', ''];
+            } elseif (in_array($op, ['<>', 'neq', 'NEQ'], true)) {
+                $where = [$field, 'NOTNULL', ''];
+            } else {
+                // 字段相等查询
+                $where = [$field, '=', $op];
+            }
+        } elseif (in_array(strtoupper($op), ['REGEXP', 'NOT REGEXP', 'EXISTS', 'NOT EXISTS', 'NOTEXISTS'], true)) {
+            $where = [$field, $op, is_string($condition) ? $this->raw($condition) : $condition];
+        } else {
+            $where = $field ? [$field, $op, $condition, isset($param[2]) ? $param[2] : null] : null;
+        }
+
+        return $where;
+    }
+
+    /**
+     * 数组批量查询
+     * @access protected
+     * @param  array    $field     批量查询
+     * @param  string   $logic     查询逻辑 and or xor
+     * @return $this
+     */
+    protected function parseArrayWhereItems($field, $logic)
+    {
+        if (key($field) !== 0) {
+            $where = [];
+            foreach ($field as $key => $val) {
+                if ($val instanceof Expression) {
+                    $where[] = [$key, 'exp', $val];
+                } elseif (is_null($val)) {
+                    $where[] = [$key, 'NULL', ''];
+                } else {
+                    $where[] = [$key, is_array($val) ? 'IN' : '=', $val];
+                }
+            }
+        } else {
+            // 数组批量查询
+            $where = $field;
+        }
+
+        if (!empty($where)) {
+            $this->options['where'][$logic] = isset($this->options['where'][$logic]) ? array_merge($this->options['where'][$logic], $where) : $where;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 去除某个查询条件
+     * @access public
+     * @param  string $field 查询字段
+     * @param  string $logic 查询逻辑 and or xor
+     * @return $this
+     */
+    public function removeWhereField($field, $logic = 'AND')
+    {
+        $logic = strtoupper($logic);
+
+        if (isset($this->options['where'][$logic])) {
+            foreach ($this->options['where'][$logic] as $key => $val) {
+                if (is_array($val) && $val[0] == $field) {
+                    unset($this->options['where'][$logic][$key]);
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 去除查询参数
+     * @access public
+     * @param  string|bool $option 参数名 true 表示去除所有参数
+     * @return $this
+     */
+    public function removeOption($option = true)
+    {
+        if (true === $option) {
+            $this->options = [];
+        } elseif (is_string($option) && isset($this->options[$option])) {
+            unset($this->options[$option]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * 条件查询
+     * @access public
+     * @param  mixed             $condition  满足条件（支持闭包）
+     * @param  \Closure|array    $query      满足条件后执行的查询表达式（闭包或数组）
+     * @param  \Closure|array    $otherwise  不满足条件后执行
+     * @return $this
+     */
+    public function when($condition, $query, $otherwise = null)
+    {
+        if ($condition instanceof \Closure) {
+            $condition = $condition($this);
+        }
+
+        if ($condition) {
+            if ($query instanceof \Closure) {
+                $query($this, $condition);
+            } elseif (is_array($query)) {
+                $this->where($query);
+            }
+        } elseif ($otherwise) {
+            if ($otherwise instanceof \Closure) {
+                $otherwise($this, $condition);
+            } elseif (is_array($otherwise)) {
+                $this->where($otherwise);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 指定查询数量
+     * @access public
+     * @param  mixed $offset 起始位置
+     * @param  mixed $length 查询数量
+     * @return $this
+     */
+    public function limit($offset, $length = null)
+    {
+        if (is_null($length) && strpos($offset, ',')) {
+            list($offset, $length) = explode(',', $offset);
+        }
+
+        $this->options['limit'] = intval($offset) . ($length ? ',' . intval($length) : '');
+
+        return $this;
+    }
+
+    /**
+     * 指定分页
+     * @access public
+     * @param  mixed $page     页数
+     * @param  mixed $listRows 每页数量
+     * @return $this
+     */
+    public function page($page, $listRows = null)
+    {
+        if (is_null($listRows) && strpos($page, ',')) {
+            list($page, $listRows) = explode(',', $page);
+        }
+
+        $this->options['page'] = [intval($page), intval($listRows)];
+
+        return $this;
+    }
+
+    /**
+     * 分页查询
+     * @access public
+     * @param  int|array $listRows 每页数量 数组表示配置参数
+     * @param  int|bool  $simple   是否简洁模式或者总记录数
+     * @param  array     $config   配置参数
+     *                            page:当前页,
+     *                            path:url路径,
+     *                            query:url额外参数,
+     *                            fragment:url锚点,
+     *                            var_page:分页变量,
+     *                            list_rows:每页数量
+     *                            type:分页类名
+     * @return \think\Paginator
+     * @throws DbException
+     */
+    public function paginate($listRows = null, $simple = false, $config = [])
+    {
+        if (is_int($simple)) {
+            $total  = $simple;
+            $simple = false;
+        }
+
+        $paginate = Container::get('config')->pull('paginate');
+
+        if (is_array($listRows)) {
+            $config   = array_merge($paginate, $listRows);
+            $listRows = $config['list_rows'];
+        } else {
+            $config   = array_merge($paginate, $config);
+            $listRows = $listRows ?: $config['list_rows'];
+        }
+
+        /** @var Paginator $class */
+        $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\paginator\\driver\\' . ucwords($config['type']);
+        $page  = isset($config['page']) ? (int) $config['page'] : call_user_func([
+            $class,
+            'getCurrentPage',
+        ], $config['var_page']);
+
+        $page = $page < 1 ? 1 : $page;
+
+        $config['path'] = isset($config['path']) ? $config['path'] : call_user_func([$class, 'getCurrentPath']);
+
+        if (!isset($total) && !$simple) {
+            $options = $this->getOptions();
+
+            unset($this->options['order'], $this->options['limit'], $this->options['page'], $this->options['field']);
+
+            $bind    = $this->bind;
+            $total   = $this->count();
+            $results = $this->options($options)->bind($bind)->page($page, $listRows)->select();
+        } elseif ($simple) {
+            $results = $this->limit(($page - 1) * $listRows, $listRows + 1)->select();
+            $total   = null;
+        } else {
+            $results = $this->page($page, $listRows)->select();
+        }
+
+        return $class::make($results, $listRows, $page, $total, $simple, $config);
+    }
+
+    /**
+     * 指定当前操作的数据表
+     * @access public
+     * @param  mixed $table 表名
+     * @return $this
+     */
+    public function table($table)
+    {
+        if (is_string($table)) {
+            if (strpos($table, ')')) {
+                // 子查询
+            } elseif (strpos($table, ',')) {
+                $tables = explode(',', $table);
+                $table  = [];
+
+                foreach ($tables as $item) {
+                    list($item, $alias) = explode(' ', trim($item));
+                    if ($alias) {
+                        $this->alias([$item => $alias]);
+                        $table[$item] = $alias;
+                    } else {
+                        $table[] = $item;
+                    }
+                }
+            } elseif (strpos($table, ' ')) {
+                list($table, $alias) = explode(' ', $table);
+
+                $table = [$table => $alias];
+                $this->alias($table);
+            }
+        } else {
+            $tables = $table;
+            $table  = [];
+
+            foreach ($tables as $key => $val) {
+                if (is_numeric($key)) {
+                    $table[] = $val;
+                } else {
+                    $this->alias([$key => $val]);
+                    $table[$key] = $val;
+                }
+            }
+        }
+
+        $this->options['table'] = $table;
+
+        return $this;
+    }
+
+    /**
+     * USING支持 用于多表删除
+     * @access public
+     * @param  mixed $using
+     * @return $this
+     */
+    public function using($using)
+    {
+        $this->options['using'] = $using;
+        return $this;
+    }
+
+    /**
+     * 指定排序 order('id','desc') 或者 order(['id'=>'desc','create_time'=>'desc'])
+     * @access public
+     * @param  string|array $field 排序字段
+     * @param  string       $order 排序
+     * @return $this
+     */
+    public function order($field, $order = null)
+    {
+        if (empty($field)) {
+            return $this;
+        } elseif ($field instanceof Expression) {
+            $this->options['order'][] = $field;
+            return $this;
+        }
+
+        if (is_string($field)) {
+            if (!empty($this->options['via'])) {
+                $field = $this->options['via'] . '.' . $field;
+            }
+
+            if (strpos($field, ',')) {
+                $field = array_map('trim', explode(',', $field));
+            } else {
+                $field = empty($order) ? $field : [$field => $order];
+            }
+        } elseif (!empty($this->options['via'])) {
+            foreach ($field as $key => $val) {
+                if (is_numeric($key)) {
+                    $field[$key] = $this->options['via'] . '.' . $val;
+                } else {
+                    $field[$this->options['via'] . '.' . $key] = $val;
+                    unset($field[$key]);
+                }
+            }
+        }
+
+        if (!isset($this->options['order'])) {
+            $this->options['order'] = [];
+        }
+
+        if (is_array($field)) {
+            $this->options['order'] = array_merge($this->options['order'], $field);
+        } else {
+            $this->options['order'][] = $field;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 表达式方式指定Field排序
+     * @access public
+     * @param  string $field 排序字段
+     * @param  array  $bind  参数绑定
+     * @return $this
+     */
+    public function orderRaw($field, array $bind = [])
+    {
+        $this->options['order'][] = $this->raw($field);
+
+        if ($bind) {
+            $this->bind($bind);
+        }
+
+        return $this;
+    }
+
+    /**
+     * 指定Field排序 order('id',[1,2,3],'desc')
+     * @access public
+     * @param  string|array $field 排序字段
+     * @param  array        $values 排序值
+     * @param  string       $order
+     * @return $this
+     */
+    public function orderField($field, array $values, $order = '')
+    {
+        if (!empty($values)) {
+            $values['sort'] = $order;
+
+            $this->options['order'][$field] = $values;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 随机排序
+     * @access public
+     * @return $this
+     */
+    public function orderRand()
+    {
+        $this->options['order'][] = '[rand]';
+        return $this;
+    }
+
+    /**
+     * 查询缓存
+     * @access public
+     * @param  mixed             $key    缓存key
+     * @param  integer|\DateTime $expire 缓存有效期
+     * @param  string            $tag    缓存标签
+     * @return $this
+     */
+    public function cache($key = true, $expire = null, $tag = null)
+    {
+        // 增加快捷调用方式 cache(10) 等同于 cache(true, 10)
+        if ($key instanceof \DateTime || (is_numeric($key) && is_null($expire))) {
+            $expire = $key;
+            $key    = true;
+        }
+
+        if (false !== $key) {
+            $this->options['cache'] = ['key' => $key, 'expire' => $expire, 'tag' => $tag];
+        }
+
+        return $this;
+    }
+
+    /**
+     * 指定group查询
+     * @access public
+     * @param  string|array $group GROUP
+     * @return $this
+     */
+    public function group($group)
+    {
+        $this->options['group'] = $group;
+        return $this;
+    }
+
+    /**
+     * 指定having查询
+     * @access public
+     * @param  string $having having
+     * @return $this
+     */
+    public function having($having)
+    {
+        $this->options['having'] = $having;
+        return $this;
+    }
+
+    /**
+     * 指定查询lock
+     * @access public
+     * @param  bool|string $lock 是否lock
+     * @return $this
+     */
+    public function lock($lock = false)
+    {
+        $this->options['lock']   = $lock;
+        $this->options['master'] = true;
+
+        return $this;
+    }
+
+    /**
+     * 指定distinct查询
+     * @access public
+     * @param  string $distinct 是否唯一
+     * @return $this
+     */
+    public function distinct($distinct)
+    {
+        $this->options['distinct'] = $distinct;
+        return $this;
+    }
+
+    /**
+     * 指定数据表别名
+     * @access public
+     * @param  array|string $alias 数据表别名
+     * @return $this
+     */
+    public function alias($alias)
+    {
+        if (is_array($alias)) {
+            foreach ($alias as $key => $val) {
+                if (false !== strpos($key, '__')) {
+                    $table = $this->connection->parseSqlTable($key);
+                } else {
+                    $table = $key;
+                }
+                $this->options['alias'][$table] = $val;
+            }
+        } else {
+            if (isset($this->options['table'])) {
+                $table = is_array($this->options['table']) ? key($this->options['table']) : $this->options['table'];
+                if (false !== strpos($table, '__')) {
+                    $table = $this->connection->parseSqlTable($table);
+                }
+            } else {
+                $table = $this->getTable();
+            }
+
+            $this->options['alias'][$table] = $alias;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 指定强制索引
+     * @access public
+     * @param  string $force 索引名称
+     * @return $this
+     */
+    public function force($force)
+    {
+        $this->options['force'] = $force;
+        return $this;
+    }
+
+    /**
+     * 查询注释
+     * @access public
+     * @param  string $comment 注释
+     * @return $this
+     */
+    public function comment($comment)
+    {
+        $this->options['comment'] = $comment;
+        return $this;
+    }
+
+    /**
+     * 获取执行的SQL语句
+     * @access public
+     * @param  boolean $fetch 是否返回sql
+     * @return $this
+     */
+    public function fetchSql($fetch = true)
+    {
+        $this->options['fetch_sql'] = $fetch;
+        return $this;
+    }
+
+    /**
+     * 不主动获取数据集
+     * @access public
+     * @param  bool $pdo 是否返回 PDOStatement 对象
+     * @return $this
+     */
+    public function fetchPdo($pdo = true)
+    {
+        $this->options['fetch_pdo'] = $pdo;
+        return $this;
+    }
+
+    /**
+     * 设置从主服务器读取数据
+     * @access public
+     * @return $this
+     */
+    public function master()
+    {
+        $this->options['master'] = true;
+        return $this;
+    }
+
+    /**
+     * 设置是否严格检查字段名
+     * @access public
+     * @param  bool $strict 是否严格检查字段
+     * @return $this
+     */
+    public function strict($strict = true)
+    {
+        $this->options['strict'] = $strict;
+        return $this;
+    }
+
+    /**
+     * 设置查询数据不存在是否抛出异常
+     * @access public
+     * @param  bool $fail 数据不存在是否抛出异常
+     * @return $this
+     */
+    public function failException($fail = true)
+    {
+        $this->options['fail'] = $fail;
+        return $this;
+    }
+
+    /**
+     * 设置自增序列名
+     * @access public
+     * @param  string $sequence 自增序列名
+     * @return $this
+     */
+    public function sequence($sequence = null)
+    {
+        $this->options['sequence'] = $sequence;
+        return $this;
+    }
+
+    /**
+     * 设置JSON字段信息
+     * @access public
+     * @param  array $json JSON字段
+     * @param  bool  $assoc 是否取出数组
+     * @return $this
+     */
+    public function json(array $json = [], $assoc = false)
+    {
+        $this->options['json']       = $json;
+        $this->options['json_assoc'] = $assoc;
+        return $this;
+    }
+
+    /**
+     * 设置字段类型信息
+     * @access public
+     * @param  array $type 字段类型信息
+     * @return $this
+     */
+    public function setJsonFieldType(array $type)
+    {
+        $this->options['field_type'] = $type;
+        return $this;
+    }
+
+    /**
+     * 获取字段类型信息
+     * @access public
+     * @param  string $field 字段名
+     * @return string|null
+     */
+    public function getJsonFieldType($field)
+    {
+        return isset($this->options['field_type'][$field]) ? $this->options['field_type'][$field] : null;
+    }
+
+    /**
+     * 添加查询范围
+     * @access public
+     * @param  array|string|\Closure   $scope 查询范围定义
+     * @param  array                   $args  参数
+     * @return $this
+     */
+    public function scope($scope, ...$args)
+    {
+        // 查询范围的第一个参数始终是当前查询对象
+        array_unshift($args, $this);
+
+        if ($scope instanceof \Closure) {
+            call_user_func_array($scope, $args);
+            return $this;
+        }
+
+        if (is_string($scope)) {
+            $scope = explode(',', $scope);
+        }
+
+        if ($this->model) {
+            // 检查模型类的查询范围方法
+            foreach ($scope as $name) {
+                $method = 'scope' . trim($name);
+
+                if (method_exists($this->model, $method)) {
+                    call_user_func_array([$this->model, $method], $args);
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 指定数据表主键
+     * @access public
+     * @param  string $pk 主键
+     * @return $this
+     */
+    public function pk($pk)
+    {
+        $this->pk = $pk;
+        return $this;
+    }
+
+    /**
+     * 查询日期或者时间
+     * @access public
+     * @param  string       $name  时间表达式
+     * @param  string|array $rule  时间范围
+     * @return $this
+     */
+    public function timeRule($name, $rule)
+    {
+        $this->timeRule[$name] = $rule;
+        return $this;
+    }
+
+    /**
+     * 查询日期或者时间
+     * @access public
+     * @param  string       $field 日期字段名
+     * @param  string|array $op    比较运算符或者表达式
+     * @param  string|array $range 比较范围
+     * @param  string       $logic AND OR
+     * @return $this
+     */
+    public function whereTime($field, $op, $range = null, $logic = 'AND')
+    {
+        if (is_null($range)) {
+            if (is_array($op)) {
+                $range = $op;
+            } else {
+                if (isset($this->timeExp[strtolower($op)])) {
+                    $op = $this->timeExp[strtolower($op)];
+                }
+
+                if (isset($this->timeRule[strtolower($op)])) {
+                    $range = $this->timeRule[strtolower($op)];
+                } else {
+                    $range = $op;
+                }
+            }
+
+            $op = is_array($range) ? 'between' : '>=';
+        }
+
+        return $this->parseWhereExp($logic, $field, strtolower($op) . ' time', $range, [], true);
+    }
+
+    /**
+     * 查询当前时间在两个时间字段范围
+     * @access public
+     * @param  string    $startField    开始时间字段
+     * @param  string    $endField 结束时间字段
+     * @return $this
+     */
+    public function whereBetweenTimeField($startField, $endField)
+    {
+        return $this->whereTime($startField, '<=', time())
+            ->whereTime($endField, '>=', time());
+    }
+
+    /**
+     * 查询当前时间不在两个时间字段范围
+     * @access public
+     * @param  string    $startField    开始时间字段
+     * @param  string    $endField 结束时间字段
+     * @return $this
+     */
+    public function whereNotBetweenTimeField($startField, $endField)
+    {
+        return $this->whereTime($startField, '>', time())
+            ->whereTime($endField, '<', time(), 'OR');
+    }
+
+    /**
+     * 查询日期或者时间范围
+     * @access public
+     * @param  string    $field 日期字段名
+     * @param  string    $startTime    开始时间
+     * @param  string    $endTime 结束时间
+     * @param  string    $logic AND OR
+     * @return $this
+     */
+    public function whereBetweenTime($field, $startTime, $endTime = null, $logic = 'AND')
+    {
+        if (is_null($endTime)) {
+            $time    = is_string($startTime) ? strtotime($startTime) : $startTime;
+            $endTime = strtotime('+1 day', $time);
+        }
+
+        return $this->parseWhereExp($logic, $field, 'between time', [$startTime, $endTime], [], true);
+    }
+
+    /**
+     * 获取当前数据表的主键
+     * @access public
+     * @param  string|array $options 数据表名或者查询参数
+     * @return string|array
+     */
+    public function getPk($options = '')
+    {
+        if (!empty($this->pk)) {
+            $pk = $this->pk;
+        } else {
+            $pk = $this->connection->getPk(is_array($options) && isset($options['table']) ? $options['table'] : $this->getTable());
+        }
+
+        return $pk;
+    }
+
+    /**
+     * 参数绑定
+     * @access public
+     * @param  mixed   $key   参数名
+     * @param  mixed   $value 绑定变量值
+     * @param  integer $type  绑定类型
+     * @return $this
+     */
+    public function bind($key, $value = false, $type = PDO::PARAM_STR)
+    {
+        if (is_array($key)) {
+            $this->bind = array_merge($this->bind, $key);
+        } else {
+            $this->bind[$key] = [$value, $type];
+        }
+
+        return $this;
+    }
+
+    /**
+     * 检测参数是否已经绑定
+     * @access public
+     * @param  string $key 参数名
+     * @return bool
+     */
+    public function isBind($key)
+    {
+        return isset($this->bind[$key]);
+    }
+
+    /**
+     * 查询参数赋值
+     * @access public
+     * @param  string $name     参数名
+     * @param  mixed  $value    值
+     * @return $this
+     */
+    public function option($name, $value)
+    {
+        $this->options[$name] = $value;
+        return $this;
+    }
+
+    /**
+     * 查询参数赋值
+     * @access protected
+     * @param  array $options 表达式参数
+     * @return $this
+     */
+    protected function options(array $options)
+    {
+        $this->options = $options;
+        return $this;
+    }
+
+    /**
+     * 获取当前的查询参数
+     * @access public
+     * @param  string $name 参数名
+     * @return mixed
+     */
+    public function getOptions($name = '')
+    {
+        if ('' === $name) {
+            return $this->options;
+        }
+        return isset($this->options[$name]) ? $this->options[$name] : null;
+    }
+
+    /**
+     * 设置当前的查询参数
+     * @access public
+     * @param  string $option 参数名
+     * @param  mixed  $value  参数值
+     * @return $this
+     */
+    public function setOption($option, $value)
+    {
+        $this->options[$option] = $value;
+        return $this;
+    }
+
+    /**
+     * 设置关联查询JOIN预查询
+     * @access public
+     * @param  string|array $with 关联方法名称
+     * @return $this
+     */
+    public function with($with)
+    {
+        if (empty($with)) {
+            return $this;
+        }
+
+        if (is_string($with)) {
+            $with = explode(',', $with);
+        }
+
+        $first = true;
+
+        /** @var Model $class */
+        $class = $this->model;
+        foreach ($with as $key => $relation) {
+            $subRelation = '';
+            $closure     = false;
+
+            if ($relation instanceof \Closure) {
+                // 支持闭包查询过滤关联条件
+                $closure    = $relation;
+                $relation   = $key;
+                $with[$key] = $key;
+            } elseif (is_array($relation)) {
+                $subRelation = $relation;
+                $relation    = $key;
+            } elseif (is_string($relation) && strpos($relation, '.')) {
+                $with[$key] = $relation;
+
+                list($relation, $subRelation) = explode('.', $relation, 2);
+            }
+
+            /** @var Relation $model */
+            $relation = Loader::parseName($relation, 1, false);
+            $model    = $class->$relation();
+
+            if ($model instanceof OneToOne && 0 == $model->getEagerlyType()) {
+                $model->removeOption()->eagerly($this, $relation, $subRelation, $closure, $first);
+                $first = false;
+            } elseif ($closure) {
+                $with[$key] = $closure;
+            }
+        }
+        $this->via();
+
+        if (isset($this->options['with'])) {
+            $this->options['with'] = array_merge($this->options['with'], $with);
+        } else {
+            $this->options['with'] = $with;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 关联统计
+     * @access protected
+     * @param  string|array $relation 关联方法名
+     * @param  string       $aggregate 聚合查询方法
+     * @param  string       $field 字段
+     * @param  bool         $subQuery 是否使用子查询
+     * @return $this
+     */
+    protected function withAggregate($relation, $aggregate = 'count', $field = '*', $subQuery = true)
+    {
+        $relations = is_string($relation) ? explode(',', $relation) : $relation;
+
+        if (!$subQuery) {
+            $this->options['with_count'][] = [$relations, $aggregate, $field];
+        } else {
+            if (!isset($this->options['field'])) {
+                $this->field('*');
+            }
+
+            foreach ($relations as $key => $relation) {
+                $closure = false;
+                if ($relation instanceof \Closure) {
+                    $closure  = $relation;
+                    $relation = $key;
+                } elseif (!is_int($key)) {
+                    $aggregateField = $relation;
+                    $relation       = $key;
+                }
+
+                if (!isset($aggregateField)) {
+                    $aggregateField = Loader::parseName($relation) . '_' . $aggregate;
+                }
+
+                $relation = Loader::parseName($relation, 1, false);
+                $count    = '(' . $this->model->$relation()->getRelationCountQuery($closure, $aggregate, $field) . ')';
+
+                $this->field([$count => $aggregateField]);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 关联统计
+     * @access public
+     * @param  string|array $relation 关联方法名
+     * @param  bool         $subQuery 是否使用子查询
+     * @return $this
+     */
+    public function withCount($relation, $subQuery = true)
+    {
+        return $this->withAggregate($relation, 'count', '*', $subQuery);
+    }
+
+    /**
+     * 关联统计Sum
+     * @access public
+     * @param  string|array $relation 关联方法名
+     * @param  string       $field 字段
+     * @param  bool         $subQuery 是否使用子查询
+     * @return $this
+     */
+    public function withSum($relation, $field, $subQuery = true)
+    {
+        return $this->withAggregate($relation, 'sum', $field, $subQuery);
+    }
+
+    /**
+     * 关联统计Max
+     * @access public
+     * @param  string|array $relation 关联方法名
+     * @param  string       $field 字段
+     * @param  bool         $subQuery 是否使用子查询
+     * @return $this
+     */
+    public function withMax($relation, $field, $subQuery = true)
+    {
+        return $this->withAggregate($relation, 'max', $field, $subQuery);
+    }
+
+    /**
+     * 关联统计Min
+     * @access public
+     * @param  string|array $relation 关联方法名
+     * @param  string       $field 字段
+     * @param  bool         $subQuery 是否使用子查询
+     * @return $this
+     */
+    public function withMin($relation, $field, $subQuery = true)
+    {
+        return $this->withAggregate($relation, 'min', $field, $subQuery);
+    }
+
+    /**
+     * 关联统计Avg
+     * @access public
+     * @param  string|array $relation 关联方法名
+     * @param  string       $field 字段
+     * @param  bool         $subQuery 是否使用子查询
+     * @return $this
+     */
+    public function withAvg($relation, $field, $subQuery = true)
+    {
+        return $this->withAggregate($relation, 'avg', $field, $subQuery);
+    }
+
+    /**
+     * 关联预加载中 获取关联指定字段值
+     * example:
+     * Model::with(['relation' => function($query){
+     *     $query->withField("id,name");
+     * }])
+     *
+     * @access public
+     * @param  string | array $field 指定获取的字段
+     * @return $this
+     */
+    public function withField($field)
+    {
+        $this->options['with_field'] = $field;
+
+        return $this;
+    }
+
+    /**
+     * 设置当前字段添加的表别名
+     * @access public
+     * @param  string $via
+     * @return $this
+     */
+    public function via($via = '')
+    {
+        $this->options['via'] = $via;
+
+        return $this;
+    }
+
+    /**
+     * 设置关联查询
+     * @access public
+     * @param  string|array $relation 关联名称
+     * @return $this
+     */
+    public function relation($relation)
+    {
+        if (empty($relation)) {
+            return $this;
+        }
+
+        if (is_string($relation)) {
+            $relation = explode(',', $relation);
+        }
+
+        if (isset($this->options['relation'])) {
+            $this->options['relation'] = array_merge($this->options['relation'], $relation);
+        } else {
+            $this->options['relation'] = $relation;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 插入记录
+     * @access public
+     * @param  array   $data         数据
+     * @param  boolean $replace      是否replace
+     * @param  boolean $getLastInsID 返回自增主键
+     * @param  string  $sequence     自增序列名
+     * @return integer|string
+     */
+    public function insert(array $data = [], $replace = false, $getLastInsID = false, $sequence = null)
+    {
+        $this->parseOptions();
+
+        $this->options['data'] = array_merge($this->options['data'], $data);
+
+        return $this->connection->insert($this, $replace, $getLastInsID, $sequence);
+    }
+
+    /**
+     * 插入记录并获取自增ID
+     * @access public
+     * @param  array   $data     数据
+     * @param  boolean $replace  是否replace
+     * @param  string  $sequence 自增序列名
+     * @return integer|string
+     */
+    public function insertGetId(array $data, $replace = false, $sequence = null)
+    {
+        return $this->insert($data, $replace, true, $sequence);
+    }
+
+    /**
+     * 批量插入记录
+     * @access public
+     * @param  array     $dataSet 数据集
+     * @param  boolean   $replace 是否replace
+     * @param  integer   $limit   每次写入数据限制
+     * @return integer|string
+     */
+    public function insertAll(array $dataSet = [], $replace = false, $limit = null)
+    {
+        $this->parseOptions();
+
+        if (empty($dataSet)) {
+            $dataSet = $this->options['data'];
+        }
+
+        if (empty($limit) && !empty($this->options['limit'])) {
+            $limit = $this->options['limit'];
+        }
+
+        return $this->connection->insertAll($this, $dataSet, $replace, $limit);
+    }
+
+    /**
+     * 通过Select方式插入记录
+     * @access public
+     * @param  string $fields 要插入的数据表字段名
+     * @param  string $table  要插入的数据表名
+     * @return integer|string
+     * @throws PDOException
+     */
+    public function selectInsert($fields, $table)
+    {
+        $this->parseOptions();
+
+        return $this->connection->selectInsert($this, $fields, $table);
+    }
+
+    /**
+     * 更新记录
+     * @access public
+     * @param  mixed $data 数据
+     * @return integer|string
+     * @throws Exception
+     * @throws PDOException
+     */
+    public function update(array $data = [])
+    {
+        $this->parseOptions();
+
+        $this->options['data'] = array_merge($this->options['data'], $data);
+
+        return $this->connection->update($this);
+    }
+
+    /**
+     * 删除记录
+     * @access public
+     * @param  mixed $data 表达式 true 表示强制删除
+     * @return int
+     * @throws Exception
+     * @throws PDOException
+     */
+    public function delete($data = null)
+    {
+        $this->parseOptions();
+
+        if (!is_null($data) && true !== $data) {
+            // AR模式分析主键条件
+            $this->parsePkWhere($data);
+        }
+
+        if (!empty($this->options['soft_delete'])) {
+            // 软删除
+            list($field, $condition) = $this->options['soft_delete'];
+            if ($condition) {
+                unset($this->options['soft_delete']);
+                $this->options['data'] = [$field => $condition];
+
+                return $this->connection->update($this);
+            }
+        }
+
+        $this->options['data'] = $data;
+
+        return $this->connection->delete($this);
+    }
+
+    /**
+     * 执行查询但只返回PDOStatement对象
+     * @access public
+     * @return \PDOStatement|string
+     */
+    public function getPdo()
+    {
+        $this->parseOptions();
+
+        return $this->connection->pdo($this);
+    }
+
+    /**
+     * 使用游标查找记录
+     * @access public
+     * @param  array|string|Query|\Closure $data
+     * @return \Generator
+     */
+    public function cursor($data = null)
+    {
+        if ($data instanceof \Closure) {
+            $data($this);
+            $data = null;
+        }
+
+        $this->parseOptions();
+
+        if (!is_null($data)) {
+            // 主键条件分析
+            $this->parsePkWhere($data);
+        }
+
+        $this->options['data'] = $data;
+
+        $connection = clone $this->connection;
+
+        return $connection->cursor($this);
+    }
+
+    /**
+     * 查找记录
+     * @access public
+     * @param  array|string|Query|\Closure $data
+     * @return Collection|array|\PDOStatement|string
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws DataNotFoundException
+     */
+    public function select($data = null)
+    {
+        if ($data instanceof Query) {
+            return $data->select();
+        } elseif ($data instanceof \Closure) {
+            $data($this);
+            $data = null;
+        }
+
+        $this->parseOptions();
+
+        if (false === $data) {
+            // 用于子查询 不查询只返回SQL
+            $this->options['fetch_sql'] = true;
+        } elseif (!is_null($data)) {
+            // 主键条件分析
+            $this->parsePkWhere($data);
+        }
+
+        $this->options['data'] = $data;
+
+        $resultSet = $this->connection->select($this);
+
+        if ($this->options['fetch_sql']) {
+            return $resultSet;
+        }
+
+        // 数据列表读取后的处理
+        if (!empty($this->model)) {
+            // 生成模型对象
+            if (count($resultSet) > 0) {
+                foreach ($resultSet as $key => &$result) {
+                    // 数据转换为模型对象
+                    $this->resultToModel($result, $this->options, true);
+                }
+
+                if (!empty($this->options['with'])) {
+                    // 预载入
+                    $result->eagerlyResultSet($resultSet, $this->options['with']);
+                }
+
+                // 模型数据集转换
+                $resultSet = $result->toCollection($resultSet);
+            } else {
+                $resultSet = $this->model->toCollection($resultSet);
+            }
+        } else {
+            if (!empty($this->options['json'])) {
+                foreach ($resultSet as &$result) {
+                    $this->jsonResult($result, $this->options['json'], true);
+                }
+            }
+
+            if ('collection' == $this->connection->getConfig('resultset_type')) {
+                // 返回Collection对象
+                $resultSet = new Collection($resultSet);
+            }
+        }
+
+        // 返回结果处理
+        if (!empty($this->options['fail']) && count($resultSet) == 0) {
+            $this->throwNotFound($this->options);
+        }
+
+        return $resultSet;
+    }
+
+    /**
+     * 查找单条记录
+     * @access public
+     * @param  array|string|Query|\Closure $data
+     * @return array|null|\PDOStatement|string|Model
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws DataNotFoundException
+     */
+    public function find($data = null)
+    {
+        if ($data instanceof Query) {
+            return $data->find();
+        } elseif ($data instanceof \Closure) {
+            $data($this);
+            $data = null;
+        }
+
+        $this->parseOptions();
+
+        if (!is_null($data)) {
+            // AR模式分析主键条件
+            $this->parsePkWhere($data);
+        }
+
+        $this->options['data'] = $data;
+
+        $result = $this->connection->find($this);
+
+        if ($this->options['fetch_sql']) {
+            return $result;
+        }
+
+        // 数据处理
+        if (!empty($result)) {
+            if (!empty($this->model)) {
+                // 返回模型对象
+                $this->resultToModel($result, $this->options);
+            } elseif (!empty($this->options['json'])) {
+                $this->jsonResult($result, $this->options['json'], true);
+            }
+        } elseif (!empty($this->options['fail'])) {
+            $this->throwNotFound($this->options);
+        }
+
+        return $result;
+    }
+
+    /**
+     * JSON字段数据转换
+     * @access protected
+     * @param  array $result     查询数据
+     * @param  array $json       JSON字段
+     * @param  bool  $assoc      是否转换为数组
+     * @return void
+     */
+    protected function jsonResult(&$result, $json = [], $assoc = false)
+    {
+        foreach ($json as $name) {
+            if (isset($result[$name])) {
+                $result[$name] = json_decode($result[$name], $assoc);
+            }
+        }
+    }
+
+    /**
+     * 查询数据转换为模型对象
+     * @access protected
+     * @param  array $result     查询数据
+     * @param  array $options    查询参数
+     * @param  bool  $resultSet  是否为数据集查询
+     * @return void
+     */
+    protected function resultToModel(&$result, $options = [], $resultSet = false)
+    {
+        if (!empty($options['json'])) {
+            $this->jsonResult($result, $options['json'], $options['json_assoc']);
+        }
+
+        $condition = (!$resultSet && isset($options['where']['AND'])) ? $options['where']['AND'] : null;
+        $result    = $this->model->newInstance($result, $condition);
+
+        // 关联查询
+        if (!empty($options['relation'])) {
+            $result->relationQuery($options['relation']);
+        }
+
+        // 预载入查询
+        if (!$resultSet && !empty($options['with'])) {
+            $result->eagerlyResult($result, $options['with']);
+        }
+
+        // 关联统计
+        if (!empty($options['with_count'])) {
+            foreach ($options['with_count'] as $val) {
+                $result->relationCount($result, $val[0], $val[1], $val[2]);
+            }
+        }
+    }
+
+    /**
+     * 查询失败 抛出异常
+     * @access protected
+     * @param  array $options 查询参数
+     * @throws ModelNotFoundException
+     * @throws DataNotFoundException
+     */
+    protected function throwNotFound($options = [])
+    {
+        if (!empty($this->model)) {
+            $class = get_class($this->model);
+            throw new ModelNotFoundException('model data Not Found:' . $class, $class, $options);
+        }
+        $table = is_array($options['table']) ? key($options['table']) : $options['table'];
+        throw new DataNotFoundException('table data not Found:' . $table, $table, $options);
+    }
+
+    /**
+     * 查找多条记录 如果不存在则抛出异常
+     * @access public
+     * @param  array|string|Query|\Closure $data
+     * @return array|\PDOStatement|string|Model
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws DataNotFoundException
+     */
+    public function selectOrFail($data = null)
+    {
+        return $this->failException(true)->select($data);
+    }
+
+    /**
+     * 查找单条记录 如果不存在则抛出异常
+     * @access public
+     * @param  array|string|Query|\Closure $data
+     * @return array|\PDOStatement|string|Model
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws DataNotFoundException
+     */
+    public function findOrFail($data = null)
+    {
+        return $this->failException(true)->find($data);
+    }
+
+    /**
+     * 分批数据返回处理
+     * @access public
+     * @param  integer      $count    每次处理的数据数量
+     * @param  callable     $callback 处理回调方法
+     * @param  string|array $column   分批处理的字段名
+     * @param  string       $order    字段排序
+     * @return boolean
+     * @throws DbException
+     */
+    public function chunk($count, $callback, $column = null, $order = 'asc')
+    {
+        $options = $this->getOptions();
+        $column  = $column ?: $this->getPk($options);
+
+        if (isset($options['order'])) {
+            if (Container::get('app')->isDebug()) {
+                throw new DbException('chunk not support call order');
+            }
+            unset($options['order']);
+        }
+
+        $bind = $this->bind;
+
+        if (is_array($column)) {
+            $times = 1;
+            $query = $this->options($options)->page($times, $count);
+        } else {
+            $query = $this->options($options)->limit($count);
+
+            if (strpos($column, '.')) {
+                list($alias, $key) = explode('.', $column);
+            } else {
+                $key = $column;
+            }
+        }
+
+        $resultSet = $query->order($column, $order)->select();
+
+        while (count($resultSet) > 0) {
+            if ($resultSet instanceof Collection) {
+                $resultSet = $resultSet->all();
+            }
+
+            if (false === call_user_func($callback, $resultSet)) {
+                return false;
+            }
+
+            if (isset($times)) {
+                $times++;
+                $query = $this->options($options)->page($times, $count);
+            } else {
+                $end    = end($resultSet);
+                $lastId = is_array($end) ? $end[$key] : $end->getData($key);
+
+                $query = $this->options($options)
+                    ->limit($count)
+                    ->where($column, 'asc' == strtolower($order) ? '>' : '<', $lastId);
+            }
+
+            $resultSet = $query->bind($bind)->order($column, $order)->select();
+        }
+
+        return true;
+    }
+
+    /**
+     * 获取绑定的参数 并清空
+     * @access public
+     * @param  bool $clear
+     * @return array
+     */
+    public function getBind($clear = true)
+    {
+        $bind = $this->bind;
+        if ($clear) {
+            $this->bind = [];
+        }
+
+        return $bind;
+    }
+
+    /**
+     * 创建子查询SQL
+     * @access public
+     * @param  bool $sub
+     * @return string
+     * @throws DbException
+     */
+    public function buildSql($sub = true)
+    {
+        return $sub ? '( ' . $this->select(false) . ' )' : $this->select(false);
+    }
+
+    /**
+     * 视图查询处理
+     * @access protected
+     * @param  array   $options    查询参数
+     * @return void
+     */
+    protected function parseView(&$options)
+    {
+        foreach (['AND', 'OR'] as $logic) {
+            if (isset($options['where'][$logic])) {
+                foreach ($options['where'][$logic] as $key => $val) {
+                    if (array_key_exists($key, $options['map'])) {
+                        array_shift($val);
+                        array_unshift($val, $options['map'][$key]);
+                        $options['where'][$logic][$options['map'][$key]] = $val;
+                        unset($options['where'][$logic][$key]);
+                    }
+                }
+            }
+        }
+
+        if (isset($options['order'])) {
+            // 视图查询排序处理
+            if (is_string($options['order'])) {
+                $options['order'] = explode(',', $options['order']);
+            }
+            foreach ($options['order'] as $key => $val) {
+                if (is_numeric($key)) {
+                    if (strpos($val, ' ')) {
+                        list($field, $sort) = explode(' ', $val);
+                        if (array_key_exists($field, $options['map'])) {
+                            $options['order'][$options['map'][$field]] = $sort;
+                            unset($options['order'][$key]);
+                        }
+                    } elseif (array_key_exists($val, $options['map'])) {
+                        $options['order'][$options['map'][$val]] = 'asc';
+                        unset($options['order'][$key]);
+                    }
+                } elseif (array_key_exists($key, $options['map'])) {
+                    $options['order'][$options['map'][$key]] = $val;
+                    unset($options['order'][$key]);
+                }
+            }
+        }
+    }
+
+    /**
+     * 把主键值转换为查询条件 支持复合主键
+     * @access public
+     * @param  array|string $data    主键数据
+     * @return void
+     * @throws Exception
+     */
+    public function parsePkWhere($data)
+    {
+        $pk = $this->getPk($this->options);
+        // 获取当前数据表
+        $table = is_array($this->options['table']) ? key($this->options['table']) : $this->options['table'];
+
+        if (!empty($this->options['alias'][$table])) {
+            $alias = $this->options['alias'][$table];
+        }
+
+        if (is_string($pk)) {
+            $key = isset($alias) ? $alias . '.' . $pk : $pk;
+            // 根据主键查询
+            if (is_array($data)) {
+                $where[$pk] = isset($data[$pk]) ? [$key, '=', $data[$pk]] : [$key, 'in', $data];
+            } else {
+                $where[$pk] = strpos($data, ',') ? [$key, 'IN', $data] : [$key, '=', $data];
+            }
+        } elseif (is_array($pk) && is_array($data) && !empty($data)) {
+            // 根据复合主键查询
+            foreach ($pk as $key) {
+                if (isset($data[$key])) {
+                    $attr        = isset($alias) ? $alias . '.' . $key : $key;
+                    $where[$key] = [$attr, '=', $data[$key]];
+                } else {
+                    throw new Exception('miss complex primary data');
+                }
+            }
+        }
+
+        if (!empty($where)) {
+            if (isset($this->options['where']['AND'])) {
+                $this->options['where']['AND'] = array_merge($this->options['where']['AND'], $where);
+            } else {
+                $this->options['where']['AND'] = $where;
+            }
+        }
+
+        return;
+    }
+
+    /**
+     * 分析表达式（可用于查询或者写入操作）
+     * @access protected
+     * @return array
+     */
+    protected function parseOptions()
+    {
+        $options = $this->getOptions();
+
+        // 获取数据表
+        if (empty($options['table'])) {
+            $options['table'] = $this->getTable();
+        }
+
+        if (!isset($options['where'])) {
+            $options['where'] = [];
+        } elseif (isset($options['view'])) {
+            // 视图查询条件处理
+            $this->parseView($options);
+        }
+
+        if (!isset($options['field'])) {
+            $options['field'] = '*';
+        }
+
+        foreach (['data', 'order'] as $name) {
+            if (!isset($options[$name])) {
+                $options[$name] = [];
+            }
+        }
+
+        if (!isset($options['strict'])) {
+            $options['strict'] = $this->getConfig('fields_strict');
+        }
+
+        foreach (['master', 'lock', 'fetch_pdo', 'fetch_sql', 'distinct'] as $name) {
+            if (!isset($options[$name])) {
+                $options[$name] = false;
+            }
+        }
+
+        if (isset(static::$readMaster['*']) || (is_string($options['table']) && isset(static::$readMaster[$options['table']]))) {
+            $options['master'] = true;
+        }
+
+        foreach (['join', 'union', 'group', 'having', 'limit', 'force', 'comment'] as $name) {
+            if (!isset($options[$name])) {
+                $options[$name] = '';
+            }
+        }
+
+        if (isset($options['page'])) {
+            // 根据页数计算limit
+            list($page, $listRows) = $options['page'];
+            $page                  = $page > 0 ? $page : 1;
+            $listRows              = $listRows > 0 ? $listRows : (is_numeric($options['limit']) ? $options['limit'] : 20);
+            $offset                = $listRows * ($page - 1);
+            $options['limit']      = $offset . ',' . $listRows;
+        }
+
+        $this->options = $options;
+
+        return $options;
+    }
+
+    /**
+     * 注册回调方法
+     * @access public
+     * @param  string   $event    事件名
+     * @param  callable $callback 回调方法
+     * @return void
+     */
+    public static function event($event, $callback)
+    {
+        self::$event[$event] = $callback;
+    }
+
+    /**
+     * 触发事件
+     * @access public
+     * @param  string $event   事件名
+     * @return bool
+     */
+    public function trigger($event)
+    {
+        $result = false;
+
+        if (isset(self::$event[$event])) {
+            $result = Container::getInstance()->invoke(self::$event[$event], [$this]);
+        }
+
+        return $result;
+    }
+
+}
diff --git a/thinkphp/library/think/db/builder/Mysql.php b/thinkphp/library/think/db/builder/Mysql.php
new file mode 100644
index 0000000000000000000000000000000000000000..ab21648e157a48e1c011fe5f079befd98f6d411c
--- /dev/null
+++ b/thinkphp/library/think/db/builder/Mysql.php
@@ -0,0 +1,169 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db\builder;
+
+use think\db\Builder;
+use think\db\Expression;
+use think\db\Query;
+
+/**
+ * mysql数据库驱动
+ */
+class Mysql extends Builder
+{
+    // 查询表达式解析
+    protected $parser = [
+        'parseCompare'     => ['=', '<>', '>', '>=', '<', '<='],
+        'parseLike'        => ['LIKE', 'NOT LIKE'],
+        'parseBetween'     => ['NOT BETWEEN', 'BETWEEN'],
+        'parseIn'          => ['NOT IN', 'IN'],
+        'parseExp'         => ['EXP'],
+        'parseRegexp'      => ['REGEXP', 'NOT REGEXP'],
+        'parseNull'        => ['NOT NULL', 'NULL'],
+        'parseBetweenTime' => ['BETWEEN TIME', 'NOT BETWEEN TIME'],
+        'parseTime'        => ['< TIME', '> TIME', '<= TIME', '>= TIME'],
+        'parseExists'      => ['NOT EXISTS', 'EXISTS'],
+        'parseColumn'      => ['COLUMN'],
+    ];
+
+    protected $insertAllSql = '%INSERT% INTO %TABLE% (%FIELD%) VALUES %DATA% %COMMENT%';
+    protected $updateSql    = 'UPDATE %TABLE% %JOIN% SET %SET% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%';
+
+    /**
+     * 生成insertall SQL
+     * @access public
+     * @param  Query     $query   查询对象
+     * @param  array     $dataSet 数据集
+     * @param  bool      $replace 是否replace
+     * @return string
+     */
+    public function insertAll(Query $query, $dataSet, $replace = false)
+    {
+        $options = $query->getOptions();
+
+        // 获取合法的字段
+        if ('*' == $options['field']) {
+            $allowFields = $this->connection->getTableFields($options['table']);
+        } else {
+            $allowFields = $options['field'];
+        }
+
+        // 获取绑定信息
+        $bind = $this->connection->getFieldsBind($options['table']);
+
+        foreach ($dataSet as $k => $data) {
+            $data = $this->parseData($query, $data, $allowFields, $bind, '_' . $k);
+
+            $values[] = '( ' . implode(',', array_values($data)) . ' )';
+
+            if (!isset($insertFields)) {
+                $insertFields = array_keys($data);
+            }
+        }
+
+        $fields = [];
+        foreach ($insertFields as $field) {
+            $fields[] = $this->parseKey($query, $field);
+        }
+
+        return str_replace(
+            ['%INSERT%', '%TABLE%', '%FIELD%', '%DATA%', '%COMMENT%'],
+            [
+                $replace ? 'REPLACE' : 'INSERT',
+                $this->parseTable($query, $options['table']),
+                implode(' , ', $fields),
+                implode(' , ', $values),
+                $this->parseComment($query, $options['comment']),
+            ],
+            $this->insertAllSql);
+    }
+
+    /**
+     * 正则查询
+     * @access protected
+     * @param  Query        $query        查询对象
+     * @param  string       $key
+     * @param  string       $exp
+     * @param  Expression   $value
+     * @param  string       $field
+     * @return string
+     */
+    protected function parseRegexp(Query $query, $key, $exp, Expression $value, $field)
+    {
+        return $key . ' ' . $exp . ' ' . $value->getValue();
+    }
+
+    /**
+     * 字段和表名处理
+     * @access public
+     * @param  Query     $query 查询对象
+     * @param  mixed     $key   字段名
+     * @param  bool      $strict   严格检测
+     * @return string
+     */
+    public function parseKey(Query $query, $key, $strict = false)
+    {
+        if (is_numeric($key)) {
+            return $key;
+        } elseif ($key instanceof Expression) {
+            return $key->getValue();
+        }
+
+        $key = trim($key);
+
+        if (strpos($key, '->') && false === strpos($key, '(')) {
+            // JSON字段支持
+            list($field, $name) = explode('->', $key, 2);
+
+            return 'json_extract(' . $this->parseKey($query, $field) . ', \'$.' . str_replace('->', '.', $name) . '\')';
+        } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
+            list($table, $key) = explode('.', $key, 2);
+
+            $alias = $query->getOptions('alias');
+
+            if ('__TABLE__' == $table) {
+                $table = $query->getOptions('table');
+                $table = is_array($table) ? array_shift($table) : $table;
+            }
+
+            if (isset($alias[$table])) {
+                $table = $alias[$table];
+            }
+        }
+
+        if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)`.\s]/', $key))) {
+            $key = '`' . $key . '`';
+        }
+
+        if (isset($table)) {
+            if (strpos($table, '.')) {
+                $table = str_replace('.', '`.`', $table);
+            }
+
+            $key = '`' . $table . '`.' . $key;
+        }
+
+        return $key;
+    }
+
+    /**
+     * 随机排序
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @return string
+     */
+    protected function parseRand(Query $query)
+    {
+        return 'rand()';
+    }
+
+}
diff --git a/thinkphp/library/think/db/builder/Pgsql.php b/thinkphp/library/think/db/builder/Pgsql.php
new file mode 100644
index 0000000000000000000000000000000000000000..742c7db3795658db928c57f420893dafffd6df19
--- /dev/null
+++ b/thinkphp/library/think/db/builder/Pgsql.php
@@ -0,0 +1,104 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db\builder;
+
+use think\db\Builder;
+use think\db\Query;
+
+/**
+ * Pgsql数据库驱动
+ */
+class Pgsql extends Builder
+{
+
+    protected $insertSql    = 'INSERT INTO %TABLE% (%FIELD%) VALUES (%DATA%) %COMMENT%';
+    protected $insertAllSql = 'INSERT INTO %TABLE% (%FIELD%) %DATA% %COMMENT%';
+
+    /**
+     * limit分析
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  mixed     $limit
+     * @return string
+     */
+    public function parseLimit(Query $query, $limit)
+    {
+        $limitStr = '';
+
+        if (!empty($limit)) {
+            $limit = explode(',', $limit);
+            if (count($limit) > 1) {
+                $limitStr .= ' LIMIT ' . $limit[1] . ' OFFSET ' . $limit[0] . ' ';
+            } else {
+                $limitStr .= ' LIMIT ' . $limit[0] . ' ';
+            }
+        }
+
+        return $limitStr;
+    }
+
+    /**
+     * 字段和表名处理
+     * @access public
+     * @param  Query     $query     查询对象
+     * @param  mixed     $key       字段名
+     * @param  bool      $strict   严格检测
+     * @return string
+     */
+    public function parseKey(Query $query, $key, $strict = false)
+    {
+        if (is_numeric($key)) {
+            return $key;
+        } elseif ($key instanceof Expression) {
+            return $key->getValue();
+        }
+
+        $key = trim($key);
+
+        if (strpos($key, '->') && false === strpos($key, '(')) {
+            // JSON字段支持
+            list($field, $name) = explode('->', $key);
+            $key                = $field . '->>\'' . $name . '\'';
+        } elseif (strpos($key, '.')) {
+            list($table, $key) = explode('.', $key, 2);
+
+            $alias = $query->getOptions('alias');
+
+            if ('__TABLE__' == $table) {
+                $table = $query->getOptions('table');
+                $table = is_array($table) ? array_shift($table) : $table;
+            }
+
+            if (isset($alias[$table])) {
+                $table = $alias[$table];
+            }
+        }
+
+        if (isset($table)) {
+            $key = $table . '.' . $key;
+        }
+
+        return $key;
+    }
+
+    /**
+     * 随机排序
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @return string
+     */
+    protected function parseRand(Query $query)
+    {
+        return 'RANDOM()';
+    }
+
+}
diff --git a/thinkphp/library/think/db/builder/Sqlite.php b/thinkphp/library/think/db/builder/Sqlite.php
new file mode 100644
index 0000000000000000000000000000000000000000..2b887ca8ef55bcc78be6a1cabcffaa3b13a1ba39
--- /dev/null
+++ b/thinkphp/library/think/db/builder/Sqlite.php
@@ -0,0 +1,96 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db\builder;
+
+use think\db\Builder;
+use think\db\Query;
+
+/**
+ * Sqlite数据库驱动
+ */
+class Sqlite extends Builder
+{
+
+    /**
+     * limit
+     * @access public
+     * @param  Query     $query        查询对象
+     * @param  mixed     $limit
+     * @return string
+     */
+    public function parseLimit(Query $query, $limit)
+    {
+        $limitStr = '';
+
+        if (!empty($limit)) {
+            $limit = explode(',', $limit);
+            if (count($limit) > 1) {
+                $limitStr .= ' LIMIT ' . $limit[1] . ' OFFSET ' . $limit[0] . ' ';
+            } else {
+                $limitStr .= ' LIMIT ' . $limit[0] . ' ';
+            }
+        }
+
+        return $limitStr;
+    }
+
+    /**
+     * 随机排序
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @return string
+     */
+    protected function parseRand(Query $query)
+    {
+        return 'RANDOM()';
+    }
+
+    /**
+     * 字段和表名处理
+     * @access public
+     * @param  Query     $query     查询对象
+     * @param  mixed     $key       字段名
+     * @param  bool      $strict   严格检测
+     * @return string
+     */
+    public function parseKey(Query $query, $key, $strict = false)
+    {
+        if (is_numeric($key)) {
+            return $key;
+        } elseif ($key instanceof Expression) {
+            return $key->getValue();
+        }
+
+        $key = trim($key);
+
+        if (strpos($key, '.')) {
+            list($table, $key) = explode('.', $key, 2);
+
+            $alias = $query->getOptions('alias');
+
+            if ('__TABLE__' == $table) {
+                $table = $query->getOptions('table');
+                $table = is_array($table) ? array_shift($table) : $table;
+            }
+
+            if (isset($alias[$table])) {
+                $table = $alias[$table];
+            }
+        }
+
+        if (isset($table)) {
+            $key = $table . '.' . $key;
+        }
+
+        return $key;
+    }
+}
diff --git a/thinkphp/library/think/db/builder/Sqlsrv.php b/thinkphp/library/think/db/builder/Sqlsrv.php
new file mode 100644
index 0000000000000000000000000000000000000000..25da4d9fda92aaa716515cfbc4e05a3016ab1506
--- /dev/null
+++ b/thinkphp/library/think/db/builder/Sqlsrv.php
@@ -0,0 +1,151 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db\builder;
+
+use think\db\Builder;
+use think\db\Expression;
+use think\db\Query;
+
+/**
+ * Sqlsrv数据库驱动
+ */
+class Sqlsrv extends Builder
+{
+    protected $selectSql       = 'SELECT T1.* FROM (SELECT thinkphp.*, ROW_NUMBER() OVER (%ORDER%) AS ROW_NUMBER FROM (SELECT %DISTINCT% %FIELD% FROM %TABLE%%JOIN%%WHERE%%GROUP%%HAVING%) AS thinkphp) AS T1 %LIMIT%%COMMENT%';
+    protected $selectInsertSql = 'SELECT %DISTINCT% %FIELD% FROM %TABLE%%JOIN%%WHERE%%GROUP%%HAVING%';
+    protected $updateSql       = 'UPDATE %TABLE% SET %SET% FROM %TABLE% %JOIN% %WHERE% %LIMIT% %LOCK%%COMMENT%';
+    protected $deleteSql       = 'DELETE FROM %TABLE% %USING% FROM %TABLE% %JOIN% %WHERE% %LIMIT% %LOCK%%COMMENT%';
+    protected $insertSql       = 'INSERT INTO %TABLE% (%FIELD%) VALUES (%DATA%) %COMMENT%';
+    protected $insertAllSql    = 'INSERT INTO %TABLE% (%FIELD%) %DATA% %COMMENT%';
+
+    /**
+     * order分析
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  mixed     $order
+     * @return string
+     */
+    protected function parseOrder(Query $query, $order)
+    {
+        if (empty($order)) {
+            return ' ORDER BY rand()';
+        }
+
+        $array = [];
+
+        foreach ($order as $key => $val) {
+            if ($val instanceof Expression) {
+                $array[] = $val->getValue();
+            } elseif ('[rand]' == $val) {
+                $array[] = $this->parseRand($query);
+            } else {
+                if (is_numeric($key)) {
+                    list($key, $sort) = explode(' ', strpos($val, ' ') ? $val : $val . ' ');
+                } else {
+                    $sort = $val;
+                }
+
+                $sort    = in_array(strtolower($sort), ['asc', 'desc'], true) ? ' ' . $sort : '';
+                $array[] = $this->parseKey($query, $key, true) . $sort;
+            }
+        }
+
+        return ' ORDER BY ' . implode(',', $array);
+    }
+
+    /**
+     * 随机排序
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @return string
+     */
+    protected function parseRand(Query $query)
+    {
+        return 'rand()';
+    }
+
+    /**
+     * 字段和表名处理
+     * @access public
+     * @param  Query     $query     查询对象
+     * @param  mixed     $key       字段名
+     * @param  bool      $strict   严格检测
+     * @return string
+     */
+    public function parseKey(Query $query, $key, $strict = false)
+    {
+        if (is_numeric($key)) {
+            return $key;
+        } elseif ($key instanceof Expression) {
+            return $key->getValue();
+        }
+
+        $key = trim($key);
+
+        if (strpos($key, '.') && !preg_match('/[,\'\"\(\)\[\s]/', $key)) {
+            list($table, $key) = explode('.', $key, 2);
+
+            $alias = $query->getOptions('alias');
+
+            if ('__TABLE__' == $table) {
+                $table = $query->getOptions('table');
+                $table = is_array($table) ? array_shift($table) : $table;
+            }
+
+            if (isset($alias[$table])) {
+                $table = $alias[$table];
+            }
+        }
+
+        if ('*' != $key && ($strict || !preg_match('/[,\'\"\*\(\)\[.\s]/', $key))) {
+            $key = '[' . $key . ']';
+        }
+
+        if (isset($table)) {
+            $key = '[' . $table . '].' . $key;
+        }
+
+        return $key;
+    }
+
+    /**
+     * limit
+     * @access protected
+     * @param  Query     $query        查询对象
+     * @param  mixed     $limit
+     * @return string
+     */
+    protected function parseLimit(Query $query, $limit)
+    {
+        if (empty($limit)) {
+            return '';
+        }
+
+        $limit = explode(',', $limit);
+
+        if (count($limit) > 1) {
+            $limitStr = '(T1.ROW_NUMBER BETWEEN ' . $limit[0] . ' + 1 AND ' . $limit[0] . ' + ' . $limit[1] . ')';
+        } else {
+            $limitStr = '(T1.ROW_NUMBER BETWEEN 1 AND ' . $limit[0] . ")";
+        }
+
+        return 'WHERE ' . $limitStr;
+    }
+
+    public function selectInsert(Query $query, $fields, $table)
+    {
+        $this->selectSql = $this->selectInsertSql;
+
+        return parent::selectInsert($query, $fields, $table);
+    }
+
+}
diff --git a/thinkphp/library/think/db/connector/Mysql.php b/thinkphp/library/think/db/connector/Mysql.php
new file mode 100644
index 0000000000000000000000000000000000000000..93b8a1825bde159ecb0cf11cf6b7e1eca3d70c90
--- /dev/null
+++ b/thinkphp/library/think/db/connector/Mysql.php
@@ -0,0 +1,209 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db\connector;
+
+use PDO;
+use think\db\Connection;
+use think\db\Query;
+
+/**
+ * mysql数据库驱动
+ */
+class Mysql extends Connection
+{
+
+    protected $builder = '\\think\\db\\builder\\Mysql';
+
+    /**
+     * 初始化
+     * @access protected
+     * @return void
+     */
+    protected function initialize()
+    {
+        // Point类型支持
+        Query::extend('point', function ($query, $field, $value = null, $fun = 'GeomFromText', $type = 'POINT') {
+            if (!is_null($value)) {
+                $query->data($field, ['point', $value, $fun, $type]);
+            } else {
+                if (is_string($field)) {
+                    $field = explode(',', $field);
+                }
+                $query->setOption('point', $field);
+            }
+
+            return $query;
+        });
+    }
+
+    /**
+     * 解析pdo连接的dsn信息
+     * @access protected
+     * @param  array $config 连接信息
+     * @return string
+     */
+    protected function parseDsn($config)
+    {
+        if (!empty($config['socket'])) {
+            $dsn = 'mysql:unix_socket=' . $config['socket'];
+        } elseif (!empty($config['hostport'])) {
+            $dsn = 'mysql:host=' . $config['hostname'] . ';port=' . $config['hostport'];
+        } else {
+            $dsn = 'mysql:host=' . $config['hostname'];
+        }
+        $dsn .= ';dbname=' . $config['database'];
+
+        if (!empty($config['charset'])) {
+            $dsn .= ';charset=' . $config['charset'];
+        }
+
+        return $dsn;
+    }
+
+    /**
+     * 取得数据表的字段信息
+     * @access public
+     * @param  string $tableName
+     * @return array
+     */
+    public function getFields($tableName)
+    {
+        list($tableName) = explode(' ', $tableName);
+
+        if (false === strpos($tableName, '`')) {
+            if (strpos($tableName, '.')) {
+                $tableName = str_replace('.', '`.`', $tableName);
+            }
+            $tableName = '`' . $tableName . '`';
+        }
+
+        $sql    = 'SHOW COLUMNS FROM ' . $tableName;
+        $pdo    = $this->query($sql, [], false, true);
+        $result = $pdo->fetchAll(PDO::FETCH_ASSOC);
+        $info   = [];
+
+        if ($result) {
+            foreach ($result as $key => $val) {
+                $val                 = array_change_key_case($val);
+                $info[$val['field']] = [
+                    'name'    => $val['field'],
+                    'type'    => $val['type'],
+                    'notnull' => (bool) ('' === $val['null']), // not null is empty, null is yes
+                    'default' => $val['default'],
+                    'primary' => (strtolower($val['key']) == 'pri'),
+                    'autoinc' => (strtolower($val['extra']) == 'auto_increment'),
+                ];
+            }
+        }
+
+        return $this->fieldCase($info);
+    }
+
+    /**
+     * 取得数据库的表信息
+     * @access public
+     * @param  string $dbName
+     * @return array
+     */
+    public function getTables($dbName = '')
+    {
+        $sql    = !empty($dbName) ? 'SHOW TABLES FROM ' . $dbName : 'SHOW TABLES ';
+        $pdo    = $this->query($sql, [], false, true);
+        $result = $pdo->fetchAll(PDO::FETCH_ASSOC);
+        $info   = [];
+
+        foreach ($result as $key => $val) {
+            $info[$key] = current($val);
+        }
+
+        return $info;
+    }
+
+    /**
+     * SQL性能分析
+     * @access protected
+     * @param  string $sql
+     * @return array
+     */
+    protected function getExplain($sql)
+    {
+        $pdo    = $this->linkID->query("EXPLAIN " . $sql);
+        $result = $pdo->fetch(PDO::FETCH_ASSOC);
+        $result = array_change_key_case($result);
+
+        if (isset($result['extra'])) {
+            if (strpos($result['extra'], 'filesort') || strpos($result['extra'], 'temporary')) {
+                $this->log('SQL:' . $this->queryStr . '[' . $result['extra'] . ']', 'warn');
+            }
+        }
+
+        return $result;
+    }
+
+    protected function supportSavepoint()
+    {
+        return true;
+    }
+
+    /**
+     * 启动XA事务
+     * @access public
+     * @param  string $xid XA事务id
+     * @return void
+     */
+    public function startTransXa($xid)
+    {
+        $this->initConnect(true);
+        if (!$this->linkID) {
+            return false;
+        }
+
+        $this->execute("XA START '$xid'");
+    }
+
+    /**
+     * 预编译XA事务
+     * @access public
+     * @param  string $xid XA事务id
+     * @return void
+     */
+    public function prepareXa($xid)
+    {
+        $this->initConnect(true);
+        $this->execute("XA END '$xid'");
+        $this->execute("XA PREPARE '$xid'");
+    }
+
+    /**
+     * 提交XA事务
+     * @access public
+     * @param  string $xid XA事务id
+     * @return void
+     */
+    public function commitXa($xid)
+    {
+        $this->initConnect(true);
+        $this->execute("XA COMMIT '$xid'");
+    }
+
+    /**
+     * 回滚XA事务
+     * @access public
+     * @param  string $xid XA事务id
+     * @return void
+     */
+    public function rollbackXa($xid)
+    {
+        $this->initConnect(true);
+        $this->execute("XA ROLLBACK '$xid'");
+    }
+}
diff --git a/thinkphp/library/think/db/connector/Pgsql.php b/thinkphp/library/think/db/connector/Pgsql.php
new file mode 100644
index 0000000000000000000000000000000000000000..ee9fca017da3144e776a92cc658af8b93ba35318
--- /dev/null
+++ b/thinkphp/library/think/db/connector/Pgsql.php
@@ -0,0 +1,116 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db\connector;
+
+use PDO;
+use think\db\Connection;
+
+/**
+ * Pgsql数据库驱动
+ */
+class Pgsql extends Connection
+{
+    protected $builder = '\\think\\db\\builder\\Pgsql';
+
+    // PDO连接参数
+    protected $params = [
+        PDO::ATTR_CASE              => PDO::CASE_NATURAL,
+        PDO::ATTR_ERRMODE           => PDO::ERRMODE_EXCEPTION,
+        PDO::ATTR_ORACLE_NULLS      => PDO::NULL_NATURAL,
+        PDO::ATTR_STRINGIFY_FETCHES => false,
+    ];
+
+    /**
+     * 解析pdo连接的dsn信息
+     * @access protected
+     * @param  array $config 连接信息
+     * @return string
+     */
+    protected function parseDsn($config)
+    {
+        $dsn = 'pgsql:dbname=' . $config['database'] . ';host=' . $config['hostname'];
+
+        if (!empty($config['hostport'])) {
+            $dsn .= ';port=' . $config['hostport'];
+        }
+
+        return $dsn;
+    }
+
+    /**
+     * 取得数据表的字段信息
+     * @access public
+     * @param  string $tableName
+     * @return array
+     */
+    public function getFields($tableName)
+    {
+        list($tableName) = explode(' ', $tableName);
+        $sql             = 'select fields_name as "field",fields_type as "type",fields_not_null as "null",fields_key_name as "key",fields_default as "default",fields_default as "extra" from table_msg(\'' . $tableName . '\');';
+
+        $pdo    = $this->query($sql, [], false, true);
+        $result = $pdo->fetchAll(PDO::FETCH_ASSOC);
+        $info   = [];
+
+        if ($result) {
+            foreach ($result as $key => $val) {
+                $val                 = array_change_key_case($val);
+                $info[$val['field']] = [
+                    'name'    => $val['field'],
+                    'type'    => $val['type'],
+                    'notnull' => (bool) ('' !== $val['null']),
+                    'default' => $val['default'],
+                    'primary' => !empty($val['key']),
+                    'autoinc' => (0 === strpos($val['extra'], 'nextval(')),
+                ];
+            }
+        }
+
+        return $this->fieldCase($info);
+    }
+
+    /**
+     * 取得数据库的表信息
+     * @access public
+     * @param  string $dbName
+     * @return array
+     */
+    public function getTables($dbName = '')
+    {
+        $sql    = "select tablename as Tables_in_test from pg_tables where  schemaname ='public'";
+        $pdo    = $this->query($sql, [], false, true);
+        $result = $pdo->fetchAll(PDO::FETCH_ASSOC);
+        $info   = [];
+
+        foreach ($result as $key => $val) {
+            $info[$key] = current($val);
+        }
+
+        return $info;
+    }
+
+    /**
+     * SQL性能分析
+     * @access protected
+     * @param  string $sql
+     * @return array
+     */
+    protected function getExplain($sql)
+    {
+        return [];
+    }
+
+    protected function supportSavepoint()
+    {
+        return true;
+    }
+}
diff --git a/thinkphp/library/think/db/connector/Sqlite.php b/thinkphp/library/think/db/connector/Sqlite.php
new file mode 100644
index 0000000000000000000000000000000000000000..5b9b3fa64d9aa428f2c96c7c01215b49b6ee6f8a
--- /dev/null
+++ b/thinkphp/library/think/db/connector/Sqlite.php
@@ -0,0 +1,108 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db\connector;
+
+use PDO;
+use think\db\Connection;
+
+/**
+ * Sqlite数据库驱动
+ */
+class Sqlite extends Connection
+{
+
+    protected $builder = '\\think\\db\\builder\\Sqlite';
+
+    /**
+     * 解析pdo连接的dsn信息
+     * @access protected
+     * @param  array $config 连接信息
+     * @return string
+     */
+    protected function parseDsn($config)
+    {
+        $dsn = 'sqlite:' . $config['database'];
+
+        return $dsn;
+    }
+
+    /**
+     * 取得数据表的字段信息
+     * @access public
+     * @param  string $tableName
+     * @return array
+     */
+    public function getFields($tableName)
+    {
+        list($tableName) = explode(' ', $tableName);
+        $sql             = 'PRAGMA table_info( ' . $tableName . ' )';
+
+        $pdo    = $this->query($sql, [], false, true);
+        $result = $pdo->fetchAll(PDO::FETCH_ASSOC);
+        $info   = [];
+
+        if ($result) {
+            foreach ($result as $key => $val) {
+                $val                = array_change_key_case($val);
+                $info[$val['name']] = [
+                    'name'    => $val['name'],
+                    'type'    => $val['type'],
+                    'notnull' => 1 === $val['notnull'],
+                    'default' => $val['dflt_value'],
+                    'primary' => '1' == $val['pk'],
+                    'autoinc' => '1' == $val['pk'],
+                ];
+            }
+        }
+
+        return $this->fieldCase($info);
+    }
+
+    /**
+     * 取得数据库的表信息
+     * @access public
+     * @param  string $dbName
+     * @return array
+     */
+    public function getTables($dbName = '')
+    {
+        $sql = "SELECT name FROM sqlite_master WHERE type='table' "
+            . "UNION ALL SELECT name FROM sqlite_temp_master "
+            . "WHERE type='table' ORDER BY name";
+
+        $pdo    = $this->query($sql, [], false, true);
+        $result = $pdo->fetchAll(PDO::FETCH_ASSOC);
+        $info   = [];
+
+        foreach ($result as $key => $val) {
+            $info[$key] = current($val);
+        }
+
+        return $info;
+    }
+
+    /**
+     * SQL性能分析
+     * @access protected
+     * @param  string $sql
+     * @return array
+     */
+    protected function getExplain($sql)
+    {
+        return [];
+    }
+
+    protected function supportSavepoint()
+    {
+        return true;
+    }
+}
diff --git a/thinkphp/library/think/db/connector/Sqlsrv.php b/thinkphp/library/think/db/connector/Sqlsrv.php
new file mode 100644
index 0000000000000000000000000000000000000000..aba405fd95874041ac78906f4c8c0a7ad1fe47e2
--- /dev/null
+++ b/thinkphp/library/think/db/connector/Sqlsrv.php
@@ -0,0 +1,233 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2012 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\db\connector;
+
+use PDO;
+use think\db\Connection;
+use think\db\Query;
+
+/**
+ * Sqlsrv数据库驱动
+ */
+class Sqlsrv extends Connection
+{
+    // PDO连接参数
+    protected $params = [
+        PDO::ATTR_CASE              => PDO::CASE_NATURAL,
+        PDO::ATTR_ERRMODE           => PDO::ERRMODE_EXCEPTION,
+        PDO::ATTR_ORACLE_NULLS      => PDO::NULL_NATURAL,
+        PDO::ATTR_STRINGIFY_FETCHES => false,
+    ];
+
+    protected $builder = '\\think\\db\\builder\\Sqlsrv';
+
+    /**
+     * 解析pdo连接的dsn信息
+     * @access protected
+     * @param  array $config 连接信息
+     * @return string
+     */
+    protected function parseDsn($config)
+    {
+        $dsn = 'sqlsrv:Database=' . $config['database'] . ';Server=' . $config['hostname'];
+
+        if (!empty($config['hostport'])) {
+            $dsn .= ',' . $config['hostport'];
+        }
+
+        return $dsn;
+    }
+
+    /**
+     * 取得数据表的字段信息
+     * @access public
+     * @param  string $tableName
+     * @return array
+     */
+    public function getFields($tableName)
+    {
+        list($tableName) = explode(' ', $tableName);
+
+        $sql = "SELECT   column_name,   data_type,   column_default,   is_nullable
+        FROM    information_schema.tables AS t
+        JOIN    information_schema.columns AS c
+        ON  t.table_catalog = c.table_catalog
+        AND t.table_schema  = c.table_schema
+        AND t.table_name    = c.table_name
+        WHERE   t.table_name = '$tableName'";
+
+        $pdo    = $this->query($sql, [], false, true);
+        $result = $pdo->fetchAll(PDO::FETCH_ASSOC);
+        $info   = [];
+
+        if ($result) {
+            foreach ($result as $key => $val) {
+                $val                       = array_change_key_case($val);
+                $info[$val['column_name']] = [
+                    'name'    => $val['column_name'],
+                    'type'    => $val['data_type'],
+                    'notnull' => (bool) ('' === $val['is_nullable']), // not null is empty, null is yes
+                    'default' => $val['column_default'],
+                    'primary' => false,
+                    'autoinc' => false,
+                ];
+            }
+        }
+
+        $sql = "SELECT column_name FROM information_schema.key_column_usage WHERE table_name='$tableName'";
+
+        // 调试开始
+        $this->debug(true);
+
+        $pdo = $this->linkID->query($sql);
+
+        // 调试结束
+        $this->debug(false, $sql);
+
+        $result = $pdo->fetch(PDO::FETCH_ASSOC);
+
+        if ($result) {
+            $info[$result['column_name']]['primary'] = true;
+        }
+
+        return $this->fieldCase($info);
+    }
+
+    /**
+     * 取得数据表的字段信息
+     * @access public
+     * @param  string $dbName
+     * @return array
+     */
+    public function getTables($dbName = '')
+    {
+        $sql = "SELECT TABLE_NAME
+            FROM INFORMATION_SCHEMA.TABLES
+            WHERE TABLE_TYPE = 'BASE TABLE'
+            ";
+
+        $pdo    = $this->query($sql, [], false, true);
+        $result = $pdo->fetchAll(PDO::FETCH_ASSOC);
+        $info   = [];
+
+        foreach ($result as $key => $val) {
+            $info[$key] = current($val);
+        }
+
+        return $info;
+    }
+
+    /**
+     * 得到某个列的数组
+     * @access public
+     * @param  Query     $query 查询对象
+     * @param  string    $field 字段名 多个字段用逗号分隔
+     * @param  string    $key   索引
+     * @return array
+     */
+    public function column(Query $query, $field, $key = '')
+    {
+        $options = $query->getOptions();
+
+        if (empty($options['fetch_sql']) && !empty($options['cache'])) {
+            // 判断查询缓存
+            $cache = $options['cache'];
+
+            $guid = is_string($cache['key']) ? $cache['key'] : $this->getCacheKey($query, $field);
+
+            $result = Container::get('cache')->get($guid);
+
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
+        if (isset($options['field'])) {
+            $query->removeOption('field');
+        }
+
+        if (is_null($field)) {
+            $field = '*';
+        } elseif ($key && '*' != $field) {
+            $field = $key . ',' . $field;
+        }
+
+        if (is_string($field)) {
+            $field = array_map('trim', explode(',', $field));
+        }
+
+        $query->setOption('field', $field);
+
+        // 生成查询SQL
+        $sql = $this->builder->select($query);
+
+        $bind = $query->getBind();
+
+        if (!empty($options['fetch_sql'])) {
+            // 获取实际执行的SQL语句
+            return $this->getRealSql($sql, $bind);
+        }
+
+        // 执行查询操作
+        $pdo = $this->query($sql, $bind, $options['master'], true);
+
+        if (1 == $pdo->columnCount()) {
+            $result = $pdo->fetchAll(PDO::FETCH_COLUMN);
+        } else {
+            $resultSet = $pdo->fetchAll(PDO::FETCH_ASSOC);
+
+            if ('*' == $field && $key) {
+                $result = array_column($resultSet, null, $key);
+            } elseif ($resultSet) {
+                $fields = array_keys($resultSet[0]);
+                $count  = count($fields);
+                $key1   = array_shift($fields);
+                $key2   = $fields ? array_shift($fields) : '';
+                $key    = $key ?: $key1;
+
+                if (strpos($key, '.')) {
+                    list($alias, $key) = explode('.', $key);
+                }
+
+                if (3 == $count) {
+                    $column = $key2;
+                } elseif ($count < 3) {
+                    $column = $key1;
+                } else {
+                    $column = null;
+                }
+
+                $result = array_column($resultSet, $column, $key);
+            } else {
+                $result = [];
+            }
+        }
+
+        if (isset($cache) && isset($guid)) {
+            // 缓存数据
+            $this->cacheData($guid, $result, $cache);
+        }
+
+        return $result;
+    }
+
+    /**
+     * SQL性能分析
+     * @access protected
+     * @param  string $sql
+     * @return array
+     */
+    protected function getExplain($sql)
+    {
+        return [];
+    }
+}
diff --git a/thinkphp/library/think/db/connector/pgsql.sql b/thinkphp/library/think/db/connector/pgsql.sql
new file mode 100644
index 0000000000000000000000000000000000000000..e1a09a30c54d24947948be8c0f69a57891094179
--- /dev/null
+++ b/thinkphp/library/think/db/connector/pgsql.sql
@@ -0,0 +1,117 @@
+CREATE OR REPLACE FUNCTION pgsql_type(a_type varchar) RETURNS varchar AS
+$BODY$
+DECLARE
+     v_type varchar;
+BEGIN
+     IF a_type='int8' THEN
+          v_type:='bigint';
+     ELSIF a_type='int4' THEN
+          v_type:='integer';
+     ELSIF a_type='int2' THEN
+          v_type:='smallint';
+     ELSIF a_type='bpchar' THEN
+          v_type:='char';
+     ELSE
+          v_type:=a_type;
+     END IF;
+     RETURN v_type;
+END;
+$BODY$
+LANGUAGE PLPGSQL;
+
+CREATE TYPE "public"."tablestruct" AS (
+  "fields_key_name" varchar(100),
+  "fields_name" VARCHAR(200),
+  "fields_type" VARCHAR(20),
+  "fields_length" BIGINT,
+  "fields_not_null" VARCHAR(10),
+  "fields_default" VARCHAR(500),
+  "fields_comment" VARCHAR(1000)
+);
+
+CREATE OR REPLACE FUNCTION "public"."table_msg" (a_schema_name varchar, a_table_name varchar) RETURNS SETOF "public"."tablestruct" AS
+$body$
+DECLARE
+     v_ret tablestruct;
+     v_oid oid;
+     v_sql varchar;
+     v_rec RECORD;
+     v_key varchar;
+BEGIN
+     SELECT
+           pg_class.oid  INTO v_oid
+     FROM
+           pg_class
+           INNER JOIN pg_namespace ON (pg_class.relnamespace = pg_namespace.oid AND lower(pg_namespace.nspname) = a_schema_name)
+     WHERE
+           pg_class.relname=a_table_name;
+     IF NOT FOUND THEN
+         RETURN;
+     END IF;
+
+     v_sql='
+     SELECT
+           pg_attribute.attname AS fields_name,
+           pg_attribute.attnum AS fields_index,
+           pgsql_type(pg_type.typname::varchar) AS fields_type,
+           pg_attribute.atttypmod-4 as fields_length,
+           CASE WHEN pg_attribute.attnotnull  THEN ''not null''
+           ELSE ''''
+           END AS fields_not_null,
+           pg_attrdef.adsrc AS fields_default,
+           pg_description.description AS fields_comment
+     FROM
+           pg_attribute
+           INNER JOIN pg_class  ON pg_attribute.attrelid = pg_class.oid
+           INNER JOIN pg_type   ON pg_attribute.atttypid = pg_type.oid
+           LEFT OUTER JOIN pg_attrdef ON pg_attrdef.adrelid = pg_class.oid AND pg_attrdef.adnum = pg_attribute.attnum
+           LEFT OUTER JOIN pg_description ON pg_description.objoid = pg_class.oid AND pg_description.objsubid = pg_attribute.attnum
+     WHERE
+           pg_attribute.attnum > 0
+           AND attisdropped <> ''t''
+           AND pg_class.oid = ' || v_oid || '
+     ORDER BY pg_attribute.attnum' ;
+
+     FOR v_rec IN EXECUTE v_sql LOOP
+         v_ret.fields_name=v_rec.fields_name;
+         v_ret.fields_type=v_rec.fields_type;
+         IF v_rec.fields_length > 0 THEN
+            v_ret.fields_length:=v_rec.fields_length;
+         ELSE
+            v_ret.fields_length:=NULL;
+         END IF;
+         v_ret.fields_not_null=v_rec.fields_not_null;
+         v_ret.fields_default=v_rec.fields_default;
+         v_ret.fields_comment=v_rec.fields_comment;
+         SELECT constraint_name INTO v_key FROM information_schema.key_column_usage WHERE table_schema=a_schema_name AND table_name=a_table_name AND column_name=v_rec.fields_name;
+         IF FOUND THEN
+            v_ret.fields_key_name=v_key;
+         ELSE
+            v_ret.fields_key_name='';
+         END IF;
+         RETURN NEXT v_ret;
+     END LOOP;
+     RETURN ;
+END;
+$body$
+LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+COMMENT ON FUNCTION "public"."table_msg"(a_schema_name varchar, a_table_name varchar)
+IS '获得表信息';
+
+---重载一个函数
+CREATE OR REPLACE FUNCTION "public"."table_msg" (a_table_name varchar) RETURNS SETOF "public"."tablestruct" AS
+$body$
+DECLARE
+    v_ret tablestruct;
+BEGIN
+    FOR v_ret IN SELECT * FROM table_msg('public',a_table_name) LOOP
+        RETURN NEXT v_ret;
+    END LOOP;
+    RETURN;
+END;
+$body$
+LANGUAGE 'plpgsql' VOLATILE CALLED ON NULL INPUT SECURITY INVOKER;
+
+COMMENT ON FUNCTION "public"."table_msg"(a_table_name varchar)
+IS '获得表信息';
\ No newline at end of file
diff --git a/thinkphp/library/think/db/exception/BindParamException.php b/thinkphp/library/think/db/exception/BindParamException.php
new file mode 100644
index 0000000000000000000000000000000000000000..dce0c7bfcd4d0b9925ad5458bc853c4ba3ae31ee
--- /dev/null
+++ b/thinkphp/library/think/db/exception/BindParamException.php
@@ -0,0 +1,36 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
+// +----------------------------------------------------------------------
+
+namespace think\db\exception;
+
+use think\exception\DbException;
+
+/**
+ * PDO参数绑定异常
+ */
+class BindParamException extends DbException
+{
+
+    /**
+     * BindParamException constructor.
+     * @access public
+     * @param  string $message
+     * @param  array  $config
+     * @param  string $sql
+     * @param  array    $bind
+     * @param  int    $code
+     */
+    public function __construct($message, $config, $sql, $bind, $code = 10502)
+    {
+        $this->setData('Bind Param', $bind);
+        parent::__construct($message, $config, $sql, $code);
+    }
+}
diff --git a/thinkphp/library/think/db/exception/DataNotFoundException.php b/thinkphp/library/think/db/exception/DataNotFoundException.php
new file mode 100644
index 0000000000000000000000000000000000000000..883e333e356d7fa0f80ddc79cd779ed592b74c91
--- /dev/null
+++ b/thinkphp/library/think/db/exception/DataNotFoundException.php
@@ -0,0 +1,44 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
+// +----------------------------------------------------------------------
+
+namespace think\db\exception;
+
+use think\exception\DbException;
+
+class DataNotFoundException extends DbException
+{
+    protected $table;
+
+    /**
+     * DbException constructor.
+     * @access public
+     * @param  string $message
+     * @param  string $table
+     * @param  array $config
+     */
+    public function __construct($message, $table = '', array $config = [])
+    {
+        $this->message = $message;
+        $this->table   = $table;
+
+        $this->setData('Database Config', $config);
+    }
+
+    /**
+     * 获取数据表名
+     * @access public
+     * @return string
+     */
+    public function getTable()
+    {
+        return $this->table;
+    }
+}
diff --git a/thinkphp/library/think/db/exception/ModelNotFoundException.php b/thinkphp/library/think/db/exception/ModelNotFoundException.php
new file mode 100644
index 0000000000000000000000000000000000000000..ae52baf3b36de62f0c0ea613d96fb00e94e6d9fe
--- /dev/null
+++ b/thinkphp/library/think/db/exception/ModelNotFoundException.php
@@ -0,0 +1,45 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
+// +----------------------------------------------------------------------
+
+namespace think\db\exception;
+
+use think\exception\DbException;
+
+class ModelNotFoundException extends DbException
+{
+    protected $model;
+
+    /**
+     * 构造方法
+     * @access public
+     * @param  string $message
+     * @param  string $model
+     * @param  array  $config
+     */
+    public function __construct($message, $model = '', array $config = [])
+    {
+        $this->message = $message;
+        $this->model   = $model;
+
+        $this->setData('Database Config', $config);
+    }
+
+    /**
+     * 获取模型类名
+     * @access public
+     * @return string
+     */
+    public function getModel()
+    {
+        return $this->model;
+    }
+
+}
diff --git a/thinkphp/library/think/debug/Console.php b/thinkphp/library/think/debug/Console.php
new file mode 100644
index 0000000000000000000000000000000000000000..dd063c1c32026e500ff7ad6a80bc42e77482eabd
--- /dev/null
+++ b/thinkphp/library/think/debug/Console.php
@@ -0,0 +1,156 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yangweijie <yangweijiester@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\debug;
+
+use think\Container;
+use think\Db;
+use think\Response;
+
+/**
+ * 浏览器调试输出
+ */
+class Console
+{
+    protected $config = [
+        'tabs' => ['base' => '基本', 'file' => '文件', 'info' => '流程', 'notice|error' => '错误', 'sql' => 'SQL', 'debug|log' => '调试'],
+    ];
+
+    // 实例化并传入参数
+    public function __construct($config = [])
+    {
+        if (is_array($config)) {
+            $this->config = array_merge($this->config, $config);
+        }
+    }
+
+    /**
+     * 调试输出接口
+     * @access public
+     * @param  Response  $response Response对象
+     * @param  array     $log 日志信息
+     * @return bool
+     */
+    public function output(Response $response, array $log = [])
+    {
+        $request     = Container::get('request');
+        $contentType = $response->getHeader('Content-Type');
+        $accept      = $request->header('accept');
+        if (strpos($accept, 'application/json') === 0 || $request->isAjax()) {
+            return false;
+        } elseif (!empty($contentType) && strpos($contentType, 'html') === false) {
+            return false;
+        }
+        // 获取基本信息
+        $runtime = number_format(microtime(true) - Container::get('app')->getBeginTime(), 10);
+        $reqs    = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
+        $mem     = number_format((memory_get_usage() - Container::get('app')->getBeginMem()) / 1024, 2);
+
+        if (isset($_SERVER['HTTP_HOST'])) {
+            $uri = $_SERVER['SERVER_PROTOCOL'] . ' ' . $_SERVER['REQUEST_METHOD'] . ' : ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+        } else {
+            $uri = 'cmd:' . implode(' ', $_SERVER['argv']);
+        }
+
+        // 页面Trace信息
+        $base = [
+            '请求信息' => date('Y-m-d H:i:s', $_SERVER['REQUEST_TIME']) . ' ' . $uri,
+            '运行时间' => number_format($runtime, 6) . 's [ 吞吐率：' . $reqs . 'req/s ] 内存消耗：' . $mem . 'kb 文件加载：' . count(get_included_files()),
+            '查询信息' => Db::$queryTimes . ' queries ' . Db::$executeTimes . ' writes ',
+            '缓存信息' => Container::get('cache')->getReadTimes() . ' reads,' . Container::get('cache')->getWriteTimes() . ' writes',
+        ];
+
+        if (session_id()) {
+            $base['会话信息'] = 'SESSION_ID=' . session_id();
+        }
+
+        $info = Container::get('debug')->getFile(true);
+
+        // 页面Trace信息
+        $trace = [];
+        foreach ($this->config['tabs'] as $name => $title) {
+            $name = strtolower($name);
+            switch ($name) {
+                case 'base': // 基本信息
+                    $trace[$title] = $base;
+                    break;
+                case 'file': // 文件信息
+                    $trace[$title] = $info;
+                    break;
+                default: // 调试信息
+                    if (strpos($name, '|')) {
+                        // 多组信息
+                        $names  = explode('|', $name);
+                        $result = [];
+                        foreach ($names as $name) {
+                            $result = array_merge($result, isset($log[$name]) ? $log[$name] : []);
+                        }
+                        $trace[$title] = $result;
+                    } else {
+                        $trace[$title] = isset($log[$name]) ? $log[$name] : '';
+                    }
+            }
+        }
+
+        //输出到控制台
+        $lines = '';
+        foreach ($trace as $type => $msg) {
+            $lines .= $this->console($type, $msg);
+        }
+        $js = <<<JS
+
+<script type='text/javascript'>
+{$lines}
+</script>
+JS;
+        return $js;
+    }
+
+    protected function console($type, $msg)
+    {
+        $type       = strtolower($type);
+        $trace_tabs = array_values($this->config['tabs']);
+        $line[]     = ($type == $trace_tabs[0] || '调试' == $type || '错误' == $type)
+        ? "console.group('{$type}');"
+        : "console.groupCollapsed('{$type}');";
+
+        foreach ((array) $msg as $key => $m) {
+            switch ($type) {
+                case '调试':
+                    $var_type = gettype($m);
+                    if (in_array($var_type, ['array', 'string'])) {
+                        $line[] = "console.log(" . json_encode($m) . ");";
+                    } else {
+                        $line[] = "console.log(" . json_encode(var_export($m, 1)) . ");";
+                    }
+                    break;
+                case '错误':
+                    $msg    = str_replace("\n", '\n', addslashes(is_scalar($m) ? $m : json_encode($m)));
+                    $style  = 'color:#F4006B;font-size:14px;';
+                    $line[] = "console.error(\"%c{$msg}\", \"{$style}\");";
+                    break;
+                case 'sql':
+                    $msg    = str_replace("\n", '\n', addslashes($m));
+                    $style  = "color:#009bb4;";
+                    $line[] = "console.log(\"%c{$msg}\", \"{$style}\");";
+                    break;
+                default:
+                    $m      = is_string($key) ? $key . ' ' . $m : $key + 1 . ' ' . $m;
+                    $msg    = json_encode($m);
+                    $line[] = "console.log({$msg});";
+                    break;
+            }
+        }
+        $line[] = "console.groupEnd();";
+        return implode(PHP_EOL, $line);
+    }
+
+}
diff --git a/thinkphp/library/think/debug/Html.php b/thinkphp/library/think/debug/Html.php
new file mode 100644
index 0000000000000000000000000000000000000000..85f354af00140c0c10d4498c56c93a16ea0e4dc9
--- /dev/null
+++ b/thinkphp/library/think/debug/Html.php
@@ -0,0 +1,106 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | 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\debug;
+
+use think\Container;
+use think\Db;
+use think\Response;
+
+/**
+ * 页面Trace调试
+ */
+class Html
+{
+    protected $config = [
+        'file' => '',
+        'tabs' => ['base' => '基本', 'file' => '文件', 'info' => '流程', 'notice|error' => '错误', 'sql' => 'SQL', 'debug|log' => '调试'],
+    ];
+
+    // 实例化并传入参数
+    public function __construct(array $config = [])
+    {
+        $this->config = array_merge($this->config, $config);
+    }
+
+    /**
+     * 调试输出接口
+     * @access public
+     * @param  Response  $response Response对象
+     * @param  array     $log 日志信息
+     * @return bool
+     */
+    public function output(Response $response, array $log = [])
+    {
+        $request     = Container::get('request');
+        $contentType = $response->getHeader('Content-Type');
+        $accept      = $request->header('accept');
+        if (strpos($accept, 'application/json') === 0 || $request->isAjax()) {
+            return false;
+        } elseif (!empty($contentType) && strpos($contentType, 'html') === false) {
+            return false;
+        }
+        // 获取基本信息
+        $runtime = number_format(microtime(true) - Container::get('app')->getBeginTime(), 10, '.', '');
+        $reqs    = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
+        $mem     = number_format((memory_get_usage() - Container::get('app')->getBeginMem()) / 1024, 2);
+
+        // 页面Trace信息
+        if (isset($_SERVER['HTTP_HOST'])) {
+            $uri = $_SERVER['SERVER_PROTOCOL'] . ' ' . $_SERVER['REQUEST_METHOD'] . ' : ' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+        } else {
+            $uri = 'cmd:' . implode(' ', $_SERVER['argv']);
+        }
+        $base = [
+            '请求信息' => date('Y-m-d H:i:s', $_SERVER['REQUEST_TIME']) . ' ' . $uri,
+            '运行时间' => number_format($runtime, 6) . 's [ 吞吐率：' . $reqs . 'req/s ] 内存消耗：' . $mem . 'kb 文件加载：' . count(get_included_files()),
+            '查询信息' => Db::$queryTimes . ' queries ' . Db::$executeTimes . ' writes ',
+            '缓存信息' => Container::get('cache')->getReadTimes() . ' reads,' . Container::get('cache')->getWriteTimes() . ' writes',
+        ];
+
+        if (session_id()) {
+            $base['会话信息'] = 'SESSION_ID=' . session_id();
+        }
+
+        $info = Container::get('debug')->getFile(true);
+
+        // 页面Trace信息
+        $trace = [];
+        foreach ($this->config['tabs'] as $name => $title) {
+            $name = strtolower($name);
+            switch ($name) {
+                case 'base': // 基本信息
+                    $trace[$title] = $base;
+                    break;
+                case 'file': // 文件信息
+                    $trace[$title] = $info;
+                    break;
+                default: // 调试信息
+                    if (strpos($name, '|')) {
+                        // 多组信息
+                        $names  = explode('|', $name);
+                        $result = [];
+                        foreach ($names as $name) {
+                            $result = array_merge($result, isset($log[$name]) ? $log[$name] : []);
+                        }
+                        $trace[$title] = $result;
+                    } else {
+                        $trace[$title] = isset($log[$name]) ? $log[$name] : '';
+                    }
+            }
+        }
+        // 调用Trace页面模板
+        ob_start();
+        include $this->config['file'];
+        return ob_get_clean();
+    }
+
+}
diff --git a/thinkphp/library/think/exception/ClassNotFoundException.php b/thinkphp/library/think/exception/ClassNotFoundException.php
new file mode 100644
index 0000000000000000000000000000000000000000..eb22e73018056f4d35c04d0e98d50d4248efc2d0
--- /dev/null
+++ b/thinkphp/library/think/exception/ClassNotFoundException.php
@@ -0,0 +1,32 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+class ClassNotFoundException extends \RuntimeException
+{
+    protected $class;
+    public function __construct($message, $class = '')
+    {
+        $this->message = $message;
+        $this->class   = $class;
+    }
+
+    /**
+     * 获取类名
+     * @access public
+     * @return string
+     */
+    public function getClass()
+    {
+        return $this->class;
+    }
+}
diff --git a/thinkphp/library/think/exception/DbException.php b/thinkphp/library/think/exception/DbException.php
new file mode 100644
index 0000000000000000000000000000000000000000..0f504257c821b5233abd06cdc560dfa89600b9f9
--- /dev/null
+++ b/thinkphp/library/think/exception/DbException.php
@@ -0,0 +1,44 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+use think\Exception;
+
+/**
+ * Database相关异常处理类
+ */
+class DbException extends Exception
+{
+    /**
+     * DbException constructor.
+     * @access public
+     * @param  string    $message
+     * @param  array     $config
+     * @param  string    $sql
+     * @param  int       $code
+     */
+    public function __construct($message, array $config, $sql, $code = 10500)
+    {
+        $this->message = $message;
+        $this->code    = $code;
+
+        $this->setData('Database Status', [
+            'Error Code'    => $code,
+            'Error Message' => $message,
+            'Error SQL'     => $sql,
+        ]);
+
+        unset($config['username'], $config['password']);
+        $this->setData('Database Config', $config);
+    }
+
+}
diff --git a/thinkphp/library/think/exception/ErrorException.php b/thinkphp/library/think/exception/ErrorException.php
new file mode 100644
index 0000000000000000000000000000000000000000..3143b8f703203364ea095cdc504e239e4c6bd64d
--- /dev/null
+++ b/thinkphp/library/think/exception/ErrorException.php
@@ -0,0 +1,56 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+use think\Exception;
+
+/**
+ * ThinkPHP错误异常
+ * 主要用于封装 set_error_handler 和 register_shutdown_function 得到的错误
+ * 除开从 think\Exception 继承的功能
+ * 其他和PHP系统\ErrorException功能基本一样
+ */
+class ErrorException extends Exception
+{
+    /**
+     * 用于保存错误级别
+     * @var integer
+     */
+    protected $severity;
+
+    /**
+     * 错误异常构造函数
+     * @access public
+     * @param  integer $severity 错误级别
+     * @param  string  $message  错误详细信息
+     * @param  string  $file     出错文件路径
+     * @param  integer $line     出错行号
+     */
+    public function __construct($severity, $message, $file, $line)
+    {
+        $this->severity = $severity;
+        $this->message  = $message;
+        $this->file     = $file;
+        $this->line     = $line;
+        $this->code     = 0;
+    }
+
+    /**
+     * 获取错误级别
+     * @access public
+     * @return integer 错误级别
+     */
+    final public function getSeverity()
+    {
+        return $this->severity;
+    }
+}
diff --git a/thinkphp/library/think/exception/Handle.php b/thinkphp/library/think/exception/Handle.php
new file mode 100644
index 0000000000000000000000000000000000000000..02c85ec1397324aa5ea847b639cc8fa6bb47bf5e
--- /dev/null
+++ b/thinkphp/library/think/exception/Handle.php
@@ -0,0 +1,306 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+use Exception;
+use think\console\Output;
+use think\Container;
+use think\Response;
+
+class Handle
+{
+    protected $render;
+    protected $ignoreReport = [
+        '\\think\\exception\\HttpException',
+    ];
+
+    public function setRender($render)
+    {
+        $this->render = $render;
+    }
+
+    /**
+     * Report or log an exception.
+     *
+     * @access public
+     * @param  \Exception $exception
+     * @return void
+     */
+    public function report(Exception $exception)
+    {
+        if (!$this->isIgnoreReport($exception)) {
+            // 收集异常数据
+            if (Container::get('app')->isDebug()) {
+                $data = [
+                    'file'    => $exception->getFile(),
+                    'line'    => $exception->getLine(),
+                    'message' => $this->getMessage($exception),
+                    'code'    => $this->getCode($exception),
+                ];
+                $log = "[{$data['code']}]{$data['message']}[{$data['file']}:{$data['line']}]";
+            } else {
+                $data = [
+                    'code'    => $this->getCode($exception),
+                    'message' => $this->getMessage($exception),
+                ];
+                $log = "[{$data['code']}]{$data['message']}";
+            }
+
+            if (Container::get('app')->config('log.record_trace')) {
+                $log .= "\r\n" . $exception->getTraceAsString();
+            }
+
+            Container::get('log')->record($log, 'error');
+        }
+    }
+
+    protected function isIgnoreReport(Exception $exception)
+    {
+        foreach ($this->ignoreReport as $class) {
+            if ($exception instanceof $class) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Render an exception into an HTTP response.
+     *
+     * @access public
+     * @param  \Exception $e
+     * @return Response
+     */
+    public function render(Exception $e)
+    {
+        if ($this->render && $this->render instanceof \Closure) {
+            $result = call_user_func_array($this->render, [$e]);
+
+            if ($result) {
+                return $result;
+            }
+        }
+
+        if ($e instanceof HttpException) {
+            return $this->renderHttpException($e);
+        } else {
+            return $this->convertExceptionToResponse($e);
+        }
+    }
+
+    /**
+     * @access public
+     * @param  Output    $output
+     * @param  Exception $e
+     */
+    public function renderForConsole(Output $output, Exception $e)
+    {
+        if (Container::get('app')->isDebug()) {
+            $output->setVerbosity(Output::VERBOSITY_DEBUG);
+        }
+
+        $output->renderException($e);
+    }
+
+    /**
+     * @access protected
+     * @param  HttpException $e
+     * @return Response
+     */
+    protected function renderHttpException(HttpException $e)
+    {
+        $status   = $e->getStatusCode();
+        $template = Container::get('app')->config('http_exception_template');
+
+        if (!Container::get('app')->isDebug() && !empty($template[$status])) {
+            return Response::create($template[$status], 'view', $status)->assign(['e' => $e]);
+        } else {
+            return $this->convertExceptionToResponse($e);
+        }
+    }
+
+    /**
+     * @access protected
+     * @param  Exception $exception
+     * @return Response
+     */
+    protected function convertExceptionToResponse(Exception $exception)
+    {
+        // 收集异常数据
+        if (Container::get('app')->isDebug()) {
+            // 调试模式，获取详细的错误信息
+            $data = [
+                'name'    => get_class($exception),
+                'file'    => $exception->getFile(),
+                'line'    => $exception->getLine(),
+                'message' => $this->getMessage($exception),
+                'trace'   => $exception->getTrace(),
+                'code'    => $this->getCode($exception),
+                'source'  => $this->getSourceCode($exception),
+                'datas'   => $this->getExtendData($exception),
+                'tables'  => [
+                    'GET Data'              => $_GET,
+                    'POST Data'             => $_POST,
+                    'Files'                 => $_FILES,
+                    'Cookies'               => $_COOKIE,
+                    'Session'               => isset($_SESSION) ? $_SESSION : [],
+                    'Server/Request Data'   => $_SERVER,
+                    'Environment Variables' => $_ENV,
+                    'ThinkPHP Constants'    => $this->getConst(),
+                ],
+            ];
+        } else {
+            // 部署模式仅显示 Code 和 Message
+            $data = [
+                'code'    => $this->getCode($exception),
+                'message' => $this->getMessage($exception),
+            ];
+
+            if (!Container::get('app')->config('show_error_msg')) {
+                // 不显示详细错误信息
+                $data['message'] = Container::get('app')->config('error_message');
+            }
+        }
+
+        //保留一层
+        while (ob_get_level() > 1) {
+            ob_end_clean();
+        }
+
+        $data['echo'] = ob_get_clean();
+
+        ob_start();
+        extract($data);
+        include Container::get('app')->config('exception_tmpl');
+
+        // 获取并清空缓存
+        $content  = ob_get_clean();
+        $response = Response::create($content, 'html');
+
+        if ($exception instanceof HttpException) {
+            $statusCode = $exception->getStatusCode();
+            $response->header($exception->getHeaders());
+        }
+
+        if (!isset($statusCode)) {
+            $statusCode = 500;
+        }
+        $response->code($statusCode);
+
+        return $response;
+    }
+
+    /**
+     * 获取错误编码
+     * ErrorException则使用错误级别作为错误编码
+     * @access protected
+     * @param  \Exception $exception
+     * @return integer                错误编码
+     */
+    protected function getCode(Exception $exception)
+    {
+        $code = $exception->getCode();
+
+        if (!$code && $exception instanceof ErrorException) {
+            $code = $exception->getSeverity();
+        }
+
+        return $code;
+    }
+
+    /**
+     * 获取错误信息
+     * ErrorException则使用错误级别作为错误编码
+     * @access protected
+     * @param  \Exception $exception
+     * @return string                错误信息
+     */
+    protected function getMessage(Exception $exception)
+    {
+        $message = $exception->getMessage();
+
+        if (PHP_SAPI == 'cli') {
+            return $message;
+        }
+
+        $lang = Container::get('lang');
+
+        if (strpos($message, ':')) {
+            $name    = strstr($message, ':', true);
+            $message = $lang->has($name) ? $lang->get($name) . strstr($message, ':') : $message;
+        } elseif (strpos($message, ',')) {
+            $name    = strstr($message, ',', true);
+            $message = $lang->has($name) ? $lang->get($name) . ':' . substr(strstr($message, ','), 1) : $message;
+        } elseif ($lang->has($message)) {
+            $message = $lang->get($message);
+        }
+
+        return $message;
+    }
+
+    /**
+     * 获取出错文件内容
+     * 获取错误的前9行和后9行
+     * @access protected
+     * @param  \Exception $exception
+     * @return array                 错误文件内容
+     */
+    protected function getSourceCode(Exception $exception)
+    {
+        // 读取前9行和后9行
+        $line  = $exception->getLine();
+        $first = ($line - 9 > 0) ? $line - 9 : 1;
+
+        try {
+            $contents = file($exception->getFile());
+            $source   = [
+                'first'  => $first,
+                'source' => array_slice($contents, $first - 1, 19),
+            ];
+        } catch (Exception $e) {
+            $source = [];
+        }
+
+        return $source;
+    }
+
+    /**
+     * 获取异常扩展信息
+     * 用于非调试模式html返回类型显示
+     * @access protected
+     * @param  \Exception $exception
+     * @return array                 异常类定义的扩展数据
+     */
+    protected function getExtendData(Exception $exception)
+    {
+        $data = [];
+
+        if ($exception instanceof \think\Exception) {
+            $data = $exception->getData();
+        }
+
+        return $data;
+    }
+
+    /**
+     * 获取常量列表
+     * @access private
+     * @return array 常量列表
+     */
+    private static function getConst()
+    {
+        $const = get_defined_constants(true);
+
+        return isset($const['user']) ? $const['user'] : [];
+    }
+}
diff --git a/thinkphp/library/think/exception/HttpException.php b/thinkphp/library/think/exception/HttpException.php
new file mode 100644
index 0000000000000000000000000000000000000000..01a27fc230e5a2ece33def9fe01856fc4e513b99
--- /dev/null
+++ b/thinkphp/library/think/exception/HttpException.php
@@ -0,0 +1,36 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+class HttpException extends \RuntimeException
+{
+    private $statusCode;
+    private $headers;
+
+    public function __construct($statusCode, $message = null, \Exception $previous = null, array $headers = [], $code = 0)
+    {
+        $this->statusCode = $statusCode;
+        $this->headers    = $headers;
+
+        parent::__construct($message, $code, $previous);
+    }
+
+    public function getStatusCode()
+    {
+        return $this->statusCode;
+    }
+
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+}
diff --git a/thinkphp/library/think/exception/HttpResponseException.php b/thinkphp/library/think/exception/HttpResponseException.php
new file mode 100644
index 0000000000000000000000000000000000000000..52972867b67f2bd42dd3b6b1bf279638970d94d9
--- /dev/null
+++ b/thinkphp/library/think/exception/HttpResponseException.php
@@ -0,0 +1,33 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+use think\Response;
+
+class HttpResponseException extends \RuntimeException
+{
+    /**
+     * @var Response
+     */
+    protected $response;
+
+    public function __construct(Response $response)
+    {
+        $this->response = $response;
+    }
+
+    public function getResponse()
+    {
+        return $this->response;
+    }
+
+}
diff --git a/thinkphp/library/think/exception/PDOException.php b/thinkphp/library/think/exception/PDOException.php
new file mode 100644
index 0000000000000000000000000000000000000000..25240b6806f1b5f0c04e96459573e90cb70c34f0
--- /dev/null
+++ b/thinkphp/library/think/exception/PDOException.php
@@ -0,0 +1,40 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: 麦当苗儿 <zuojiazi@vip.qq.com> <http://zjzit.cn>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+/**
+ * PDO异常处理类
+ * 重新封装了系统的\PDOException类
+ */
+class PDOException extends DbException
+{
+    /**
+     * PDOException constructor.
+     * @access public
+     * @param  \PDOException $exception
+     * @param  array         $config
+     * @param  string        $sql
+     * @param  int           $code
+     */
+    public function __construct(\PDOException $exception, array $config, $sql, $code = 10501)
+    {
+        $error = $exception->errorInfo;
+
+        $this->setData('PDO Error Info', [
+            'SQLSTATE'             => $error[0],
+            'Driver Error Code'    => isset($error[1]) ? $error[1] : 0,
+            'Driver Error Message' => isset($error[2]) ? $error[2] : '',
+        ]);
+
+        parent::__construct($exception->getMessage(), $config, $sql, $code);
+    }
+}
diff --git a/thinkphp/library/think/exception/RouteNotFoundException.php b/thinkphp/library/think/exception/RouteNotFoundException.php
new file mode 100644
index 0000000000000000000000000000000000000000..d22e3a63792e126963562c83b8e644aa4e027444
--- /dev/null
+++ b/thinkphp/library/think/exception/RouteNotFoundException.php
@@ -0,0 +1,22 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+class RouteNotFoundException extends HttpException
+{
+
+    public function __construct()
+    {
+        parent::__construct(404, 'Route Not Found');
+    }
+
+}
diff --git a/thinkphp/library/think/exception/TemplateNotFoundException.php b/thinkphp/library/think/exception/TemplateNotFoundException.php
new file mode 100644
index 0000000000000000000000000000000000000000..420206931cacff2d22e9252ababd5c56216daa47
--- /dev/null
+++ b/thinkphp/library/think/exception/TemplateNotFoundException.php
@@ -0,0 +1,33 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+class TemplateNotFoundException extends \RuntimeException
+{
+    protected $template;
+
+    public function __construct($message, $template = '')
+    {
+        $this->message  = $message;
+        $this->template = $template;
+    }
+
+    /**
+     * 获取模板文件
+     * @access public
+     * @return string
+     */
+    public function getTemplate()
+    {
+        return $this->template;
+    }
+}
diff --git a/thinkphp/library/think/exception/ThrowableError.php b/thinkphp/library/think/exception/ThrowableError.php
new file mode 100644
index 0000000000000000000000000000000000000000..87b6b9d74ff2e891036b1c24ecafb11d22d0fda7
--- /dev/null
+++ b/thinkphp/library/think/exception/ThrowableError.php
@@ -0,0 +1,47 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+class ThrowableError extends \ErrorException
+{
+    public function __construct(\Throwable $e)
+    {
+
+        if ($e instanceof \ParseError) {
+            $message  = 'Parse error: ' . $e->getMessage();
+            $severity = E_PARSE;
+        } elseif ($e instanceof \TypeError) {
+            $message  = 'Type error: ' . $e->getMessage();
+            $severity = E_RECOVERABLE_ERROR;
+        } else {
+            $message  = 'Fatal error: ' . $e->getMessage();
+            $severity = E_ERROR;
+        }
+
+        parent::__construct(
+            $message,
+            $e->getCode(),
+            $severity,
+            $e->getFile(),
+            $e->getLine()
+        );
+
+        $this->setTrace($e->getTrace());
+    }
+
+    protected function setTrace($trace)
+    {
+        $traceReflector = new \ReflectionProperty('Exception', 'trace');
+        $traceReflector->setAccessible(true);
+        $traceReflector->setValue($this, $trace);
+    }
+}
diff --git a/thinkphp/library/think/exception/ValidateException.php b/thinkphp/library/think/exception/ValidateException.php
new file mode 100644
index 0000000000000000000000000000000000000000..b3684169c53b1ea564f2c7e689be16e0353c167a
--- /dev/null
+++ b/thinkphp/library/think/exception/ValidateException.php
@@ -0,0 +1,33 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\exception;
+
+class ValidateException extends \RuntimeException
+{
+    protected $error;
+
+    public function __construct($error)
+    {
+        $this->error   = $error;
+        $this->message = is_array($error) ? implode("\n\r", $error) : $error;
+    }
+
+    /**
+     * 获取验证错误信息
+     * @access public
+     * @return array|string
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+}
diff --git a/thinkphp/library/think/facade/App.php b/thinkphp/library/think/facade/App.php
new file mode 100644
index 0000000000000000000000000000000000000000..37d995106860a562031d0e1e7e298309f742afdc
--- /dev/null
+++ b/thinkphp/library/think/facade/App.php
@@ -0,0 +1,54 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\App
+ * @mixin \think\App
+ * @method \think\App bind(string $bind) static 绑定模块或者控制器
+ * @method void initialize() static 初始化应用
+ * @method void init(string $module='') static 初始化模块
+ * @method \think\Response run() static 执行应用
+ * @method \think\App dispatch(\think\route\Dispatch $dispatch) static 设置当前请求的调度信息
+ * @method void log(mixed $log, string $type = 'info') static 记录调试信息
+ * @method mixed config(string $name='') static 获取配置参数
+ * @method \think\route\Dispatch routeCheck() static URL路由检测（根据PATH_INFO)
+ * @method \think\App routeMust(bool $must = false) static 设置应用的路由检测机制
+ * @method \think\Model model(string $name = '', string $layer = 'model', bool $appendSuffix = false, string $common = 'common') static 实例化模型
+ * @method object controller(string $name, string $layer = 'controller', bool $appendSuffix = false, string $empty = '') static 实例化控制器
+ * @method \think\Validate validate(string $name = '', string $layer = 'validate', bool $appendSuffix = false, string $common = 'common') static 实例化验证器类
+ * @method \think\db\Query db(mixed $config = [], mixed $name = false) static 数据库初始化
+ * @method mixed action(string $url, $vars = [], $layer = 'controller', $appendSuffix = false) static 调用模块的操作方法
+ * @method string parseClass(string $module, string $layer, string $name, bool $appendSuffix = false) static 解析应用类的类名
+ * @method string version() static 获取框架版本
+ * @method bool isDebug() static 是否为调试模式
+ * @method string getModulePath() static 获取当前模块路径
+ * @method void setModulePath(string $path) static 设置当前模块路径
+ * @method string getRootPath() static 获取应用根目录
+ * @method string getAppPath() static 获取应用类库目录
+ * @method string getRuntimePath() static 获取应用运行时目录
+ * @method string getThinkPath() static 获取核心框架目录
+ * @method string getRoutePath() static 获取路由目录
+ * @method string getConfigPath() static 获取应用配置目录
+ * @method string getConfigExt() static 获取配置后缀
+ * @method string setNamespace(string $namespace) static 设置应用类库命名空间
+ * @method string getNamespace() static 获取应用类库命名空间
+ * @method string getSuffix() static 是否启用类库后缀
+ * @method float getBeginTime() static 获取应用开启时间
+ * @method integer getBeginMem() static 获取应用初始内存占用
+ * @method \think\Container container() static 获取容器实例
+ */
+class App extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Build.php b/thinkphp/library/think/facade/Build.php
new file mode 100644
index 0000000000000000000000000000000000000000..465962367394438521f4960ccc125c433f8230c2
--- /dev/null
+++ b/thinkphp/library/think/facade/Build.php
@@ -0,0 +1,24 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Build
+ * @mixin \think\Build
+ * @method void run(array $build = [], string $namespace = 'app', bool $suffix = false) static 根据传入的build资料创建目录和文件
+ * @method void module(string $module = '', array $list = [], string $namespace = 'app', bool $suffix = false) static 创建模块
+ */
+class Build extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Cache.php b/thinkphp/library/think/facade/Cache.php
new file mode 100644
index 0000000000000000000000000000000000000000..3011d6b3a5ae7073a6a792b05a461d1173c70277
--- /dev/null
+++ b/thinkphp/library/think/facade/Cache.php
@@ -0,0 +1,36 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Cache
+ * @mixin \think\Cache
+ * @method \think\cache\Driver connect(array $options = [], mixed $name = false) static 连接缓存
+ * @method \think\cache\Driver init(array $options = []) static 初始化缓存
+ * @method \think\cache\Driver store(string $name = '') static 切换缓存类型
+ * @method bool has(string $name) static 判断缓存是否存在
+ * @method mixed get(string $name, mixed $default = false) static 读取缓存
+ * @method mixed pull(string $name) static 读取缓存并删除
+ * @method mixed set(string $name, mixed $value, int $expire = null) static 设置缓存
+ * @method mixed remember(string $name, mixed $value, int $expire = null) static 如果不存在则写入缓存
+ * @method mixed inc(string $name, int $step = 1) static 自增缓存（针对数值缓存）
+ * @method mixed dec(string $name, int $step = 1) static 自减缓存（针对数值缓存）
+ * @method bool rm(string $name) static 删除缓存
+ * @method bool clear(string $tag = null) static 清除缓存
+ * @method mixed tag(string $name, mixed $keys = null, bool $overlay = false) static 缓存标签
+ * @method object handler() static 返回句柄对象，可执行其它高级方法
+ */
+class Cache extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Config.php b/thinkphp/library/think/facade/Config.php
new file mode 100644
index 0000000000000000000000000000000000000000..3332413b8a2e35e0db3ee725b08dc6ee832078dc
--- /dev/null
+++ b/thinkphp/library/think/facade/Config.php
@@ -0,0 +1,27 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Config
+ * @mixin \think\Config
+ * @method bool has(string $name) static 检测配置是否存在
+ * @method array pull(string $name) static 获取一级配置
+ * @method mixed get(string $name) static 获取配置参数
+ * @method mixed set(string $name, mixed $value = null) static 设置配置参数
+ * @method array reset(string $prefix ='') static 重置配置参数
+ */
+class Config extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Cookie.php b/thinkphp/library/think/facade/Cookie.php
new file mode 100644
index 0000000000000000000000000000000000000000..18efbde0cb82e48c5afe8a48610e1e3607422490
--- /dev/null
+++ b/thinkphp/library/think/facade/Cookie.php
@@ -0,0 +1,30 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Cookie
+ * @mixin \think\Cookie
+ * @method void init(array $config = []) static 初始化
+ * @method bool has(string $name,string $prefix = null) static 判断Cookie数据
+ * @method mixed prefix(string $prefix = '') static 设置或者获取cookie作用域（前缀）
+ * @method mixed get(string $name,string $prefix = null) static Cookie获取
+ * @method mixed set(string $name, mixed $value = null, mixed $option = null) static 设置Cookie
+ * @method void forever(string $name, mixed $value = null, mixed $option = null) static 永久保存Cookie数据
+ * @method void delete(string $name, string $prefix = null) static Cookie删除
+ * @method void clear($prefix = null) static Cookie清空
+ */
+class Cookie extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Debug.php b/thinkphp/library/think/facade/Debug.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac482a41eb29ff89c45f468c8343cbbf0d8cc167
--- /dev/null
+++ b/thinkphp/library/think/facade/Debug.php
@@ -0,0 +1,31 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Debug
+ * @mixin \think\Debug
+ * @method void remark(string $name, mixed $value = '') static 记录时间（微秒）和内存使用情况
+ * @method int getRangeTime(string $start, string $end, mixed $dec = 6) static 统计某个区间的时间（微秒）使用情况
+ * @method int getUseTime(int $dec = 6) static 统计从开始到统计时的时间（微秒）使用情况
+ * @method string getThroughputRate(string $start, string $end, mixed $dec = 6) static 获取当前访问的吞吐率情况
+ * @method string getRangeMem(string $start, string $end, mixed $dec = 2) static 记录区间的内存使用情况
+ * @method int getUseMem(int $dec = 2) static 统计从开始到统计时的内存使用情况
+ * @method string getMemPeak(string $start, string $end, mixed $dec = 2) static 统计区间的内存峰值情况
+ * @method mixed getFile(bool $detail = false) static 获取文件加载信息
+ * @method mixed dump(mixed $var, bool $echo = true, string $label = null, int $flags = ENT_SUBSTITUTE) static 浏览器友好的变量输出
+ */
+class Debug extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Env.php b/thinkphp/library/think/facade/Env.php
new file mode 100644
index 0000000000000000000000000000000000000000..d430d683fda675f8c3575718e346f58d7fdf71f8
--- /dev/null
+++ b/thinkphp/library/think/facade/Env.php
@@ -0,0 +1,25 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Env
+ * @mixin \think\Env
+ * @method void load(string $file) static 读取环境变量定义文件
+ * @method mixed get(string $name = null, mixed $default = null) static 获取环境变量值
+ * @method void set(mixed $env, string $value = null) static 设置环境变量值
+ */
+class Env extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Hook.php b/thinkphp/library/think/facade/Hook.php
new file mode 100644
index 0000000000000000000000000000000000000000..e18f83b5d5ecbe34a6186203cf4f3f4b9695abf6
--- /dev/null
+++ b/thinkphp/library/think/facade/Hook.php
@@ -0,0 +1,28 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Hook
+ * @mixin \think\Hook
+ * @method \think\Hook alias(mixed $name, mixed $behavior = null) static 指定行为标识
+ * @method void add(string $tag, mixed $behavior, bool $first = false) static 动态添加行为扩展到某个标签
+ * @method void import(array $tags, bool $recursive = true) static 批量导入插件
+ * @method array get(string $tag = '') static 获取插件信息
+ * @method mixed listen(string $tag, mixed $params = null, bool $once = false) static 监听标签的行为
+ * @method mixed exec(mixed $class, mixed $params = null) static 执行行为
+ */
+class Hook extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Lang.php b/thinkphp/library/think/facade/Lang.php
new file mode 100644
index 0000000000000000000000000000000000000000..3eb5d4acd2a752faf12adecbc9860522e406ff77
--- /dev/null
+++ b/thinkphp/library/think/facade/Lang.php
@@ -0,0 +1,32 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Lang
+ * @mixin \think\Lang
+ * @method mixed range($range = '') static 设定当前的语言
+ * @method mixed set(mixed $name, string $value = null, string $range = '') static 设置语言定义
+ * @method array load(mixed $file, string $range = '') static 加载语言定义
+ * @method mixed get(string $name = null, array $vars = [], string $range = '') static 获取语言定义
+ * @method mixed has(string $name, string $range = '') static 获取语言定义
+ * @method string detect() static 自动侦测设置获取语言选择
+ * @method void saveToCookie(string $lang = null) static 设置当前语言到Cookie
+ * @method void setLangDetectVar(string $var) static 设置语言自动侦测的变量
+ * @method void setLangCookieVar(string $var) static 设置语言的cookie保存变量
+ * @method void setAllowLangList(array $list) static 设置允许的语言列表
+ */
+class Lang extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Log.php b/thinkphp/library/think/facade/Log.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a1fbf88ff9d907b3d4f5d38398868f51695bb39
--- /dev/null
+++ b/thinkphp/library/think/facade/Log.php
@@ -0,0 +1,40 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Log
+ * @mixin \think\Log
+ * @method \think\Log init(array $config = []) static 日志初始化
+ * @method mixed getLog(string $type = '') static 获取日志信息
+ * @method \think\Log record(mixed $msg, string $type = 'info', array $context = []) static 记录日志信息
+ * @method \think\Log clear() static 清空日志信息
+ * @method \think\Log key(string $key) static 当前日志记录的授权key
+ * @method bool check(array $config) static 检查日志写入权限
+ * @method bool save() static 保存调试信息
+ * @method void write(mixed $msg, string $type = 'info', bool $force = false) static 实时写入日志信息
+ * @method void log(string $level,mixed $message, array $context = []) static 记录日志信息
+ * @method void emergency(mixed $message, array $context = []) static 记录emergency信息
+ * @method void alert(mixed $message, array $context = []) static 记录alert信息
+ * @method void critical(mixed $message, array $context = []) static 记录critical信息
+ * @method void error(mixed $message, array $context = []) static 记录error信息
+ * @method void warning(mixed $message, array $context = []) static 记录warning信息
+ * @method void notice(mixed $message, array $context = []) static 记录notice信息
+ * @method void info(mixed $message, array $context = []) static 记录info信息
+ * @method void debug(mixed $message, array $context = []) static 记录debug信息
+ * @method void sql(mixed $message, array $context = []) static 记录sql信息
+ */
+class Log extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Middleware.php b/thinkphp/library/think/facade/Middleware.php
new file mode 100644
index 0000000000000000000000000000000000000000..46827964246dadbbdbde099b5702168ea411dde3
--- /dev/null
+++ b/thinkphp/library/think/facade/Middleware.php
@@ -0,0 +1,27 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Middleware
+ * @mixin \think\Middleware
+ * @method void import(array $middlewares = []) static 批量设置中间件
+ * @method void add(mixed $middleware) static 添加中间件到队列
+ * @method void unshift(mixed $middleware) static 添加中间件到队列开头
+ * @method array all() static 获取中间件队列
+ * @method \think\Response dispatch(\think\Request $request) static 执行中间件调度
+ */
+class Middleware extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Request.php b/thinkphp/library/think/facade/Request.php
new file mode 100644
index 0000000000000000000000000000000000000000..d0eedb2463d0b1ea4e33b74c119f7a7d97339024
--- /dev/null
+++ b/thinkphp/library/think/facade/Request.php
@@ -0,0 +1,88 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Request
+ * @mixin \think\Request
+ * @method void hook(mixed $method, mixed $callback = null) static Hook 方法注入
+ * @method \think\Request create(string $uri, string $method = 'GET', array $params = [], array $cookie = [], array $files = [], array $server = [], string $content = null) static 创建一个URL请求
+ * @method mixed domain(bool $port = false) static 获取当前包含协议、端口的域名
+ * @method mixed url(bool $domain = false) static 获取当前完整URL
+ * @method mixed baseUrl(bool $domain = false) static 获取当前URL
+ * @method mixed baseFile(bool $domain = false) static 获取当前执行的文件
+ * @method mixed root(bool $domain = false) static 获取URL访问根地址
+ * @method string rootUrl() static 获取URL访问根目录
+ * @method string pathinfo() static 获取当前请求URL的pathinfo信息（含URL后缀）
+ * @method string path() static 获取当前请求URL的pathinfo信息(不含URL后缀)
+ * @method string ext() static 当前URL的访问后缀
+ * @method float time(bool $float = false) static 获取当前请求的时间
+ * @method mixed type() static 当前请求的资源类型
+ * @method void mimeType(mixed $type, string $val = '') static 设置资源类型
+ * @method string method(bool $method = false) static 当前的请求类型
+ * @method bool isGet() static 是否为GET请求
+ * @method bool isPost() static 是否为POST请求
+ * @method bool isPut() static 是否为PUT请求
+ * @method bool isDelete() static 是否为DELTE请求
+ * @method bool isHead() static 是否为HEAD请求
+ * @method bool isPatch() static 是否为PATCH请求
+ * @method bool isOptions() static 是否为OPTIONS请求
+ * @method bool isCli() static 是否为cli
+ * @method bool isCgi() static 是否为cgi
+ * @method mixed param(string $name = '', mixed $default = null, mixed $filter = '') static 获取当前请求的参数
+ * @method mixed route(string $name = '', mixed $default = null, mixed $filter = '') static 设置获取路由参数
+ * @method mixed get(string $name = '', mixed $default = null, mixed $filter = '') static 设置获取GET参数
+ * @method mixed post(string $name = '', mixed $default = null, mixed $filter = '') static 设置获取POST参数
+ * @method mixed put(string $name = '', mixed $default = null, mixed $filter = '') static 设置获取PUT参数
+ * @method mixed delete(string $name = '', mixed $default = null, mixed $filter = '') static 设置获取DELETE参数
+ * @method mixed patch(string $name = '', mixed $default = null, mixed $filter = '') static 设置获取PATCH参数
+ * @method mixed request(string $name = '', mixed $default = null, mixed $filter = '') static 获取request变量
+ * @method mixed session(string $name = '', mixed $default = null, mixed $filter = '') static 获取session数据
+ * @method mixed cookie(string $name = '', mixed $default = null, mixed $filter = '') static 获取cookie参数
+ * @method mixed server(string $name = '', mixed $default = null, mixed $filter = '') static 获取server参数
+ * @method mixed env(string $name = '', mixed $default = null, mixed $filter = '') static 获取环境变量
+ * @method mixed file(string $name = '') static 获取上传的文件信息
+ * @method mixed header(string $name = '', mixed $default = null) static 设置或者获取当前的Header
+ * @method mixed input(array $data,mixed $name = '', mixed $default = null, mixed $filter = '') static 获取变量 支持过滤和默认值
+ * @method mixed filter(mixed $filter = null) static 设置或获取当前的过滤规则
+ * @method mixed has(string $name, string $type = 'param', bool $checkEmpty = false) static 是否存在某个请求参数
+ * @method mixed only(mixed $name, string $type = 'param') static 获取指定的参数
+ * @method mixed except(mixed $name, string $type = 'param') static 排除指定参数获取
+ * @method bool isSsl() static 当前是否ssl
+ * @method bool isAjax(bool $ajax = false) static 当前是否Ajax请求
+ * @method bool isPjax(bool $pjax = false) static 当前是否Pjax请求
+ * @method mixed ip(int $type = 0, bool $adv = true) static 获取客户端IP地址
+ * @method bool isMobile() static 检测是否使用手机访问
+ * @method string scheme() static 当前URL地址中的scheme参数
+ * @method string query() static 当前请求URL地址中的query参数
+ * @method string host(bool $stric = false) static 当前请求的host
+ * @method string port() static 当前请求URL地址中的port参数
+ * @method string protocol() static 当前请求 SERVER_PROTOCOL
+ * @method string remotePort() static 当前请求 REMOTE_PORT
+ * @method string contentType() static 当前请求 HTTP_CONTENT_TYPE
+ * @method array routeInfo() static 获取当前请求的路由信息
+ * @method array dispatch() static 获取当前请求的调度信息
+ * @method string module() static 获取当前的模块名
+ * @method string controller(bool $convert = false) static 获取当前的控制器名
+ * @method string action(bool $convert = false) static 获取当前的操作名
+ * @method string langset() static 获取当前的语言
+ * @method string getContent() static 设置或者获取当前请求的content
+ * @method string getInput() static 获取当前请求的php://input
+ * @method string token(string $name = '__token__', mixed $type = 'md5') static 生成请求令牌
+ * @method string cache(string $key, mixed $expire = null, array $except = [], string $tag = null) static 设置当前地址的请求缓存
+ * @method string getCache() static 读取请求缓存设置
+ */
+class Request extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Response.php b/thinkphp/library/think/facade/Response.php
new file mode 100644
index 0000000000000000000000000000000000000000..4a4de71298008056dc58d0dc1ec5ccb941706937
--- /dev/null
+++ b/thinkphp/library/think/facade/Response.php
@@ -0,0 +1,38 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Response
+ * @mixin \think\Response
+ * @method \think\response create(mixed $data = '', string $type = '', int $code = 200, array $header = [], array $options = []) static 创建Response对象
+ * @method void send() static 发送数据到客户端
+ * @method \think\Response options(mixed $options = []) static 输出的参数
+ * @method \think\Response data(mixed $data) static 输出数据设置
+ * @method \think\Response header(mixed $name, string $value = null) static 设置响应头
+ * @method \think\Response content(mixed $content) static 设置页面输出内容
+ * @method \think\Response code(int $code) static 发送HTTP状态
+ * @method \think\Response lastModified(string $time) static LastModified
+ * @method \think\Response expires(string $time) static expires
+ * @method \think\Response eTag(string $eTag) static eTag
+ * @method \think\Response cacheControl(string $cache) static 页面缓存控制
+ * @method \think\Response contentType(string $contentType, string $charset = 'utf-8') static 页面输出类型
+ * @method mixed getHeader(string $name) static 获取头部信息
+ * @method mixed getData() static 获取原始数据
+ * @method mixed getContent() static 获取输出数据
+ * @method int getCode() static 获取状态码
+ */
+class Response extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Route.php b/thinkphp/library/think/facade/Route.php
new file mode 100644
index 0000000000000000000000000000000000000000..c9f843d9067993e91772dd7a2e661412932c846c
--- /dev/null
+++ b/thinkphp/library/think/facade/Route.php
@@ -0,0 +1,48 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Route
+ * @mixin \think\Route
+ * @method \think\route\Domain domain(mixed $name, mixed $rule = '', array $option = [], array $pattern = []) static 注册域名路由
+ * @method \think\Route pattern(mixed $name, string $rule = '') static 注册变量规则
+ * @method \think\Route option(mixed $name, mixed $value = '') static 注册路由参数
+ * @method \think\Route bind(string $bind) static 设置路由绑定
+ * @method mixed getBind(string $bind) static 读取路由绑定
+ * @method \think\Route name(string $name) static 设置当前路由标识
+ * @method mixed getName(string $name) static 读取路由标识
+ * @method void setName(string $name) static 批量导入路由标识
+ * @method void import(array $rules, string $type = '*') static 导入配置文件的路由规则
+ * @method \think\route\RuleItem rule(string $rule, mixed $route, string $method = '*', array $option = [], array $pattern = []) static 注册路由规则
+ * @method void rules(array $rules, string $method = '*', array $option = [], array $pattern = []) static 批量注册路由规则
+ * @method \think\route\RuleGroup group(string|array $name, mixed $route, string $method = '*', array $option = [], array $pattern = []) static 注册路由分组
+ * @method \think\route\RuleItem any(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由
+ * @method \think\route\RuleItem get(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由
+ * @method \think\route\RuleItem post(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由
+ * @method \think\route\RuleItem put(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由
+ * @method \think\route\RuleItem delete(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由
+ * @method \think\route\RuleItem patch(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册路由
+ * @method \think\route\Resource resource(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册资源路由
+ * @method \think\Route controller(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册控制器路由
+ * @method \think\Route alias(string $rule, mixed $route, array $option = [], array $pattern = []) static 注册别名路由
+ * @method \think\Route setMethodPrefix(mixed $method, string $prefix = '') static 设置不同请求类型下面的方法前缀
+ * @method \think\Route rest(string $name, array $resource = []) static rest方法定义和修改
+ * @method \think\Route\RuleItem miss(string $route, string $method = '*', array $option = []) static 注册未匹配路由规则后的处理
+ * @method \think\Route\RuleItem auto(string $route) static 注册一个自动解析的URL路由
+ * @method \think\Route\Dispatch check(string $url, string $depr = '/', bool $must = false, bool $completeMatch = false) static 检测URL路由
+ */
+class Route extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Session.php b/thinkphp/library/think/facade/Session.php
new file mode 100644
index 0000000000000000000000000000000000000000..a68db382a3b028ff1cbc3bc097c6dd4dad8dc47f
--- /dev/null
+++ b/thinkphp/library/think/facade/Session.php
@@ -0,0 +1,37 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Session
+ * @mixin \think\Session
+ * @method void init(array $config = []) static session初始化
+ * @method bool has(string $name,string $prefix = null) static 判断session数据
+ * @method mixed prefix(string $prefix = '') static 设置或者获取session作用域（前缀）
+ * @method mixed get(string $name = '',string $prefix = null) static session获取
+ * @method mixed pull(string $name,string $prefix = null) static session获取并删除
+ * @method void push(string $key, mixed $value) static 添加数据到一个session数组
+ * @method void set(string $name, mixed $value , string $prefix = null) static 设置session数据
+ * @method void flash(string $name, mixed $value = null) static session设置 下一次请求有效
+ * @method void flush() static 清空当前请求的session数据
+ * @method void delete(string $name, string $prefix = null) static 删除session数据
+ * @method void clear($prefix = null) static 清空session数据
+ * @method void start() static 启动session
+ * @method void destroy() static 销毁session
+ * @method void pause() static 暂停session
+ * @method void regenerate(bool $delete = false) static 重新生成session_id
+ */
+class Session extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Url.php b/thinkphp/library/think/facade/Url.php
new file mode 100644
index 0000000000000000000000000000000000000000..db5a16f2be19a73289b4a3b0cf9cb45e1d924e35
--- /dev/null
+++ b/thinkphp/library/think/facade/Url.php
@@ -0,0 +1,24 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Url
+ * @mixin \think\Url
+ * @method string build(string $url = '', mixed $vars = '', mixed $suffix = true, mixed $domain = false) static URL生成 支持路由反射
+ * @method void root(string $root) static 指定当前生成URL地址的root
+ */
+class Url extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/Validate.php b/thinkphp/library/think/facade/Validate.php
new file mode 100644
index 0000000000000000000000000000000000000000..423446d4de625a0d84b17f0d811096d1c3385b62
--- /dev/null
+++ b/thinkphp/library/think/facade/Validate.php
@@ -0,0 +1,65 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\Validate
+ * @mixin \think\Validate
+ * @method \think\Validate make(array $rules = [], array $message = [], array $field = []) static 创建一个验证器类
+ * @method \think\Validate rule(mixed $name, mixed $rule = '') static 添加字段验证规则
+ * @method void extend(string $type, mixed $callback = null) static 注册扩展验证（类型）规则
+ * @method void setTypeMsg(mixed $type, string $msg = null) static 设置验证规则的默认提示信息
+ * @method \think\Validate message(mixed $name, string $message = '') static 设置提示信息
+ * @method \think\Validate scene(string $name) static 设置验证场景
+ * @method bool hasScene(string $name) static 判断是否存在某个验证场景
+ * @method \think\Validate batch(bool $batch = true) static 设置批量验证
+ * @method \think\Validate only(array $fields) static 指定需要验证的字段列表
+ * @method \think\Validate remove(mixed $field, mixed $rule = true) static 移除某个字段的验证规则
+ * @method \think\Validate append(mixed $field, mixed $rule = null) static 追加某个字段的验证规则
+ * @method bool confirm(mixed $value, mixed $rule, array $data = [], string $field = '') static 验证是否和某个字段的值一致
+ * @method bool different(mixed $value, mixed $rule, array $data = []) static 验证是否和某个字段的值是否不同
+ * @method bool egt(mixed $value, mixed $rule, array $data = []) static 验证是否大于等于某个值
+ * @method bool gt(mixed $value, mixed $rule, array $data = []) static 验证是否大于某个值
+ * @method bool elt(mixed $value, mixed $rule, array $data = []) static 验证是否小于等于某个值
+ * @method bool lt(mixed $value, mixed $rule, array $data = []) static 验证是否小于某个值
+ * @method bool eq(mixed $value, mixed $rule) static 验证是否等于某个值
+ * @method bool must(mixed $value, mixed $rule) static 必须验证
+ * @method bool is(mixed $value, mixed $rule, array $data = []) static 验证字段值是否为有效格式
+ * @method bool ip(mixed $value, mixed $rule) static 验证是否有效IP
+ * @method bool requireIf(mixed $value, mixed $rule) static 验证某个字段等于某个值的时候必须
+ * @method bool requireCallback(mixed $value, mixed $rule,array $data) static 通过回调方法验证某个字段是否必须
+ * @method bool requireWith(mixed $value, mixed $rule, array $data) static 验证某个字段有值的情况下必须
+ * @method bool filter(mixed $value, mixed $rule) static 使用filter_var方式验证
+ * @method bool in(mixed $value, mixed $rule) static 验证是否在范围内
+ * @method bool notIn(mixed $value, mixed $rule) static 验证是否不在范围内
+ * @method bool between(mixed $value, mixed $rule) static between验证数据
+ * @method bool notBetween(mixed $value, mixed $rule) static 使用notbetween验证数据
+ * @method bool length(mixed $value, mixed $rule) static 验证数据长度
+ * @method bool max(mixed $value, mixed $rule) static 验证数据最大长度
+ * @method bool min(mixed $value, mixed $rule) static 验证数据最小长度
+ * @method bool after(mixed $value, mixed $rule) static 验证日期
+ * @method bool before(mixed $value, mixed $rule) static 验证日期
+ * @method bool expire(mixed $value, mixed $rule) static 验证有效期
+ * @method bool allowIp(mixed $value, mixed $rule) static 验证IP许可
+ * @method bool denyIp(mixed $value, mixed $rule) static 验证IP禁用
+ * @method bool regex(mixed $value, mixed $rule) static 使用正则验证数据
+ * @method bool token(mixed $value, mixed $rule) static 验证表单令牌
+ * @method bool dateFormat(mixed $value, mixed $rule) static 验证时间和日期是否符合指定格式
+ * @method bool unique(mixed $value, mixed $rule, array $data = [], string $field = '') static 验证是否唯一
+ * @method bool check(array $data, mixed $rules = [], string $scene = '') static 数据自动验证
+ * @method mixed getError(mixed $value, mixed $rule) static 获取错误信息
+ */
+class Validate extends Facade
+{
+}
diff --git a/thinkphp/library/think/facade/View.php b/thinkphp/library/think/facade/View.php
new file mode 100644
index 0000000000000000000000000000000000000000..0309a760fb9e5d21d6c3dce32b619a50e69b7662
--- /dev/null
+++ b/thinkphp/library/think/facade/View.php
@@ -0,0 +1,31 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\facade;
+
+use think\Facade;
+
+/**
+ * @see \think\View
+ * @mixin \think\View
+ * @method \think\View init(mixed $engine = [], array $replace = []) static 初始化
+ * @method \think\View share(mixed $name, mixed $value = '') static 模板变量静态赋值
+ * @method \think\View assign(mixed $name, mixed $value = '') static 模板变量赋值
+ * @method \think\View config(mixed $name, mixed $value = '') static 配置模板引擎
+ * @method \think\View exists(mixed $name) static 检查模板是否存在
+ * @method \think\View filter(Callable $filter) static 视图内容过滤
+ * @method \think\View engine(mixed $engine = []) static 设置当前模板解析的引擎
+ * @method string fetch(string $template = '', array $vars = [], array $replace = [], array $config = [], bool $renderContent = false) static 解析和获取模板内容
+ * @method string display(string $content = '', array $vars = [], array $replace = [], array $config = []) static 渲染内容输出
+ */
+class View extends Facade
+{
+}
diff --git a/thinkphp/library/think/log/driver/File.php b/thinkphp/library/think/log/driver/File.php
new file mode 100644
index 0000000000000000000000000000000000000000..dfd963c28c768f6e4d2ee8ea12dd27d858ecd337
--- /dev/null
+++ b/thinkphp/library/think/log/driver/File.php
@@ -0,0 +1,280 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | 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\log\driver;
+
+use think\App;
+
+/**
+ * 本地化调试输出到文件
+ */
+class File
+{
+    protected $config = [
+        'time_format' => ' c ',
+        'single'      => false,
+        'file_size'   => 2097152,
+        'path'        => '',
+        'apart_level' => [],
+        'max_files'   => 0,
+        'json'        => false,
+    ];
+
+    protected $app;
+
+    // 实例化并传入参数
+    public function __construct(App $app, $config = [])
+    {
+        $this->app = $app;
+
+        if (is_array($config)) {
+            $this->config = array_merge($this->config, $config);
+        }
+
+        if (empty($this->config['path'])) {
+            $this->config['path'] = $this->app->getRuntimePath() . 'log' . DIRECTORY_SEPARATOR;
+        } elseif (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
+            $this->config['path'] .= DIRECTORY_SEPARATOR;
+        }
+    }
+
+    /**
+     * 日志写入接口
+     * @access public
+     * @param  array    $log    日志信息
+     * @param  bool     $append 是否追加请求信息
+     * @return bool
+     */
+    public function save(array $log = [], $append = false)
+    {
+        $destination = $this->getMasterLogFile();
+
+        $path = dirname($destination);
+        !is_dir($path) && mkdir($path, 0755, true);
+
+        $info = [];
+
+        foreach ($log as $type => $val) {
+
+            foreach ($val as $msg) {
+                if (!is_string($msg)) {
+                    $msg = var_export($msg, true);
+                }
+
+                $info[$type][] = $this->config['json'] ? $msg : '[ ' . $type . ' ] ' . $msg;
+            }
+
+            if (!$this->config['json'] && (true === $this->config['apart_level'] || in_array($type, $this->config['apart_level']))) {
+                // 独立记录的日志级别
+                $filename = $this->getApartLevelFile($path, $type);
+
+                $this->write($info[$type], $filename, true, $append);
+
+                unset($info[$type]);
+            }
+        }
+
+        if ($info) {
+            return $this->write($info, $destination, false, $append);
+        }
+
+        return true;
+    }
+
+    /**
+     * 日志写入
+     * @access protected
+     * @param  array     $message 日志信息
+     * @param  string    $destination 日志文件
+     * @param  bool      $apart 是否独立文件写入
+     * @param  bool      $append 是否追加请求信息
+     * @return bool
+     */
+    protected function write($message, $destination, $apart = false, $append = false)
+    {
+        // 检测日志文件大小，超过配置大小则备份日志文件重新生成
+        $this->checkLogSize($destination);
+
+        // 日志信息封装
+        $info['timestamp'] = date($this->config['time_format']);
+
+        foreach ($message as $type => $msg) {
+            $info[$type] = is_array($msg) ? implode("\r\n", $msg) : $msg;
+        }
+
+        if (PHP_SAPI == 'cli') {
+            $message = $this->parseCliLog($info);
+        } else {
+            // 添加调试日志
+            $this->getDebugLog($info, $append, $apart);
+
+            $message = $this->parseLog($info);
+        }
+
+        return error_log($message, 3, $destination);
+    }
+
+    /**
+     * 获取主日志文件名
+     * @access public
+     * @return string
+     */
+    protected function getMasterLogFile()
+    {
+        if ($this->config['single']) {
+            $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
+
+            $destination = $this->config['path'] . $name . '.log';
+        } else {
+            $cli = PHP_SAPI == 'cli' ? '_cli' : '';
+
+            if ($this->config['max_files']) {
+                $filename = date('Ymd') . $cli . '.log';
+                $files    = glob($this->config['path'] . '*.log');
+
+                try {
+                    if (count($files) > $this->config['max_files']) {
+                        unlink($files[0]);
+                    }
+                } catch (\Exception $e) {
+                }
+            } else {
+                $filename = date('Ym') . DIRECTORY_SEPARATOR . date('d') . $cli . '.log';
+            }
+
+            $destination = $this->config['path'] . $filename;
+        }
+
+        return $destination;
+    }
+
+    /**
+     * 获取独立日志文件名
+     * @access public
+     * @param  string $path 日志目录
+     * @param  string $type 日志类型
+     * @return string
+     */
+    protected function getApartLevelFile($path, $type)
+    {
+        $cli = PHP_SAPI == 'cli' ? '_cli' : '';
+
+        if ($this->config['single']) {
+            $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
+
+            $name .= '_' . $type;
+        } elseif ($this->config['max_files']) {
+            $name = date('Ymd') . '_' . $type . $cli;
+        } else {
+            $name = date('d') . '_' . $type . $cli;
+        }
+
+        return $path . DIRECTORY_SEPARATOR . $name . '.log';
+    }
+
+    /**
+     * 检查日志文件大小并自动生成备份文件
+     * @access protected
+     * @param  string    $destination 日志文件
+     * @return void
+     */
+    protected function checkLogSize($destination)
+    {
+        if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) {
+            try {
+                rename($destination, dirname($destination) . DIRECTORY_SEPARATOR . time() . '-' . basename($destination));
+            } catch (\Exception $e) {
+            }
+        }
+    }
+
+    /**
+     * CLI日志解析
+     * @access protected
+     * @param  array     $info 日志信息
+     * @return string
+     */
+    protected function parseCliLog($info)
+    {
+        if ($this->config['json']) {
+            $message = json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\r\n";
+        } else {
+            $now = $info['timestamp'];
+            unset($info['timestamp']);
+
+            $message = implode("\r\n", $info);
+
+            $message = "[{$now}]" . $message . "\r\n";
+        }
+
+        return $message;
+    }
+
+    /**
+     * 解析日志
+     * @access protected
+     * @param  array     $info 日志信息
+     * @return string
+     */
+    protected function parseLog($info)
+    {
+        $requestInfo = [
+            'ip'     => $this->app['request']->ip(),
+            'method' => $this->app['request']->method(),
+            'host'   => $this->app['request']->host(),
+            'uri'    => $this->app['request']->url(),
+        ];
+
+        if ($this->config['json']) {
+            $info = $requestInfo + $info;
+            return json_encode($info, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . "\r\n";
+        }
+
+        array_unshift($info, "---------------------------------------------------------------\r\n[{$info['timestamp']}] {$requestInfo['ip']} {$requestInfo['method']} {$requestInfo['host']}{$requestInfo['uri']}");
+        unset($info['timestamp']);
+
+        return implode("\r\n", $info) . "\r\n";
+    }
+
+    protected function getDebugLog(&$info, $append, $apart)
+    {
+        if ($this->app->isDebug() && $append) {
+
+            if ($this->config['json']) {
+                // 获取基本信息
+                $runtime = round(microtime(true) - $this->app->getBeginTime(), 10);
+                $reqs    = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
+
+                $memory_use = number_format((memory_get_usage() - $this->app->getBeginMem()) / 1024, 2);
+
+                $info = [
+                    'runtime' => number_format($runtime, 6) . 's',
+                    'reqs'    => $reqs . 'req/s',
+                    'memory'  => $memory_use . 'kb',
+                    'file'    => count(get_included_files()),
+                ] + $info;
+
+            } elseif (!$apart) {
+                // 增加额外的调试信息
+                $runtime = round(microtime(true) - $this->app->getBeginTime(), 10);
+                $reqs    = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
+
+                $memory_use = number_format((memory_get_usage() - $this->app->getBeginMem()) / 1024, 2);
+
+                $time_str   = '[运行时间：' . number_format($runtime, 6) . 's] [吞吐率：' . $reqs . 'req/s]';
+                $memory_str = ' [内存消耗：' . $memory_use . 'kb]';
+                $file_load  = ' [文件加载：' . count(get_included_files()) . ']';
+
+                array_unshift($info, $time_str . $memory_str . $file_load);
+            }
+        }
+    }
+}
diff --git a/thinkphp/library/think/log/driver/Socket.php b/thinkphp/library/think/log/driver/Socket.php
new file mode 100644
index 0000000000000000000000000000000000000000..b4a2cadc7050c8b473d87609f1c399f96ab4cc51
--- /dev/null
+++ b/thinkphp/library/think/log/driver/Socket.php
@@ -0,0 +1,277 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006-2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: luofei614 <weibo.com/luofei614>
+// +----------------------------------------------------------------------
+
+namespace think\log\driver;
+
+use think\App;
+
+/**
+ * github: https://github.com/luofei614/SocketLog
+ * @author luofei614<weibo.com/luofei614>
+ */
+class Socket
+{
+    public $port = 1116; //SocketLog 服务的http的端口号
+
+    protected $config = [
+        // socket服务器地址
+        'host'                => 'localhost',
+        // 是否显示加载的文件列表
+        'show_included_files' => false,
+        // 日志强制记录到配置的client_id
+        'force_client_ids'    => [],
+        // 限制允许读取日志的client_id
+        'allow_client_ids'    => [],
+    ];
+
+    protected $css = [
+        'sql'      => 'color:#009bb4;',
+        'sql_warn' => 'color:#009bb4;font-size:14px;',
+        'error'    => 'color:#f4006b;font-size:14px;',
+        'page'     => 'color:#40e2ff;background:#171717;',
+        'big'      => 'font-size:20px;color:red;',
+    ];
+
+    protected $allowForceClientIds = []; //配置强制推送且被授权的client_id
+    protected $app;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array $config 缓存参数
+     */
+    public function __construct(App $app, array $config = [])
+    {
+        $this->app = $app;
+
+        if (!empty($config)) {
+            $this->config = array_merge($this->config, $config);
+        }
+    }
+
+    /**
+     * 调试输出接口
+     * @access public
+     * @param  array     $log 日志信息
+     * @return bool
+     */
+    public function save(array $log = [], $append = false)
+    {
+        if (!$this->check()) {
+            return false;
+        }
+
+        $trace = [];
+
+        if ($this->app->isDebug()) {
+            $runtime    = round(microtime(true) - $this->app->getBeginTime(), 10);
+            $reqs       = $runtime > 0 ? number_format(1 / $runtime, 2) : '∞';
+            $time_str   = ' [运行时间：' . number_format($runtime, 6) . 's][吞吐率：' . $reqs . 'req/s]';
+            $memory_use = number_format((memory_get_usage() - $this->app->getBeginMem()) / 1024, 2);
+            $memory_str = ' [内存消耗：' . $memory_use . 'kb]';
+            $file_load  = ' [文件加载：' . count(get_included_files()) . ']';
+
+            if (isset($_SERVER['HTTP_HOST'])) {
+                $current_uri = $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+            } else {
+                $current_uri = 'cmd:' . implode(' ', $_SERVER['argv']);
+            }
+
+            // 基本信息
+            $trace[] = [
+                'type' => 'group',
+                'msg'  => $current_uri . $time_str . $memory_str . $file_load,
+                'css'  => $this->css['page'],
+            ];
+        }
+
+        foreach ($log as $type => $val) {
+            $trace[] = [
+                'type' => 'groupCollapsed',
+                'msg'  => '[ ' . $type . ' ]',
+                'css'  => isset($this->css[$type]) ? $this->css[$type] : '',
+            ];
+
+            foreach ($val as $msg) {
+                if (!is_string($msg)) {
+                    $msg = var_export($msg, true);
+                }
+                $trace[] = [
+                    'type' => 'log',
+                    'msg'  => $msg,
+                    'css'  => '',
+                ];
+            }
+
+            $trace[] = [
+                'type' => 'groupEnd',
+                'msg'  => '',
+                'css'  => '',
+            ];
+        }
+
+        if ($this->config['show_included_files']) {
+            $trace[] = [
+                'type' => 'groupCollapsed',
+                'msg'  => '[ file ]',
+                'css'  => '',
+            ];
+
+            $trace[] = [
+                'type' => 'log',
+                'msg'  => implode("\n", get_included_files()),
+                'css'  => '',
+            ];
+
+            $trace[] = [
+                'type' => 'groupEnd',
+                'msg'  => '',
+                'css'  => '',
+            ];
+        }
+
+        $trace[] = [
+            'type' => 'groupEnd',
+            'msg'  => '',
+            'css'  => '',
+        ];
+
+        $tabid = $this->getClientArg('tabid');
+
+        if (!$client_id = $this->getClientArg('client_id')) {
+            $client_id = '';
+        }
+
+        if (!empty($this->allowForceClientIds)) {
+            //强制推送到多个client_id
+            foreach ($this->allowForceClientIds as $force_client_id) {
+                $client_id = $force_client_id;
+                $this->sendToClient($tabid, $client_id, $trace, $force_client_id);
+            }
+        } else {
+            $this->sendToClient($tabid, $client_id, $trace, '');
+        }
+
+        return true;
+    }
+
+    /**
+     * 发送给指定客户端
+     * @access protected
+     * @author Zjmainstay
+     * @param  $tabid
+     * @param  $client_id
+     * @param  $logs
+     * @param  $force_client_id
+     */
+    protected function sendToClient($tabid, $client_id, $logs, $force_client_id)
+    {
+        $logs = [
+            'tabid'           => $tabid,
+            'client_id'       => $client_id,
+            'logs'            => $logs,
+            'force_client_id' => $force_client_id,
+        ];
+
+        $msg     = @json_encode($logs);
+        $address = '/' . $client_id; //将client_id作为地址， server端通过地址判断将日志发布给谁
+
+        $this->send($this->config['host'], $msg, $address);
+    }
+
+    protected function check()
+    {
+        $tabid = $this->getClientArg('tabid');
+
+        //是否记录日志的检查
+        if (!$tabid && !$this->config['force_client_ids']) {
+            return false;
+        }
+
+        //用户认证
+        $allow_client_ids = $this->config['allow_client_ids'];
+
+        if (!empty($allow_client_ids)) {
+            //通过数组交集得出授权强制推送的client_id
+            $this->allowForceClientIds = array_intersect($allow_client_ids, $this->config['force_client_ids']);
+            if (!$tabid && count($this->allowForceClientIds)) {
+                return true;
+            }
+
+            $client_id = $this->getClientArg('client_id');
+            if (!in_array($client_id, $allow_client_ids)) {
+                return false;
+            }
+        } else {
+            $this->allowForceClientIds = $this->config['force_client_ids'];
+        }
+
+        return true;
+    }
+
+    protected function getClientArg($name)
+    {
+        static $args = [];
+
+        $key = 'HTTP_USER_AGENT';
+
+        if (isset($_SERVER['HTTP_SOCKETLOG'])) {
+            $key = 'HTTP_SOCKETLOG';
+        }
+
+        if (!isset($_SERVER[$key])) {
+            return;
+        }
+
+        if (empty($args)) {
+            if (!preg_match('/SocketLog\((.*?)\)/', $_SERVER[$key], $match)) {
+                $args = ['tabid' => null];
+                return;
+            }
+            parse_str($match[1], $args);
+        }
+
+        if (isset($args[$name])) {
+            return $args[$name];
+        }
+
+        return;
+    }
+
+    /**
+     * @access protected
+     * @param  string $host - $host of socket server
+     * @param  string $message - 发送的消息
+     * @param  string $address - 地址
+     * @return bool
+     */
+    protected function send($host, $message = '', $address = '/')
+    {
+        $url = 'http://' . $host . ':' . $this->port . $address;
+        $ch  = curl_init();
+
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $message);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+
+        $headers = [
+            "Content-Type: application/json;charset=UTF-8",
+        ];
+
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); //设置header
+
+        return curl_exec($ch);
+    }
+
+}
diff --git a/thinkphp/library/think/model/Collection.php b/thinkphp/library/think/model/Collection.php
new file mode 100644
index 0000000000000000000000000000000000000000..3a9b60f590586baee595960c665035f6b8477e4b
--- /dev/null
+++ b/thinkphp/library/think/model/Collection.php
@@ -0,0 +1,96 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: zhangyajun <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\model;
+
+use think\Collection as BaseCollection;
+use think\Model;
+
+class Collection extends BaseCollection
+{
+    /**
+     * 返回数组中指定的一列
+     * @access public
+     * @param  string        $column_key
+     * @param  string|null   $index_key
+     * @return array
+     */
+    public function column($column_key, $index_key = null)
+    {
+        return array_column($this->toArray(), $column_key, $index_key);
+    }
+
+    /**
+     * 延迟预载入关联查询
+     * @access public
+     * @param  mixed $relation 关联
+     * @return $this
+     */
+    public function load($relation)
+    {
+        $item = current($this->items);
+        $item->eagerlyResultSet($this->items, $relation);
+
+        return $this;
+    }
+
+    /**
+     * 设置需要隐藏的输出属性
+     * @access public
+     * @param  array $hidden   属性列表
+     * @param  bool  $override 是否覆盖
+     * @return $this
+     */
+    public function hidden($hidden = [], $override = false)
+    {
+        $this->each(function ($model) use ($hidden, $override) {
+            /** @var Model $model */
+            $model->hidden($hidden, $override);
+        });
+
+        return $this;
+    }
+
+    /**
+     * 设置需要输出的属性
+     * @access public
+     * @param  array $visible
+     * @param  bool  $override 是否覆盖
+     * @return $this
+     */
+    public function visible($visible = [], $override = false)
+    {
+        $this->each(function ($model) use ($visible, $override) {
+            /** @var Model $model */
+            $model->visible($visible, $override);
+        });
+
+        return $this;
+    }
+
+    /**
+     * 设置需要追加的输出属性
+     * @access public
+     * @param  array $append   属性列表
+     * @param  bool  $override 是否覆盖
+     * @return $this
+     */
+    public function append($append = [], $override = false)
+    {
+        $this->each(function ($model) use ($append, $override) {
+            /** @var Model $model */
+            $model && $model->append($append, $override);
+        });
+
+        return $this;
+    }
+
+}
diff --git a/thinkphp/library/think/model/Pivot.php b/thinkphp/library/think/model/Pivot.php
new file mode 100644
index 0000000000000000000000000000000000000000..a3a395e3fb267ac6ec93232e15be670aa0076931
--- /dev/null
+++ b/thinkphp/library/think/model/Pivot.php
@@ -0,0 +1,42 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model;
+
+use think\Model;
+
+class Pivot extends Model
+{
+
+    /** @var Model */
+    public $parent;
+
+    protected $autoWriteTimestamp = false;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  array|object  $data 数据
+     * @param  Model         $parent 上级模型
+     * @param  string        $table 中间数据表名
+     */
+    public function __construct($data = [], Model $parent = null, $table = '')
+    {
+        $this->parent = $parent;
+
+        if (is_null($this->name)) {
+            $this->name = $table;
+        }
+
+        parent::__construct($data);
+    }
+
+}
diff --git a/thinkphp/library/think/model/Relation.php b/thinkphp/library/think/model/Relation.php
new file mode 100644
index 0000000000000000000000000000000000000000..b969bca2aa1d8c2f01c76652ad53b725d5a50df0
--- /dev/null
+++ b/thinkphp/library/think/model/Relation.php
@@ -0,0 +1,164 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model;
+
+use think\db\Query;
+use think\Exception;
+use think\Model;
+
+/**
+ * Class Relation
+ * @package think\model
+ *
+ * @mixin Query
+ */
+abstract class Relation
+{
+    // 父模型对象
+    protected $parent;
+    /** @var  Model 当前关联的模型类 */
+    protected $model;
+    /** @var Query 关联模型查询对象 */
+    protected $query;
+    // 关联表外键
+    protected $foreignKey;
+    // 关联表主键
+    protected $localKey;
+    // 基础查询
+    protected $baseQuery;
+    // 是否为自关联
+    protected $selfRelation;
+
+    /**
+     * 获取关联的所属模型
+     * @access public
+     * @return Model
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * 获取当前的关联模型类的实例
+     * @access public
+     * @return Model
+     */
+    public function getModel()
+    {
+        return $this->query->getModel();
+    }
+
+    /**
+     * 设置当前关联为自关联
+     * @access public
+     * @param  bool $self 是否自关联
+     * @return $this
+     */
+    public function selfRelation($self = true)
+    {
+        $this->selfRelation = $self;
+        return $this;
+    }
+
+    /**
+     * 当前关联是否为自关联
+     * @access public
+     * @return bool
+     */
+    public function isSelfRelation()
+    {
+        return $this->selfRelation;
+    }
+
+    /**
+     * 封装关联数据集
+     * @access public
+     * @param  array $resultSet 数据集
+     * @return mixed
+     */
+    protected function resultSetBuild($resultSet)
+    {
+        return (new $this->model)->toCollection($resultSet);
+    }
+
+    protected function getQueryFields($model)
+    {
+        $fields = $this->query->getOptions('field');
+        return $this->getRelationQueryFields($fields, $model);
+    }
+
+    protected function getRelationQueryFields($fields, $model)
+    {
+        if ($fields) {
+
+            if (is_string($fields)) {
+                $fields = explode(',', $fields);
+            }
+
+            foreach ($fields as &$field) {
+                if (false === strpos($field, '.')) {
+                    $field = $model . '.' . $field;
+                }
+            }
+        } else {
+            $fields = $model . '.*';
+        }
+
+        return $fields;
+    }
+
+    protected function getQueryWhere(&$where, $relation)
+    {
+        foreach ($where as $key => $val) {
+            if (is_string($key)) {
+                $where[] = [false === strpos($key, '.') ? $relation . '.' . $key : $key, '=', $val];
+                unset($where[$key]);
+            }
+        }
+    }
+
+    /**
+     * 删除记录
+     * @access public
+     * @param  mixed $data 表达式 true 表示强制删除
+     * @return int
+     * @throws Exception
+     * @throws PDOException
+     */
+    public function delete($data = null)
+    {
+        return $this->query->delete($data);
+    }
+
+    /**
+     * 执行基础查询（仅执行一次）
+     * @access protected
+     * @return void
+     */
+    protected function baseQuery()
+    {}
+
+    public function __call($method, $args)
+    {
+        if ($this->query) {
+            // 执行基础查询
+            $this->baseQuery();
+
+            $result = call_user_func_array([$this->query->getModel(), $method], $args);
+
+            return $result === $this->query ? $this : $result;
+        } else {
+            throw new Exception('method not exists:' . __CLASS__ . '->' . $method);
+        }
+    }
+}
diff --git a/thinkphp/library/think/model/concern/Attribute.php b/thinkphp/library/think/model/concern/Attribute.php
new file mode 100644
index 0000000000000000000000000000000000000000..c65c557bb6b21c17bb0e1412744c46c208f7437b
--- /dev/null
+++ b/thinkphp/library/think/model/concern/Attribute.php
@@ -0,0 +1,586 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\concern;
+
+use InvalidArgumentException;
+use think\Exception;
+use think\Loader;
+use think\model\Relation;
+
+trait Attribute
+{
+    /**
+     * 数据表主键 复合主键使用数组定义
+     * @var string|array
+     */
+    protected $pk = 'id';
+
+    /**
+     * 数据表字段信息 留空则自动获取
+     * @var array
+     */
+    protected $field = [];
+
+    /**
+     * JSON数据表字段
+     * @var array
+     */
+    protected $json = [];
+
+    /**
+     * JSON数据取出是否需要转换为数组
+     * @var bool
+     */
+    protected $jsonAssoc = false;
+
+    /**
+     * JSON数据表字段类型
+     * @var array
+     */
+    protected $jsonType = [];
+
+    /**
+     * 数据表废弃字段
+     * @var array
+     */
+    protected $disuse = [];
+
+    /**
+     * 数据表只读字段
+     * @var array
+     */
+    protected $readonly = [];
+
+    /**
+     * 数据表字段类型
+     * @var array
+     */
+    protected $type = [];
+
+    /**
+     * 当前模型数据
+     * @var array
+     */
+    private $data = [];
+
+    /**
+     * 原始数据
+     * @var array
+     */
+    private $origin = [];
+
+    /**
+     * 获取模型对象的主键
+     * @access public
+     * @return string|array
+     */
+    public function getPk()
+    {
+        return $this->pk;
+    }
+
+    /**
+     * 判断一个字段名是否为主键字段
+     * @access public
+     * @param  string $key 名称
+     * @return bool
+     */
+    protected function isPk($key)
+    {
+        $pk = $this->getPk();
+        if (is_string($pk) && $pk == $key) {
+            return true;
+        } elseif (is_array($pk) && in_array($key, $pk)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 设置允许写入的字段
+     * @access public
+     * @param  array|string|true $field 允许写入的字段 如果为true只允许写入数据表字段
+     * @return $this
+     */
+    public function allowField($field)
+    {
+        if (is_string($field)) {
+            $field = explode(',', $field);
+        }
+
+        $this->field = $field;
+
+        return $this;
+    }
+
+    /**
+     * 设置只读字段
+     * @access public
+     * @param  array|string $field 只读字段
+     * @return $this
+     */
+    public function readonly($field)
+    {
+        if (is_string($field)) {
+            $field = explode(',', $field);
+        }
+
+        $this->readonly = $field;
+
+        return $this;
+    }
+
+    /**
+     * 设置数据对象值
+     * @access public
+     * @param  mixed $data  数据或者属性名
+     * @param  mixed $value 值
+     * @return $this
+     */
+    public function data($data, $value = null)
+    {
+        if (is_string($data)) {
+            $this->data[$data] = $value;
+            return $this;
+        }
+
+        // 清空数据
+        $this->data = [];
+
+        if (is_object($data)) {
+            $data = get_object_vars($data);
+        }
+
+        if ($this->disuse) {
+            // 废弃字段
+            foreach ((array) $this->disuse as $key) {
+                if (array_key_exists($key, $data)) {
+                    unset($data[$key]);
+                }
+            }
+        }
+
+        if (true === $value) {
+            // 数据对象赋值
+            foreach ($data as $key => $value) {
+                $this->setAttr($key, $value, $data);
+            }
+        } elseif (is_array($value)) {
+            foreach ($value as $name) {
+                if (isset($data[$name])) {
+                    $this->data[$name] = $data[$name];
+                }
+            }
+        } else {
+            $this->data = $data;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 批量设置数据对象值
+     * @access public
+     * @param  mixed $data  数据
+     * @param  bool  $set   是否需要进行数据处理
+     * @return $this
+     */
+    public function appendData($data, $set = false)
+    {
+        if ($set) {
+            // 进行数据处理
+            foreach ($data as $key => $value) {
+                $this->setAttr($key, $value, $data);
+            }
+        } else {
+            if (is_object($data)) {
+                $data = get_object_vars($data);
+            }
+
+            $this->data = array_merge($this->data, $data);
+        }
+
+        return $this;
+    }
+
+    /**
+     * 获取对象原始数据 如果不存在指定字段返回null
+     * @access public
+     * @param  string $name 字段名 留空获取全部
+     * @return mixed
+     */
+    public function getOrigin($name = null)
+    {
+        if (is_null($name)) {
+            return $this->origin;
+        }
+        return array_key_exists($name, $this->origin) ? $this->origin[$name] : null;
+    }
+
+    /**
+     * 获取对象原始数据 如果不存在指定字段返回false
+     * @access public
+     * @param  string $name 字段名 留空获取全部
+     * @return mixed
+     * @throws InvalidArgumentException
+     */
+    public function getData($name = null)
+    {
+        if (is_null($name)) {
+            return $this->data;
+        } elseif (array_key_exists($name, $this->data)) {
+            return $this->data[$name];
+        } elseif (array_key_exists($name, $this->relation)) {
+            return $this->relation[$name];
+        }
+        throw new InvalidArgumentException('property not exists:' . static::class . '->' . $name);
+    }
+
+    /**
+     * 获取变化的数据 并排除只读数据
+     * @access public
+     * @return array
+     */
+    public function getChangedData()
+    {
+        if ($this->force) {
+            $data = $this->data;
+        } else {
+            $data = array_udiff_assoc($this->data, $this->origin, function ($a, $b) {
+                if ((empty($a) || empty($b)) && $a !== $b) {
+                    return 1;
+                }
+
+                return is_object($a) || $a != $b ? 1 : 0;
+            });
+        }
+
+        if (!empty($this->readonly)) {
+            // 只读字段不允许更新
+            foreach ($this->readonly as $key => $field) {
+                if (isset($data[$field])) {
+                    unset($data[$field]);
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /**
+     * 修改器 设置数据对象值
+     * @access public
+     * @param  string $name  属性名
+     * @param  mixed  $value 属性值
+     * @param  array  $data  数据
+     * @return $this
+     */
+    public function setAttr($name, $value, $data = [])
+    {
+        if (is_null($value) && $this->autoWriteTimestamp && in_array($name, [$this->createTime, $this->updateTime])) {
+            // 自动写入的时间戳字段
+            $value = $this->autoWriteTimestamp($name);
+        } else {
+            // 检测修改器
+            $method = 'set' . Loader::parseName($name, 1) . 'Attr';
+
+            if (method_exists($this, $method)) {
+                $value = $this->$method($value, array_merge($this->data, $data));
+            } elseif (isset($this->type[$name])) {
+                // 类型转换
+                $value = $this->writeTransform($value, $this->type[$name]);
+            }
+        }
+
+        // 设置数据对象属性
+        $this->data[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * 是否需要自动写入时间字段
+     * @access public
+     * @param  bool $auto
+     * @return $this
+     */
+    public function isAutoWriteTimestamp($auto)
+    {
+        $this->autoWriteTimestamp = $auto;
+
+        return $this;
+    }
+
+    /**
+     * 自动写入时间戳
+     * @access protected
+     * @param  string $name 时间戳字段
+     * @return mixed
+     */
+    protected function autoWriteTimestamp($name)
+    {
+        if (isset($this->type[$name])) {
+            $type = $this->type[$name];
+
+            if (strpos($type, ':')) {
+                list($type, $param) = explode(':', $type, 2);
+            }
+
+            switch ($type) {
+                case 'datetime':
+                case 'date':
+                    $format = !empty($param) ? $param : $this->dateFormat;
+                    $value  = $this->formatDateTime(time(), $format);
+                    break;
+                case 'timestamp':
+                case 'integer':
+                default:
+                    $value = time();
+                    break;
+            }
+        } elseif (is_string($this->autoWriteTimestamp) && in_array(strtolower($this->autoWriteTimestamp), [
+            'datetime',
+            'date',
+            'timestamp',
+        ])) {
+            $value = $this->formatDateTime(time(), $this->dateFormat);
+        } else {
+            $value = $this->formatDateTime(time(), $this->dateFormat, true);
+        }
+
+        return $value;
+    }
+
+    /**
+     * 数据写入 类型转换
+     * @access protected
+     * @param  mixed        $value 值
+     * @param  string|array $type  要转换的类型
+     * @return mixed
+     */
+    protected function writeTransform($value, $type)
+    {
+        if (is_null($value)) {
+            return;
+        }
+
+        if (is_array($type)) {
+            list($type, $param) = $type;
+        } elseif (strpos($type, ':')) {
+            list($type, $param) = explode(':', $type, 2);
+        }
+
+        switch ($type) {
+            case 'integer':
+                $value = (int) $value;
+                break;
+            case 'float':
+                if (empty($param)) {
+                    $value = (float) $value;
+                } else {
+                    $value = (float) number_format($value, $param, '.', '');
+                }
+                break;
+            case 'boolean':
+                $value = (bool) $value;
+                break;
+            case 'timestamp':
+                if (!is_numeric($value)) {
+                    $value = strtotime($value);
+                }
+                break;
+            case 'datetime':
+                $format = !empty($param) ? $param : $this->dateFormat;
+                $value  = is_numeric($value) ? $value : strtotime($value);
+                $value  = $this->formatDateTime($value, $format);
+                break;
+            case 'object':
+                if (is_object($value)) {
+                    $value = json_encode($value, JSON_FORCE_OBJECT);
+                }
+                break;
+            case 'array':
+                $value = (array) $value;
+            case 'json':
+                $option = !empty($param) ? (int) $param : JSON_UNESCAPED_UNICODE;
+                $value  = json_encode($value, $option);
+                break;
+            case 'serialize':
+                $value = serialize($value);
+                break;
+        }
+
+        return $value;
+    }
+
+    /**
+     * 获取器 获取数据对象的值
+     * @access public
+     * @param  string $name 名称
+     * @param  array  $item 数据
+     * @return mixed
+     * @throws InvalidArgumentException
+     */
+    public function getAttr($name, &$item = null)
+    {
+        try {
+            $notFound = false;
+            $value    = $this->getData($name);
+        } catch (InvalidArgumentException $e) {
+            $notFound = true;
+            $value    = null;
+        }
+
+        // 检测属性获取器
+        $method = 'get' . Loader::parseName($name, 1) . 'Attr';
+
+        if (method_exists($this, $method)) {
+            if ($notFound && $relation = $this->isRelationAttr($name)) {
+                $modelRelation = $this->$relation();
+                $value         = $this->getRelationData($modelRelation);
+            }
+
+            $value = $this->$method($value, $this->data);
+        } elseif (isset($this->type[$name])) {
+            // 类型转换
+            $value = $this->readTransform($value, $this->type[$name]);
+        } elseif ($this->autoWriteTimestamp && in_array($name, [$this->createTime, $this->updateTime])) {
+            if (is_string($this->autoWriteTimestamp) && in_array(strtolower($this->autoWriteTimestamp), [
+                'datetime',
+                'date',
+                'timestamp',
+            ])) {
+                $value = $this->formatDateTime(strtotime($value), $this->dateFormat);
+            } else {
+                $value = $this->formatDateTime($value, $this->dateFormat);
+            }
+        } elseif ($notFound) {
+            $value = $this->getRelationAttribute($name, $item);
+        }
+
+        return $value;
+    }
+
+    /**
+     * 获取关联属性值
+     * @access protected
+     * @param  string   $name  属性名
+     * @param  array    $item  数据
+     * @return mixed
+     */
+    protected function getRelationAttribute($name, &$item)
+    {
+        $relation = $this->isRelationAttr($name);
+
+        if ($relation) {
+            $modelRelation = $this->$relation();
+            if ($modelRelation instanceof Relation) {
+                $value = $this->getRelationData($modelRelation);
+
+                if ($item && method_exists($modelRelation, 'getBindAttr') && $bindAttr = $modelRelation->getBindAttr()) {
+
+                    foreach ($bindAttr as $key => $attr) {
+                        $key = is_numeric($key) ? $attr : $key;
+
+                        if (isset($item[$key])) {
+                            throw new Exception('bind attr has exists:' . $key);
+                        } else {
+                            $item[$key] = $value ? $value->getAttr($attr) : null;
+                        }
+                    }
+
+                    return false;
+                }
+
+                // 保存关联对象值
+                $this->relation[$name] = $value;
+
+                return $value;
+            }
+        }
+
+        throw new InvalidArgumentException('property not exists:' . static::class . '->' . $name);
+    }
+
+    /**
+     * 数据读取 类型转换
+     * @access protected
+     * @param  mixed        $value 值
+     * @param  string|array $type  要转换的类型
+     * @return mixed
+     */
+    protected function readTransform($value, $type)
+    {
+        if (is_null($value)) {
+            return;
+        }
+
+        if (is_array($type)) {
+            list($type, $param) = $type;
+        } elseif (strpos($type, ':')) {
+            list($type, $param) = explode(':', $type, 2);
+        }
+
+        switch ($type) {
+            case 'integer':
+                $value = (int) $value;
+                break;
+            case 'float':
+                if (empty($param)) {
+                    $value = (float) $value;
+                } else {
+                    $value = (float) number_format($value, $param, '.', '');
+                }
+                break;
+            case 'boolean':
+                $value = (bool) $value;
+                break;
+            case 'timestamp':
+                if (!is_null($value)) {
+                    $format = !empty($param) ? $param : $this->dateFormat;
+                    $value  = $this->formatDateTime($value, $format);
+                }
+                break;
+            case 'datetime':
+                if (!is_null($value)) {
+                    $format = !empty($param) ? $param : $this->dateFormat;
+                    $value  = $this->formatDateTime(strtotime($value), $format);
+                }
+                break;
+            case 'json':
+                $value = json_decode($value, true);
+                break;
+            case 'array':
+                $value = empty($value) ? [] : json_decode($value, true);
+                break;
+            case 'object':
+                $value = empty($value) ? new \stdClass() : json_decode($value);
+                break;
+            case 'serialize':
+                try {
+                    $value = unserialize($value);
+                } catch (\Exception $e) {
+                    $value = null;
+                }
+                break;
+            default:
+                if (false !== strpos($type, '\\')) {
+                    // 对象类型
+                    $value = new $type($value);
+                }
+        }
+
+        return $value;
+    }
+
+}
diff --git a/thinkphp/library/think/model/concern/Conversion.php b/thinkphp/library/think/model/concern/Conversion.php
new file mode 100644
index 0000000000000000000000000000000000000000..b88528adbc584a47bbd5bcb12f9e95bbff6a1bd2
--- /dev/null
+++ b/thinkphp/library/think/model/concern/Conversion.php
@@ -0,0 +1,288 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\concern;
+
+use think\Collection;
+use think\Exception;
+use think\Loader;
+use think\Model;
+use think\model\Collection as ModelCollection;
+
+/**
+ * 模型数据转换处理
+ */
+trait Conversion
+{
+    /**
+     * 数据输出显示的属性
+     * @var array
+     */
+    protected $visible = [];
+
+    /**
+     * 数据输出隐藏的属性
+     * @var array
+     */
+    protected $hidden = [];
+
+    /**
+     * 数据输出需要追加的属性
+     * @var array
+     */
+    protected $append = [];
+
+    /**
+     * 数据集对象名
+     * @var string
+     */
+    protected $resultSetType;
+
+    /**
+     * 设置需要附加的输出属性
+     * @access public
+     * @param  array $append   属性列表
+     * @param  bool  $override 是否覆盖
+     * @return $this
+     */
+    public function append(array $append = [], $override = false)
+    {
+        $this->append = $override ? $append : array_merge($this->append, $append);
+
+        return $this;
+    }
+
+    /**
+     * 设置附加关联对象的属性
+     * @access public
+     * @param  string       $attr    关联属性
+     * @param  string|array $append  追加属性名
+     * @return $this
+     * @throws Exception
+     */
+    public function appendRelationAttr($attr, $append)
+    {
+        if (is_string($append)) {
+            $append = explode(',', $append);
+        }
+
+        $relation = Loader::parseName($attr, 1, false);
+        if (isset($this->relation[$relation])) {
+            $model = $this->relation[$relation];
+        } else {
+            $model = $this->getRelationData($this->$relation());
+        }
+
+        if ($model instanceof Model) {
+            foreach ($append as $key => $attr) {
+                $key = is_numeric($key) ? $attr : $key;
+                if (isset($this->data[$key])) {
+                    throw new Exception('bind attr has exists:' . $key);
+                } else {
+                    $this->data[$key] = $model->$attr;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 设置需要隐藏的输出属性
+     * @access public
+     * @param  array $hidden   属性列表
+     * @param  bool  $override 是否覆盖
+     * @return $this
+     */
+    public function hidden(array $hidden = [], $override = false)
+    {
+        $this->hidden = $override ? $hidden : array_merge($this->hidden, $hidden);
+
+        return $this;
+    }
+
+    /**
+     * 设置需要输出的属性
+     * @access public
+     * @param  array $visible
+     * @param  bool  $override 是否覆盖
+     * @return $this
+     */
+    public function visible(array $visible = [], $override = false)
+    {
+        $this->visible = $override ? $visible : array_merge($this->visible, $visible);
+
+        return $this;
+    }
+
+    /**
+     * 转换当前模型对象为数组
+     * @access public
+     * @return array
+     */
+    public function toArray()
+    {
+        $item    = [];
+        $visible = [];
+        $hidden  = [];
+
+        // 合并关联数据
+        $data = array_merge($this->data, $this->relation);
+
+        // 过滤属性
+        if (!empty($this->visible)) {
+            $array = $this->parseAttr($this->visible, $visible);
+            $data  = array_intersect_key($data, array_flip($array));
+        } elseif (!empty($this->hidden)) {
+            $array = $this->parseAttr($this->hidden, $hidden, false);
+            $data  = array_diff_key($data, array_flip($array));
+        }
+
+        foreach ($data as $key => $val) {
+            if ($val instanceof Model || $val instanceof ModelCollection) {
+                // 关联模型对象
+                if (isset($visible[$key])) {
+                    $val->visible($visible[$key]);
+                } elseif (isset($hidden[$key])) {
+                    $val->hidden($hidden[$key]);
+                }
+                // 关联模型对象
+                $item[$key] = $val->toArray();
+            } else {
+                // 模型属性
+                $item[$key] = $this->getAttr($key);
+            }
+        }
+
+        // 追加属性（必须定义获取器）
+        if (!empty($this->append)) {
+            foreach ($this->append as $key => $name) {
+                if (is_array($name)) {
+                    // 追加关联对象属性
+                    $relation = $this->getRelation($key);
+
+                    if (!$relation) {
+                        $relation = $this->getAttr($key);
+                        $relation->visible($name);
+                    }
+
+                    $item[$key] = $relation->append($name)->toArray();
+                } elseif (strpos($name, '.')) {
+                    list($key, $attr) = explode('.', $name);
+                    // 追加关联对象属性
+                    $relation = $this->getRelation($key);
+
+                    if (!$relation) {
+                        $relation = $this->getAttr($key);
+                        $relation->visible([$attr]);
+                    }
+
+                    $item[$key] = $relation->append([$attr])->toArray();
+                } else {
+                    $value = $this->getAttr($name, $item);
+                    if (false !== $value) {
+                        $item[$name] = $value;
+                    }
+                }
+            }
+        }
+
+        return $item;
+    }
+
+    /**
+     * 转换当前模型对象为JSON字符串
+     * @access public
+     * @param  integer $options json参数
+     * @return string
+     */
+    public function toJson($options = JSON_UNESCAPED_UNICODE)
+    {
+        return json_encode($this->toArray(), $options);
+    }
+
+    /**
+     * 移除当前模型的关联属性
+     * @access public
+     * @return $this
+     */
+    public function removeRelation()
+    {
+        $this->relation = [];
+        return $this;
+    }
+
+    public function __toString()
+    {
+        return $this->toJson();
+    }
+
+    // JsonSerializable
+    public function jsonSerialize()
+    {
+        return $this->toArray();
+    }
+
+    /**
+     * 转换数据集为数据集对象
+     * @access public
+     * @param  array|Collection $collection 数据集
+     * @param  string           $resultSetType 数据集类
+     * @return Collection
+     */
+    public function toCollection($collection, $resultSetType = null)
+    {
+        $resultSetType = $resultSetType ?: $this->resultSetType;
+
+        if ($resultSetType && false !== strpos($resultSetType, '\\')) {
+            $collection = new $resultSetType($collection);
+        } else {
+            $collection = new ModelCollection($collection);
+        }
+
+        return $collection;
+    }
+
+    /**
+     * 解析隐藏及显示属性
+     * @access protected
+     * @param  array $attrs  属性
+     * @param  array $result 结果集
+     * @param  bool  $visible
+     * @return array
+     */
+    protected function parseAttr($attrs, &$result, $visible = true)
+    {
+        $array = [];
+
+        foreach ($attrs as $key => $val) {
+            if (is_array($val)) {
+                if ($visible) {
+                    $array[] = $key;
+                }
+
+                $result[$key] = $val;
+            } elseif (strpos($val, '.')) {
+                list($key, $name) = explode('.', $val);
+
+                if ($visible) {
+                    $array[] = $key;
+                }
+
+                $result[$key][] = $name;
+            } else {
+                $array[] = $val;
+            }
+        }
+
+        return $array;
+    }
+}
diff --git a/thinkphp/library/think/model/concern/ModelEvent.php b/thinkphp/library/think/model/concern/ModelEvent.php
new file mode 100644
index 0000000000000000000000000000000000000000..2bb6d5fe0619ac18136fb7c7c8d5d8f60fb21386
--- /dev/null
+++ b/thinkphp/library/think/model/concern/ModelEvent.php
@@ -0,0 +1,236 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\concern;
+
+use think\Container;
+use think\Loader;
+
+/**
+ * 模型事件处理
+ */
+trait ModelEvent
+{
+    /**
+     * 模型回调
+     * @var array
+     */
+    private static $event = [];
+
+    /**
+     * 模型事件观察
+     * @var array
+     */
+    protected static $observe = ['before_write', 'after_write', 'before_insert', 'after_insert', 'before_update', 'after_update', 'before_delete', 'after_delete', 'before_restore', 'after_restore'];
+
+    /**
+     * 绑定模型事件观察者类
+     * @var array
+     */
+    protected $observerClass;
+
+    /**
+     * 是否需要事件响应
+     * @var bool
+     */
+    private $withEvent = true;
+
+    /**
+     * 注册回调方法
+     * @access public
+     * @param  string   $event    事件名
+     * @param  callable $callback 回调方法
+     * @param  bool     $override 是否覆盖
+     * @return void
+     */
+    public static function event($event, $callback, $override = false)
+    {
+        $class = static::class;
+
+        if ($override) {
+            self::$event[$class][$event] = [];
+        }
+
+        self::$event[$class][$event][] = $callback;
+    }
+
+    /**
+     * 清除回调方法
+     * @access public
+     * @return void
+     */
+    public static function flushEvent()
+    {
+        self::$event[static::class] = [];
+    }
+
+    /**
+     * 注册一个模型观察者
+     *
+     * @param  object|string  $class
+     * @return void
+     */
+    public static function observe($class)
+    {
+        foreach (static::$observe as $event) {
+            $eventFuncName = Loader::parseName($event, 1, false);
+
+            if (method_exists($class, $eventFuncName)) {
+                static::event($event, [$class, $eventFuncName]);
+            }
+        }
+    }
+
+    /**
+     * 当前操作的事件响应
+     * @access protected
+     * @param  bool $event  是否需要事件响应
+     * @return $this
+     */
+    public function withEvent($event)
+    {
+        $this->withEvent = $event;
+        return $this;
+    }
+
+    /**
+     * 触发事件
+     * @access protected
+     * @param  string $event  事件名
+     * @return bool
+     */
+    protected function trigger($event)
+    {
+        $class = static::class;
+
+        if ($this->withEvent && isset(self::$event[$class][$event])) {
+            foreach (self::$event[$class][$event] as $callback) {
+                $result = Container::getInstance()->invoke($callback, [$this]);
+
+                if (false === $result) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 模型before_insert事件快捷方法
+     * @access protected
+     * @param callable  $callback
+     * @param bool      $override
+     */
+    protected static function beforeInsert($callback, $override = false)
+    {
+        self::event('before_insert', $callback, $override);
+    }
+
+    /**
+     * 模型after_insert事件快捷方法
+     * @access protected
+     * @param callable  $callback
+     * @param bool      $override
+     */
+    protected static function afterInsert($callback, $override = false)
+    {
+        self::event('after_insert', $callback, $override);
+    }
+
+    /**
+     * 模型before_update事件快捷方法
+     * @access protected
+     * @param callable  $callback
+     * @param bool      $override
+     */
+    protected static function beforeUpdate($callback, $override = false)
+    {
+        self::event('before_update', $callback, $override);
+    }
+
+    /**
+     * 模型after_update事件快捷方法
+     * @access protected
+     * @param callable  $callback
+     * @param bool      $override
+     */
+    protected static function afterUpdate($callback, $override = false)
+    {
+        self::event('after_update', $callback, $override);
+    }
+
+    /**
+     * 模型before_write事件快捷方法
+     * @access protected
+     * @param callable  $callback
+     * @param bool      $override
+     */
+    protected static function beforeWrite($callback, $override = false)
+    {
+        self::event('before_write', $callback, $override);
+    }
+
+    /**
+     * 模型after_write事件快捷方法
+     * @access protected
+     * @param callable  $callback
+     * @param bool      $override
+     */
+    protected static function afterWrite($callback, $override = false)
+    {
+        self::event('after_write', $callback, $override);
+    }
+
+    /**
+     * 模型before_delete事件快捷方法
+     * @access protected
+     * @param callable  $callback
+     * @param bool      $override
+     */
+    protected static function beforeDelete($callback, $override = false)
+    {
+        self::event('before_delete', $callback, $override);
+    }
+
+    /**
+     * 模型after_delete事件快捷方法
+     * @access protected
+     * @param callable  $callback
+     * @param bool      $override
+     */
+    protected static function afterDelete($callback, $override = false)
+    {
+        self::event('after_delete', $callback, $override);
+    }
+
+    /**
+     * 模型before_restore事件快捷方法
+     * @access protected
+     * @param callable  $callback
+     * @param bool      $override
+     */
+    protected static function beforeRestore($callback, $override = false)
+    {
+        self::event('before_restore', $callback, $override);
+    }
+
+    /**
+     * 模型after_restore事件快捷方法
+     * @access protected
+     * @param callable  $callback
+     * @param bool      $override
+     */
+    protected static function afterRestore($callback, $override = false)
+    {
+        self::event('after_restore', $callback, $override);
+    }
+}
diff --git a/thinkphp/library/think/model/concern/RelationShip.php b/thinkphp/library/think/model/concern/RelationShip.php
new file mode 100644
index 0000000000000000000000000000000000000000..2c993bd2013411b5089f1700c779bf1a7e275641
--- /dev/null
+++ b/thinkphp/library/think/model/concern/RelationShip.php
@@ -0,0 +1,643 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\concern;
+
+use think\Collection;
+use think\db\Query;
+use think\Loader;
+use think\Model;
+use think\model\Relation;
+use think\model\relation\BelongsTo;
+use think\model\relation\BelongsToMany;
+use think\model\relation\HasMany;
+use think\model\relation\HasManyThrough;
+use think\model\relation\HasOne;
+use think\model\relation\MorphMany;
+use think\model\relation\MorphOne;
+use think\model\relation\MorphTo;
+
+/**
+ * 模型关联处理
+ */
+trait RelationShip
+{
+    /**
+     * 父关联模型对象
+     * @var object
+     */
+    private $parent;
+
+    /**
+     * 模型关联数据
+     * @var array
+     */
+    private $relation = [];
+
+    /**
+     * 关联写入定义信息
+     * @var array
+     */
+    private $together;
+
+    /**
+     * 关联自动写入信息
+     * @var array
+     */
+    protected $relationWrite;
+
+    /**
+     * 设置父关联对象
+     * @access public
+     * @param  Model $model  模型对象
+     * @return $this
+     */
+    public function setParent($model)
+    {
+        $this->parent = $model;
+
+        return $this;
+    }
+
+    /**
+     * 获取父关联对象
+     * @access public
+     * @return Model
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * 获取当前模型的关联模型数据
+     * @access public
+     * @param  string $name 关联方法名
+     * @return mixed
+     */
+    public function getRelation($name = null)
+    {
+        if (is_null($name)) {
+            return $this->relation;
+        } elseif (array_key_exists($name, $this->relation)) {
+            return $this->relation[$name];
+        }
+        return;
+    }
+
+    /**
+     * 设置关联数据对象值
+     * @access public
+     * @param  string $name  属性名
+     * @param  mixed  $value 属性值
+     * @param  array  $data  数据
+     * @return $this
+     */
+    public function setRelation($name, $value, $data = [])
+    {
+        // 检测修改器
+        $method = 'set' . Loader::parseName($name, 1) . 'Attr';
+
+        if (method_exists($this, $method)) {
+            $value = $this->$method($value, array_merge($this->data, $data));
+        }
+
+        $this->relation[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * 关联数据写入
+     * @access public
+     * @param  array|string $relation 关联
+     * @return $this
+     */
+    public function together($relation)
+    {
+        if (is_string($relation)) {
+            $relation = explode(',', $relation);
+        }
+
+        $this->together = $relation;
+
+        $this->checkAutoRelationWrite();
+
+        return $this;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  string  $relation 关联方法名
+     * @param  mixed   $operator 比较操作符
+     * @param  integer $count    个数
+     * @param  string  $id       关联表的统计字段
+     * @param  string  $joinType JOIN类型
+     * @return Query
+     */
+    public static function has($relation, $operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
+    {
+        $relation = (new static())->$relation();
+
+        if (is_array($operator) || $operator instanceof \Closure) {
+            return $relation->hasWhere($operator);
+        }
+
+        return $relation->has($operator, $count, $id, $joinType);
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  string $relation 关联方法名
+     * @param  mixed  $where    查询条件（数组或者闭包）
+     * @param  mixed  $fields   字段
+     * @return Query
+     */
+    public static function hasWhere($relation, $where = [], $fields = '*')
+    {
+        return (new static())->$relation()->hasWhere($where, $fields);
+    }
+
+    /**
+     * 查询当前模型的关联数据
+     * @access public
+     * @param  string|array $relations 关联名
+     * @return $this
+     */
+    public function relationQuery($relations)
+    {
+        if (is_string($relations)) {
+            $relations = explode(',', $relations);
+        }
+
+        foreach ($relations as $key => $relation) {
+            $subRelation = '';
+            $closure     = null;
+
+            if ($relation instanceof \Closure) {
+                // 支持闭包查询过滤关联条件
+                $closure  = $relation;
+                $relation = $key;
+            }
+
+            if (is_array($relation)) {
+                $subRelation = $relation;
+                $relation    = $key;
+            } elseif (strpos($relation, '.')) {
+                list($relation, $subRelation) = explode('.', $relation, 2);
+            }
+
+            $method = Loader::parseName($relation, 1, false);
+
+            $this->relation[$relation] = $this->$method()->getRelation($subRelation, $closure);
+        }
+
+        return $this;
+    }
+
+    /**
+     * 预载入关联查询 返回数据集
+     * @access public
+     * @param  array  $resultSet 数据集
+     * @param  string $relation  关联名
+     * @return array
+     */
+    public function eagerlyResultSet(&$resultSet, $relation)
+    {
+        $relations = is_string($relation) ? explode(',', $relation) : $relation;
+
+        foreach ($relations as $key => $relation) {
+            $subRelation = '';
+            $closure     = false;
+
+            if ($relation instanceof \Closure) {
+                $closure  = $relation;
+                $relation = $key;
+            }
+
+            if (is_array($relation)) {
+                $subRelation = $relation;
+                $relation    = $key;
+            } elseif (strpos($relation, '.')) {
+                list($relation, $subRelation) = explode('.', $relation, 2);
+            }
+
+            $relation = Loader::parseName($relation, 1, false);
+
+            $this->$relation()->eagerlyResultSet($resultSet, $relation, $subRelation, $closure);
+        }
+    }
+
+    /**
+     * 预载入关联查询 返回模型对象
+     * @access public
+     * @param  Model  $result   数据对象
+     * @param  string $relation 关联名
+     * @return Model
+     */
+    public function eagerlyResult(&$result, $relation)
+    {
+        $relations = is_string($relation) ? explode(',', $relation) : $relation;
+
+        foreach ($relations as $key => $relation) {
+            $subRelation = '';
+            $closure     = false;
+
+            if ($relation instanceof \Closure) {
+                $closure  = $relation;
+                $relation = $key;
+            }
+
+            if (is_array($relation)) {
+                $subRelation = $relation;
+                $relation    = $key;
+            } elseif (strpos($relation, '.')) {
+                list($relation, $subRelation) = explode('.', $relation, 2);
+            }
+
+            $relation = Loader::parseName($relation, 1, false);
+
+            $this->$relation()->eagerlyResult($result, $relation, $subRelation, $closure);
+        }
+    }
+
+    /**
+     * 关联统计
+     * @access public
+     * @param  Model    $result     数据对象
+     * @param  array    $relations  关联名
+     * @param  string   $aggregate  聚合查询方法
+     * @param  string   $field      字段
+     * @return void
+     */
+    public function relationCount(&$result, $relations, $aggregate = 'sum', $field = '*')
+    {
+        foreach ($relations as $key => $relation) {
+            $closure = false;
+
+            if ($relation instanceof \Closure) {
+                $closure  = $relation;
+                $relation = $key;
+            } elseif (is_string($key)) {
+                $name     = $relation;
+                $relation = $key;
+            }
+
+            $relation = Loader::parseName($relation, 1, false);
+            $count    = $this->$relation()->relationCount($result, $closure, $aggregate, $field);
+
+            if (!isset($name)) {
+                $name = Loader::parseName($relation) . '_' . $aggregate;
+            }
+
+            $result->setAttr($name, $count);
+        }
+    }
+
+    /**
+     * HAS ONE 关联定义
+     * @access public
+     * @param  string $model      模型名
+     * @param  string $foreignKey 关联外键
+     * @param  string $localKey   当前主键
+     * @return HasOne
+     */
+    public function hasOne($model, $foreignKey = '', $localKey = '')
+    {
+        // 记录当前关联信息
+        $model      = $this->parseModel($model);
+        $localKey   = $localKey ?: $this->getPk();
+        $foreignKey = $foreignKey ?: $this->getForeignKey($this->name);
+
+        return new HasOne($this, $model, $foreignKey, $localKey);
+    }
+
+    /**
+     * BELONGS TO 关联定义
+     * @access public
+     * @param  string $model      模型名
+     * @param  string $foreignKey 关联外键
+     * @param  string $localKey   关联主键
+     * @return BelongsTo
+     */
+    public function belongsTo($model, $foreignKey = '', $localKey = '')
+    {
+        // 记录当前关联信息
+        $model      = $this->parseModel($model);
+        $foreignKey = $foreignKey ?: $this->getForeignKey((new $model)->getName());
+        $localKey   = $localKey ?: (new $model)->getPk();
+        $trace      = debug_backtrace(false, 2);
+        $relation   = Loader::parseName($trace[1]['function']);
+
+        return new BelongsTo($this, $model, $foreignKey, $localKey, $relation);
+    }
+
+    /**
+     * HAS MANY 关联定义
+     * @access public
+     * @param  string $model      模型名
+     * @param  string $foreignKey 关联外键
+     * @param  string $localKey   当前主键
+     * @return HasMany
+     */
+    public function hasMany($model, $foreignKey = '', $localKey = '')
+    {
+        // 记录当前关联信息
+        $model      = $this->parseModel($model);
+        $localKey   = $localKey ?: $this->getPk();
+        $foreignKey = $foreignKey ?: $this->getForeignKey($this->name);
+
+        return new HasMany($this, $model, $foreignKey, $localKey);
+    }
+
+    /**
+     * HAS MANY 远程关联定义
+     * @access public
+     * @param  string $model      模型名
+     * @param  string $through    中间模型名
+     * @param  string $foreignKey 关联外键
+     * @param  string $throughKey 关联外键
+     * @param  string $localKey   当前主键
+     * @return HasManyThrough
+     */
+    public function hasManyThrough($model, $through, $foreignKey = '', $throughKey = '', $localKey = '')
+    {
+        // 记录当前关联信息
+        $model      = $this->parseModel($model);
+        $through    = $this->parseModel($through);
+        $localKey   = $localKey ?: $this->getPk();
+        $foreignKey = $foreignKey ?: $this->getForeignKey($this->name);
+        $throughKey = $throughKey ?: $this->getForeignKey((new $through)->getName());
+
+        return new HasManyThrough($this, $model, $through, $foreignKey, $throughKey, $localKey);
+    }
+
+    /**
+     * BELONGS TO MANY 关联定义
+     * @access public
+     * @param  string $model      模型名
+     * @param  string $table      中间表名
+     * @param  string $foreignKey 关联外键
+     * @param  string $localKey   当前模型关联键
+     * @return BelongsToMany
+     */
+    public function belongsToMany($model, $table = '', $foreignKey = '', $localKey = '')
+    {
+        // 记录当前关联信息
+        $model      = $this->parseModel($model);
+        $name       = Loader::parseName(basename(str_replace('\\', '/', $model)));
+        $table      = $table ?: Loader::parseName($this->name) . '_' . $name;
+        $foreignKey = $foreignKey ?: $name . '_id';
+        $localKey   = $localKey ?: $this->getForeignKey($this->name);
+
+        return new BelongsToMany($this, $model, $table, $foreignKey, $localKey);
+    }
+
+    /**
+     * MORPH  One 关联定义
+     * @access public
+     * @param  string       $model 模型名
+     * @param  string|array $morph 多态字段信息
+     * @param  string       $type  多态类型
+     * @return MorphOne
+     */
+    public function morphOne($model, $morph = null, $type = '')
+    {
+        // 记录当前关联信息
+        $model = $this->parseModel($model);
+
+        if (is_null($morph)) {
+            $trace = debug_backtrace(false, 2);
+            $morph = Loader::parseName($trace[1]['function']);
+        }
+
+        if (is_array($morph)) {
+            list($morphType, $foreignKey) = $morph;
+        } else {
+            $morphType  = $morph . '_type';
+            $foreignKey = $morph . '_id';
+        }
+
+        $type = $type ?: get_class($this);
+
+        return new MorphOne($this, $model, $foreignKey, $morphType, $type);
+    }
+
+    /**
+     * MORPH  MANY 关联定义
+     * @access public
+     * @param  string       $model 模型名
+     * @param  string|array $morph 多态字段信息
+     * @param  string       $type  多态类型
+     * @return MorphMany
+     */
+    public function morphMany($model, $morph = null, $type = '')
+    {
+        // 记录当前关联信息
+        $model = $this->parseModel($model);
+
+        if (is_null($morph)) {
+            $trace = debug_backtrace(false, 2);
+            $morph = Loader::parseName($trace[1]['function']);
+        }
+
+        $type = $type ?: get_class($this);
+
+        if (is_array($morph)) {
+            list($morphType, $foreignKey) = $morph;
+        } else {
+            $morphType  = $morph . '_type';
+            $foreignKey = $morph . '_id';
+        }
+
+        return new MorphMany($this, $model, $foreignKey, $morphType, $type);
+    }
+
+    /**
+     * MORPH TO 关联定义
+     * @access public
+     * @param  string|array $morph 多态字段信息
+     * @param  array        $alias 多态别名定义
+     * @return MorphTo
+     */
+    public function morphTo($morph = null, $alias = [])
+    {
+        $trace    = debug_backtrace(false, 2);
+        $relation = Loader::parseName($trace[1]['function']);
+
+        if (is_null($morph)) {
+            $morph = $relation;
+        }
+
+        // 记录当前关联信息
+        if (is_array($morph)) {
+            list($morphType, $foreignKey) = $morph;
+        } else {
+            $morphType  = $morph . '_type';
+            $foreignKey = $morph . '_id';
+        }
+
+        return new MorphTo($this, $morphType, $foreignKey, $alias, $relation);
+    }
+
+    /**
+     * 解析模型的完整命名空间
+     * @access protected
+     * @param  string $model 模型名（或者完整类名）
+     * @return string
+     */
+    protected function parseModel($model)
+    {
+        if (false === strpos($model, '\\')) {
+            $path = explode('\\', static::class);
+            array_pop($path);
+            array_push($path, Loader::parseName($model, 1));
+            $model = implode('\\', $path);
+        }
+
+        return $model;
+    }
+
+    /**
+     * 获取模型的默认外键名
+     * @access protected
+     * @param  string $name 模型名
+     * @return string
+     */
+    protected function getForeignKey($name)
+    {
+        if (strpos($name, '\\')) {
+            $name = basename(str_replace('\\', '/', $name));
+        }
+
+        return Loader::parseName($name) . '_id';
+    }
+
+    /**
+     * 检查属性是否为关联属性 如果是则返回关联方法名
+     * @access protected
+     * @param  string $attr 关联属性名
+     * @return string|false
+     */
+    protected function isRelationAttr($attr)
+    {
+        $relation = Loader::parseName($attr, 1, false);
+
+        if (method_exists($this, $relation)) {
+            return $relation;
+        }
+
+        return false;
+    }
+
+    /**
+     * 智能获取关联模型数据
+     * @access protected
+     * @param  Relation  $modelRelation 模型关联对象
+     * @return mixed
+     */
+    protected function getRelationData(Relation $modelRelation)
+    {
+        if ($this->parent && !$modelRelation->isSelfRelation() && get_class($this->parent) == get_class($modelRelation->getModel())) {
+            $value = $this->parent;
+        } else {
+            // 获取关联数据
+            $value = $modelRelation->getRelation();
+        }
+
+        return $value;
+    }
+
+    /**
+     * 关联数据自动写入检查
+     * @access protected
+     * @return void
+     */
+    protected function checkAutoRelationWrite()
+    {
+        foreach ($this->together as $key => $name) {
+            if (is_array($name)) {
+                if (key($name) === 0) {
+                    $this->relationWrite[$key] = [];
+                    // 绑定关联属性
+                    foreach ((array) $name as $val) {
+                        if (isset($this->data[$val])) {
+                            $this->relationWrite[$key][$val] = $this->data[$val];
+                        }
+                    }
+                } else {
+                    // 直接传入关联数据
+                    $this->relationWrite[$key] = $name;
+                }
+            } elseif (isset($this->relation[$name])) {
+                $this->relationWrite[$name] = $this->relation[$name];
+            } elseif (isset($this->data[$name])) {
+                $this->relationWrite[$name] = $this->data[$name];
+                unset($this->data[$name]);
+            }
+        }
+    }
+
+    /**
+     * 自动关联数据更新（针对一对一关联）
+     * @access protected
+     * @return void
+     */
+    protected function autoRelationUpdate()
+    {
+        foreach ($this->relationWrite as $name => $val) {
+            if ($val instanceof Model) {
+                $val->isUpdate()->save();
+            } else {
+                $model = $this->getRelation($name);
+                if ($model instanceof Model) {
+                    $model->isUpdate()->save($val);
+                }
+            }
+        }
+    }
+
+    /**
+     * 自动关联数据写入（针对一对一关联）
+     * @access protected
+     * @return void
+     */
+    protected function autoRelationInsert()
+    {
+        foreach ($this->relationWrite as $name => $val) {
+            $method = Loader::parseName($name, 1, false);
+            $this->$method()->save($val);
+        }
+    }
+
+    /**
+     * 自动关联数据删除（支持一对一及一对多关联）
+     * @access protected
+     * @return void
+     */
+    protected function autoRelationDelete()
+    {
+        foreach ($this->relationWrite as $key => $name) {
+            $name   = is_numeric($key) ? $name : $key;
+            $result = $this->getRelation($name);
+
+            if ($result instanceof Model) {
+                $result->delete();
+            } elseif ($result instanceof Collection) {
+                foreach ($result as $model) {
+                    $model->delete();
+                }
+            }
+        }
+    }
+}
diff --git a/thinkphp/library/think/model/concern/SoftDelete.php b/thinkphp/library/think/model/concern/SoftDelete.php
new file mode 100644
index 0000000000000000000000000000000000000000..7ba0324321922d8ab0b63f94c4e9bafd525ddeb3
--- /dev/null
+++ b/thinkphp/library/think/model/concern/SoftDelete.php
@@ -0,0 +1,240 @@
+<?php
+
+namespace think\model\concern;
+
+use think\db\Query;
+
+/**
+ * 数据软删除
+ */
+trait SoftDelete
+{
+
+    /**
+     * 是否包含软删除数据
+     * @var bool
+     */
+    protected $withTrashed = false;
+
+    /**
+     * 判断当前实例是否被软删除
+     * @access public
+     * @return boolean
+     */
+    public function trashed()
+    {
+        $field = $this->getDeleteTimeField();
+
+        if ($field && !empty($this->getOrigin($field))) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 查询软删除数据
+     * @access public
+     * @return Query
+     */
+    public static function withTrashed()
+    {
+        $model = new static();
+
+        return $model->withTrashedData(true)->db(false);
+    }
+
+    /**
+     * 是否包含软删除数据
+     * @access protected
+     * @param  bool $withTrashed 是否包含软删除数据
+     * @return $this
+     */
+    protected function withTrashedData($withTrashed)
+    {
+        $this->withTrashed = $withTrashed;
+        return $this;
+    }
+
+    /**
+     * 只查询软删除数据
+     * @access public
+     * @return Query
+     */
+    public static function onlyTrashed()
+    {
+        $model = new static();
+        $field = $model->getDeleteTimeField(true);
+
+        if ($field) {
+            return $model
+                ->db(false)
+                ->useSoftDelete($field, $model->getWithTrashedExp());
+        }
+
+        return $model->db(false);
+    }
+
+    /**
+     * 获取软删除数据的查询条件
+     * @access protected
+     * @return array
+     */
+    protected function getWithTrashedExp()
+    {
+        return is_null($this->defaultSoftDelete) ?
+        ['notnull', ''] : ['<>', $this->defaultSoftDelete];
+    }
+
+    /**
+     * 删除当前的记录
+     * @access public
+     * @return bool
+     */
+    public function delete($force = false)
+    {
+        if (!$this->isExists() || false === $this->trigger('before_delete', $this)) {
+            return false;
+        }
+
+        $name = $this->getDeleteTimeField();
+
+        if ($name && !$force) {
+            // 软删除
+            $this->data($name, $this->autoWriteTimestamp($name));
+
+            $result = $this->isUpdate()->withEvent(false)->save();
+
+            $this->withEvent(true);
+        } else {
+            // 读取更新条件
+            $where = $this->getWhere();
+
+            // 删除当前模型数据
+            $result = $this->db(false)
+                ->where($where)
+                ->removeOption('soft_delete')
+                ->delete();
+        }
+
+        // 关联删除
+        if (!empty($this->relationWrite)) {
+            $this->autoRelationDelete();
+        }
+
+        $this->trigger('after_delete', $this);
+
+        $this->exists(false);
+
+        return true;
+    }
+
+    /**
+     * 删除记录
+     * @access public
+     * @param  mixed $data 主键列表 支持闭包查询条件
+     * @param  bool  $force 是否强制删除
+     * @return bool
+     */
+    public static function destroy($data, $force = false)
+    {
+        // 包含软删除数据
+        $query = self::withTrashed();
+
+        if (is_array($data) && key($data) !== 0) {
+            $query->where($data);
+            $data = null;
+        } elseif ($data instanceof \Closure) {
+            call_user_func_array($data, [ & $query]);
+            $data = null;
+        } elseif (is_null($data)) {
+            return false;
+        }
+
+        $resultSet = $query->select($data);
+
+        if ($resultSet) {
+            foreach ($resultSet as $data) {
+                $data->force($force)->delete();
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 恢复被软删除的记录
+     * @access public
+     * @param  array $where 更新条件
+     * @return bool
+     */
+    public function restore($where = [])
+    {
+        $name = $this->getDeleteTimeField();
+
+        if ($name) {
+            if (false === $this->trigger('before_restore')) {
+                return false;
+            }
+
+            if (empty($where)) {
+                $pk = $this->getPk();
+
+                $where[] = [$pk, '=', $this->getData($pk)];
+            }
+
+            // 恢复删除
+            $this->db(false)
+                ->where($where)
+                ->useSoftDelete($name, $this->getWithTrashedExp())
+                ->update([$name => $this->defaultSoftDelete]);
+
+            $this->trigger('after_restore');
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 获取软删除字段
+     * @access protected
+     * @param  bool  $read 是否查询操作 写操作的时候会自动去掉表别名
+     * @return string|false
+     */
+    protected function getDeleteTimeField($read = false)
+    {
+        $field = property_exists($this, 'deleteTime') && isset($this->deleteTime) ? $this->deleteTime : 'delete_time';
+
+        if (false === $field) {
+            return false;
+        }
+
+        if (!strpos($field, '.')) {
+            $field = '__TABLE__.' . $field;
+        }
+
+        if (!$read && strpos($field, '.')) {
+            $array = explode('.', $field);
+            $field = array_pop($array);
+        }
+
+        return $field;
+    }
+
+    /**
+     * 查询的时候默认排除软删除数据
+     * @access protected
+     * @param  Query  $query
+     * @return void
+     */
+    protected function withNoTrashed($query)
+    {
+        $field = $this->getDeleteTimeField(true);
+
+        if ($field) {
+            $query->useSoftDelete($field, $this->defaultSoftDelete);
+        }
+    }
+}
diff --git a/thinkphp/library/think/model/concern/TimeStamp.php b/thinkphp/library/think/model/concern/TimeStamp.php
new file mode 100644
index 0000000000000000000000000000000000000000..923b7d45331427515eb478afb2cfaad6e67a8d47
--- /dev/null
+++ b/thinkphp/library/think/model/concern/TimeStamp.php
@@ -0,0 +1,79 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\concern;
+
+/**
+ * 自动时间戳
+ */
+trait TimeStamp
+{
+    /**
+     * 是否需要自动写入时间戳 如果设置为字符串 则表示时间字段的类型
+     * @var bool|string
+     */
+    protected $autoWriteTimestamp;
+
+    /**
+     * 创建时间字段 false表示关闭
+     * @var false|string
+     */
+    protected $createTime = 'create_time';
+
+    /**
+     * 更新时间字段 false表示关闭
+     * @var false|string
+     */
+    protected $updateTime = 'update_time';
+
+    /**
+     * 时间字段显示格式
+     * @var string
+     */
+    protected $dateFormat;
+
+    /**
+     * 时间日期字段格式化处理
+     * @access protected
+     * @param  mixed $time      时间日期表达式
+     * @param  mixed $format    日期格式
+     * @param  bool  $timestamp 是否进行时间戳转换
+     * @return mixed
+     */
+    protected function formatDateTime($time, $format, $timestamp = false)
+    {
+        if (false !== strpos($format, '\\')) {
+            $time = new $format($time);
+        } elseif (!$timestamp && false !== $format) {
+            $time = date($format, $time);
+        }
+
+        return $time;
+    }
+
+    /**
+     * 检查时间字段写入
+     * @access protected
+     * @return void
+     */
+    protected function checkTimeStampWrite()
+    {
+        // 自动写入创建时间和更新时间
+        if ($this->autoWriteTimestamp) {
+            if ($this->createTime && !isset($this->data[$this->createTime])) {
+                $this->data[$this->createTime] = $this->autoWriteTimestamp($this->createTime);
+            }
+            if ($this->updateTime && !isset($this->data[$this->updateTime])) {
+                $this->data[$this->updateTime] = $this->autoWriteTimestamp($this->updateTime);
+            }
+        }
+    }
+}
diff --git a/thinkphp/library/think/model/relation/BelongsTo.php b/thinkphp/library/think/model/relation/BelongsTo.php
new file mode 100644
index 0000000000000000000000000000000000000000..8ffa9ea161b00893f862741030b62d2d5b18afb9
--- /dev/null
+++ b/thinkphp/library/think/model/relation/BelongsTo.php
@@ -0,0 +1,251 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\relation;
+
+use think\Loader;
+use think\Model;
+
+class BelongsTo extends OneToOne
+{
+    /**
+     * 架构函数
+     * @access public
+     * @param  Model  $parent 上级模型对象
+     * @param  string $model 模型名
+     * @param  string $foreignKey 关联外键
+     * @param  string $localKey 关联主键
+     * @param  string $relation  关联名
+     */
+    public function __construct(Model $parent, $model, $foreignKey, $localKey, $relation = null)
+    {
+        $this->parent     = $parent;
+        $this->model      = $model;
+        $this->foreignKey = $foreignKey;
+        $this->localKey   = $localKey;
+        $this->joinType   = 'INNER';
+        $this->query      = (new $model)->db();
+        $this->relation   = $relation;
+
+        if (get_class($parent) == $model) {
+            $this->selfRelation = true;
+        }
+    }
+
+    /**
+     * 延迟获取关联数据
+     * @access public
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包查询条件
+     * @return Model
+     */
+    public function getRelation($subRelation = '', $closure = null)
+    {
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        $foreignKey = $this->foreignKey;
+
+        $relationModel = $this->query
+            ->removeWhereField($this->localKey)
+            ->where($this->localKey, $this->parent->$foreignKey)
+            ->relation($subRelation)
+            ->find();
+
+        if ($relationModel) {
+            $relationModel->setParent(clone $this->parent);
+        }
+
+        return $relationModel;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  string  $operator 比较操作符
+     * @param  integer $count    个数
+     * @param  string  $id       关联表的统计字段
+     * @param  string  $joinType JOIN类型
+     * @return Query
+     */
+    public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
+    {
+        return $this->parent;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  mixed     $where  查询条件（数组或者闭包）
+     * @param  mixed     $fields 字段
+     * @return Query
+     */
+    public function hasWhere($where = [], $fields = null)
+    {
+        $table    = $this->query->getTable();
+        $model    = basename(str_replace('\\', '/', get_class($this->parent)));
+        $relation = basename(str_replace('\\', '/', $this->model));
+
+        if (is_array($where)) {
+            $this->getQueryWhere($where, $relation);
+        }
+
+        $fields = $this->getRelationQueryFields($fields, $model);
+
+        return $this->parent->db()
+            ->alias($model)
+            ->field($fields)
+            ->join([$table => $relation], $model . '.' . $this->foreignKey . '=' . $relation . '.' . $this->localKey, $this->joinType)
+            ->where($where);
+    }
+
+    /**
+     * 预载入关联查询（数据集）
+     * @access protected
+     * @param  array     $resultSet 数据集
+     * @param  string    $relation 当前关联名
+     * @param  string    $subRelation 子关联名
+     * @param  \Closure  $closure 闭包
+     * @return void
+     */
+    protected function eagerlySet(&$resultSet, $relation, $subRelation, $closure)
+    {
+        $localKey   = $this->localKey;
+        $foreignKey = $this->foreignKey;
+
+        $range = [];
+        foreach ($resultSet as $result) {
+            // 获取关联外键列表
+            if (isset($result->$foreignKey)) {
+                $range[] = $result->$foreignKey;
+            }
+        }
+
+        if (!empty($range)) {
+            $this->query->removeWhereField($localKey);
+
+            $data = $this->eagerlyWhere([
+                [$localKey, 'in', $range],
+            ], $localKey, $relation, $subRelation, $closure);
+
+            // 关联属性名
+            $attr = Loader::parseName($relation);
+
+            // 关联数据封装
+            foreach ($resultSet as $result) {
+                // 关联模型
+                if (!isset($data[$result->$foreignKey])) {
+                    $relationModel = null;
+                } else {
+                    $relationModel = $data[$result->$foreignKey];
+                    $relationModel->setParent(clone $result);
+                    $relationModel->isUpdate(true);
+                }
+
+                if (!empty($this->bindAttr)) {
+                    // 绑定关联属性
+                    $this->bindAttr($relationModel, $result);
+                } else {
+                    // 设置关联属性
+                    $result->setRelation($attr, $relationModel);
+                }
+            }
+        }
+    }
+
+    /**
+     * 预载入关联查询（数据）
+     * @access protected
+     * @param  Model     $result 数据对象
+     * @param  string    $relation 当前关联名
+     * @param  string    $subRelation 子关联名
+     * @param  \Closure  $closure 闭包
+     * @return void
+     */
+    protected function eagerlyOne(&$result, $relation, $subRelation, $closure)
+    {
+        $localKey   = $this->localKey;
+        $foreignKey = $this->foreignKey;
+
+        $this->query->removeWhereField($localKey);
+
+        $data = $this->eagerlyWhere([
+            [$localKey, '=', $result->$foreignKey],
+        ], $localKey, $relation, $subRelation, $closure);
+
+        // 关联模型
+        if (!isset($data[$result->$foreignKey])) {
+            $relationModel = null;
+        } else {
+            $relationModel = $data[$result->$foreignKey];
+            $relationModel->setParent(clone $result);
+            $relationModel->isUpdate(true);
+        }
+
+        if (!empty($this->bindAttr)) {
+            // 绑定关联属性
+            $this->bindAttr($relationModel, $result);
+        } else {
+            // 设置关联属性
+            $result->setRelation(Loader::parseName($relation), $relationModel);
+        }
+    }
+
+    /**
+     * 添加关联数据
+     * @access public
+     * @param  Model $model       关联模型对象
+     * @return Model
+     */
+    public function associate($model)
+    {
+        $foreignKey = $this->foreignKey;
+        $pk         = $model->getPk();
+
+        $this->parent->setAttr($foreignKey, $model->$pk);
+        $this->parent->save();
+
+        return $this->parent->setRelation($this->relation, $model);
+    }
+
+    /**
+     * 注销关联数据
+     * @access public
+     * @return Model
+     */
+    public function dissociate()
+    {
+        $foreignKey = $this->foreignKey;
+
+        $this->parent->setAttr($foreignKey, null);
+        $this->parent->save();
+
+        return $this->parent->setRelation($this->relation, null);
+    }
+
+    /**
+     * 执行基础查询（仅执行一次）
+     * @access protected
+     * @return void
+     */
+    protected function baseQuery()
+    {
+        if (empty($this->baseQuery)) {
+            if (isset($this->parent->{$this->foreignKey})) {
+                // 关联查询带入关联条件
+                $this->query->where($this->localKey, '=', $this->parent->{$this->foreignKey});
+            }
+
+            $this->baseQuery = true;
+        }
+    }
+}
diff --git a/thinkphp/library/think/model/relation/BelongsToMany.php b/thinkphp/library/think/model/relation/BelongsToMany.php
new file mode 100644
index 0000000000000000000000000000000000000000..02e666695c19a856414ccc54dfdddf81196249b2
--- /dev/null
+++ b/thinkphp/library/think/model/relation/BelongsToMany.php
@@ -0,0 +1,648 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\relation;
+
+use think\Collection;
+use think\db\Query;
+use think\Exception;
+use think\Loader;
+use think\Model;
+use think\model\Pivot;
+use think\model\Relation;
+
+class BelongsToMany extends Relation
+{
+    // 中间表表名
+    protected $middle;
+    // 中间表模型名称
+    protected $pivotName;
+    // 中间表模型对象
+    protected $pivot;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  Model  $parent     上级模型对象
+     * @param  string $model      模型名
+     * @param  string $table      中间表名
+     * @param  string $foreignKey 关联模型外键
+     * @param  string $localKey   当前模型关联键
+     */
+    public function __construct(Model $parent, $model, $table, $foreignKey, $localKey)
+    {
+        $this->parent     = $parent;
+        $this->model      = $model;
+        $this->foreignKey = $foreignKey;
+        $this->localKey   = $localKey;
+
+        if (false !== strpos($table, '\\')) {
+            $this->pivotName = $table;
+            $this->middle    = basename(str_replace('\\', '/', $table));
+        } else {
+            $this->middle = $table;
+        }
+
+        $this->query = (new $model)->db();
+        $this->pivot = $this->newPivot();
+    }
+
+    /**
+     * 设置中间表模型
+     * @access public
+     * @param  $pivot
+     * @return $this
+     */
+    public function pivot($pivot)
+    {
+        $this->pivotName = $pivot;
+        return $this;
+    }
+
+    /**
+     * 获取中间表更新条件
+     * @param $data
+     * @return array
+     */
+    protected function getUpdateWhere($data)
+    {
+        return [
+            $this->localKey   => $data[$this->localKey],
+            $this->foreignKey => $data[$this->foreignKey],
+        ];
+    }
+
+    /**
+     * 实例化中间表模型
+     * @access public
+     * @param  array    $data
+     * @param  bool     $isUpdate
+     * @return Pivot
+     * @throws Exception
+     */
+    protected function newPivot($data = [], $isUpdate = false)
+    {
+        $class = $this->pivotName ?: '\\think\\model\\Pivot';
+        $pivot = new $class($data, $this->parent, $this->middle);
+
+        if ($pivot instanceof Pivot) {
+            return $isUpdate ? $pivot->isUpdate(true, $this->getUpdateWhere($data)) : $pivot;
+        }
+
+        throw new Exception('pivot model must extends: \think\model\Pivot');
+    }
+
+    /**
+     * 合成中间表模型
+     * @access protected
+     * @param  array|Collection|Paginator $models
+     */
+    protected function hydratePivot($models)
+    {
+        foreach ($models as $model) {
+            $pivot = [];
+
+            foreach ($model->getData() as $key => $val) {
+                if (strpos($key, '__')) {
+                    list($name, $attr) = explode('__', $key, 2);
+
+                    if ('pivot' == $name) {
+                        $pivot[$attr] = $val;
+                        unset($model->$key);
+                    }
+                }
+            }
+
+            $model->setRelation('pivot', $this->newPivot($pivot, true));
+        }
+    }
+
+    /**
+     * 创建关联查询Query对象
+     * @access protected
+     * @return Query
+     */
+    protected function buildQuery()
+    {
+        $foreignKey = $this->foreignKey;
+        $localKey   = $this->localKey;
+
+        // 关联查询
+        $pk = $this->parent->getPk();
+
+        $condition[] = ['pivot.' . $localKey, '=', $this->parent->$pk];
+
+        return $this->belongsToManyQuery($foreignKey, $localKey, $condition);
+    }
+
+    /**
+     * 延迟获取关联数据
+     * @access public
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包查询条件
+     * @return Collection
+     */
+    public function getRelation($subRelation = '', $closure = null)
+    {
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        $result = $this->buildQuery()->relation($subRelation)->select();
+        $this->hydratePivot($result);
+
+        return $result;
+    }
+
+    /**
+     * 重载select方法
+     * @access public
+     * @param  mixed $data
+     * @return Collection
+     */
+    public function select($data = null)
+    {
+        $result = $this->buildQuery()->select($data);
+        $this->hydratePivot($result);
+
+        return $result;
+    }
+
+    /**
+     * 重载paginate方法
+     * @access public
+     * @param  null  $listRows
+     * @param  bool  $simple
+     * @param  array $config
+     * @return Paginator
+     */
+    public function paginate($listRows = null, $simple = false, $config = [])
+    {
+        $result = $this->buildQuery()->paginate($listRows, $simple, $config);
+        $this->hydratePivot($result);
+
+        return $result;
+    }
+
+    /**
+     * 重载find方法
+     * @access public
+     * @param  mixed $data
+     * @return Model
+     */
+    public function find($data = null)
+    {
+        $result = $this->buildQuery()->find($data);
+        if ($result) {
+            $this->hydratePivot([$result]);
+        }
+
+        return $result;
+    }
+
+    /**
+     * 查找多条记录 如果不存在则抛出异常
+     * @access public
+     * @param  array|string|Query|\Closure $data
+     * @return Collection
+     */
+    public function selectOrFail($data = null)
+    {
+        return $this->failException(true)->select($data);
+    }
+
+    /**
+     * 查找单条记录 如果不存在则抛出异常
+     * @access public
+     * @param  array|string|Query|\Closure $data
+     * @return Model
+     */
+    public function findOrFail($data = null)
+    {
+        return $this->failException(true)->find($data);
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  string  $operator 比较操作符
+     * @param  integer $count    个数
+     * @param  string  $id       关联表的统计字段
+     * @param  string  $joinType JOIN类型
+     * @return Query
+     */
+    public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
+    {
+        return $this->parent;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  mixed     $where 查询条件（数组或者闭包）
+     * @param  mixed     $fields 字段
+     * @return Query
+     * @throws Exception
+     */
+    public function hasWhere($where = [], $fields = null)
+    {
+        throw new Exception('relation not support: hasWhere');
+    }
+
+    /**
+     * 设置中间表的查询条件
+     * @access public
+     * @param  string    $field
+     * @param  string    $op
+     * @param  mixed     $condition
+     * @return $this
+     */
+    public function wherePivot($field, $op = null, $condition = null)
+    {
+        $this->query->where('pivot.' . $field, $op, $condition);
+        return $this;
+    }
+
+    /**
+     * 预载入关联查询（数据集）
+     * @access public
+     * @param  array    $resultSet   数据集
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
+    {
+        $localKey   = $this->localKey;
+        $foreignKey = $this->foreignKey;
+
+        $pk    = $resultSet[0]->getPk();
+        $range = [];
+        foreach ($resultSet as $result) {
+            // 获取关联外键列表
+            if (isset($result->$pk)) {
+                $range[] = $result->$pk;
+            }
+        }
+
+        if (!empty($range)) {
+            // 查询关联数据
+            $data = $this->eagerlyManyToMany([
+                ['pivot.' . $localKey, 'in', $range],
+            ], $relation, $subRelation);
+
+            // 关联属性名
+            $attr = Loader::parseName($relation);
+
+            // 关联数据封装
+            foreach ($resultSet as $result) {
+                if (!isset($data[$result->$pk])) {
+                    $data[$result->$pk] = [];
+                }
+
+                $result->setRelation($attr, $this->resultSetBuild($data[$result->$pk]));
+            }
+        }
+    }
+
+    /**
+     * 预载入关联查询（单个数据）
+     * @access public
+     * @param  Model    $result      数据对象
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
+    {
+        $pk = $result->getPk();
+
+        if (isset($result->$pk)) {
+            $pk = $result->$pk;
+            // 查询管理数据
+            $data = $this->eagerlyManyToMany([
+                ['pivot.' . $this->localKey, '=', $pk],
+            ], $relation, $subRelation);
+
+            // 关联数据封装
+            if (!isset($data[$pk])) {
+                $data[$pk] = [];
+            }
+
+            $result->setRelation(Loader::parseName($relation), $this->resultSetBuild($data[$pk]));
+        }
+    }
+
+    /**
+     * 关联统计
+     * @access public
+     * @param  Model    $result  数据对象
+     * @param  \Closure $closure 闭包
+     * @param  string   $aggregate 聚合查询方法
+     * @param  string   $field 字段
+     * @return integer
+     */
+    public function relationCount($result, $closure, $aggregate = 'count', $field = '*')
+    {
+        $pk    = $result->getPk();
+        $count = 0;
+
+        if (isset($result->$pk)) {
+            $pk    = $result->$pk;
+            $count = $this->belongsToManyQuery($this->foreignKey, $this->localKey, [
+                ['pivot.' . $this->localKey, '=', $pk],
+            ])->$aggregate($field);
+        }
+
+        return $count;
+    }
+
+    /**
+     * 获取关联统计子查询
+     * @access public
+     * @param  \Closure $closure 闭包
+     * @param  string   $aggregate 聚合查询方法
+     * @param  string   $field 字段
+     * @return string
+     */
+    public function getRelationCountQuery($closure, $aggregate = 'count', $field = '*')
+    {
+        return $this->belongsToManyQuery($this->foreignKey, $this->localKey, [
+            [
+                'pivot.' . $this->localKey, 'exp', $this->query->raw('=' . $this->parent->getTable() . '.' . $this->parent->getPk()),
+            ],
+        ])->fetchSql()->$aggregate($field);
+    }
+
+    /**
+     * 多对多 关联模型预查询
+     * @access protected
+     * @param  array  $where       关联预查询条件
+     * @param  string $relation    关联名
+     * @param  string $subRelation 子关联
+     * @return array
+     */
+    protected function eagerlyManyToMany($where, $relation, $subRelation = '')
+    {
+        // 预载入关联查询 支持嵌套预载入
+        $list = $this->belongsToManyQuery($this->foreignKey, $this->localKey, $where)
+            ->with($subRelation)
+            ->select();
+
+        // 组装模型数据
+        $data = [];
+        foreach ($list as $set) {
+            $pivot = [];
+            foreach ($set->getData() as $key => $val) {
+                if (strpos($key, '__')) {
+                    list($name, $attr) = explode('__', $key, 2);
+                    if ('pivot' == $name) {
+                        $pivot[$attr] = $val;
+                        unset($set->$key);
+                    }
+                }
+            }
+
+            $set->setRelation('pivot', $this->newPivot($pivot, true));
+
+            $data[$pivot[$this->localKey]][] = $set;
+        }
+
+        return $data;
+    }
+
+    /**
+     * BELONGS TO MANY 关联查询
+     * @access protected
+     * @param  string $foreignKey 关联模型关联键
+     * @param  string $localKey   当前模型关联键
+     * @param  array  $condition  关联查询条件
+     * @return Query
+     */
+    protected function belongsToManyQuery($foreignKey, $localKey, $condition = [])
+    {
+        // 关联查询封装
+        $tableName = $this->query->getTable();
+        $table     = $this->pivot->getTable();
+        $fields    = $this->getQueryFields($tableName);
+
+        $query = $this->query
+            ->field($fields)
+            ->field(true, false, $table, 'pivot', 'pivot__');
+
+        if (empty($this->baseQuery)) {
+            $relationFk = $this->query->getPk();
+            $query->join([$table => 'pivot'], 'pivot.' . $foreignKey . '=' . $tableName . '.' . $relationFk)
+                ->where($condition);
+        }
+
+        return $query;
+    }
+
+    /**
+     * 保存（新增）当前关联数据对象
+     * @access public
+     * @param  mixed $data  数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @param  array $pivot 中间表额外数据
+     * @return array|Pivot
+     */
+    public function save($data, array $pivot = [])
+    {
+        // 保存关联表/中间表数据
+        return $this->attach($data, $pivot);
+    }
+
+    /**
+     * 批量保存当前关联数据对象
+     * @access public
+     * @param  array $dataSet   数据集
+     * @param  array $pivot     中间表额外数据
+     * @param  bool  $samePivot 额外数据是否相同
+     * @return array|false
+     */
+    public function saveAll(array $dataSet, array $pivot = [], $samePivot = false)
+    {
+        $result = [];
+
+        foreach ($dataSet as $key => $data) {
+            if (!$samePivot) {
+                $pivotData = isset($pivot[$key]) ? $pivot[$key] : [];
+            } else {
+                $pivotData = $pivot;
+            }
+
+            $result[] = $this->attach($data, $pivotData);
+        }
+
+        return empty($result) ? false : $result;
+    }
+
+    /**
+     * 附加关联的一个中间表数据
+     * @access public
+     * @param  mixed $data  数据 可以使用数组、关联模型对象 或者 关联对象的主键
+     * @param  array $pivot 中间表额外数据
+     * @return array|Pivot
+     * @throws Exception
+     */
+    public function attach($data, $pivot = [])
+    {
+        if (is_array($data)) {
+            if (key($data) === 0) {
+                $id = $data;
+            } else {
+                // 保存关联表数据
+                $model = new $this->model;
+                $model->save($data);
+                $id = $model->getLastInsID();
+            }
+        } elseif (is_numeric($data) || is_string($data)) {
+            // 根据关联表主键直接写入中间表
+            $id = $data;
+        } elseif ($data instanceof Model) {
+            // 根据关联表主键直接写入中间表
+            $relationFk = $data->getPk();
+            $id         = $data->$relationFk;
+        }
+
+        if ($id) {
+            // 保存中间表数据
+            $pk                     = $this->parent->getPk();
+            $pivot[$this->localKey] = $this->parent->$pk;
+            $ids                    = (array) $id;
+
+            foreach ($ids as $id) {
+                $pivot[$this->foreignKey] = $id;
+                $this->pivot->insert($pivot, true);
+                $result[] = $this->newPivot($pivot, true);
+            }
+
+            if (count($result) == 1) {
+                // 返回中间表模型对象
+                $result = $result[0];
+            }
+
+            return $result;
+        } else {
+            throw new Exception('miss relation data');
+        }
+    }
+
+    /**
+     * 解除关联的一个中间表数据
+     * @access public
+     * @param  integer|array $data        数据 可以使用关联对象的主键
+     * @param  bool          $relationDel 是否同时删除关联表数据
+     * @return integer
+     */
+    public function detach($data = null, $relationDel = false)
+    {
+        if (is_array($data)) {
+            $id = $data;
+        } elseif (is_numeric($data) || is_string($data)) {
+            // 根据关联表主键直接写入中间表
+            $id = $data;
+        } elseif ($data instanceof Model) {
+            // 根据关联表主键直接写入中间表
+            $relationFk = $data->getPk();
+            $id         = $data->$relationFk;
+        }
+
+        // 删除中间表数据
+        $pk      = $this->parent->getPk();
+        $pivot[] = [$this->localKey, '=', $this->parent->$pk];
+
+        if (isset($id)) {
+            $pivot[] = [$this->foreignKey, is_array($id) ? 'in' : '=', $id];
+        }
+
+        $result = $this->pivot->where($pivot)->delete();
+
+        // 删除关联表数据
+        if (isset($id) && $relationDel) {
+            $model = $this->model;
+            $model::destroy($id);
+        }
+
+        return $result;
+    }
+
+    /**
+     * 数据同步
+     * @access public
+     * @param  array $ids
+     * @param  bool  $detaching
+     * @return array
+     */
+    public function sync($ids, $detaching = true)
+    {
+        $changes = [
+            'attached' => [],
+            'detached' => [],
+            'updated'  => [],
+        ];
+
+        $pk = $this->parent->getPk();
+
+        $current = $this->pivot
+            ->where($this->localKey, $this->parent->$pk)
+            ->column($this->foreignKey);
+
+        $records = [];
+
+        foreach ($ids as $key => $value) {
+            if (!is_array($value)) {
+                $records[$value] = [];
+            } else {
+                $records[$key] = $value;
+            }
+        }
+
+        $detach = array_diff($current, array_keys($records));
+
+        if ($detaching && count($detach) > 0) {
+            $this->detach($detach);
+            $changes['detached'] = $detach;
+        }
+
+        foreach ($records as $id => $attributes) {
+            if (!in_array($id, $current)) {
+                $this->attach($id, $attributes);
+                $changes['attached'][] = $id;
+            } elseif (count($attributes) > 0 && $this->attach($id, $attributes)) {
+                $changes['updated'][] = $id;
+            }
+        }
+
+        return $changes;
+    }
+
+    /**
+     * 执行基础查询（仅执行一次）
+     * @access protected
+     * @return void
+     */
+    protected function baseQuery()
+    {
+        if (empty($this->baseQuery) && $this->parent->getData()) {
+            $pk    = $this->parent->getPk();
+            $table = $this->pivot->getTable();
+
+            $this->query
+                ->join([$table => 'pivot'], 'pivot.' . $this->foreignKey . '=' . $this->query->getTable() . '.' . $this->query->getPk())
+                ->where('pivot.' . $this->localKey, $this->parent->$pk);
+            $this->baseQuery = true;
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/model/relation/HasMany.php b/thinkphp/library/think/model/relation/HasMany.php
new file mode 100644
index 0000000000000000000000000000000000000000..2038a960638b3fc4234db05605d2009c2b7bf341
--- /dev/null
+++ b/thinkphp/library/think/model/relation/HasMany.php
@@ -0,0 +1,331 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\relation;
+
+use think\db\Query;
+use think\Loader;
+use think\Model;
+use think\model\Relation;
+
+class HasMany extends Relation
+{
+    /**
+     * 架构函数
+     * @access public
+     * @param  Model  $parent     上级模型对象
+     * @param  string $model      模型名
+     * @param  string $foreignKey 关联外键
+     * @param  string $localKey   当前模型主键
+     */
+    public function __construct(Model $parent, $model, $foreignKey, $localKey)
+    {
+        $this->parent     = $parent;
+        $this->model      = $model;
+        $this->foreignKey = $foreignKey;
+        $this->localKey   = $localKey;
+        $this->query      = (new $model)->db();
+
+        if (get_class($parent) == $model) {
+            $this->selfRelation = true;
+        }
+    }
+
+    /**
+     * 延迟获取关联数据
+     * @access public
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包查询条件
+     * @return \think\Collection
+     */
+    public function getRelation($subRelation = '', $closure = null)
+    {
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        $list = $this->query
+            ->where($this->foreignKey, $this->parent->{$this->localKey})
+            ->relation($subRelation)
+            ->select();
+
+        $parent = clone $this->parent;
+
+        foreach ($list as &$model) {
+            $model->setParent($parent);
+        }
+
+        return $list;
+    }
+
+    /**
+     * 预载入关联查询
+     * @access public
+     * @param  array    $resultSet   数据集
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
+    {
+        $localKey = $this->localKey;
+        $range    = [];
+
+        foreach ($resultSet as $result) {
+            // 获取关联外键列表
+            if (isset($result->$localKey)) {
+                $range[] = $result->$localKey;
+            }
+        }
+
+        if (!empty($range)) {
+            $where = [
+                [$this->foreignKey, 'in', $range],
+            ];
+            $data = $this->eagerlyOneToMany($where, $relation, $subRelation, $closure);
+
+            // 关联属性名
+            $attr = Loader::parseName($relation);
+
+            // 关联数据封装
+            foreach ($resultSet as $result) {
+                $pk = $result->$localKey;
+                if (!isset($data[$pk])) {
+                    $data[$pk] = [];
+                }
+
+                foreach ($data[$pk] as &$relationModel) {
+                    $relationModel->setParent(clone $result);
+                }
+
+                $result->setRelation($attr, $this->resultSetBuild($data[$pk]));
+            }
+        }
+    }
+
+    /**
+     * 预载入关联查询
+     * @access public
+     * @param  Model    $result      数据对象
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
+    {
+        $localKey = $this->localKey;
+
+        if (isset($result->$localKey)) {
+            $pk    = $result->$localKey;
+            $where = [
+                [$this->foreignKey, '=', $pk],
+            ];
+            $data = $this->eagerlyOneToMany($where, $relation, $subRelation, $closure);
+
+            // 关联数据封装
+            if (!isset($data[$pk])) {
+                $data[$pk] = [];
+            }
+
+            foreach ($data[$pk] as &$relationModel) {
+                $relationModel->setParent(clone $result);
+            }
+
+            $result->setRelation(Loader::parseName($relation), $this->resultSetBuild($data[$pk]));
+        }
+    }
+
+    /**
+     * 关联统计
+     * @access public
+     * @param  Model    $result  数据对象
+     * @param  \Closure $closure 闭包
+     * @param  string   $aggregate 聚合查询方法
+     * @param  string   $field 字段
+     * @return integer
+     */
+    public function relationCount($result, $closure, $aggregate = 'count', $field = '*')
+    {
+        $localKey = $this->localKey;
+        $count    = 0;
+
+        if (isset($result->$localKey)) {
+            if ($closure) {
+                $closure($this->query);
+            }
+
+            $count = $this->query->where($this->foreignKey, '=', $result->$localKey)->$aggregate($field);
+        }
+
+        return $count;
+    }
+
+    /**
+     * 创建关联统计子查询
+     * @access public
+     * @param  \Closure $closure 闭包
+     * @param  string   $aggregate 聚合查询方法
+     * @param  string   $field 字段
+     * @return string
+     */
+    public function getRelationCountQuery($closure, $aggregate = 'count', $field = '*')
+    {
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        return $this->query
+            ->whereExp($this->foreignKey, '=' . $this->parent->getTable() . '.' . $this->parent->getPk())
+            ->fetchSql()
+            ->$aggregate($field);
+    }
+
+    /**
+     * 一对多 关联模型预查询
+     * @access public
+     * @param  array    $where       关联预查询条件
+     * @param  string   $relation    关联名
+     * @param  string   $subRelation 子关联
+     * @param  \Closure $closure
+     * @return array
+     */
+    protected function eagerlyOneToMany($where, $relation, $subRelation = '', $closure = null)
+    {
+        $foreignKey = $this->foreignKey;
+
+        $this->query->removeWhereField($this->foreignKey);
+
+        // 预载入关联查询 支持嵌套预载入
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        $list = $this->query->where($where)->with($subRelation)->select();
+
+        // 组装模型数据
+        $data = [];
+
+        foreach ($list as $set) {
+            $data[$set->$foreignKey][] = $set;
+        }
+
+        return $data;
+    }
+
+    /**
+     * 保存（新增）当前关联数据对象
+     * @access public
+     * @param  mixed    $data       数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @param  boolean  $replace    是否自动识别更新和写入
+     * @return Model|false
+     */
+    public function save($data, $replace = true)
+    {
+        if ($data instanceof Model) {
+            $data = $data->getData();
+        }
+
+        // 保存关联表数据
+        $data[$this->foreignKey] = $this->parent->{$this->localKey};
+
+        $model = new $this->model;
+
+        return $model->replace($replace)->save($data) ? $model : false;
+    }
+
+    /**
+     * 批量保存当前关联数据对象
+     * @access public
+     * @param  array $dataSet   数据集
+     * @param  boolean $replace 是否自动识别更新和写入
+     * @return array|false
+     */
+    public function saveAll(array $dataSet, $replace = true)
+    {
+        $result = [];
+
+        foreach ($dataSet as $key => $data) {
+            $result[] = $this->save($data, $replace);
+        }
+
+        return empty($result) ? false : $result;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  string  $operator 比较操作符
+     * @param  integer $count    个数
+     * @param  string  $id       关联表的统计字段
+     * @param  string  $joinType JOIN类型
+     * @return Query
+     */
+    public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
+    {
+        $table    = $this->query->getTable();
+        $model    = basename(str_replace('\\', '/', get_class($this->parent)));
+        $relation = basename(str_replace('\\', '/', $this->model));
+
+        return $this->parent->db()
+            ->alias($model)
+            ->field($model . '.*')
+            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $joinType)
+            ->group($relation . '.' . $this->foreignKey)
+            ->having('count(' . $id . ')' . $operator . $count);
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  mixed     $where 查询条件（数组或者闭包）
+     * @param  mixed     $fields 字段
+     * @return Query
+     */
+    public function hasWhere($where = [], $fields = null)
+    {
+        $table    = $this->query->getTable();
+        $model    = basename(str_replace('\\', '/', get_class($this->parent)));
+        $relation = basename(str_replace('\\', '/', $this->model));
+
+        if (is_array($where)) {
+            $this->getQueryWhere($where, $relation);
+        }
+
+        $fields = $this->getRelationQueryFields($fields, $model);
+
+        return $this->parent->db()
+            ->alias($model)
+            ->group($model . '.' . $this->localKey)
+            ->field($fields)
+            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey)
+            ->where($where);
+    }
+
+    /**
+     * 执行基础查询（仅执行一次）
+     * @access protected
+     * @return void
+     */
+    protected function baseQuery()
+    {
+        if (empty($this->baseQuery)) {
+            if (isset($this->parent->{$this->localKey})) {
+                // 关联查询带入关联条件
+                $this->query->where($this->foreignKey, '=', $this->parent->{$this->localKey});
+            }
+
+            $this->baseQuery = true;
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/model/relation/HasManyThrough.php b/thinkphp/library/think/model/relation/HasManyThrough.php
new file mode 100644
index 0000000000000000000000000000000000000000..411f3fccf36598b20f13c901ba60eef1e603ac2f
--- /dev/null
+++ b/thinkphp/library/think/model/relation/HasManyThrough.php
@@ -0,0 +1,155 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\relation;
+
+use think\db\Query;
+use think\Exception;
+use think\Loader;
+use think\Model;
+use think\model\Relation;
+
+class HasManyThrough extends Relation
+{
+    // 中间关联表外键
+    protected $throughKey;
+    // 中间表模型
+    protected $through;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  Model  $parent     上级模型对象
+     * @param  string $model      模型名
+     * @param  string $through    中间模型名
+     * @param  string $foreignKey 关联外键
+     * @param  string $throughKey 关联外键
+     * @param  string $localKey   当前主键
+     */
+    public function __construct(Model $parent, $model, $through, $foreignKey, $throughKey, $localKey)
+    {
+        $this->parent     = $parent;
+        $this->model      = $model;
+        $this->through    = $through;
+        $this->foreignKey = $foreignKey;
+        $this->throughKey = $throughKey;
+        $this->localKey   = $localKey;
+        $this->query      = (new $model)->db();
+    }
+
+    /**
+     * 延迟获取关联数据
+     * @access public
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包查询条件
+     * @return \think\Collection
+     */
+    public function getRelation($subRelation = '', $closure = null)
+    {
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        $this->baseQuery();
+
+        return $this->query->relation($subRelation)->select();
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  string  $operator 比较操作符
+     * @param  integer $count    个数
+     * @param  string  $id       关联表的统计字段
+     * @param  string  $joinType JOIN类型
+     * @return Query
+     */
+    public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
+    {
+        return $this->parent;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  mixed     $where 查询条件（数组或者闭包）
+     * @param  mixed     $fields 字段
+     * @return Query
+     */
+    public function hasWhere($where = [], $fields = null)
+    {
+        throw new Exception('relation not support: hasWhere');
+    }
+
+    /**
+     * 预载入关联查询
+     * @access public
+     * @param  array    $resultSet   数据集
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
+    {}
+
+    /**
+     * 预载入关联查询 返回模型对象
+     * @access public
+     * @param  Model    $result      数据对象
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
+    {}
+
+    /**
+     * 关联统计
+     * @access public
+     * @param  Model    $result  数据对象
+     * @param  \Closure $closure 闭包
+     * @param  string   $aggregate 聚合查询方法
+     * @param  string   $field 字段
+     * @return integer
+     */
+    public function relationCount($result, $closure, $aggregate = 'count', $field = '*')
+    {}
+
+    /**
+     * 执行基础查询（仅执行一次）
+     * @access protected
+     * @return void
+     */
+    protected function baseQuery()
+    {
+        if (empty($this->baseQuery) && $this->parent->getData()) {
+            $through      = $this->through;
+            $alias        = Loader::parseName(basename(str_replace('\\', '/', $this->model)));
+            $throughTable = $through::getTable();
+            $pk           = (new $through)->getPk();
+            $throughKey   = $this->throughKey;
+            $modelTable   = $this->parent->getTable();
+            $fields       = $this->getQueryFields($alias);
+
+            $this->query
+                ->field($fields)
+                ->alias($alias)
+                ->join($throughTable, $throughTable . '.' . $pk . '=' . $alias . '.' . $throughKey)
+                ->join($modelTable, $modelTable . '.' . $this->localKey . '=' . $throughTable . '.' . $this->foreignKey)
+                ->where($throughTable . '.' . $this->foreignKey, $this->parent->{$this->localKey});
+
+            $this->baseQuery = true;
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/model/relation/HasOne.php b/thinkphp/library/think/model/relation/HasOne.php
new file mode 100644
index 0000000000000000000000000000000000000000..3ce5fea03b816c6ab296d682c25715ef1a90fedd
--- /dev/null
+++ b/thinkphp/library/think/model/relation/HasOne.php
@@ -0,0 +1,230 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\relation;
+
+use think\db\Query;
+use think\Loader;
+use think\Model;
+
+class HasOne extends OneToOne
+{
+    /**
+     * 架构函数
+     * @access public
+     * @param  Model  $parent     上级模型对象
+     * @param  string $model      模型名
+     * @param  string $foreignKey 关联外键
+     * @param  string $localKey   当前模型主键
+     */
+    public function __construct(Model $parent, $model, $foreignKey, $localKey)
+    {
+        $this->parent     = $parent;
+        $this->model      = $model;
+        $this->foreignKey = $foreignKey;
+        $this->localKey   = $localKey;
+        $this->joinType   = 'INNER';
+        $this->query      = (new $model)->db();
+
+        if (get_class($parent) == $model) {
+            $this->selfRelation = true;
+        }
+    }
+
+    /**
+     * 延迟获取关联数据
+     * @access public
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包查询条件
+     * @return Model
+     */
+    public function getRelation($subRelation = '', $closure = null)
+    {
+        $localKey = $this->localKey;
+
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        // 判断关联类型执行查询
+        $relationModel = $this->query
+            ->removeWhereField($this->foreignKey)
+            ->where($this->foreignKey, $this->parent->$localKey)
+            ->relation($subRelation)
+            ->find();
+
+        if ($relationModel) {
+            $relationModel->setParent(clone $this->parent);
+        }
+
+        return $relationModel;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  string  $operator 比较操作符
+     * @param  integer $count    个数
+     * @param  string  $id       关联表的统计字段
+     * @param  string  $joinType JOIN类型
+     * @return Query
+     */
+    public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
+    {
+        $table      = $this->query->getTable();
+        $model      = basename(str_replace('\\', '/', get_class($this->parent)));
+        $relation   = basename(str_replace('\\', '/', $this->model));
+        $localKey   = $this->localKey;
+        $foreignKey = $this->foreignKey;
+
+        return $this->parent->db()
+            ->alias($model)
+            ->whereExists(function ($query) use ($table, $model, $relation, $localKey, $foreignKey) {
+                $query->table([$table => $relation])
+                    ->field($relation . '.' . $foreignKey)
+                    ->whereExp($model . '.' . $localKey, '=' . $relation . '.' . $foreignKey);
+            });
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  mixed     $where 查询条件（数组或者闭包）
+     * @param  mixed     $fields   字段
+     * @return Query
+     */
+    public function hasWhere($where = [], $fields = null)
+    {
+        $table    = $this->query->getTable();
+        $model    = basename(str_replace('\\', '/', get_class($this->parent)));
+        $relation = basename(str_replace('\\', '/', $this->model));
+
+        if (is_array($where)) {
+            $this->getQueryWhere($where, $relation);
+        }
+
+        $fields = $this->getRelationQueryFields($fields, $model);
+
+        return $this->parent->db()
+            ->alias($model)
+            ->field($fields)
+            ->join([$table => $relation], $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $this->joinType)
+            ->where($where);
+    }
+
+    /**
+     * 预载入关联查询（数据集）
+     * @access protected
+     * @param  array    $resultSet   数据集
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    protected function eagerlySet(&$resultSet, $relation, $subRelation, $closure)
+    {
+        $localKey   = $this->localKey;
+        $foreignKey = $this->foreignKey;
+
+        $range = [];
+        foreach ($resultSet as $result) {
+            // 获取关联外键列表
+            if (isset($result->$localKey)) {
+                $range[] = $result->$localKey;
+            }
+        }
+
+        if (!empty($range)) {
+            $this->query->removeWhereField($foreignKey);
+
+            $data = $this->eagerlyWhere([
+                [$foreignKey, 'in', $range],
+            ], $foreignKey, $relation, $subRelation, $closure);
+
+            // 关联属性名
+            $attr = Loader::parseName($relation);
+
+            // 关联数据封装
+            foreach ($resultSet as $result) {
+                // 关联模型
+                if (!isset($data[$result->$localKey])) {
+                    $relationModel = null;
+                } else {
+                    $relationModel = $data[$result->$localKey];
+                    $relationModel->setParent(clone $result);
+                    $relationModel->isUpdate(true);
+                }
+
+                if (!empty($this->bindAttr)) {
+                    // 绑定关联属性
+                    $this->bindAttr($relationModel, $result, $this->bindAttr);
+                } else {
+                    // 设置关联属性
+                    $result->setRelation($attr, $relationModel);
+                }
+            }
+        }
+    }
+
+    /**
+     * 预载入关联查询（数据）
+     * @access protected
+     * @param  Model    $result      数据对象
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    protected function eagerlyOne(&$result, $relation, $subRelation, $closure)
+    {
+        $localKey   = $this->localKey;
+        $foreignKey = $this->foreignKey;
+
+        $this->query->removeWhereField($foreignKey);
+
+        $data = $this->eagerlyWhere([
+            [$foreignKey, '=', $result->$localKey],
+        ], $foreignKey, $relation, $subRelation, $closure);
+
+        // 关联模型
+        if (!isset($data[$result->$localKey])) {
+            $relationModel = null;
+        } else {
+            $relationModel = $data[$result->$localKey];
+            $relationModel->setParent(clone $result);
+            $relationModel->isUpdate(true);
+        }
+
+        if (!empty($this->bindAttr)) {
+            // 绑定关联属性
+            $this->bindAttr($relationModel, $result, $this->bindAttr);
+        } else {
+            $result->setRelation(Loader::parseName($relation), $relationModel);
+        }
+    }
+
+    /**
+     * 执行基础查询（仅执行一次）
+     * @access protected
+     * @return void
+     */
+    protected function baseQuery()
+    {
+        if (empty($this->baseQuery)) {
+            if (isset($this->parent->{$this->localKey})) {
+                // 关联查询带入关联条件
+                $this->query->where($this->foreignKey, '=', $this->parent->{$this->localKey});
+            }
+
+            $this->baseQuery = true;
+        }
+    }
+}
diff --git a/thinkphp/library/think/model/relation/MorphMany.php b/thinkphp/library/think/model/relation/MorphMany.php
new file mode 100644
index 0000000000000000000000000000000000000000..3e913ccd06f6fb69d01f46a6c7be30e73ac9d528
--- /dev/null
+++ b/thinkphp/library/think/model/relation/MorphMany.php
@@ -0,0 +1,322 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\relation;
+
+use think\db\Query;
+use think\Exception;
+use think\Loader;
+use think\Model;
+use think\model\Relation;
+
+class MorphMany extends Relation
+{
+    // 多态字段
+    protected $morphKey;
+    protected $morphType;
+    // 多态类型
+    protected $type;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  Model  $parent    上级模型对象
+     * @param  string $model     模型名
+     * @param  string $morphKey  关联外键
+     * @param  string $morphType 多态字段名
+     * @param  string $type      多态类型
+     */
+    public function __construct(Model $parent, $model, $morphKey, $morphType, $type)
+    {
+        $this->parent    = $parent;
+        $this->model     = $model;
+        $this->type      = $type;
+        $this->morphKey  = $morphKey;
+        $this->morphType = $morphType;
+        $this->query     = (new $model)->db();
+    }
+
+    /**
+     * 延迟获取关联数据
+     * @access public
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包查询条件
+     * @return \think\Collection
+     */
+    public function getRelation($subRelation = '', $closure = null)
+    {
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        $this->baseQuery();
+
+        $list   = $this->query->relation($subRelation)->select();
+        $parent = clone $this->parent;
+
+        foreach ($list as &$model) {
+            $model->setParent($parent);
+        }
+
+        return $list;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  string  $operator 比较操作符
+     * @param  integer $count    个数
+     * @param  string  $id       关联表的统计字段
+     * @param  string  $joinType JOIN类型
+     * @return Query
+     */
+    public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
+    {
+        throw new Exception('relation not support: has');
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  mixed     $where 查询条件（数组或者闭包）
+     * @param  mixed     $fields 字段
+     * @return Query
+     */
+    public function hasWhere($where = [], $fields = null)
+    {
+        throw new Exception('relation not support: hasWhere');
+    }
+
+    /**
+     * 预载入关联查询
+     * @access public
+     * @param  array    $resultSet   数据集
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
+    {
+        $morphType = $this->morphType;
+        $morphKey  = $this->morphKey;
+        $type      = $this->type;
+        $range     = [];
+
+        foreach ($resultSet as $result) {
+            $pk = $result->getPk();
+            // 获取关联外键列表
+            if (isset($result->$pk)) {
+                $range[] = $result->$pk;
+            }
+        }
+
+        if (!empty($range)) {
+            $where = [
+                [$morphKey, 'in', $range],
+                [$morphType, '=', $type],
+            ];
+            $data = $this->eagerlyMorphToMany($where, $relation, $subRelation, $closure);
+
+            // 关联属性名
+            $attr = Loader::parseName($relation);
+
+            // 关联数据封装
+            foreach ($resultSet as $result) {
+                if (!isset($data[$result->$pk])) {
+                    $data[$result->$pk] = [];
+                }
+
+                foreach ($data[$result->$pk] as &$relationModel) {
+                    $relationModel->setParent(clone $result);
+                    $relationModel->isUpdate(true);
+                }
+
+                $result->setRelation($attr, $this->resultSetBuild($data[$result->$pk]));
+            }
+        }
+    }
+
+    /**
+     * 预载入关联查询
+     * @access public
+     * @param  Model    $result      数据对象
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
+    {
+        $pk = $result->getPk();
+
+        if (isset($result->$pk)) {
+            $key   = $result->$pk;
+            $where = [
+                [$this->morphKey, '=', $key],
+                [$this->morphType, '=', $this->type],
+            ];
+            $data = $this->eagerlyMorphToMany($where, $relation, $subRelation, $closure);
+
+            if (!isset($data[$key])) {
+                $data[$key] = [];
+            }
+
+            foreach ($data[$key] as &$relationModel) {
+                $relationModel->setParent(clone $result);
+                $relationModel->isUpdate(true);
+            }
+
+            $result->setRelation(Loader::parseName($relation), $this->resultSetBuild($data[$key]));
+        }
+    }
+
+    /**
+     * 关联统计
+     * @access public
+     * @param  Model    $result  数据对象
+     * @param  \Closure $closure 闭包
+     * @param  string   $aggregate 聚合查询方法
+     * @param  string   $field 字段
+     * @return integer
+     */
+    public function relationCount($result, $closure, $aggregate = 'count', $field = '*')
+    {
+        $pk    = $result->getPk();
+        $count = 0;
+
+        if (isset($result->$pk)) {
+            if ($closure) {
+                $closur($this->query);
+            }
+
+            $count = $this->query
+                ->where([
+                    [$this->morphKey, '=', $result->$pk],
+                    [$this->morphType, '=', $this->type],
+                ])
+                ->$aggregate($field);
+        }
+
+        return $count;
+    }
+
+    /**
+     * 获取关联统计子查询
+     * @access public
+     * @param  \Closure $closure 闭包
+     * @param  string   $aggregate 聚合查询方法
+     * @param  string   $field 字段
+     * @return string
+     */
+    public function getRelationCountQuery($closure, $aggregate = 'count', $field = '*')
+    {
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        return $this->query
+            ->whereExp($this->morphKey, '=' . $this->parent->getTable() . '.' . $this->parent->getPk())
+            ->where($this->morphType, '=', $this->type)
+            ->fetchSql()
+            ->$aggregate($field);
+    }
+
+    /**
+     * 多态一对多 关联模型预查询
+     * @access protected
+     * @param  array         $where       关联预查询条件
+     * @param  string        $relation    关联名
+     * @param  string        $subRelation 子关联
+     * @param  \Closure      $closure     闭包
+     * @return array
+     */
+    protected function eagerlyMorphToMany($where, $relation, $subRelation = '', $closure = null)
+    {
+        // 预载入关联查询 支持嵌套预载入
+        $this->query->removeOption('where');
+
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        $list     = $this->query->where($where)->with($subRelation)->select();
+        $morphKey = $this->morphKey;
+
+        // 组装模型数据
+        $data = [];
+        foreach ($list as $set) {
+            $data[$set->$morphKey][] = $set;
+        }
+
+        return $data;
+    }
+
+    /**
+     * 保存（新增）当前关联数据对象
+     * @access public
+     * @param  mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @return Model|false
+     */
+    public function save($data)
+    {
+        if ($data instanceof Model) {
+            $data = $data->getData();
+        }
+
+        // 保存关联表数据
+        $pk = $this->parent->getPk();
+
+        $model = new $this->model;
+
+        $data[$this->morphKey]  = $this->parent->$pk;
+        $data[$this->morphType] = $this->type;
+
+        return $model->save($data) ? $model : false;
+    }
+
+    /**
+     * 批量保存当前关联数据对象
+     * @access public
+     * @param  array $dataSet 数据集
+     * @return array|false
+     */
+    public function saveAll(array $dataSet)
+    {
+        $result = [];
+
+        foreach ($dataSet as $key => $data) {
+            $result[] = $this->save($data);
+        }
+
+        return empty($result) ? false : $result;
+    }
+
+    /**
+     * 执行基础查询（仅执行一次）
+     * @access protected
+     * @return void
+     */
+    protected function baseQuery()
+    {
+        if (empty($this->baseQuery) && $this->parent->getData()) {
+            $pk = $this->parent->getPk();
+
+            $this->query->where([
+                [$this->morphKey, '=', $this->parent->$pk],
+                [$this->morphType, '=', $this->type],
+            ]);
+
+            $this->baseQuery = true;
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/model/relation/MorphOne.php b/thinkphp/library/think/model/relation/MorphOne.php
new file mode 100644
index 0000000000000000000000000000000000000000..ede680c63a3fb5d139cc28b89a3e1af6cf7dc117
--- /dev/null
+++ b/thinkphp/library/think/model/relation/MorphOne.php
@@ -0,0 +1,245 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\relation;
+
+use think\db\Query;
+use think\Exception;
+use think\Loader;
+use think\Model;
+use think\model\Relation;
+
+class MorphOne extends Relation
+{
+    // 多态字段
+    protected $morphKey;
+    protected $morphType;
+    // 多态类型
+    protected $type;
+
+    /**
+     * 构造函数
+     * @access public
+     * @param  Model  $parent    上级模型对象
+     * @param  string $model     模型名
+     * @param  string $morphKey  关联外键
+     * @param  string $morphType 多态字段名
+     * @param  string $type      多态类型
+     */
+    public function __construct(Model $parent, $model, $morphKey, $morphType, $type)
+    {
+        $this->parent    = $parent;
+        $this->model     = $model;
+        $this->type      = $type;
+        $this->morphKey  = $morphKey;
+        $this->morphType = $morphType;
+        $this->query     = (new $model)->db();
+    }
+
+    /**
+     * 延迟获取关联数据
+     * @access public
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包查询条件
+     * @return Model
+     */
+    public function getRelation($subRelation = '', $closure = null)
+    {
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        $this->baseQuery();
+
+        $relationModel = $this->query->relation($subRelation)->find();
+
+        if ($relationModel) {
+            $relationModel->setParent(clone $this->parent);
+        }
+
+        return $relationModel;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  string  $operator 比较操作符
+     * @param  integer $count    个数
+     * @param  string  $id       关联表的统计字段
+     * @param  string  $joinType JOIN类型
+     * @return Query
+     */
+    public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
+    {
+        return $this->parent;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  mixed     $where 查询条件（数组或者闭包）
+     * @param  mixed     $fields 字段
+     * @return Query
+     */
+    public function hasWhere($where = [], $fields = null)
+    {
+        throw new Exception('relation not support: hasWhere');
+    }
+
+    /**
+     * 预载入关联查询
+     * @access public
+     * @param  array    $resultSet   数据集
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
+    {
+        $morphType = $this->morphType;
+        $morphKey  = $this->morphKey;
+        $type      = $this->type;
+        $range     = [];
+
+        foreach ($resultSet as $result) {
+            $pk = $result->getPk();
+            // 获取关联外键列表
+            if (isset($result->$pk)) {
+                $range[] = $result->$pk;
+            }
+        }
+
+        if (!empty($range)) {
+            $data = $this->eagerlyMorphToOne([
+                [$morphKey, 'in', $range],
+                [$morphType, '=', $type],
+            ], $relation, $subRelation, $closure);
+
+            // 关联属性名
+            $attr = Loader::parseName($relation);
+
+            // 关联数据封装
+            foreach ($resultSet as $result) {
+                if (!isset($data[$result->$pk])) {
+                    $relationModel = null;
+                } else {
+                    $relationModel = $data[$result->$pk];
+                    $relationModel->setParent(clone $result);
+                    $relationModel->isUpdate(true);
+                }
+
+                $result->setRelation($attr, $relationModel);
+            }
+        }
+    }
+
+    /**
+     * 预载入关联查询
+     * @access public
+     * @param  Model    $result      数据对象
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
+    {
+        $pk = $result->getPk();
+
+        if (isset($result->$pk)) {
+            $pk   = $result->$pk;
+            $data = $this->eagerlyMorphToOne([
+                [$this->morphKey, '=', $pk],
+                [$this->morphType, '=', $this->type],
+            ], $relation, $subRelation, $closure);
+
+            if (isset($data[$pk])) {
+                $relationModel = $data[$pk];
+                $relationModel->setParent(clone $result);
+                $relationModel->isUpdate(true);
+            } else {
+                $relationModel = null;
+            }
+
+            $result->setRelation(Loader::parseName($relation), $relationModel);
+        }
+    }
+
+    /**
+     * 多态一对一 关联模型预查询
+     * @access protected
+     * @param  array         $where       关联预查询条件
+     * @param  string        $relation    关联名
+     * @param  string        $subRelation 子关联
+     * @param  \Closure      $closure     闭包
+     * @return array
+     */
+    protected function eagerlyMorphToOne($where, $relation, $subRelation = '', $closure = null)
+    {
+        // 预载入关联查询 支持嵌套预载入
+        if ($closure) {
+            $closure($this->query);
+        }
+
+        $list     = $this->query->where($where)->with($subRelation)->find();
+        $morphKey = $this->morphKey;
+
+        // 组装模型数据
+        $data = [];
+
+        foreach ($list as $set) {
+            $data[$set->$morphKey] = $set;
+        }
+
+        return $data;
+    }
+
+    /**
+     * 保存（新增）当前关联数据对象
+     * @access public
+     * @param  mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @return Model|false
+     */
+    public function save($data)
+    {
+        if ($data instanceof Model) {
+            $data = $data->getData();
+        }
+        // 保存关联表数据
+        $pk = $this->parent->getPk();
+
+        $model = new $this->model;
+
+        $data[$this->morphKey]  = $this->parent->$pk;
+        $data[$this->morphType] = $this->type;
+        return $model->save($data) ? $model : false;
+    }
+
+    /**
+     * 执行基础查询（进执行一次）
+     * @access protected
+     * @return void
+     */
+    protected function baseQuery()
+    {
+        if (empty($this->baseQuery) && $this->parent->getData()) {
+            $pk = $this->parent->getPk();
+
+            $this->query->where([
+                [$this->morphKey, '=', $this->parent->$pk],
+                [$this->morphType, '=', $this->type],
+            ]);
+            $this->baseQuery = true;
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/model/relation/MorphTo.php b/thinkphp/library/think/model/relation/MorphTo.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb7c4d0b3a83ec9489c28871cf5f14971f8992df
--- /dev/null
+++ b/thinkphp/library/think/model/relation/MorphTo.php
@@ -0,0 +1,306 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\relation;
+
+use think\Exception;
+use think\Loader;
+use think\Model;
+use think\model\Relation;
+
+class MorphTo extends Relation
+{
+    // 多态字段
+    protected $morphKey;
+    protected $morphType;
+    // 多态别名
+    protected $alias;
+    // 关联名
+    protected $relation;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  Model  $parent    上级模型对象
+     * @param  string $morphType 多态字段名
+     * @param  string $morphKey  外键名
+     * @param  array  $alias     多态别名定义
+     * @param  string $relation  关联名
+     */
+    public function __construct(Model $parent, $morphType, $morphKey, $alias = [], $relation = null)
+    {
+        $this->parent    = $parent;
+        $this->morphType = $morphType;
+        $this->morphKey  = $morphKey;
+        $this->alias     = $alias;
+        $this->relation  = $relation;
+    }
+
+    /**
+     * 获取当前的关联模型类的实例
+     * @access public
+     * @return Model
+     */
+    public function getModel()
+    {
+        $morphType = $this->morphType;
+        $model     = $this->parseModel($this->parent->$morphType);
+
+        return (new $model);
+    }
+
+    /**
+     * 延迟获取关联数据
+     * @access public
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包查询条件
+     * @return Model
+     */
+    public function getRelation($subRelation = '', $closure = null)
+    {
+        $morphKey  = $this->morphKey;
+        $morphType = $this->morphType;
+
+        // 多态模型
+        $model = $this->parseModel($this->parent->$morphType);
+
+        // 主键数据
+        $pk = $this->parent->$morphKey;
+
+        $relationModel = (new $model)->relation($subRelation)->find($pk);
+
+        if ($relationModel) {
+            $relationModel->setParent(clone $this->parent);
+        }
+
+        return $relationModel;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  string  $operator 比较操作符
+     * @param  integer $count    个数
+     * @param  string  $id       关联表的统计字段
+     * @param  string  $joinType JOIN类型
+     * @return Query
+     */
+    public function has($operator = '>=', $count = 1, $id = '*', $joinType = 'INNER')
+    {
+        return $this->parent;
+    }
+
+    /**
+     * 根据关联条件查询当前模型
+     * @access public
+     * @param  mixed     $where 查询条件（数组或者闭包）
+     * @param  mixed     $fields 字段
+     * @return Query
+     */
+    public function hasWhere($where = [], $fields = null)
+    {
+        throw new Exception('relation not support: hasWhere');
+    }
+
+    /**
+     * 解析模型的完整命名空间
+     * @access protected
+     * @param  string $model 模型名（或者完整类名）
+     * @return string
+     */
+    protected function parseModel($model)
+    {
+        if (isset($this->alias[$model])) {
+            $model = $this->alias[$model];
+        }
+
+        if (false === strpos($model, '\\')) {
+            $path = explode('\\', get_class($this->parent));
+            array_pop($path);
+            array_push($path, Loader::parseName($model, 1));
+            $model = implode('\\', $path);
+        }
+
+        return $model;
+    }
+
+    /**
+     * 设置多态别名
+     * @access public
+     * @param  array $alias 别名定义
+     * @return $this
+     */
+    public function setAlias($alias)
+    {
+        $this->alias = $alias;
+
+        return $this;
+    }
+
+    /**
+     * 移除关联查询参数
+     * @access public
+     * @return $this
+     */
+    public function removeOption()
+    {
+        return $this;
+    }
+
+    /**
+     * 预载入关联查询
+     * @access public
+     * @param  array    $resultSet   数据集
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     * @throws Exception
+     */
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
+    {
+        $morphKey  = $this->morphKey;
+        $morphType = $this->morphType;
+        $range     = [];
+
+        foreach ($resultSet as $result) {
+            // 获取关联外键列表
+            if (!empty($result->$morphKey)) {
+                $range[$result->$morphType][] = $result->$morphKey;
+            }
+        }
+
+        if (!empty($range)) {
+            // 关联属性名
+            $attr = Loader::parseName($relation);
+
+            foreach ($range as $key => $val) {
+                // 多态类型映射
+                $model = $this->parseModel($key);
+                $obj   = new $model;
+                $pk    = $obj->getPk();
+                $list  = $obj->all($val, $subRelation);
+                $data  = [];
+
+                foreach ($list as $k => $vo) {
+                    $data[$vo->$pk] = $vo;
+                }
+
+                foreach ($resultSet as $result) {
+                    if ($key == $result->$morphType) {
+                        // 关联模型
+                        if (!isset($data[$result->$morphKey])) {
+                            $relationModel = null;
+                        } else {
+                            $relationModel = $data[$result->$morphKey];
+                            $relationModel->setParent(clone $result);
+                            $relationModel->isUpdate(true);
+                        }
+
+                        $result->setRelation($attr, $relationModel);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 预载入关联查询
+     * @access public
+     * @param  Model    $result      数据对象
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
+    {
+        $morphKey  = $this->morphKey;
+        $morphType = $this->morphType;
+        // 多态类型映射
+        $model = $this->parseModel($result->{$this->morphType});
+
+        $this->eagerlyMorphToOne($model, $relation, $result, $subRelation);
+    }
+
+    /**
+     * 关联统计
+     * @access public
+     * @param  Model    $result  数据对象
+     * @param  \Closure $closure 闭包
+     * @param  string   $aggregate 聚合查询方法
+     * @param  string   $field 字段
+     * @return integer
+     */
+    public function relationCount($result, $closure, $aggregate = 'count', $field = '*')
+    {}
+
+    /**
+     * 多态MorphTo 关联模型预查询
+     * @access protected
+     * @param  string $model       关联模型对象
+     * @param  string $relation    关联名
+     * @param  Model  $result
+     * @param  string $subRelation 子关联
+     * @return void
+     */
+    protected function eagerlyMorphToOne($model, $relation, &$result, $subRelation = '')
+    {
+        // 预载入关联查询 支持嵌套预载入
+        $pk   = $this->parent->{$this->morphKey};
+        $data = (new $model)->with($subRelation)->find($pk);
+
+        if ($data) {
+            $data->setParent(clone $result);
+            $data->isUpdate(true);
+        }
+
+        $result->setRelation(Loader::parseName($relation), $data ?: null);
+    }
+
+    /**
+     * 添加关联数据
+     * @access public
+     * @param  Model     $model  关联模型对象
+     * @param  string    $type   多态类型
+     * @return Model
+     */
+    public function associate($model, $type = '')
+    {
+        $morphKey  = $this->morphKey;
+        $morphType = $this->morphType;
+        $pk        = $model->getPk();
+
+        $this->parent->setAttr($morphKey, $model->$pk);
+        $this->parent->setAttr($morphType, $type ?: get_class($model));
+        $this->parent->save();
+
+        return $this->parent->setRelation($this->relation, $model);
+    }
+
+    /**
+     * 注销关联数据
+     * @access public
+     * @return Model
+     */
+    public function dissociate()
+    {
+        $morphKey  = $this->morphKey;
+        $morphType = $this->morphType;
+
+        $this->parent->setAttr($morphKey, null);
+        $this->parent->setAttr($morphType, null);
+        $this->parent->save();
+
+        return $this->parent->setRelation($this->relation, null);
+    }
+
+}
diff --git a/thinkphp/library/think/model/relation/OneToOne.php b/thinkphp/library/think/model/relation/OneToOne.php
new file mode 100644
index 0000000000000000000000000000000000000000..ac5d4e4c43a5668c41d2fcd0907241c654be1a88
--- /dev/null
+++ b/thinkphp/library/think/model/relation/OneToOne.php
@@ -0,0 +1,342 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\model\relation;
+
+use think\db\Query;
+use think\Exception;
+use think\Loader;
+use think\Model;
+use think\model\Relation;
+
+/**
+ * Class OneToOne
+ * @package think\model\relation
+ *
+ */
+abstract class OneToOne extends Relation
+{
+    // 预载入方式 0 -JOIN 1 -IN
+    protected $eagerlyType = 1;
+    // 当前关联的JOIN类型
+    protected $joinType;
+    // 要绑定的属性
+    protected $bindAttr = [];
+    // 关联名
+    protected $relation;
+
+    /**
+     * 设置join类型
+     * @access public
+     * @param  string $type JOIN类型
+     * @return $this
+     */
+    public function joinType($type)
+    {
+        $this->joinType = $type;
+        return $this;
+    }
+
+    /**
+     * 预载入关联查询（JOIN方式）
+     * @access public
+     * @param  Query    $query       查询对象
+     * @param  string   $relation    关联名
+     * @param  string   $subRelation 子关联
+     * @param  \Closure $closure     闭包条件
+     * @param  bool     $first
+     * @return void
+     */
+    public function eagerly(Query $query, $relation, $subRelation, $closure, $first)
+    {
+        $name = Loader::parseName(basename(str_replace('\\', '/', get_class($this->parent))));
+
+        if ($first) {
+            $table = $query->getTable();
+            $query->table([$table => $name]);
+
+            if ($query->getOptions('field')) {
+                $field = $query->getOptions('field');
+                $query->removeOption('field');
+            } else {
+                $field = true;
+            }
+
+            $query->field($field, false, $table, $name);
+        }
+
+        // 预载入封装
+        $joinTable = $this->query->getTable();
+        $joinAlias = $relation;
+        $query->via($joinAlias);
+
+        if ($this instanceof BelongsTo) {
+            $query->join([$joinTable => $joinAlias], $name . '.' . $this->foreignKey . '=' . $joinAlias . '.' . $this->localKey, $this->joinType);
+        } else {
+            $query->join([$joinTable => $joinAlias], $name . '.' . $this->localKey . '=' . $joinAlias . '.' . $this->foreignKey, $this->joinType);
+        }
+
+        if ($closure) {
+            // 执行闭包查询
+            $closure($query);
+            // 使用withField指定获取关联的字段，如
+            // $query->where(['id'=>1])->withField('id,name');
+            if ($query->getOptions('with_field')) {
+                $field = $query->getOptions('with_field');
+                $query->removeOption('with_field');
+            } else {
+                $field = true;
+            }
+        } elseif (isset($this->option['field'])) {
+            $field = $this->option['field'];
+        } else {
+            $field = true;
+        }
+
+        $query->field($field, false, $joinTable, $joinAlias, $relation . '__');
+    }
+
+    /**
+     *  预载入关联查询（数据集）
+     * @access protected
+     * @param  array    $resultSet
+     * @param  string   $relation
+     * @param  string   $subRelation
+     * @param  \Closure $closure
+     * @return mixed
+     */
+    abstract protected function eagerlySet(&$resultSet, $relation, $subRelation, $closure);
+
+    /**
+     * 预载入关联查询（数据）
+     * @access protected
+     * @param  Model    $result
+     * @param  string   $relation
+     * @param  string   $subRelation
+     * @param  \Closure $closure
+     * @return mixed
+     */
+    abstract protected function eagerlyOne(&$result, $relation, $subRelation, $closure);
+
+    /**
+     * 预载入关联查询（数据集）
+     * @access public
+     * @param  array    $resultSet   数据集
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
+    {
+        if (1 == $this->eagerlyType) {
+            // IN查询
+            $this->eagerlySet($resultSet, $relation, $subRelation, $closure);
+        } else {
+            // 模型关联组装
+            foreach ($resultSet as $result) {
+                $this->match($this->model, $relation, $result);
+            }
+        }
+    }
+
+    /**
+     * 预载入关联查询（数据）
+     * @access public
+     * @param  Model    $result      数据对象
+     * @param  string   $relation    当前关联名
+     * @param  string   $subRelation 子关联名
+     * @param  \Closure $closure     闭包
+     * @return void
+     */
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
+    {
+        if (1 == $this->eagerlyType) {
+            // IN查询
+            $this->eagerlyOne($result, $relation, $subRelation, $closure);
+        } else {
+            // 模型关联组装
+            $this->match($this->model, $relation, $result);
+        }
+    }
+
+    /**
+     * 保存（新增）当前关联数据对象
+     * @access public
+     * @param  mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @return Model|false
+     */
+    public function save($data)
+    {
+        if ($data instanceof Model) {
+            $data = $data->getData();
+        }
+
+        $model = new $this->model;
+        // 保存关联表数据
+        $data[$this->foreignKey] = $this->parent->{$this->localKey};
+
+        return $model->save($data) ? $model : false;
+    }
+
+    /**
+     * 设置预载入方式
+     * @access public
+     * @param  integer $type 预载入方式 0 JOIN查询 1 IN查询
+     * @return $this
+     */
+    public function setEagerlyType($type)
+    {
+        $this->eagerlyType = $type;
+
+        return $this;
+    }
+
+    /**
+     * 获取预载入方式
+     * @access public
+     * @return integer
+     */
+    public function getEagerlyType()
+    {
+        return $this->eagerlyType;
+    }
+
+    /**
+     * 绑定关联表的属性到父模型属性
+     * @access public
+     * @param  mixed $attr 要绑定的属性列表
+     * @return $this
+     */
+    public function bind($attr)
+    {
+        if (is_string($attr)) {
+            $attr = explode(',', $attr);
+        }
+        $this->bindAttr = $attr;
+
+        return $this;
+    }
+
+    /**
+     * 获取绑定属性
+     * @access public
+     * @return array
+     */
+    public function getBindAttr()
+    {
+        return $this->bindAttr;
+    }
+
+    /**
+     * 关联统计
+     * @access public
+     * @param  Model    $result  数据对象
+     * @param  \Closure $closure 闭包
+     * @param  string   $aggregate 聚合查询方法
+     * @param  string   $field 字段
+     * @return integer
+     */
+    public function relationCount($result, $closure, $aggregate = 'count', $field = '*')
+    {
+        throw new Exception('relation not support: ' . $aggregate);
+    }
+
+    /**
+     * 一对一 关联模型预查询拼装
+     * @access public
+     * @param  string $model    模型名称
+     * @param  string $relation 关联名
+     * @param  Model  $result   模型对象实例
+     * @return void
+     */
+    protected function match($model, $relation, &$result)
+    {
+        // 重新组装模型数据
+        foreach ($result->getData() as $key => $val) {
+            if (strpos($key, '__')) {
+                list($name, $attr) = explode('__', $key, 2);
+                if ($name == $relation) {
+                    $list[$name][$attr] = $val;
+                    unset($result->$key);
+                }
+            }
+        }
+
+        if (isset($list[$relation])) {
+            $relationModel = new $model($list[$relation]);
+            $relationModel->setParent(clone $result);
+            $relationModel->isUpdate(true);
+
+            if (!empty($this->bindAttr)) {
+                $this->bindAttr($relationModel, $result, $this->bindAttr);
+            }
+        } else {
+            $relationModel = null;
+        }
+
+        $result->setRelation(Loader::parseName($relation), $relationModel);
+    }
+
+    /**
+     * 绑定关联属性到父模型
+     * @access protected
+     * @param  Model $model    关联模型对象
+     * @param  Model $result   父模型对象
+     * @return void
+     * @throws Exception
+     */
+    protected function bindAttr($model, &$result)
+    {
+        foreach ($this->bindAttr as $key => $attr) {
+            $key = is_numeric($key) ? $attr : $key;
+            if (isset($result->$key)) {
+                throw new Exception('bind attr has exists:' . $key);
+            } else {
+                $result->setAttr($key, $model ? $model->$attr : null);
+            }
+        }
+    }
+
+    /**
+     * 一对一 关联模型预查询（IN方式）
+     * @access public
+     * @param  array         $where       关联预查询条件
+     * @param  string        $key         关联键名
+     * @param  string        $relation    关联名
+     * @param  string        $subRelation 子关联
+     * @param  \Closure      $closure
+     * @return array
+     */
+    protected function eagerlyWhere($where, $key, $relation, $subRelation = '', $closure = null)
+    {
+        // 预载入关联查询 支持嵌套预载入
+        if ($closure) {
+            $closure($this->query);
+
+            if ($field = $this->query->getOptions('with_field')) {
+                $this->query->field($field)->removeOption('with_field');
+            }
+        }
+
+        $list = $this->query->where($where)->with($subRelation)->select();
+
+        // 组装模型数据
+        $data = [];
+
+        foreach ($list as $set) {
+            $data[$set->$key] = $set;
+        }
+
+        return $data;
+    }
+
+}
diff --git a/thinkphp/library/think/paginator/driver/Bootstrap.php b/thinkphp/library/think/paginator/driver/Bootstrap.php
new file mode 100644
index 0000000000000000000000000000000000000000..ab5315c06608d4d476422bd02df07771372dfce8
--- /dev/null
+++ b/thinkphp/library/think/paginator/driver/Bootstrap.php
@@ -0,0 +1,206 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: zhangyajun <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\paginator\driver;
+
+use think\Paginator;
+
+class Bootstrap extends Paginator
+{
+
+    /**
+     * 上一页按钮
+     * @param string $text
+     * @return string
+     */
+    protected function getPreviousButton($text = "&laquo;")
+    {
+
+        if ($this->currentPage() <= 1) {
+            return $this->getDisabledTextWrapper($text);
+        }
+
+        $url = $this->url(
+            $this->currentPage() - 1
+        );
+
+        return $this->getPageLinkWrapper($url, $text);
+    }
+
+    /**
+     * 下一页按钮
+     * @param string $text
+     * @return string
+     */
+    protected function getNextButton($text = '&raquo;')
+    {
+        if (!$this->hasMore) {
+            return $this->getDisabledTextWrapper($text);
+        }
+
+        $url = $this->url($this->currentPage() + 1);
+
+        return $this->getPageLinkWrapper($url, $text);
+    }
+
+    /**
+     * 页码按钮
+     * @return string
+     */
+    protected function getLinks()
+    {
+        if ($this->simple) {
+            return '';
+        }
+
+        $block = [
+            'first'  => null,
+            'slider' => null,
+            'last'   => null,
+        ];
+
+        $side   = 3;
+        $window = $side * 2;
+
+        if ($this->lastPage < $window + 6) {
+            $block['first'] = $this->getUrlRange(1, $this->lastPage);
+        } elseif ($this->currentPage <= $window) {
+            $block['first'] = $this->getUrlRange(1, $window + 2);
+            $block['last']  = $this->getUrlRange($this->lastPage - 1, $this->lastPage);
+        } elseif ($this->currentPage > ($this->lastPage - $window)) {
+            $block['first'] = $this->getUrlRange(1, 2);
+            $block['last']  = $this->getUrlRange($this->lastPage - ($window + 2), $this->lastPage);
+        } else {
+            $block['first']  = $this->getUrlRange(1, 2);
+            $block['slider'] = $this->getUrlRange($this->currentPage - $side, $this->currentPage + $side);
+            $block['last']   = $this->getUrlRange($this->lastPage - 1, $this->lastPage);
+        }
+
+        $html = '';
+
+        if (is_array($block['first'])) {
+            $html .= $this->getUrlLinks($block['first']);
+        }
+
+        if (is_array($block['slider'])) {
+            $html .= $this->getDots();
+            $html .= $this->getUrlLinks($block['slider']);
+        }
+
+        if (is_array($block['last'])) {
+            $html .= $this->getDots();
+            $html .= $this->getUrlLinks($block['last']);
+        }
+
+        return $html;
+    }
+
+    /**
+     * 渲染分页html
+     * @return mixed
+     */
+    public function render()
+    {
+        if ($this->hasPages()) {
+            if ($this->simple) {
+                return sprintf(
+                    '<ul class="pager">%s %s</ul>',
+                    $this->getPreviousButton(),
+                    $this->getNextButton()
+                );
+            } else {
+                return sprintf(
+                    '<ul class="pagination">%s %s %s</ul>',
+                    $this->getPreviousButton(),
+                    $this->getLinks(),
+                    $this->getNextButton()
+                );
+            }
+        }
+    }
+
+    /**
+     * 生成一个可点击的按钮
+     *
+     * @param  string $url
+     * @param  int    $page
+     * @return string
+     */
+    protected function getAvailablePageWrapper($url, $page)
+    {
+        return '<li><a href="' . htmlentities($url) . '">' . $page . '</a></li>';
+    }
+
+    /**
+     * 生成一个禁用的按钮
+     *
+     * @param  string $text
+     * @return string
+     */
+    protected function getDisabledTextWrapper($text)
+    {
+        return '<li class="disabled"><span>' . $text . '</span></li>';
+    }
+
+    /**
+     * 生成一个激活的按钮
+     *
+     * @param  string $text
+     * @return string
+     */
+    protected function getActivePageWrapper($text)
+    {
+        return '<li class="active"><span>' . $text . '</span></li>';
+    }
+
+    /**
+     * 生成省略号按钮
+     *
+     * @return string
+     */
+    protected function getDots()
+    {
+        return $this->getDisabledTextWrapper('...');
+    }
+
+    /**
+     * 批量生成页码按钮.
+     *
+     * @param  array $urls
+     * @return string
+     */
+    protected function getUrlLinks(array $urls)
+    {
+        $html = '';
+
+        foreach ($urls as $page => $url) {
+            $html .= $this->getPageLinkWrapper($url, $page);
+        }
+
+        return $html;
+    }
+
+    /**
+     * 生成普通页码按钮
+     *
+     * @param  string $url
+     * @param  int    $page
+     * @return string
+     */
+    protected function getPageLinkWrapper($url, $page)
+    {
+        if ($this->currentPage() == $page) {
+            return $this->getActivePageWrapper($page);
+        }
+
+        return $this->getAvailablePageWrapper($url, $page);
+    }
+}
diff --git a/thinkphp/library/think/process/Builder.php b/thinkphp/library/think/process/Builder.php
new file mode 100644
index 0000000000000000000000000000000000000000..da5616397258db3d3862f51016600ce084cdb5e2
--- /dev/null
+++ b/thinkphp/library/think/process/Builder.php
@@ -0,0 +1,233 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\process;
+
+use think\Process;
+
+class Builder
+{
+    private $arguments;
+    private $cwd;
+    private $env = null;
+    private $input;
+    private $timeout        = 60;
+    private $options        = [];
+    private $inheritEnv     = true;
+    private $prefix         = [];
+    private $outputDisabled = false;
+
+    /**
+     * 构造方法
+     * @param string[] $arguments 参数
+     */
+    public function __construct(array $arguments = [])
+    {
+        $this->arguments = $arguments;
+    }
+
+    /**
+     * 创建一个实例
+     * @param string[] $arguments 参数
+     * @return self
+     */
+    public static function create(array $arguments = [])
+    {
+        return new static($arguments);
+    }
+
+    /**
+     * 添加一个参数
+     * @param string $argument 参数
+     * @return self
+     */
+    public function add($argument)
+    {
+        $this->arguments[] = $argument;
+
+        return $this;
+    }
+
+    /**
+     * 添加一个前缀
+     * @param string|array $prefix
+     * @return self
+     */
+    public function setPrefix($prefix)
+    {
+        $this->prefix = is_array($prefix) ? $prefix : [$prefix];
+
+        return $this;
+    }
+
+    /**
+     * 设置参数
+     * @param string[] $arguments
+     * @return  self
+     */
+    public function setArguments(array $arguments)
+    {
+        $this->arguments = $arguments;
+
+        return $this;
+    }
+
+    /**
+     * 设置工作目录
+     * @param null|string $cwd
+     * @return  self
+     */
+    public function setWorkingDirectory($cwd)
+    {
+        $this->cwd = $cwd;
+
+        return $this;
+    }
+
+    /**
+     * 是否初始化环境变量
+     * @param bool $inheritEnv
+     * @return self
+     */
+    public function inheritEnvironmentVariables($inheritEnv = true)
+    {
+        $this->inheritEnv = $inheritEnv;
+
+        return $this;
+    }
+
+    /**
+     * 设置环境变量
+     * @param string      $name
+     * @param null|string $value
+     * @return self
+     */
+    public function setEnv($name, $value)
+    {
+        $this->env[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     *  添加环境变量
+     * @param array $variables
+     * @return self
+     */
+    public function addEnvironmentVariables(array $variables)
+    {
+        $this->env = array_replace($this->env, $variables);
+
+        return $this;
+    }
+
+    /**
+     * 设置输入
+     * @param mixed $input
+     * @return self
+     */
+    public function setInput($input)
+    {
+        $this->input = Utils::validateInput(sprintf('%s::%s', __CLASS__, __FUNCTION__), $input);
+
+        return $this;
+    }
+
+    /**
+     * 设置超时时间
+     * @param float|null $timeout
+     * @return self
+     */
+    public function setTimeout($timeout)
+    {
+        if (null === $timeout) {
+            $this->timeout = null;
+
+            return $this;
+        }
+
+        $timeout = (float) $timeout;
+
+        if ($timeout < 0) {
+            throw new \InvalidArgumentException('The timeout value must be a valid positive integer or float number.');
+        }
+
+        $this->timeout = $timeout;
+
+        return $this;
+    }
+
+    /**
+     * 设置proc_open选项
+     * @param string $name
+     * @param string $value
+     * @return self
+     */
+    public function setOption($name, $value)
+    {
+        $this->options[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * 禁止输出
+     * @return self
+     */
+    public function disableOutput()
+    {
+        $this->outputDisabled = true;
+
+        return $this;
+    }
+
+    /**
+     * 开启输出
+     * @return self
+     */
+    public function enableOutput()
+    {
+        $this->outputDisabled = false;
+
+        return $this;
+    }
+
+    /**
+     * 创建一个Process实例
+     * @return Process
+     */
+    public function getProcess()
+    {
+        if (0 === count($this->prefix) && 0 === count($this->arguments)) {
+            throw new \LogicException('You must add() command arguments before calling getProcess().');
+        }
+
+        $options = $this->options;
+
+        $arguments = array_merge($this->prefix, $this->arguments);
+        $script    = implode(' ', array_map([__NAMESPACE__ . '\\Utils', 'escapeArgument'], $arguments));
+
+        if ($this->inheritEnv) {
+            // include $_ENV for BC purposes
+            $env = array_replace($_ENV, $_SERVER, $this->env);
+        } else {
+            $env = $this->env;
+        }
+
+        $process = new Process($script, $this->cwd, $env, $this->input, $this->timeout, $options);
+
+        if ($this->outputDisabled) {
+            $process->disableOutput();
+        }
+
+        return $process;
+    }
+}
diff --git a/thinkphp/library/think/process/Utils.php b/thinkphp/library/think/process/Utils.php
new file mode 100644
index 0000000000000000000000000000000000000000..f94c6488e436306a28e1235b6e5003195fd7d7d9
--- /dev/null
+++ b/thinkphp/library/think/process/Utils.php
@@ -0,0 +1,75 @@
+<?php
+// +----------------------------------------------------------------------
+// | TopThink [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2015 http://www.topthink.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Author: zhangyajun <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\process;
+
+class Utils
+{
+
+    /**
+     * 转义字符串
+     * @param string $argument
+     * @return string
+     */
+    public static function escapeArgument($argument)
+    {
+
+        if ('' === $argument) {
+            return escapeshellarg($argument);
+        }
+        $escapedArgument = '';
+        $quote           = false;
+        foreach (preg_split('/(")/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
+            if ('"' === $part) {
+                $escapedArgument .= '\\"';
+            } elseif (self::isSurroundedBy($part, '%')) {
+                // Avoid environment variable expansion
+                $escapedArgument .= '^%"' . substr($part, 1, -1) . '"^%';
+            } else {
+                // escape trailing backslash
+                if ('\\' === substr($part, -1)) {
+                    $part .= '\\';
+                }
+                $quote = true;
+                $escapedArgument .= $part;
+            }
+        }
+        if ($quote) {
+            $escapedArgument = '"' . $escapedArgument . '"';
+        }
+        return $escapedArgument;
+    }
+
+    /**
+     * 验证并进行规范化Process输入。
+     * @param string $caller
+     * @param mixed  $input
+     * @return string
+     * @throws \InvalidArgumentException
+     */
+    public static function validateInput($caller, $input)
+    {
+        if (null !== $input) {
+            if (is_resource($input)) {
+                return $input;
+            }
+            if (is_scalar($input)) {
+                return (string) $input;
+            }
+            throw new \InvalidArgumentException(sprintf('%s only accepts strings or stream resources.', $caller));
+        }
+        return $input;
+    }
+
+    private static function isSurroundedBy($arg, $char)
+    {
+        return 2 < strlen($arg) && $char === $arg[0] && $char === $arg[strlen($arg) - 1];
+    }
+
+}
diff --git a/thinkphp/library/think/process/exception/Faild.php b/thinkphp/library/think/process/exception/Faild.php
new file mode 100644
index 0000000000000000000000000000000000000000..38647bc11b1f6c82f450e5a7f34f900287ad7f87
--- /dev/null
+++ b/thinkphp/library/think/process/exception/Faild.php
@@ -0,0 +1,42 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\process\exception;
+
+use think\Process;
+
+class Faild extends \RuntimeException
+{
+
+    private $process;
+
+    public function __construct(Process $process)
+    {
+        if ($process->isSuccessful()) {
+            throw new \InvalidArgumentException('Expected a failed process, but the given process was successful.');
+        }
+
+        $error = sprintf('The command "%s" failed.' . "\nExit Code: %s(%s)", $process->getCommandLine(), $process->getExitCode(), $process->getExitCodeText());
+
+        if (!$process->isOutputDisabled()) {
+            $error .= sprintf("\n\nOutput:\n================\n%s\n\nError Output:\n================\n%s", $process->getOutput(), $process->getErrorOutput());
+        }
+
+        parent::__construct($error);
+
+        $this->process = $process;
+    }
+
+    public function getProcess()
+    {
+        return $this->process;
+    }
+}
diff --git a/thinkphp/library/think/process/exception/Failed.php b/thinkphp/library/think/process/exception/Failed.php
new file mode 100644
index 0000000000000000000000000000000000000000..5295082325cf1514440e217130e44aa77ef6b980
--- /dev/null
+++ b/thinkphp/library/think/process/exception/Failed.php
@@ -0,0 +1,42 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\process\exception;
+
+use think\Process;
+
+class Failed extends \RuntimeException
+{
+
+    private $process;
+
+    public function __construct(Process $process)
+    {
+        if ($process->isSuccessful()) {
+            throw new \InvalidArgumentException('Expected a failed process, but the given process was successful.');
+        }
+
+        $error = sprintf('The command "%s" failed.' . "\nExit Code: %s(%s)", $process->getCommandLine(), $process->getExitCode(), $process->getExitCodeText());
+
+        if (!$process->isOutputDisabled()) {
+            $error .= sprintf("\n\nOutput:\n================\n%s\n\nError Output:\n================\n%s", $process->getOutput(), $process->getErrorOutput());
+        }
+
+        parent::__construct($error);
+
+        $this->process = $process;
+    }
+
+    public function getProcess()
+    {
+        return $this->process;
+    }
+}
diff --git a/thinkphp/library/think/process/exception/Timeout.php b/thinkphp/library/think/process/exception/Timeout.php
new file mode 100644
index 0000000000000000000000000000000000000000..d5f1162f4392ce382d2f4e3f512d6e31db3625a5
--- /dev/null
+++ b/thinkphp/library/think/process/exception/Timeout.php
@@ -0,0 +1,61 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\process\exception;
+
+use think\Process;
+
+class Timeout extends \RuntimeException
+{
+
+    const TYPE_GENERAL = 1;
+    const TYPE_IDLE    = 2;
+
+    private $process;
+    private $timeoutType;
+
+    public function __construct(Process $process, $timeoutType)
+    {
+        $this->process     = $process;
+        $this->timeoutType = $timeoutType;
+
+        parent::__construct(sprintf('The process "%s" exceeded the timeout of %s seconds.', $process->getCommandLine(), $this->getExceededTimeout()));
+    }
+
+    public function getProcess()
+    {
+        return $this->process;
+    }
+
+    public function isGeneralTimeout()
+    {
+        return $this->timeoutType === self::TYPE_GENERAL;
+    }
+
+    public function isIdleTimeout()
+    {
+        return $this->timeoutType === self::TYPE_IDLE;
+    }
+
+    public function getExceededTimeout()
+    {
+        switch ($this->timeoutType) {
+            case self::TYPE_GENERAL:
+                return $this->process->getTimeout();
+
+            case self::TYPE_IDLE:
+                return $this->process->getIdleTimeout();
+
+            default:
+                throw new \LogicException(sprintf('Unknown timeout type "%d".', $this->timeoutType));
+        }
+    }
+}
diff --git a/thinkphp/library/think/process/pipes/Pipes.php b/thinkphp/library/think/process/pipes/Pipes.php
new file mode 100644
index 0000000000000000000000000000000000000000..82396b8ff8b2318bce56e9f55369780dc053e347
--- /dev/null
+++ b/thinkphp/library/think/process/pipes/Pipes.php
@@ -0,0 +1,93 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\process\pipes;
+
+abstract class Pipes
+{
+
+    /** @var array */
+    public $pipes = [];
+
+    /** @var string */
+    protected $inputBuffer = '';
+    /** @var resource|null */
+    protected $input;
+
+    /** @var bool */
+    private $blocked = true;
+
+    const CHUNK_SIZE = 16384;
+
+    /**
+     * 返回用于 proc_open 描述符的数组
+     * @return array
+     */
+    abstract public function getDescriptors();
+
+    /**
+     * 返回一个数组的索引由其相关的流，以防这些管道使用的临时文件的文件名。
+     * @return string[]
+     */
+    abstract public function getFiles();
+
+    /**
+     * 文件句柄和管道中读取数据。
+     * @param bool $blocking 是否使用阻塞调用
+     * @param bool $close    是否要关闭管道，如果他们已经到达 EOF。
+     * @return string[]
+     */
+    abstract public function readAndWrite($blocking, $close = false);
+
+    /**
+     * 返回当前状态如果有打开的文件句柄或管道。
+     * @return bool
+     */
+    abstract public function areOpen();
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        foreach ($this->pipes as $pipe) {
+            fclose($pipe);
+        }
+        $this->pipes = [];
+    }
+
+    /**
+     * 检查系统调用已被中断
+     * @return bool
+     */
+    protected function hasSystemCallBeenInterrupted()
+    {
+        $lastError = error_get_last();
+
+        return isset($lastError['message']) && false !== stripos($lastError['message'], 'interrupted system call');
+    }
+
+    protected function unblock()
+    {
+        if (!$this->blocked) {
+            return;
+        }
+
+        foreach ($this->pipes as $pipe) {
+            stream_set_blocking($pipe, 0);
+        }
+        if (null !== $this->input) {
+            stream_set_blocking($this->input, 0);
+        }
+
+        $this->blocked = false;
+    }
+}
diff --git a/thinkphp/library/think/process/pipes/Unix.php b/thinkphp/library/think/process/pipes/Unix.php
new file mode 100644
index 0000000000000000000000000000000000000000..fd99a5d67eba451ea46caef249d613e396fbef66
--- /dev/null
+++ b/thinkphp/library/think/process/pipes/Unix.php
@@ -0,0 +1,196 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\process\pipes;
+
+use think\Process;
+
+class Unix extends Pipes
+{
+
+    /** @var bool */
+    private $ttyMode;
+    /** @var bool */
+    private $ptyMode;
+    /** @var bool */
+    private $disableOutput;
+
+    public function __construct($ttyMode, $ptyMode, $input, $disableOutput)
+    {
+        $this->ttyMode       = (bool) $ttyMode;
+        $this->ptyMode       = (bool) $ptyMode;
+        $this->disableOutput = (bool) $disableOutput;
+
+        if (is_resource($input)) {
+            $this->input = $input;
+        } else {
+            $this->inputBuffer = (string) $input;
+        }
+    }
+
+    public function __destruct()
+    {
+        $this->close();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDescriptors()
+    {
+        if ($this->disableOutput) {
+            $nullstream = fopen('/dev/null', 'c');
+
+            return [
+                ['pipe', 'r'],
+                $nullstream,
+                $nullstream,
+            ];
+        }
+
+        if ($this->ttyMode) {
+            return [
+                ['file', '/dev/tty', 'r'],
+                ['file', '/dev/tty', 'w'],
+                ['file', '/dev/tty', 'w'],
+            ];
+        }
+
+        if ($this->ptyMode && Process::isPtySupported()) {
+            return [
+                ['pty'],
+                ['pty'],
+                ['pty'],
+            ];
+        }
+
+        return [
+            ['pipe', 'r'],
+            ['pipe', 'w'], // stdout
+            ['pipe', 'w'], // stderr
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFiles()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function readAndWrite($blocking, $close = false)
+    {
+
+        if (1 === count($this->pipes) && [0] === array_keys($this->pipes)) {
+            fclose($this->pipes[0]);
+            unset($this->pipes[0]);
+        }
+
+        if (empty($this->pipes)) {
+            return [];
+        }
+
+        $this->unblock();
+
+        $read = [];
+
+        if (null !== $this->input) {
+            $r = array_merge($this->pipes, ['input' => $this->input]);
+        } else {
+            $r = $this->pipes;
+        }
+
+        unset($r[0]);
+
+        $w = isset($this->pipes[0]) ? [$this->pipes[0]] : null;
+        $e = null;
+
+        if (false === $n = @stream_select($r, $w, $e, 0, $blocking ? Process::TIMEOUT_PRECISION * 1E6 : 0)) {
+
+            if (!$this->hasSystemCallBeenInterrupted()) {
+                $this->pipes = [];
+            }
+
+            return $read;
+        }
+
+        if (0 === $n) {
+            return $read;
+        }
+
+        foreach ($r as $pipe) {
+
+            $type = (false !== $found = array_search($pipe, $this->pipes)) ? $found : 'input';
+            $data = '';
+            while ('' !== $dataread = (string) fread($pipe, self::CHUNK_SIZE)) {
+                $data .= $dataread;
+            }
+
+            if ('' !== $data) {
+                if ('input' === $type) {
+                    $this->inputBuffer .= $data;
+                } else {
+                    $read[$type] = $data;
+                }
+            }
+
+            if (false === $data || (true === $close && feof($pipe) && '' === $data)) {
+                if ('input' === $type) {
+                    $this->input = null;
+                } else {
+                    fclose($this->pipes[$type]);
+                    unset($this->pipes[$type]);
+                }
+            }
+        }
+
+        if (null !== $w && 0 < count($w)) {
+            while (strlen($this->inputBuffer)) {
+                $written = fwrite($w[0], $this->inputBuffer, 2 << 18); // write 512k
+                if ($written > 0) {
+                    $this->inputBuffer = (string) substr($this->inputBuffer, $written);
+                } else {
+                    break;
+                }
+            }
+        }
+
+        if ('' === $this->inputBuffer && null === $this->input && isset($this->pipes[0])) {
+            fclose($this->pipes[0]);
+            unset($this->pipes[0]);
+        }
+
+        return $read;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function areOpen()
+    {
+        return (bool) $this->pipes;
+    }
+
+    /**
+     * 创建一个新的 UnixPipes 实例
+     * @param Process         $process
+     * @param string|resource $input
+     * @return self
+     */
+    public static function create(Process $process, $input)
+    {
+        return new static($process->isTty(), $process->isPty(), $input, $process->isOutputDisabled());
+    }
+}
diff --git a/thinkphp/library/think/process/pipes/Windows.php b/thinkphp/library/think/process/pipes/Windows.php
new file mode 100644
index 0000000000000000000000000000000000000000..1b8b0d4f2e5c695cf1a778cd6a6b8fb7ec948eb8
--- /dev/null
+++ b/thinkphp/library/think/process/pipes/Windows.php
@@ -0,0 +1,228 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2015 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: yunwuxin <448901948@qq.com>
+// +----------------------------------------------------------------------
+
+namespace think\process\pipes;
+
+use think\Process;
+
+class Windows extends Pipes
+{
+
+    /** @var array */
+    private $files = [];
+    /** @var array */
+    private $fileHandles = [];
+    /** @var array */
+    private $readBytes = [
+        Process::STDOUT => 0,
+        Process::STDERR => 0,
+    ];
+    /** @var bool */
+    private $disableOutput;
+
+    public function __construct($disableOutput, $input)
+    {
+        $this->disableOutput = (bool) $disableOutput;
+
+        if (!$this->disableOutput) {
+
+            $this->files = [
+                Process::STDOUT => tempnam(sys_get_temp_dir(), 'sf_proc_stdout'),
+                Process::STDERR => tempnam(sys_get_temp_dir(), 'sf_proc_stderr'),
+            ];
+            foreach ($this->files as $offset => $file) {
+                $this->fileHandles[$offset] = fopen($this->files[$offset], 'rb');
+                if (false === $this->fileHandles[$offset]) {
+                    throw new \RuntimeException('A temporary file could not be opened to write the process output to, verify that your TEMP environment variable is writable');
+                }
+            }
+        }
+
+        if (is_resource($input)) {
+            $this->input = $input;
+        } else {
+            $this->inputBuffer = $input;
+        }
+    }
+
+    public function __destruct()
+    {
+        $this->close();
+        $this->removeFiles();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDescriptors()
+    {
+        if ($this->disableOutput) {
+            $nullstream = fopen('NUL', 'c');
+
+            return [
+                ['pipe', 'r'],
+                $nullstream,
+                $nullstream,
+            ];
+        }
+
+        return [
+            ['pipe', 'r'],
+            ['file', 'NUL', 'w'],
+            ['file', 'NUL', 'w'],
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getFiles()
+    {
+        return $this->files;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function readAndWrite($blocking, $close = false)
+    {
+        $this->write($blocking, $close);
+
+        $read = [];
+        $fh   = $this->fileHandles;
+        foreach ($fh as $type => $fileHandle) {
+            if (0 !== fseek($fileHandle, $this->readBytes[$type])) {
+                continue;
+            }
+            $data     = '';
+            $dataread = null;
+            while (!feof($fileHandle)) {
+                if (false !== $dataread = fread($fileHandle, self::CHUNK_SIZE)) {
+                    $data .= $dataread;
+                }
+            }
+            if (0 < $length = strlen($data)) {
+                $this->readBytes[$type] += $length;
+                $read[$type] = $data;
+            }
+
+            if (false === $dataread || (true === $close && feof($fileHandle) && '' === $data)) {
+                fclose($this->fileHandles[$type]);
+                unset($this->fileHandles[$type]);
+            }
+        }
+
+        return $read;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function areOpen()
+    {
+        return (bool) $this->pipes && (bool) $this->fileHandles;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function close()
+    {
+        parent::close();
+        foreach ($this->fileHandles as $handle) {
+            fclose($handle);
+        }
+        $this->fileHandles = [];
+    }
+
+    /**
+     * 创建一个新的 WindowsPipes 实例。
+     * @param Process $process
+     * @param         $input
+     * @return self
+     */
+    public static function create(Process $process, $input)
+    {
+        return new static($process->isOutputDisabled(), $input);
+    }
+
+    /**
+     * 删除临时文件
+     */
+    private function removeFiles()
+    {
+        foreach ($this->files as $filename) {
+            if (file_exists($filename)) {
+                @unlink($filename);
+            }
+        }
+        $this->files = [];
+    }
+
+    /**
+     * 写入到 stdin 输入
+     * @param bool $blocking
+     * @param bool $close
+     */
+    private function write($blocking, $close)
+    {
+        if (empty($this->pipes)) {
+            return;
+        }
+
+        $this->unblock();
+
+        $r = null !== $this->input ? ['input' => $this->input] : null;
+        $w = isset($this->pipes[0]) ? [$this->pipes[0]] : null;
+        $e = null;
+
+        if (false === $n = @stream_select($r, $w, $e, 0, $blocking ? Process::TIMEOUT_PRECISION * 1E6 : 0)) {
+            if (!$this->hasSystemCallBeenInterrupted()) {
+                $this->pipes = [];
+            }
+
+            return;
+        }
+
+        if (0 === $n) {
+            return;
+        }
+
+        if (null !== $r && 0 < count($r)) {
+            $data = '';
+            while ($dataread = fread($r['input'], self::CHUNK_SIZE)) {
+                $data .= $dataread;
+            }
+
+            $this->inputBuffer .= $data;
+
+            if (false === $data || (true === $close && feof($r['input']) && '' === $data)) {
+                $this->input = null;
+            }
+        }
+
+        if (null !== $w && 0 < count($w)) {
+            while (strlen($this->inputBuffer)) {
+                $written = fwrite($w[0], $this->inputBuffer, 2 << 18);
+                if ($written > 0) {
+                    $this->inputBuffer = (string) substr($this->inputBuffer, $written);
+                } else {
+                    break;
+                }
+            }
+        }
+
+        if ('' === $this->inputBuffer && null === $this->input && isset($this->pipes[0])) {
+            fclose($this->pipes[0]);
+            unset($this->pipes[0]);
+        }
+    }
+}
diff --git a/thinkphp/library/think/response/Json.php b/thinkphp/library/think/response/Json.php
new file mode 100644
index 0000000000000000000000000000000000000000..aa5bbd6fa98e644d47efe5cd94cae3ed40c45d7e
--- /dev/null
+++ b/thinkphp/library/think/response/Json.php
@@ -0,0 +1,51 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\response;
+
+use think\Response;
+
+class Json extends Response
+{
+    // 输出参数
+    protected $options = [
+        'json_encode_param' => JSON_UNESCAPED_UNICODE,
+    ];
+
+    protected $contentType = 'application/json';
+
+    /**
+     * 处理数据
+     * @access protected
+     * @param  mixed $data 要处理的数据
+     * @return mixed
+     * @throws \Exception
+     */
+    protected function output($data)
+    {
+        try {
+            // 返回JSON数据格式到客户端 包含状态信息
+            $data = json_encode($data, $this->options['json_encode_param']);
+
+            if (false === $data) {
+                throw new \InvalidArgumentException(json_last_error_msg());
+            }
+
+            return $data;
+        } catch (\Exception $e) {
+            if ($e->getPrevious()) {
+                throw $e->getPrevious();
+            }
+            throw $e;
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/response/Jsonp.php b/thinkphp/library/think/response/Jsonp.php
new file mode 100644
index 0000000000000000000000000000000000000000..f69e88e1d0f5870b1c5b93b37f0542ea7fc6d8d2
--- /dev/null
+++ b/thinkphp/library/think/response/Jsonp.php
@@ -0,0 +1,58 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\response;
+
+use think\Response;
+
+class Jsonp extends Response
+{
+    // 输出参数
+    protected $options = [
+        'var_jsonp_handler'     => 'callback',
+        'default_jsonp_handler' => 'jsonpReturn',
+        'json_encode_param'     => JSON_UNESCAPED_UNICODE,
+    ];
+
+    protected $contentType = 'application/javascript';
+
+    /**
+     * 处理数据
+     * @access protected
+     * @param  mixed $data 要处理的数据
+     * @return mixed
+     * @throws \Exception
+     */
+    protected function output($data)
+    {
+        try {
+            // 返回JSON数据格式到客户端 包含状态信息 [当url_common_param为false时是无法获取到$_GET的数据的，故使用Request来获取<xiaobo.sun@qq.com>]
+            $var_jsonp_handler = $this->app['request']->param($this->options['var_jsonp_handler'], "");
+            $handler           = !empty($var_jsonp_handler) ? $var_jsonp_handler : $this->options['default_jsonp_handler'];
+
+            $data = json_encode($data, $this->options['json_encode_param']);
+
+            if (false === $data) {
+                throw new \InvalidArgumentException(json_last_error_msg());
+            }
+
+            $data = $handler . '(' . $data . ');';
+
+            return $data;
+        } catch (\Exception $e) {
+            if ($e->getPrevious()) {
+                throw $e->getPrevious();
+            }
+            throw $e;
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/response/Jump.php b/thinkphp/library/think/response/Jump.php
new file mode 100644
index 0000000000000000000000000000000000000000..258448ca4ae5a98a63a942fe8a8cfad69566de13
--- /dev/null
+++ b/thinkphp/library/think/response/Jump.php
@@ -0,0 +1,32 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\response;
+
+use think\Response;
+
+class Jump extends Response
+{
+    protected $contentType = 'text/html';
+
+    /**
+     * 处理数据
+     * @access protected
+     * @param  mixed $data 要处理的数据
+     * @return mixed
+     * @throws \Exception
+     */
+    protected function output($data)
+    {
+        $data = $this->app['view']->fetch($this->options['jump_template'], $data);
+        return $data;
+    }
+}
diff --git a/thinkphp/library/think/response/Redirect.php b/thinkphp/library/think/response/Redirect.php
new file mode 100644
index 0000000000000000000000000000000000000000..62fa83a7aafd42d880ee6302f60417342c13ce03
--- /dev/null
+++ b/thinkphp/library/think/response/Redirect.php
@@ -0,0 +1,115 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\response;
+
+use think\Response;
+
+class Redirect extends Response
+{
+
+    protected $options = [];
+
+    // URL参数
+    protected $params = [];
+
+    public function __construct($data = '', $code = 302, array $header = [], array $options = [])
+    {
+        parent::__construct($data, $code, $header, $options);
+
+        $this->cacheControl('no-cache,must-revalidate');
+    }
+
+    /**
+     * 处理数据
+     * @access protected
+     * @param  mixed $data 要处理的数据
+     * @return mixed
+     */
+    protected function output($data)
+    {
+        $this->header['Location'] = $this->getTargetUrl();
+
+        return;
+    }
+
+    /**
+     * 重定向传值（通过Session）
+     * @access protected
+     * @param  string|array  $name 变量名或者数组
+     * @param  mixed         $value 值
+     * @return $this
+     */
+    public function with($name, $value = null)
+    {
+        $session = $this->app['session'];
+
+        if (is_array($name)) {
+            foreach ($name as $key => $val) {
+                $session->flash($key, $val);
+            }
+        } else {
+            $session->flash($name, $value);
+        }
+
+        return $this;
+    }
+
+    /**
+     * 获取跳转地址
+     * @access public
+     * @return string
+     */
+    public function getTargetUrl()
+    {
+        if (strpos($this->data, '://') || (0 === strpos($this->data, '/') && empty($this->params))) {
+            return $this->data;
+        } else {
+            return $this->app['url']->build($this->data, $this->params);
+        }
+    }
+
+    public function params($params = [])
+    {
+        $this->params = $params;
+
+        return $this;
+    }
+
+    /**
+     * 记住当前url后跳转
+     * @access public
+     * @return $this
+     */
+    public function remember()
+    {
+        $this->app['session']->set('redirect_url', $this->app['request']->url());
+
+        return $this;
+    }
+
+    /**
+     * 跳转到上次记住的url
+     * @access public
+     * @return $this
+     */
+    public function restore()
+    {
+        $session = $this->app['session'];
+
+        if ($session->has('redirect_url')) {
+            $this->data = $session->get('redirect_url');
+            $session->delete('redirect_url');
+        }
+
+        return $this;
+    }
+}
diff --git a/thinkphp/library/think/response/View.php b/thinkphp/library/think/response/View.php
new file mode 100644
index 0000000000000000000000000000000000000000..c836ccb5d4cce0cee1f076a159db9bad707a8935
--- /dev/null
+++ b/thinkphp/library/think/response/View.php
@@ -0,0 +1,94 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\response;
+
+use think\Response;
+
+class View extends Response
+{
+    // 输出参数
+    protected $options = [];
+    protected $vars    = [];
+    protected $filter;
+    protected $contentType = 'text/html';
+
+    /**
+     * 处理数据
+     * @access protected
+     * @param  mixed $data 要处理的数据
+     * @return mixed
+     */
+    protected function output($data)
+    {
+        // 渲染模板输出
+        return $this->app['view']
+            ->filter($this->filter)
+            ->fetch($data, $this->vars);
+    }
+
+    /**
+     * 获取视图变量
+     * @access public
+     * @param  string $name 模板变量
+     * @return mixed
+     */
+    public function getVars($name = null)
+    {
+        if (is_null($name)) {
+            return $this->vars;
+        } else {
+            return isset($this->vars[$name]) ? $this->vars[$name] : null;
+        }
+    }
+
+    /**
+     * 模板变量赋值
+     * @access public
+     * @param  mixed $name  变量名
+     * @param  mixed $value 变量值
+     * @return $this
+     */
+    public function assign($name, $value = '')
+    {
+        if (is_array($name)) {
+            $this->vars = array_merge($this->vars, $name);
+        } else {
+            $this->vars[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 视图内容过滤
+     * @access public
+     * @param callable $filter
+     * @return $this
+     */
+    public function filter($filter)
+    {
+        $this->filter = $filter;
+        return $this;
+    }
+
+    /**
+     * 检查模板是否存在
+     * @access private
+     * @param  string|array  $name 参数名
+     * @return bool
+     */
+    public function exists($name)
+    {
+        return $this->app['view']->exists($name);
+    }
+
+}
diff --git a/thinkphp/library/think/response/Xml.php b/thinkphp/library/think/response/Xml.php
new file mode 100644
index 0000000000000000000000000000000000000000..9c1681a4a389c29d217b991cc065ee2abccad23f
--- /dev/null
+++ b/thinkphp/library/think/response/Xml.php
@@ -0,0 +1,116 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\response;
+
+use think\Collection;
+use think\Model;
+use think\Response;
+
+class Xml extends Response
+{
+    // 输出参数
+    protected $options = [
+        // 根节点名
+        'root_node' => 'think',
+        // 根节点属性
+        'root_attr' => '',
+        //数字索引的子节点名
+        'item_node' => 'item',
+        // 数字索引子节点key转换的属性名
+        'item_key'  => 'id',
+        // 数据编码
+        'encoding'  => 'utf-8',
+    ];
+
+    protected $contentType = 'text/xml';
+
+    /**
+     * 处理数据
+     * @access protected
+     * @param  mixed $data 要处理的数据
+     * @return mixed
+     */
+    protected function output($data)
+    {
+        if (is_string($data)) {
+            if (0 !== strpos($data, '<?xml')) {
+                $encoding = $this->options['encoding'];
+                $xml      = "<?xml version=\"1.0\" encoding=\"{$encoding}\"?>";
+                $data     = $xml . $data;
+            }
+            return $data;
+        }
+
+        // XML数据转换
+        return $this->xmlEncode($data, $this->options['root_node'], $this->options['item_node'], $this->options['root_attr'], $this->options['item_key'], $this->options['encoding']);
+    }
+
+    /**
+     * XML编码
+     * @access protected
+     * @param  mixed $data 数据
+     * @param  string $root 根节点名
+     * @param  string $item 数字索引的子节点名
+     * @param  string $attr 根节点属性
+     * @param  string $id   数字索引子节点key转换的属性名
+     * @param  string $encoding 数据编码
+     * @return string
+     */
+    protected function xmlEncode($data, $root, $item, $attr, $id, $encoding)
+    {
+        if (is_array($attr)) {
+            $array = [];
+            foreach ($attr as $key => $value) {
+                $array[] = "{$key}=\"{$value}\"";
+            }
+            $attr = implode(' ', $array);
+        }
+
+        $attr = trim($attr);
+        $attr = empty($attr) ? '' : " {$attr}";
+        $xml  = "<?xml version=\"1.0\" encoding=\"{$encoding}\"?>";
+        $xml .= "<{$root}{$attr}>";
+        $xml .= $this->dataToXml($data, $item, $id);
+        $xml .= "</{$root}>";
+
+        return $xml;
+    }
+
+    /**
+     * 数据XML编码
+     * @access protected
+     * @param  mixed  $data 数据
+     * @param  string $item 数字索引时的节点名称
+     * @param  string $id   数字索引key转换为的属性名
+     * @return string
+     */
+    protected function dataToXml($data, $item, $id)
+    {
+        $xml = $attr = '';
+
+        if ($data instanceof Collection || $data instanceof Model) {
+            $data = $data->toArray();
+        }
+
+        foreach ($data as $key => $val) {
+            if (is_numeric($key)) {
+                $id && $attr = " {$id}=\"{$key}\"";
+                $key         = $item;
+            }
+            $xml .= "<{$key}{$attr}>";
+            $xml .= (is_array($val) || is_object($val)) ? $this->dataToXml($val, $item, $id) : $val;
+            $xml .= "</{$key}>";
+        }
+
+        return $xml;
+    }
+}
diff --git a/thinkphp/library/think/route/AliasRule.php b/thinkphp/library/think/route/AliasRule.php
new file mode 100644
index 0000000000000000000000000000000000000000..daf59fe13ebb9345759d4bf2a67624afeb72b6b5
--- /dev/null
+++ b/thinkphp/library/think/route/AliasRule.php
@@ -0,0 +1,114 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route;
+
+use think\Route;
+
+class AliasRule extends Domain
+{
+    /**
+     * 架构函数
+     * @access public
+     * @param  Route             $router 路由实例
+     * @param  RuleGroup         $parent 上级对象
+     * @param  string            $name   路由别名
+     * @param  string            $route  路由绑定
+     * @param  array             $option 路由参数
+     */
+    public function __construct(Route $router, RuleGroup $parent, $name, $route, $option = [])
+    {
+        $this->router = $router;
+        $this->parent = $parent;
+        $this->name   = $name;
+        $this->route  = $route;
+        $this->option = $option;
+    }
+
+    /**
+     * 检测路由别名
+     * @access public
+     * @param  Request      $request  请求对象
+     * @param  string       $url      访问地址
+     * @param  bool         $completeMatch   路由是否完全匹配
+     * @return Dispatch|false
+     */
+    public function check($request, $url, $completeMatch = false)
+    {
+        if ($dispatch = $this->checkCrossDomain($request)) {
+            // 允许跨域
+            return $dispatch;
+        }
+
+        // 检查参数有效性
+        if (!$this->checkOption($this->option, $request)) {
+            return false;
+        }
+
+        list($action, $bind) = array_pad(explode('|', $url, 2), 2, '');
+
+        if (isset($this->option['allow']) && !in_array($action, $this->option['allow'])) {
+            // 允许操作
+            return false;
+        } elseif (isset($this->option['except']) && in_array($action, $this->option['except'])) {
+            // 排除操作
+            return false;
+        }
+
+        if (isset($this->option['method'][$action])) {
+            $this->option['method'] = $this->option['method'][$action];
+        }
+
+        // 匹配后执行的行为
+        $this->afterMatchGroup($request);
+
+        if ($this->parent) {
+            // 合并分组参数
+            $this->mergeGroupOptions();
+        }
+
+        $this->parseBindAppendParam($this->route);
+
+        if (0 === strpos($this->route, '\\')) {
+            // 路由到类
+            return $this->bindToClass($request, $bind, substr($this->route, 1));
+        } elseif (0 === strpos($this->route, '@')) {
+            // 路由到控制器类
+            return $this->bindToController($request, $bind, substr($this->route, 1));
+        } else {
+            // 路由到模块/控制器
+            return $this->bindToModule($request, $bind, $this->route);
+        }
+    }
+
+    /**
+     * 设置允许的操作方法
+     * @access public
+     * @param  array      $action  操作方法
+     * @return $this
+     */
+    public function allow($action = [])
+    {
+        return $this->option('allow', $action);
+    }
+
+    /**
+     * 设置排除的操作方法
+     * @access public
+     * @param  array      $action  操作方法
+     * @return $this
+     */
+    public function except($action = [])
+    {
+        return $this->option('except', $action);
+    }
+
+}
diff --git a/thinkphp/library/think/route/Dispatch.php b/thinkphp/library/think/route/Dispatch.php
new file mode 100644
index 0000000000000000000000000000000000000000..4b187d1e5658ca44e3d2725bb19b27850a3477fd
--- /dev/null
+++ b/thinkphp/library/think/route/Dispatch.php
@@ -0,0 +1,355 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route;
+
+use think\Container;
+use think\exception\ValidateException;
+use think\Request;
+use think\Response;
+
+abstract class Dispatch
+{
+    /**
+     * 应用对象
+     * @var App
+     */
+    protected $app;
+
+    /**
+     * 请求对象
+     * @var Request
+     */
+    protected $request;
+
+    /**
+     * 路由规则
+     * @var Rule
+     */
+    protected $rule;
+
+    /**
+     * 调度信息
+     * @var mixed
+     */
+    protected $dispatch;
+
+    /**
+     * 调度参数
+     * @var array
+     */
+    protected $param;
+
+    /**
+     * 状态码
+     * @var string
+     */
+    protected $code;
+
+    /**
+     * 是否进行大小写转换
+     * @var bool
+     */
+    protected $convert;
+
+    public function __construct(Request $request, Rule $rule, $dispatch, $param = [], $code = null)
+    {
+        $this->request  = $request;
+        $this->rule     = $rule;
+        $this->app      = Container::get('app');
+        $this->dispatch = $dispatch;
+        $this->param    = $param;
+        $this->code     = $code;
+
+        if (isset($param['convert'])) {
+            $this->convert = $param['convert'];
+        }
+    }
+
+    public function init()
+    {
+        // 执行路由后置操作
+        if ($this->rule->doAfter()) {
+            // 设置请求的路由信息
+
+            // 设置当前请求的参数
+            $this->request->setRouteVars($this->rule->getVars());
+            $this->request->routeInfo([
+                'rule'   => $this->rule->getRule(),
+                'route'  => $this->rule->getRoute(),
+                'option' => $this->rule->getOption(),
+                'var'    => $this->rule->getVars(),
+            ]);
+
+            $this->doRouteAfter();
+        }
+
+        return $this;
+    }
+
+    /**
+     * 检查路由后置操作
+     * @access protected
+     * @return void
+     */
+    protected function doRouteAfter()
+    {
+        // 记录匹配的路由信息
+        $option  = $this->rule->getOption();
+        $matches = $this->rule->getVars();
+
+        // 添加中间件
+        if (!empty($option['middleware'])) {
+            $this->app['middleware']->import($option['middleware']);
+        }
+
+        // 绑定模型数据
+        if (!empty($option['model'])) {
+            $this->createBindModel($option['model'], $matches);
+        }
+
+        // 指定Header数据
+        if (!empty($option['header'])) {
+            $header = $option['header'];
+            $this->app['hook']->add('response_send', function ($response) use ($header) {
+                $response->header($header);
+            });
+        }
+
+        // 指定Response响应数据
+        if (!empty($option['response'])) {
+            foreach ($option['response'] as $response) {
+                $this->app['hook']->add('response_send', $response);
+            }
+        }
+
+        // 开启请求缓存
+        if (isset($option['cache']) && $this->request->isGet()) {
+            $this->parseRequestCache($option['cache']);
+        }
+
+        if (!empty($option['append'])) {
+            $this->request->setRouteVars($option['append']);
+        }
+    }
+
+    /**
+     * 执行路由调度
+     * @access public
+     * @return mixed
+     */
+    public function run()
+    {
+        $option = $this->rule->getOption();
+
+        // 检测路由after行为
+        if (!empty($option['after'])) {
+            $dispatch = $this->checkAfter($option['after']);
+
+            if ($dispatch instanceof Response) {
+                return $dispatch;
+            }
+        }
+
+        // 数据自动验证
+        if (isset($option['validate'])) {
+            $this->autoValidate($option['validate']);
+        }
+
+        $data = $this->exec();
+
+        return $this->autoResponse($data);
+    }
+
+    protected function autoResponse($data)
+    {
+        if ($data instanceof Response) {
+            $response = $data;
+        } elseif (!is_null($data)) {
+            // 默认自动识别响应输出类型
+            $isAjax = $this->request->isAjax();
+            $type   = $isAjax ? $this->rule->getConfig('default_ajax_return') : $this->rule->getConfig('default_return_type');
+
+            $response = Response::create($data, $type);
+        } else {
+            $data     = ob_get_clean();
+            $content  = false === $data ? '' : $data;
+            $status   = false === $data ? 204 : 200;
+            $response = Response::create($content, '', $status);
+        }
+
+        return $response;
+    }
+
+    /**
+     * 检查路由后置行为
+     * @access protected
+     * @param  mixed   $after 后置行为
+     * @return mixed
+     */
+    protected function checkAfter($after)
+    {
+        $this->app['log']->notice('路由后置行为建议使用中间件替代！');
+
+        $hook = $this->app['hook'];
+
+        $result = null;
+
+        foreach ((array) $after as $behavior) {
+            $result = $hook->exec($behavior);
+
+            if (!is_null($result)) {
+                break;
+            }
+        }
+
+        // 路由规则重定向
+        if ($result instanceof Response) {
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * 验证数据
+     * @access protected
+     * @param  array             $option
+     * @return void
+     * @throws ValidateException
+     */
+    protected function autoValidate($option)
+    {
+        list($validate, $scene, $message, $batch) = $option;
+
+        if (is_array($validate)) {
+            // 指定验证规则
+            $v = $this->app->validate();
+            $v->rule($validate);
+        } else {
+            // 调用验证器
+            $v = $this->app->validate($validate);
+            if (!empty($scene)) {
+                $v->scene($scene);
+            }
+        }
+
+        if (!empty($message)) {
+            $v->message($message);
+        }
+
+        // 批量验证
+        if ($batch) {
+            $v->batch(true);
+        }
+
+        if (!$v->check($this->request->param())) {
+            throw new ValidateException($v->getError());
+        }
+    }
+
+    /**
+     * 处理路由请求缓存
+     * @access protected
+     * @param  Request       $request 请求对象
+     * @param  string|array  $cache  路由缓存
+     * @return void
+     */
+    protected function parseRequestCache($cache)
+    {
+        if (is_array($cache)) {
+            list($key, $expire, $tag) = array_pad($cache, 3, null);
+        } else {
+            $key    = str_replace('|', '/', $this->request->url());
+            $expire = $cache;
+            $tag    = null;
+        }
+
+        $this->request->cache($key, $expire, $tag);
+    }
+
+    /**
+     * 路由绑定模型实例
+     * @access protected
+     * @param  array|\Clousre    $bindModel 绑定模型
+     * @param  array             $matches   路由变量
+     * @return void
+     */
+    protected function createBindModel($bindModel, $matches)
+    {
+        foreach ($bindModel as $key => $val) {
+            if ($val instanceof \Closure) {
+                $result = $this->app->invokeFunction($val, $matches);
+            } else {
+                $fields = explode('&', $key);
+
+                if (is_array($val)) {
+                    list($model, $exception) = $val;
+                } else {
+                    $model     = $val;
+                    $exception = true;
+                }
+
+                $where = [];
+                $match = true;
+
+                foreach ($fields as $field) {
+                    if (!isset($matches[$field])) {
+                        $match = false;
+                        break;
+                    } else {
+                        $where[] = [$field, '=', $matches[$field]];
+                    }
+                }
+
+                if ($match) {
+                    $query  = strpos($model, '\\') ? $model::where($where) : $this->app->model($model)->where($where);
+                    $result = $query->failException($exception)->find();
+                }
+            }
+
+            if (!empty($result)) {
+                // 注入容器
+                $this->app->instance(get_class($result), $result);
+            }
+        }
+    }
+
+    public function convert($convert)
+    {
+        $this->convert = $convert;
+
+        return $this;
+    }
+
+    public function getDispatch()
+    {
+        return $this->dispatch;
+    }
+
+    public function getParam()
+    {
+        return $this->param;
+    }
+
+    abstract public function exec();
+
+    public function __sleep()
+    {
+        return ['rule', 'dispatch', 'convert', 'param', 'code', 'controller', 'actionName'];
+    }
+
+    public function __wakeup()
+    {
+        $this->app     = Container::get('app');
+        $this->request = $this->app['request'];
+    }
+}
diff --git a/thinkphp/library/think/route/Domain.php b/thinkphp/library/think/route/Domain.php
new file mode 100644
index 0000000000000000000000000000000000000000..260ca500ad67c10b0bf1e3ab02c4e78fdc0a3ef0
--- /dev/null
+++ b/thinkphp/library/think/route/Domain.php
@@ -0,0 +1,235 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route;
+
+use think\Container;
+use think\Loader;
+use think\Route;
+use think\route\dispatch\Callback as CallbackDispatch;
+use think\route\dispatch\Controller as ControllerDispatch;
+use think\route\dispatch\Module as ModuleDispatch;
+
+class Domain extends RuleGroup
+{
+    protected $bind;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  Route       $router   路由对象
+     * @param  string      $name     路由域名
+     * @param  mixed       $rule     域名路由
+     * @param  array       $option   路由参数
+     * @param  array       $pattern  变量规则
+     */
+    public function __construct(Route $router, $name = '', $rule = null, $option = [], $pattern = [])
+    {
+        $this->router  = $router;
+        $this->domain  = $name;
+        $this->option  = $option;
+        $this->rule    = $rule;
+        $this->pattern = $pattern;
+    }
+
+    /**
+     * 检测域名路由
+     * @access public
+     * @param  Request      $request  请求对象
+     * @param  string       $url      访问地址
+     * @param  bool         $completeMatch   路由是否完全匹配
+     * @return Dispatch|false
+     */
+    public function check($request, $url, $completeMatch = false)
+    {
+        // 检测别名路由
+        $result = $this->checkRouteAlias($request, $url);
+
+        if (false !== $result) {
+            return $result;
+        }
+
+        // 检测URL绑定
+        $result = $this->checkUrlBind($request, $url);
+
+        if (!empty($this->option['append'])) {
+            $request->setRouteVars($this->option['append']);
+            unset($this->option['append']);
+        }
+
+        if (false !== $result) {
+            return $result;
+        }
+
+        // 添加域名中间件
+        if (!empty($this->option['middleware'])) {
+            Container::get('middleware')->import($this->option['middleware']);
+            unset($this->option['middleware']);
+        }
+
+        return parent::check($request, $url, $completeMatch);
+    }
+
+    /**
+     * 设置路由绑定
+     * @access public
+     * @param  string     $bind 绑定信息
+     * @return $this
+     */
+    public function bind($bind)
+    {
+        $this->bind = $bind;
+        $this->router->bind($bind, $this->domain);
+
+        return $this;
+    }
+
+    /**
+     * 检测路由别名
+     * @access private
+     * @param  Request   $request
+     * @param  string    $url URL地址
+     * @return Dispatch|false
+     */
+    private function checkRouteAlias($request, $url)
+    {
+        $alias = strpos($url, '|') ? strstr($url, '|', true) : $url;
+
+        $item = $this->router->getAlias($alias);
+
+        return $item ? $item->check($request, $url) : false;
+    }
+
+    /**
+     * 检测URL绑定
+     * @access private
+     * @param  Request   $request
+     * @param  string    $url URL地址
+     * @return Dispatch|false
+     */
+    private function checkUrlBind($request, $url)
+    {
+        if (!empty($this->bind)) {
+            $bind = $this->bind;
+            $this->parseBindAppendParam($bind);
+
+            // 记录绑定信息
+            Container::get('app')->log('[ BIND ] ' . var_export($bind, true));
+
+            // 如果有URL绑定 则进行绑定检测
+            $type = substr($bind, 0, 1);
+            $bind = substr($bind, 1);
+
+            $bindTo = [
+                '\\' => 'bindToClass',
+                '@'  => 'bindToController',
+                ':'  => 'bindToNamespace',
+            ];
+
+            if (isset($bindTo[$type])) {
+                return $this->{$bindTo[$type]}($request, $url, $bind);
+            }
+        }
+
+        return false;
+    }
+
+    protected function parseBindAppendParam(&$bind)
+    {
+        if (false !== strpos($bind, '?')) {
+            list($bind, $query) = explode('?', $bind);
+            parse_str($query, $vars);
+            $this->append($vars);
+        }
+    }
+
+    /**
+     * 绑定到类
+     * @access protected
+     * @param  Request   $request
+     * @param  string    $url URL地址
+     * @param  string    $class 类名（带命名空间）
+     * @return CallbackDispatch
+     */
+    protected function bindToClass($request, $url, $class)
+    {
+        $array  = explode('|', $url, 2);
+        $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
+
+        if (!empty($array[1])) {
+            $this->parseUrlParams($request, $array[1]);
+        }
+
+        return new CallbackDispatch($request, $this, [$class, $action]);
+    }
+
+    /**
+     * 绑定到命名空间
+     * @access protected
+     * @param  Request   $request
+     * @param  string    $url URL地址
+     * @param  string    $namespace 命名空间
+     * @return CallbackDispatch
+     */
+    protected function bindToNamespace($request, $url, $namespace)
+    {
+        $array  = explode('|', $url, 3);
+        $class  = !empty($array[0]) ? $array[0] : $this->router->config('default_controller');
+        $method = !empty($array[1]) ? $array[1] : $this->router->config('default_action');
+
+        if (!empty($array[2])) {
+            $this->parseUrlParams($request, $array[2]);
+        }
+
+        return new CallbackDispatch($request, $this, [$namespace . '\\' . Loader::parseName($class, 1), $method]);
+    }
+
+    /**
+     * 绑定到控制器类
+     * @access protected
+     * @param  Request   $request
+     * @param  string    $url URL地址
+     * @param  string    $controller 控制器名 （支持带模块名 index/user ）
+     * @return ControllerDispatch
+     */
+    protected function bindToController($request, $url, $controller)
+    {
+        $array  = explode('|', $url, 2);
+        $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
+
+        if (!empty($array[1])) {
+            $this->parseUrlParams($request, $array[1]);
+        }
+
+        return new ControllerDispatch($request, $this, $controller . '/' . $action);
+    }
+
+    /**
+     * 绑定到模块/控制器
+     * @access protected
+     * @param  Request   $request
+     * @param  string    $url URL地址
+     * @param  string    $controller 控制器类名（带命名空间）
+     * @return ModuleDispatch
+     */
+    protected function bindToModule($request, $url, $controller)
+    {
+        $array  = explode('|', $url, 2);
+        $action = !empty($array[0]) ? $array[0] : $this->router->config('default_action');
+
+        if (!empty($array[1])) {
+            $this->parseUrlParams($request, $array[1]);
+        }
+
+        return new ModuleDispatch($request, $this, $controller . '/' . $action);
+    }
+
+}
diff --git a/thinkphp/library/think/route/Resource.php b/thinkphp/library/think/route/Resource.php
new file mode 100644
index 0000000000000000000000000000000000000000..4e66d9fd866096792cf196795dc00dfa8b8aa054
--- /dev/null
+++ b/thinkphp/library/think/route/Resource.php
@@ -0,0 +1,121 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route;
+
+use think\Route;
+
+class Resource extends RuleGroup
+{
+    // 资源路由名称
+    protected $resource;
+
+    // REST路由方法定义
+    protected $rest = [];
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  Route         $router     路由对象
+     * @param  RuleGroup     $parent     上级对象
+     * @param  string        $name       资源名称
+     * @param  string        $route      路由地址
+     * @param  array         $option     路由参数
+     * @param  array         $pattern    变量规则
+     * @param  array         $rest       资源定义
+     */
+    public function __construct(Route $router, RuleGroup $parent = null, $name = '', $route = '', $option = [], $pattern = [], $rest = [])
+    {
+        $this->router   = $router;
+        $this->parent   = $parent;
+        $this->resource = $name;
+        $this->route    = $route;
+        $this->name     = strpos($name, '.') ? strstr($name, '.', true) : $name;
+
+        $this->setFullName();
+
+        // 资源路由默认为完整匹配
+        $option['complete_match'] = true;
+
+        $this->pattern = $pattern;
+        $this->option  = $option;
+        $this->rest    = $rest;
+
+        if ($this->parent) {
+            $this->domain = $this->parent->getDomain();
+            $this->parent->addRuleItem($this);
+        }
+    }
+
+    /**
+     * 生成资源路由规则
+     * @access protected
+     * @param  string    $rule       路由规则
+     * @param  array     $option     路由参数
+     * @return void
+     */
+    protected function buildResourceRule($rule, $option = [])
+    {
+        $origin = $this->router->getGroup();
+        $this->router->setGroup($this);
+
+        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;
+        }
+
+        $prefix = substr($rule, strlen($this->name) + 1);
+
+        // 注册资源路由
+        foreach ($this->rest as $key => $val) {
+            if ((isset($option['only']) && !in_array($key, $option['only']))
+                || (isset($option['except']) && in_array($key, $option['except']))) {
+                continue;
+            }
+
+            if (isset($last) && strpos($val[1], '<id>') && isset($option['var'][$last])) {
+                $val[1] = str_replace('<id>', '<' . $option['var'][$last] . '>', $val[1]);
+            } elseif (strpos($val[1], '<id>') && isset($option['var'][$rule])) {
+                $val[1] = str_replace('<id>', '<' . $option['var'][$rule] . '>', $val[1]);
+            }
+
+            $this->addRule(trim($prefix . $val[1], '/'), $this->route . '/' . $val[2], $val[0]);
+        }
+
+        $this->router->setGroup($origin);
+    }
+
+    /**
+     * rest方法定义和修改
+     * @access public
+     * @param  string        $name 方法名称
+     * @param  array|bool    $resource 资源
+     * @return $this
+     */
+    public function rest($name, $resource = [])
+    {
+        if (is_array($name)) {
+            $this->rest = $resource ? $name : array_merge($this->rest, $name);
+        } else {
+            $this->rest[$name] = $resource;
+        }
+
+        return $this;
+    }
+}
diff --git a/thinkphp/library/think/route/Rule.php b/thinkphp/library/think/route/Rule.php
new file mode 100644
index 0000000000000000000000000000000000000000..5cdf42c814c059956c2570869de4a84f0290d567
--- /dev/null
+++ b/thinkphp/library/think/route/Rule.php
@@ -0,0 +1,1101 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route;
+
+use think\Container;
+use think\Request;
+use think\Response;
+use think\route\dispatch\Callback as CallbackDispatch;
+use think\route\dispatch\Controller as ControllerDispatch;
+use think\route\dispatch\Module as ModuleDispatch;
+use think\route\dispatch\Redirect as RedirectDispatch;
+use think\route\dispatch\Response as ResponseDispatch;
+use think\route\dispatch\View as ViewDispatch;
+
+abstract class Rule
+{
+    /**
+     * 路由标识
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * 路由对象
+     * @var Route
+     */
+    protected $router;
+
+    /**
+     * 路由所属分组
+     * @var RuleGroup
+     */
+    protected $parent;
+
+    /**
+     * 路由规则
+     * @var mixed
+     */
+    protected $rule;
+
+    /**
+     * 路由地址
+     * @var string|\Closure
+     */
+    protected $route;
+
+    /**
+     * 请求类型
+     * @var string
+     */
+    protected $method;
+
+    /**
+     * 路由变量
+     * @var array
+     */
+    protected $vars = [];
+
+    /**
+     * 路由参数
+     * @var array
+     */
+    protected $option = [];
+
+    /**
+     * 路由变量规则
+     * @var array
+     */
+    protected $pattern = [];
+
+    /**
+     * 需要和分组合并的路由参数
+     * @var array
+     */
+    protected $mergeOptions = ['after', 'before', 'model', 'header', 'response', 'append', 'middleware'];
+
+    /**
+     * 是否需要后置操作
+     * @var bool
+     */
+    protected $doAfter;
+
+    abstract public function check($request, $url, $completeMatch = false);
+
+    /**
+     * 获取Name
+     * @access public
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * 获取当前路由规则
+     * @access public
+     * @return string
+     */
+    public function getRule()
+    {
+        return $this->rule;
+    }
+
+    /**
+     * 获取当前路由地址
+     * @access public
+     * @return mixed
+     */
+    public function getRoute()
+    {
+        return $this->route;
+    }
+
+    /**
+     * 获取当前路由的请求类型
+     * @access public
+     * @return string
+     */
+    public function getMethod()
+    {
+        return strtolower($this->method);
+    }
+
+    /**
+     * 获取当前路由的变量
+     * @access public
+     * @return array
+     */
+    public function getVars()
+    {
+        return $this->vars;
+    }
+
+    /**
+     * 获取路由对象
+     * @access public
+     * @return Route
+     */
+    public function getRouter()
+    {
+        return $this->router;
+    }
+
+    /**
+     * 路由是否有后置操作
+     * @access public
+     * @return bool
+     */
+    public function doAfter()
+    {
+        return $this->doAfter;
+    }
+
+    /**
+     * 获取路由分组
+     * @access public
+     * @return RuleGroup|null
+     */
+    public function getParent()
+    {
+        return $this->parent;
+    }
+
+    /**
+     * 获取路由所在域名
+     * @access public
+     * @return string
+     */
+    public function getDomain()
+    {
+        return $this->parent->getDomain();
+    }
+
+    /**
+     * 获取变量规则定义
+     * @access public
+     * @param  string  $name 变量名
+     * @return mixed
+     */
+    public function getPattern($name = '')
+    {
+        if ('' === $name) {
+            return $this->pattern;
+        }
+
+        return isset($this->pattern[$name]) ? $this->pattern[$name] : null;
+    }
+
+    /**
+     * 获取路由参数
+     * @access public
+     * @param  string  $name 变量名
+     * @return mixed
+     */
+    public function getConfig($name = '')
+    {
+        return $this->router->config($name);
+    }
+
+    /**
+     * 获取路由参数定义
+     * @access public
+     * @param  string  $name 参数名
+     * @return mixed
+     */
+    public function getOption($name = '')
+    {
+        if ('' === $name) {
+            return $this->option;
+        }
+
+        return isset($this->option[$name]) ? $this->option[$name] : null;
+    }
+
+    /**
+     * 注册路由参数
+     * @access public
+     * @param  string|array  $name  参数名
+     * @param  mixed         $value 值
+     * @return $this
+     */
+    public function option($name, $value = '')
+    {
+        if (is_array($name)) {
+            $this->option = array_merge($this->option, $name);
+        } else {
+            $this->option[$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 注册变量规则
+     * @access public
+     * @param  string|array  $name 变量名
+     * @param  string        $rule 变量规则
+     * @return $this
+     */
+    public function pattern($name, $rule = '')
+    {
+        if (is_array($name)) {
+            $this->pattern = array_merge($this->pattern, $name);
+        } else {
+            $this->pattern[$name] = $rule;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 设置标识
+     * @access public
+     * @param  string  $name 标识名
+     * @return $this
+     */
+    public function name($name)
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * 设置变量
+     * @access public
+     * @param  array  $vars 变量
+     * @return $this
+     */
+    public function vars($vars)
+    {
+        $this->vars = $vars;
+
+        return $this;
+    }
+
+    /**
+     * 设置路由请求类型
+     * @access public
+     * @param  string     $method
+     * @return $this
+     */
+    public function method($method)
+    {
+        return $this->option('method', strtolower($method));
+    }
+
+    /**
+     * 设置路由前置行为
+     * @access public
+     * @param  array|\Closure    $before
+     * @return $this
+     */
+    public function before($before)
+    {
+        return $this->option('before', $before);
+    }
+
+    /**
+     * 设置路由后置行为
+     * @access public
+     * @param  array|\Closure     $after
+     * @return $this
+     */
+    public function after($after)
+    {
+        return $this->option('after', $after);
+    }
+
+    /**
+     * 检查后缀
+     * @access public
+     * @param  string     $ext
+     * @return $this
+     */
+    public function ext($ext = '')
+    {
+        return $this->option('ext', $ext);
+    }
+
+    /**
+     * 检查禁止后缀
+     * @access public
+     * @param  string     $ext
+     * @return $this
+     */
+    public function denyExt($ext = '')
+    {
+        return $this->option('deny_ext', $ext);
+    }
+
+    /**
+     * 检查域名
+     * @access public
+     * @param  string     $domain
+     * @return $this
+     */
+    public function domain($domain)
+    {
+        return $this->option('domain', $domain);
+    }
+
+    /**
+     * 设置参数过滤检查
+     * @access public
+     * @param  string|array     $name
+     * @param  mixed            $value
+     * @return $this
+     */
+    public function filter($name, $value = null)
+    {
+        if (is_array($name)) {
+            $this->option['filter'] = $name;
+        } else {
+            $this->option['filter'][$name] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 绑定模型
+     * @access public
+     * @param  array|string      $var  路由变量名 多个使用 & 分割
+     * @param  string|\Closure   $model 绑定模型类
+     * @param  bool              $exception 是否抛出异常
+     * @return $this
+     */
+    public function model($var, $model = null, $exception = true)
+    {
+        if ($var instanceof \Closure) {
+            $this->option['model'][] = $var;
+        } elseif (is_array($var)) {
+            $this->option['model'] = $var;
+        } elseif (is_null($model)) {
+            $this->option['model']['id'] = [$var, true];
+        } else {
+            $this->option['model'][$var] = [$model, $exception];
+        }
+
+        return $this;
+    }
+
+    /**
+     * 附加路由隐式参数
+     * @access public
+     * @param  array     $append
+     * @return $this
+     */
+    public function append(array $append = [])
+    {
+        if (isset($this->option['append'])) {
+            $this->option['append'] = array_merge($this->option['append'], $append);
+        } else {
+            $this->option['append'] = $append;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 绑定验证
+     * @access public
+     * @param  mixed    $validate 验证器类
+     * @param  string   $scene 验证场景
+     * @param  array    $message 验证提示
+     * @param  bool     $batch 批量验证
+     * @return $this
+     */
+    public function validate($validate, $scene = null, $message = [], $batch = false)
+    {
+        $this->option['validate'] = [$validate, $scene, $message, $batch];
+
+        return $this;
+    }
+
+    /**
+     * 绑定Response对象
+     * @access public
+     * @param  mixed     $response
+     * @return $this
+     */
+    public function response($response)
+    {
+        $this->option['response'][] = $response;
+        return $this;
+    }
+
+    /**
+     * 设置Response Header信息
+     * @access public
+     * @param  string|array $name  参数名
+     * @param  string       $value 参数值
+     * @return $this
+     */
+    public function header($header, $value = null)
+    {
+        if (is_array($header)) {
+            $this->option['header'] = $header;
+        } else {
+            $this->option['header'][$header] = $value;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 指定路由中间件
+     * @access public
+     * @param  string|array|\Closure    $middleware
+     * @param  mixed                    $param
+     * @return $this
+     */
+    public function middleware($middleware, $param = null)
+    {
+        if (is_null($param) && is_array($middleware)) {
+            $this->option['middleware'] = $middleware;
+        } else {
+            foreach ((array) $middleware as $item) {
+                $this->option['middleware'][] = [$item, $param];
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * 设置路由缓存
+     * @access public
+     * @param  array|string     $cache
+     * @return $this
+     */
+    public function cache($cache)
+    {
+        return $this->option('cache', $cache);
+    }
+
+    /**
+     * 检查URL分隔符
+     * @access public
+     * @param  bool     $depr
+     * @return $this
+     */
+    public function depr($depr)
+    {
+        return $this->option('param_depr', $depr);
+    }
+
+    /**
+     * 是否合并额外参数
+     * @access public
+     * @param  bool     $merge
+     * @return $this
+     */
+    public function mergeExtraVars($merge = true)
+    {
+        return $this->option('merge_extra_vars', $merge);
+    }
+
+    /**
+     * 设置需要合并的路由参数
+     * @access public
+     * @param  array     $option
+     * @return $this
+     */
+    public function mergeOptions($option = [])
+    {
+        $this->mergeOptions = array_merge($this->mergeOptions, $option);
+        return $this;
+    }
+
+    /**
+     * 检查是否为HTTPS请求
+     * @access public
+     * @param  bool     $https
+     * @return $this
+     */
+    public function https($https = true)
+    {
+        return $this->option('https', $https);
+    }
+
+    /**
+     * 检查是否为AJAX请求
+     * @access public
+     * @param  bool     $ajax
+     * @return $this
+     */
+    public function ajax($ajax = true)
+    {
+        return $this->option('ajax', $ajax);
+    }
+
+    /**
+     * 检查是否为PJAX请求
+     * @access public
+     * @param  bool     $pjax
+     * @return $this
+     */
+    public function pjax($pjax = true)
+    {
+        return $this->option('pjax', $pjax);
+    }
+
+    /**
+     * 检查是否为手机访问
+     * @access public
+     * @param  bool     $mobile
+     * @return $this
+     */
+    public function mobile($mobile = true)
+    {
+        return $this->option('mobile', $mobile);
+    }
+
+    /**
+     * 当前路由到一个模板地址 当使用数组的时候可以传入模板变量
+     * @access public
+     * @param  bool|array     $view
+     * @return $this
+     */
+    public function view($view = true)
+    {
+        return $this->option('view', $view);
+    }
+
+    /**
+     * 当前路由为重定向
+     * @access public
+     * @param  bool   $redirect 是否为重定向
+     * @return $this
+     */
+    public function redirect($redirect = true)
+    {
+        return $this->option('redirect', $redirect);
+    }
+
+    /**
+     * 设置路由完整匹配
+     * @access public
+     * @param  bool     $match
+     * @return $this
+     */
+    public function completeMatch($match = true)
+    {
+        return $this->option('complete_match', $match);
+    }
+
+    /**
+     * 是否去除URL最后的斜线
+     * @access public
+     * @param  bool     $remove
+     * @return $this
+     */
+    public function removeSlash($remove = true)
+    {
+        return $this->option('remove_slash', $remove);
+    }
+
+    /**
+     * 设置是否允许跨域
+     * @access public
+     * @param  bool     $allow
+     * @param  array    $header
+     * @return $this
+     */
+    public function allowCrossDomain($allow = true, $header = [])
+    {
+        if (!empty($header)) {
+            $this->header($header);
+        }
+
+        if ($allow && $this->parent) {
+            $this->parent->addRuleItem($this, 'options');
+        }
+
+        return $this->option('cross_domain', $allow);
+    }
+
+    /**
+     * 检查OPTIONS请求
+     * @access public
+     * @param  Request     $request
+     * @return Dispatch|void
+     */
+    protected function checkCrossDomain($request)
+    {
+        if (!empty($this->option['cross_domain'])) {
+
+            $header = [
+                'Access-Control-Allow-Origin'  => '*',
+                'Access-Control-Allow-Methods' => 'GET, POST, PATCH, PUT, DELETE',
+                'Access-Control-Allow-Headers' => 'Authorization, Content-Type, If-Match, If-Modified-Since, If-None-Match, If-Unmodified-Since, X-Requested-With',
+            ];
+
+            if (!empty($this->option['header'])) {
+                $header = array_merge($header, $this->option['header']);
+            }
+
+            $this->option['header'] = $header;
+
+            if ($request->method(true) == 'OPTIONS') {
+                return new ResponseDispatch($request, $this, Response::create()->code(204)->header($header));
+            }
+        }
+    }
+
+    /**
+     * 设置路由规则全局有效
+     * @access public
+     * @return $this
+     */
+    public function crossDomainRule()
+    {
+        if ($this instanceof RuleGroup) {
+            $method = '*';
+        } else {
+            $method = $this->method;
+        }
+
+        $this->router->setCrossDomainRule($this, $method);
+
+        return $this;
+    }
+
+    /**
+     * 合并分组参数
+     * @access protected
+     * @return void
+     */
+    protected function mergeGroupOptions()
+    {
+        $parentOption = $this->parent->getOption();
+        // 合并分组参数
+        foreach ($this->mergeOptions as $item) {
+            if (isset($parentOption[$item]) && isset($this->option[$item])) {
+                $this->option[$item] = array_merge($parentOption[$item], $this->option[$item]);
+            }
+        }
+
+        $this->option = array_merge($parentOption, $this->option);
+
+        return $this->option;
+    }
+
+    /**
+     * 解析匹配到的规则路由
+     * @access public
+     * @param  Request   $request 请求对象
+     * @param  string    $rule 路由规则
+     * @param  string    $route 路由地址
+     * @param  string    $url URL地址
+     * @param  array     $option 路由参数
+     * @param  array     $matches 匹配的变量
+     * @return Dispatch
+     */
+    public function parseRule($request, $rule, $route, $url, $option = [], $matches = [])
+    {
+        if (is_string($route) && isset($option['prefix'])) {
+            // 路由地址前缀
+            $route = $option['prefix'] . $route;
+        }
+
+        // 替换路由地址中的变量
+        if (is_string($route) && !empty($matches)) {
+            foreach ($matches as $key => $val) {
+                if (false !== strpos($route, '<' . $key . '>')) {
+                    $route = str_replace('<' . $key . '>', $val, $route);
+                } elseif (false !== strpos($route, ':' . $key)) {
+                    $route = str_replace(':' . $key, $val, $route);
+                }
+            }
+        }
+
+        // 解析额外参数
+        $count = substr_count($rule, '/');
+        $url   = array_slice(explode('|', $url), $count + 1);
+        $this->parseUrlParams($request, implode('|', $url), $matches);
+
+        $this->route   = $route;
+        $this->vars    = $matches;
+        $this->option  = $option;
+        $this->doAfter = true;
+
+        // 发起路由调度
+        return $this->dispatch($request, $route, $option);
+    }
+
+    /**
+     * 检查路由前置行为
+     * @access protected
+     * @param  mixed   $before 前置行为
+     * @return mixed
+     */
+    protected function checkBefore($before)
+    {
+        $hook = Container::get('hook');
+
+        foreach ((array) $before as $behavior) {
+            $result = $hook->exec($behavior);
+
+            if (false === $result) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * 发起路由调度
+     * @access protected
+     * @param  Request   $request Request对象
+     * @param  mixed     $route  路由地址
+     * @param  array     $option 路由参数
+     * @return Dispatch
+     */
+    protected function dispatch($request, $route, $option)
+    {
+        if ($route instanceof \Closure) {
+            // 执行闭包
+            $result = new CallbackDispatch($request, $this, $route);
+        } elseif ($route instanceof Response) {
+            $result = new ResponseDispatch($request, $this, $route);
+        } elseif (isset($option['view']) && false !== $option['view']) {
+            $result = new ViewDispatch($request, $this, $route, is_array($option['view']) ? $option['view'] : []);
+        } elseif (!empty($option['redirect']) || 0 === strpos($route, '/') || strpos($route, '://')) {
+            // 路由到重定向地址
+            $result = new RedirectDispatch($request, $this, $route, [], isset($option['status']) ? $option['status'] : 301);
+        } elseif (false !== strpos($route, '\\')) {
+            // 路由到方法
+            $result = $this->dispatchMethod($request, $route);
+        } elseif (0 === strpos($route, '@')) {
+            // 路由到控制器
+            $result = $this->dispatchController($request, substr($route, 1));
+        } else {
+            // 路由到模块/控制器/操作
+            $result = $this->dispatchModule($request, $route);
+        }
+
+        return $result;
+    }
+
+    /**
+     * 解析URL地址为 模块/控制器/操作
+     * @access protected
+     * @param  Request   $request Request对象
+     * @param  string    $route 路由地址
+     * @return CallbackDispatch
+     */
+    protected function dispatchMethod($request, $route)
+    {
+        list($path, $var) = $this->parseUrlPath($route);
+
+        $route  = str_replace('/', '@', implode('/', $path));
+        $method = strpos($route, '@') ? explode('@', $route) : $route;
+
+        return new CallbackDispatch($request, $this, $method, $var);
+    }
+
+    /**
+     * 解析URL地址为 模块/控制器/操作
+     * @access protected
+     * @param  Request   $request Request对象
+     * @param  string    $route 路由地址
+     * @return ControllerDispatch
+     */
+    protected function dispatchController($request, $route)
+    {
+        list($route, $var) = $this->parseUrlPath($route);
+
+        $result = new ControllerDispatch($request, $this, implode('/', $route), $var);
+
+        $request->setAction(array_pop($route));
+        $request->setController($route ? array_pop($route) : $this->getConfig('default_controller'));
+        $request->setModule($route ? array_pop($route) : $this->getConfig('default_module'));
+
+        return $result;
+    }
+
+    /**
+     * 解析URL地址为 模块/控制器/操作
+     * @access protected
+     * @param  Request   $request Request对象
+     * @param  string    $route 路由地址
+     * @return ModuleDispatch
+     */
+    protected function dispatchModule($request, $route)
+    {
+        list($path, $var) = $this->parseUrlPath($route);
+
+        $action     = array_pop($path);
+        $controller = !empty($path) ? array_pop($path) : null;
+        $module     = $this->getConfig('app_multi_module') && !empty($path) ? array_pop($path) : null;
+        $method     = $request->method();
+
+        if ($this->getConfig('use_action_prefix') && $this->router->getMethodPrefix($method)) {
+            $prefix = $this->router->getMethodPrefix($method);
+            // 操作方法前缀支持
+            $action = 0 !== strpos($action, $prefix) ? $prefix . $action : $action;
+        }
+
+        // 设置当前请求的路由变量
+        $request->setRouteVars($var);
+
+        // 路由到模块/控制器/操作
+        return new ModuleDispatch($request, $this, [$module, $controller, $action], ['convert' => false]);
+    }
+
+    /**
+     * 路由检查
+     * @access protected
+     * @param  array     $option 路由参数
+     * @param  Request   $request Request对象
+     * @return bool
+     */
+    protected function checkOption($option, Request $request)
+    {
+        // 请求类型检测
+        if (!empty($option['method'])) {
+            if (is_string($option['method']) && false === stripos($option['method'], $request->method())) {
+                return false;
+            }
+        }
+
+        // AJAX PJAX 请求检查
+        foreach (['ajax', 'pjax', 'mobile'] as $item) {
+            if (isset($option[$item])) {
+                $call = 'is' . $item;
+                if ($option[$item] && !$request->$call() || !$option[$item] && $request->$call()) {
+                    return false;
+                }
+            }
+        }
+
+        // 伪静态后缀检测
+        if ($request->url() != '/' && ((isset($option['ext']) && false === stripos('|' . $option['ext'] . '|', '|' . $request->ext() . '|'))
+            || (isset($option['deny_ext']) && false !== stripos('|' . $option['deny_ext'] . '|', '|' . $request->ext() . '|')))) {
+            return false;
+        }
+
+        // 域名检查
+        if ((isset($option['domain']) && !in_array($option['domain'], [$request->host(true), $request->subDomain()]))) {
+            return false;
+        }
+
+        // HTTPS检查
+        if ((isset($option['https']) && $option['https'] && !$request->isSsl())
+            || (isset($option['https']) && !$option['https'] && $request->isSsl())) {
+            return false;
+        }
+
+        // 请求参数检查
+        if (isset($option['filter'])) {
+            foreach ($option['filter'] as $name => $value) {
+                if ($request->param($name, '', null) != $value) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 解析URL地址中的参数Request对象
+     * @access protected
+     * @param  Request   $request
+     * @param  string    $rule 路由规则
+     * @param  array     $var 变量
+     * @return void
+     */
+    protected function parseUrlParams($request, $url, &$var = [])
+    {
+        if ($url) {
+            if ($this->getConfig('url_param_type')) {
+                $var += explode('|', $url);
+            } else {
+                preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) {
+                    $var[$match[1]] = strip_tags($match[2]);
+                }, $url);
+            }
+        }
+    }
+
+    /**
+     * 解析URL的pathinfo参数和变量
+     * @access public
+     * @param  string    $url URL地址
+     * @return array
+     */
+    public function parseUrlPath($url)
+    {
+        // 分隔符替换 确保路由定义使用统一的分隔符
+        $url = str_replace('|', '/', $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...
+            $path = [];
+            parse_str($url, $var);
+        } else {
+            $path = [$url];
+        }
+
+        return [$path, $var];
+    }
+
+    /**
+     * 生成路由的正则规则
+     * @access protected
+     * @param  string    $rule 路由规则
+     * @param  array     $match 匹配的变量
+     * @param  array     $pattern   路由变量规则
+     * @param  array     $option    路由参数
+     * @param  bool      $completeMatch   路由是否完全匹配
+     * @param  string    $suffix   路由正则变量后缀
+     * @return string
+     */
+    protected function buildRuleRegex($rule, $match, $pattern = [], $option = [], $completeMatch = false, $suffix = '')
+    {
+        foreach ($match as $name) {
+            $replace[] = $this->buildNameRegex($name, $pattern, $suffix);
+        }
+
+        // 是否区分 / 地址访问
+        if ('/' != $rule) {
+            if (!empty($option['remove_slash'])) {
+                $rule = rtrim($rule, '/');
+            } elseif (substr($rule, -1) == '/') {
+                $rule     = rtrim($rule, '/');
+                $hasSlash = true;
+            }
+        }
+
+        $regex = str_replace($match, $replace, $rule);
+        $regex = str_replace([')?/', ')/', ')?-', ')-', '\\\\/'], [')\/', ')\/', ')\-', ')\-', '\/'], $regex);
+
+        if (isset($hasSlash)) {
+            $regex .= '\/';
+        }
+
+        return $regex . ($completeMatch ? '$' : '');
+    }
+
+    /**
+     * 生成路由变量的正则规则
+     * @access protected
+     * @param  string    $name      路由变量
+     * @param  string    $pattern   变量规则
+     * @param  string    $suffix    路由正则变量后缀
+     * @return string
+     */
+    protected function buildNameRegex($name, $pattern, $suffix)
+    {
+        $optional = '';
+        $slash    = substr($name, 0, 1);
+
+        if (in_array($slash, ['/', '-'])) {
+            $prefix = '\\' . $slash;
+            $name   = substr($name, 1);
+            $slash  = substr($name, 0, 1);
+        } else {
+            $prefix = '';
+        }
+
+        if ('<' != $slash) {
+            return $prefix . preg_quote($name, '/');
+        }
+
+        if (strpos($name, '?')) {
+            $name     = substr($name, 1, -2);
+            $optional = '?';
+        } elseif (strpos($name, '>')) {
+            $name = substr($name, 1, -1);
+        }
+
+        if (isset($pattern[$name])) {
+            $nameRule = $pattern[$name];
+            if (0 === strpos($nameRule, '/') && '/' == substr($nameRule, -1)) {
+                $nameRule = substr($nameRule, 1, -1);
+            }
+        } else {
+            $nameRule = $this->getConfig('default_route_pattern');
+        }
+
+        return '(' . $prefix . '(?<' . $name . $suffix . '>' . $nameRule . '))' . $optional;
+    }
+
+    /**
+     * 分析路由规则中的变量
+     * @access protected
+     * @param  string    $rule 路由规则
+     * @return array
+     */
+    protected function parseVar($rule)
+    {
+        // 提取路由规则中的变量
+        $var = [];
+
+        if (preg_match_all('/<\w+\??>/', $rule, $matches)) {
+            foreach ($matches[0] as $name) {
+                $optional = false;
+
+                if (strpos($name, '?')) {
+                    $name     = substr($name, 1, -2);
+                    $optional = true;
+                } else {
+                    $name = substr($name, 1, -1);
+                }
+
+                $var[$name] = $optional ? 2 : 1;
+            }
+        }
+
+        return $var;
+    }
+
+    /**
+     * 设置路由参数
+     * @access public
+     * @param  string    $method     方法名
+     * @param  array     $args       调用参数
+     * @return $this
+     */
+    public function __call($method, $args)
+    {
+        if (count($args) > 1) {
+            $args[0] = $args;
+        }
+        array_unshift($args, $method);
+
+        return call_user_func_array([$this, 'option'], $args);
+    }
+
+    public function __sleep()
+    {
+        return ['name', 'rule', 'route', 'method', 'vars', 'option', 'pattern', 'doAfter'];
+    }
+
+    public function __wakeup()
+    {
+        $this->router = Container::get('route');
+    }
+}
diff --git a/thinkphp/library/think/route/RuleGroup.php b/thinkphp/library/think/route/RuleGroup.php
new file mode 100644
index 0000000000000000000000000000000000000000..576fe91b67a2f0b98c708976efdd7073c621210f
--- /dev/null
+++ b/thinkphp/library/think/route/RuleGroup.php
@@ -0,0 +1,575 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route;
+
+use think\Container;
+use think\Exception;
+use think\Request;
+use think\Response;
+use think\Route;
+use think\route\dispatch\Response as ResponseDispatch;
+use think\route\dispatch\Url as UrlDispatch;
+
+class RuleGroup extends Rule
+{
+    // 分组路由（包括子分组）
+    protected $rules = [
+        '*'       => [],
+        'get'     => [],
+        'post'    => [],
+        'put'     => [],
+        'patch'   => [],
+        'delete'  => [],
+        'head'    => [],
+        'options' => [],
+    ];
+
+    // MISS路由
+    protected $miss;
+
+    // 自动路由
+    protected $auto;
+
+    // 完整名称
+    protected $fullName;
+
+    // 所在域名
+    protected $domain;
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  Route       $router   路由对象
+     * @param  RuleGroup   $parent   上级对象
+     * @param  string      $name     分组名称
+     * @param  mixed       $rule     分组路由
+     * @param  array       $option   路由参数
+     * @param  array       $pattern  变量规则
+     */
+    public function __construct(Route $router, RuleGroup $parent = null, $name = '', $rule = [], $option = [], $pattern = [])
+    {
+        $this->router  = $router;
+        $this->parent  = $parent;
+        $this->rule    = $rule;
+        $this->name    = trim($name, '/');
+        $this->option  = $option;
+        $this->pattern = $pattern;
+
+        $this->setFullName();
+
+        if ($this->parent) {
+            $this->domain = $this->parent->getDomain();
+            $this->parent->addRuleItem($this);
+        }
+
+        if (!empty($option['cross_domain'])) {
+            $this->router->setCrossDomainRule($this);
+        }
+    }
+
+    /**
+     * 设置分组的路由规则
+     * @access public
+     * @return void
+     */
+    protected function setFullName()
+    {
+        if (false !== strpos($this->name, ':')) {
+            $this->name = preg_replace(['/\[\:(\w+)\]/', '/\:(\w+)/'], ['<\1?>', '<\1>'], $this->name);
+        }
+
+        if ($this->parent && $this->parent->getFullName()) {
+            $this->fullName = $this->parent->getFullName() . ($this->name ? '/' . $this->name : '');
+        } else {
+            $this->fullName = $this->name;
+        }
+    }
+
+    /**
+     * 获取所属域名
+     * @access public
+     * @return string
+     */
+    public function getDomain()
+    {
+        return $this->domain;
+    }
+
+    /**
+     * 检测分组路由
+     * @access public
+     * @param  Request      $request  请求对象
+     * @param  string       $url      访问地址
+     * @param  bool         $completeMatch   路由是否完全匹配
+     * @return Dispatch|false
+     */
+    public function check($request, $url, $completeMatch = false)
+    {
+        if ($dispatch = $this->checkCrossDomain($request)) {
+            // 跨域OPTIONS请求
+            return $dispatch;
+        }
+
+        // 检查分组有效性
+        if (!$this->checkOption($this->option, $request) || !$this->checkUrl($url)) {
+            return false;
+        }
+
+        // 解析分组路由
+        if ($this instanceof Resource) {
+            $this->buildResourceRule($this->resource, $this->option);
+        } elseif ($this->rule) {
+            if ($this->rule instanceof Response) {
+                return new ResponseDispatch($request, $this, $this->rule);
+            }
+
+            $this->parseGroupRule($this->rule);
+        }
+
+        // 获取当前路由规则
+        $method = strtolower($request->method());
+        $rules  = $this->getMethodRules($method);
+
+        if (count($rules) == 0) {
+            return false;
+        }
+
+        if ($this->parent) {
+            // 合并分组参数
+            $this->mergeGroupOptions();
+            // 合并分组变量规则
+            $this->pattern = array_merge($this->parent->getPattern(), $this->pattern);
+        }
+
+        if (isset($this->option['complete_match'])) {
+            $completeMatch = $this->option['complete_match'];
+        }
+
+        if (!empty($this->option['merge_rule_regex'])) {
+            // 合并路由正则规则进行路由匹配检查
+            $result = $this->checkMergeRuleRegex($request, $rules, $url, $completeMatch);
+
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
+        // 检查分组路由
+        foreach ($rules as $key => $item) {
+            $result = $item->check($request, $url, $completeMatch);
+
+            if (false !== $result) {
+                return $result;
+            }
+        }
+
+        if ($this->auto) {
+            // 自动解析URL地址
+            $result = new UrlDispatch($request, $this, $this->auto . '/' . $url, ['auto_search' => false]);
+        } elseif ($this->miss && in_array($this->miss->getMethod(), ['*', $method])) {
+            // 未匹配所有路由的路由规则处理
+            $result = $this->miss->parseRule($request, '', $this->miss->getRoute(), $url, $this->miss->getOption());
+        } else {
+            $result = false;
+        }
+
+        return $result;
+    }
+
+    /**
+     * 获取当前请求的路由规则（包括子分组、资源路由）
+     * @access protected
+     * @param  string      $method
+     * @return array
+     */
+    protected function getMethodRules($method)
+    {
+        return array_merge($this->rules[$method], $this->rules['*']);
+    }
+
+    /**
+     * 分组URL匹配检查
+     * @access protected
+     * @param  string     $url
+     * @return bool
+     */
+    protected function checkUrl($url)
+    {
+        if ($this->fullName) {
+            $pos = strpos($this->fullName, '<');
+
+            if (false !== $pos) {
+                $str = substr($this->fullName, 0, $pos);
+            } else {
+                $str = $this->fullName;
+            }
+
+            if ($str && 0 !== stripos(str_replace('|', '/', $url), $str)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * 延迟解析分组的路由规则
+     * @access public
+     * @param  bool     $lazy   路由是否延迟解析
+     * @return $this
+     */
+    public function lazy($lazy = true)
+    {
+        if (!$lazy) {
+            $this->parseGroupRule($this->rule);
+            $this->rule = null;
+        }
+
+        return $this;
+    }
+
+    /**
+     * 解析分组和域名的路由规则及绑定
+     * @access public
+     * @param  mixed        $rule    路由规则
+     * @return void
+     */
+    public function parseGroupRule($rule)
+    {
+        $origin = $this->router->getGroup();
+        $this->router->setGroup($this);
+
+        if ($rule instanceof \Closure) {
+            Container::getInstance()->invokeFunction($rule);
+        } elseif (is_array($rule)) {
+            $this->addRules($rule);
+        } elseif (is_string($rule) && $rule) {
+            $this->router->bind($rule, $this->domain);
+        }
+
+        $this->router->setGroup($origin);
+    }
+
+    /**
+     * 检测分组路由
+     * @access public
+     * @param  Request      $request  请求对象
+     * @param  array        $rules    路由规则
+     * @param  string       $url      访问地址
+     * @param  bool         $completeMatch   路由是否完全匹配
+     * @return Dispatch|false
+     */
+    protected function checkMergeRuleRegex($request, &$rules, $url, $completeMatch)
+    {
+        $depr = $this->router->config('pathinfo_depr');
+        $url  = $depr . str_replace('|', $depr, $url);
+
+        foreach ($rules as $key => $item) {
+            if ($item instanceof RuleItem) {
+                $rule = $depr . str_replace('/', $depr, $item->getRule());
+                if ($depr == $rule && $depr != $url) {
+                    unset($rules[$key]);
+                    continue;
+                }
+
+                $complete = null !== $item->getOption('complete_match') ? $item->getOption('complete_match') : $completeMatch;
+
+                if (false === strpos($rule, '<')) {
+                    if (0 === strcasecmp($rule, $url) || (!$complete && 0 === strncasecmp($rule, $url, strlen($rule)))) {
+                        return $item->checkRule($request, $url, []);
+                    }
+
+                    unset($rules[$key]);
+                    continue;
+                }
+
+                $slash = preg_quote('/-' . $depr, '/');
+
+                if ($matchRule = preg_split('/[' . $slash . ']<\w+\??>/', $rule, 2)) {
+                    if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) {
+                        unset($rules[$key]);
+                        continue;
+                    }
+                }
+
+                if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+                    unset($rules[$key]);
+                    $pattern = array_merge($this->getPattern(), $item->getPattern());
+                    $option  = array_merge($this->getOption(), $item->getOption());
+
+                    $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_' . $key);
+                    $items[$key] = $item;
+                }
+            }
+        }
+
+        if (empty($regex)) {
+            return false;
+        }
+
+        try {
+            $result = preg_match('/^(?:' . implode('|', $regex) . ')/u', $url, $match);
+        } catch (\Exception $e) {
+            throw new Exception('route pattern error');
+        }
+
+        if ($result) {
+            $var = [];
+            foreach ($match as $key => $val) {
+                if (is_string($key) && '' !== $val) {
+                    list($name, $pos) = explode('_THINK_', $key);
+
+                    $var[$name] = $val;
+                }
+            }
+
+            if (!isset($pos)) {
+                foreach ($regex as $key => $item) {
+                    if (0 === strpos(str_replace(['\/', '\-', '\\' . $depr], ['/', '-', $depr], $item), $match[0])) {
+                        $pos = $key;
+                        break;
+                    }
+                }
+            }
+
+            $rule  = $items[$pos]->getRule();
+            $array = $this->router->getRule($rule);
+
+            foreach ($array as $item) {
+                if (in_array($item->getMethod(), ['*', strtolower($request->method())])) {
+                    $result = $item->checkRule($request, $url, $var);
+
+                    if (false !== $result) {
+                        return $result;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 获取分组的MISS路由
+     * @access public
+     * @return RuleItem|null
+     */
+    public function getMissRule()
+    {
+        return $this->miss;
+    }
+
+    /**
+     * 获取分组的自动路由
+     * @access public
+     * @return string
+     */
+    public function getAutoRule()
+    {
+        return $this->auto;
+    }
+
+    /**
+     * 注册自动路由
+     * @access public
+     * @param  string     $route   路由规则
+     * @return void
+     */
+    public function addAutoRule($route)
+    {
+        $this->auto = $route;
+    }
+
+    /**
+     * 注册MISS路由
+     * @access public
+     * @param  string    $route      路由地址
+     * @param  string    $method     请求类型
+     * @param  array     $option     路由参数
+     * @return RuleItem
+     */
+    public function addMissRule($route, $method = '*', $option = [])
+    {
+        // 创建路由规则实例
+        $ruleItem = new RuleItem($this->router, $this, null, '', $route, strtolower($method), $option);
+
+        $this->miss = $ruleItem;
+
+        return $ruleItem;
+    }
+
+    /**
+     * 添加分组下的路由规则或者子分组
+     * @access public
+     * @param  string    $rule       路由规则
+     * @param  string    $route      路由地址
+     * @param  string    $method     请求类型
+     * @param  array     $option     路由参数
+     * @param  array     $pattern    变量规则
+     * @return $this
+     */
+    public function addRule($rule, $route, $method = '*', $option = [], $pattern = [])
+    {
+        // 读取路由标识
+        if (is_array($rule)) {
+            $name = $rule[0];
+            $rule = $rule[1];
+        } elseif (is_string($route)) {
+            $name = $route;
+        } else {
+            $name = null;
+        }
+
+        $method = strtolower($method);
+
+        if ('/' === $rule || '' === $rule) {
+            // 首页自动完整匹配
+            $rule .= '$';
+        }
+
+        // 创建路由规则实例
+        $ruleItem = new RuleItem($this->router, $this, $name, $rule, $route, $method, $option, $pattern);
+
+        if (!empty($option['cross_domain'])) {
+            $this->router->setCrossDomainRule($ruleItem, $method);
+        }
+
+        $this->addRuleItem($ruleItem, $method);
+
+        return $ruleItem;
+    }
+
+    /**
+     * 批量注册路由规则
+     * @access public
+     * @param  array     $rules      路由规则
+     * @param  string    $method     请求类型
+     * @param  array     $option     路由参数
+     * @param  array     $pattern    变量规则
+     * @return void
+     */
+    public function addRules($rules, $method = '*', $option = [], $pattern = [])
+    {
+        foreach ($rules as $key => $val) {
+            if (is_numeric($key)) {
+                $key = array_shift($val);
+            }
+
+            if (is_array($val)) {
+                $route   = array_shift($val);
+                $option  = $val ? array_shift($val) : [];
+                $pattern = $val ? array_shift($val) : [];
+            } else {
+                $route = $val;
+            }
+
+            $this->addRule($key, $route, $method, $option, $pattern);
+        }
+    }
+
+    public function addRuleItem($rule, $method = '*')
+    {
+        if (strpos($method, '|')) {
+            $rule->method($method);
+            $method = '*';
+        }
+
+        $this->rules[$method][] = $rule;
+
+        return $this;
+    }
+
+    /**
+     * 设置分组的路由前缀
+     * @access public
+     * @param  string     $prefix
+     * @return $this
+     */
+    public function prefix($prefix)
+    {
+        if ($this->parent && $this->parent->getOption('prefix')) {
+            $prefix = $this->parent->getOption('prefix') . $prefix;
+        }
+
+        return $this->option('prefix', $prefix);
+    }
+
+    /**
+     * 设置资源允许
+     * @access public
+     * @param  array     $only
+     * @return $this
+     */
+    public function only($only)
+    {
+        return $this->option('only', $only);
+    }
+
+    /**
+     * 设置资源排除
+     * @access public
+     * @param  array     $except
+     * @return $this
+     */
+    public function except($except)
+    {
+        return $this->option('except', $except);
+    }
+
+    /**
+     * 设置资源路由的变量
+     * @access public
+     * @param  array     $vars
+     * @return $this
+     */
+    public function vars($vars)
+    {
+        return $this->option('var', $vars);
+    }
+
+    /**
+     * 合并分组的路由规则正则
+     * @access public
+     * @param  bool     $merge
+     * @return $this
+     */
+    public function mergeRuleRegex($merge = true)
+    {
+        return $this->option('merge_rule_regex', $merge);
+    }
+
+    /**
+     * 获取完整分组Name
+     * @access public
+     * @return string
+     */
+    public function getFullName()
+    {
+        return $this->fullName;
+    }
+
+    /**
+     * 获取分组的路由规则
+     * @access public
+     * @param  string     $method
+     * @return array
+     */
+    public function getRules($method = '')
+    {
+        if ('' === $method) {
+            return $this->rules;
+        }
+
+        return isset($this->rules[strtolower($method)]) ? $this->rules[strtolower($method)] : [];
+    }
+
+}
diff --git a/thinkphp/library/think/route/RuleItem.php b/thinkphp/library/think/route/RuleItem.php
new file mode 100644
index 0000000000000000000000000000000000000000..91c97ad4338aabb31f43f6d83ef1cc1366f42e7c
--- /dev/null
+++ b/thinkphp/library/think/route/RuleItem.php
@@ -0,0 +1,282 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route;
+
+use think\Container;
+use think\Exception;
+use think\Route;
+
+class RuleItem extends Rule
+{
+    /**
+     * 架构函数
+     * @access public
+     * @param  Route             $router 路由实例
+     * @param  RuleGroup         $parent 上级对象
+     * @param  string            $name 路由标识
+     * @param  string|array      $rule 路由规则
+     * @param  string|\Closure   $route 路由地址
+     * @param  string            $method 请求类型
+     * @param  array             $option 路由参数
+     * @param  array             $pattern 变量规则
+     */
+    public function __construct(Route $router, RuleGroup $parent, $name, $rule, $route, $method = '*', $option = [], $pattern = [])
+    {
+        $this->router  = $router;
+        $this->parent  = $parent;
+        $this->name    = $name;
+        $this->route   = $route;
+        $this->method  = $method;
+        $this->option  = $option;
+        $this->pattern = $pattern;
+
+        $this->setRule($rule);
+
+        if (!empty($option['cross_domain'])) {
+            $this->router->setCrossDomainRule($this, $method);
+        }
+    }
+
+    /**
+     * 路由规则预处理
+     * @access public
+     * @param  string      $rule     路由规则
+     * @return void
+     */
+    public function setRule($rule)
+    {
+        if ('$' == substr($rule, -1, 1)) {
+            // 是否完整匹配
+            $rule = substr($rule, 0, -1);
+
+            $this->option['complete_match'] = true;
+        }
+
+        $rule = '/' != $rule ? ltrim($rule, '/') : '';
+
+        if ($this->parent && $prefix = $this->parent->getFullName()) {
+            $rule = $prefix . ($rule ? '/' . ltrim($rule, '/') : '');
+        }
+
+        if (false !== strpos($rule, ':')) {
+            $this->rule = preg_replace(['/\[\:(\w+)\]/', '/\:(\w+)/'], ['<\1?>', '<\1>'], $rule);
+        } else {
+            $this->rule = $rule;
+        }
+
+        // 生成路由标识的快捷访问
+        $this->setRuleName();
+    }
+
+    /**
+     * 检查后缀
+     * @access public
+     * @param  string     $ext
+     * @return $this
+     */
+    public function ext($ext = '')
+    {
+        $this->option('ext', $ext);
+        $this->setRuleName(true);
+
+        return $this;
+    }
+
+    /**
+     * 设置别名
+     * @access public
+     * @param  string     $name
+     * @return $this
+     */
+    public function name($name)
+    {
+        $this->name = $name;
+        $this->setRuleName(true);
+
+        return $this;
+    }
+
+    /**
+     * 设置路由标识 用于URL反解生成
+     * @access protected
+     * @param  bool     $first   是否插入开头
+     * @return void
+     */
+    protected function setRuleName($first = false)
+    {
+        if ($this->name) {
+            $vars = $this->parseVar($this->rule);
+            $name = strtolower($this->name);
+
+            if (isset($this->option['ext'])) {
+                $suffix = $this->option['ext'];
+            } elseif ($this->parent->getOption('ext')) {
+                $suffix = $this->parent->getOption('ext');
+            } else {
+                $suffix = null;
+            }
+
+            $value = [$this->rule, $vars, $this->parent->getDomain(), $suffix, $this->method];
+
+            Container::get('rule_name')->set($name, $value, $first);
+            Container::get('rule_name')->setRule($this->rule, $this);
+        }
+    }
+
+    /**
+     * 检测路由
+     * @access public
+     * @param  Request      $request  请求对象
+     * @param  string       $url      访问地址
+     * @param  array        $match    匹配路由变量
+     * @param  bool         $completeMatch   路由是否完全匹配
+     * @return Dispatch|false
+     */
+    public function checkRule($request, $url, $match = null, $completeMatch = false)
+    {
+        if ($dispatch = $this->checkCrossDomain($request)) {
+            // 允许跨域
+            return $dispatch;
+        }
+
+        // 检查参数有效性
+        if (!$this->checkOption($this->option, $request)) {
+            return false;
+        }
+
+        // 合并分组参数
+        $option = $this->mergeGroupOptions();
+
+        // 检查前置行为
+        if (isset($option['before']) && false === $this->checkBefore($option['before'])) {
+            return false;
+        }
+
+        $url = $this->urlSuffixCheck($request, $url, $option);
+
+        if (is_null($match)) {
+            $match = $this->match($url, $option, $completeMatch);
+        }
+
+        if (false !== $match) {
+            return $this->parseRule($request, $this->rule, $this->route, $url, $option, $match);
+        }
+
+        return false;
+    }
+
+    /**
+     * 检测路由（含路由匹配）
+     * @access public
+     * @param  Request      $request  请求对象
+     * @param  string       $url      访问地址
+     * @param  string       $depr     路径分隔符
+     * @param  bool         $completeMatch   路由是否完全匹配
+     * @return Dispatch|false
+     */
+    public function check($request, $url, $completeMatch = false)
+    {
+        return $this->checkRule($request, $url, null, $completeMatch);
+    }
+
+    /**
+     * URL后缀及Slash检查
+     * @access protected
+     * @param  Request      $request  请求对象
+     * @param  string       $url      访问地址
+     * @param  array        $option   路由参数
+     * @return string
+     */
+    protected function urlSuffixCheck($request, $url, $option = [])
+    {
+        // 是否区分 / 地址访问
+        if (!empty($option['remove_slash']) && '/' != $this->rule) {
+            $this->rule = rtrim($this->rule, '/');
+            $url        = rtrim($url, '|');
+        }
+
+        if (isset($option['ext'])) {
+            // 路由ext参数 优先于系统配置的URL伪静态后缀参数
+            $url = preg_replace('/\.(' . $request->ext() . ')$/i', '', $url);
+        }
+
+        return $url;
+    }
+
+    /**
+     * 检测URL和规则路由是否匹配
+     * @access private
+     * @param  string    $url URL地址
+     * @param  array     $option    路由参数
+     * @param  bool      $completeMatch   路由是否完全匹配
+     * @return array|false
+     */
+    private function match($url, $option, $completeMatch)
+    {
+        if (isset($option['complete_match'])) {
+            $completeMatch = $option['complete_match'];
+        }
+
+        $pattern = array_merge($this->parent->getPattern(), $this->pattern);
+        $depr    = $this->router->config('pathinfo_depr');
+
+        // 检查完整规则定义
+        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^' . $pattern['__url__'] . '/', str_replace('|', $depr, $url))) {
+            return false;
+        }
+
+        $var  = [];
+        $url  = $depr . str_replace('|', $depr, $url);
+        $rule = $depr . str_replace('/', $depr, $this->rule);
+
+        if ($depr == $rule && $depr != $url) {
+            return false;
+        }
+
+        if (false === strpos($rule, '<')) {
+            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule . $depr, $url . $depr, strlen($rule . $depr)))) {
+                return $var;
+            }
+            return false;
+        }
+
+        $slash = preg_quote('/-' . $depr, '/');
+
+        if ($matchRule = preg_split('/[' . $slash . ']?<\w+\??>/', $rule, 2)) {
+            if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) {
+                return false;
+            }
+        }
+
+        if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+            $regex = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $completeMatch);
+
+            try {
+                if (!preg_match('/^' . $regex . ($completeMatch ? '$' : '') . '/u', $url, $match)) {
+                    return false;
+                }
+            } catch (\Exception $e) {
+                throw new Exception('route pattern error');
+            }
+
+            foreach ($match as $key => $val) {
+                if (is_string($key)) {
+                    $var[$key] = $val;
+                }
+            }
+        }
+
+        // 成功匹配后返回URL中的动态变量数组
+        return $var;
+    }
+
+}
diff --git a/thinkphp/library/think/route/RuleName.php b/thinkphp/library/think/route/RuleName.php
new file mode 100644
index 0000000000000000000000000000000000000000..c73c36394fe12d2537ff152c4d34116666708295
--- /dev/null
+++ b/thinkphp/library/think/route/RuleName.php
@@ -0,0 +1,136 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route;
+
+class RuleName
+{
+    protected $item = [];
+    protected $rule = [];
+
+    /**
+     * 注册路由标识
+     * @access public
+     * @param  string   $name      路由标识
+     * @param  array    $value     路由规则
+     * @param  bool     $first     是否置顶
+     * @return void
+     */
+    public function set($name, $value, $first = false)
+    {
+        if ($first && isset($this->item[$name])) {
+            array_unshift($this->item[$name], $value);
+        } else {
+            $this->item[$name][] = $value;
+        }
+    }
+
+    /**
+     * 注册路由规则
+     * @access public
+     * @param  string   $rule      路由规则
+     * @param  RuleItem $route     路由
+     * @return void
+     */
+    public function setRule($rule, $route)
+    {
+        $this->rule[$route->getDomain()][$rule][$route->getRoute()] = $route;
+    }
+
+    /**
+     * 根据路由规则获取路由对象（列表）
+     * @access public
+     * @param  string   $name      路由标识
+     * @param  string   $domain   域名
+     * @return array
+     */
+    public function getRule($rule, $domain = null)
+    {
+        return isset($this->rule[$domain][$rule]) ? $this->rule[$domain][$rule] : [];
+    }
+
+    /**
+     * 获取全部路由列表
+     * @access public
+     * @param  string   $domain   域名
+     * @return array
+     */
+    public function getRuleList($domain = null)
+    {
+        $list = [];
+
+        foreach ($this->rule as $ruleDomain => $rules) {
+            foreach ($rules as $rule => $items) {
+                foreach ($items as $item) {
+                    $val = [];
+
+                    foreach (['method', 'rule', 'name', 'route', 'pattern', 'option'] as $param) {
+                        $call        = 'get' . $param;
+                        $val[$param] = $item->$call();
+                    }
+
+                    $list[$ruleDomain][] = $val;
+                }
+            }
+        }
+
+        if ($domain) {
+            return isset($list[$domain]) ? $list[$domain] : [];
+        }
+
+        return $list;
+    }
+
+    /**
+     * 导入路由标识
+     * @access public
+     * @param  array   $name      路由标识
+     * @return void
+     */
+    public function import($item)
+    {
+        $this->item = $item;
+    }
+
+    /**
+     * 根据路由标识获取路由信息（用于URL生成）
+     * @access public
+     * @param  string   $name      路由标识
+     * @param  string   $domain   域名
+     * @return array|null
+     */
+    public function get($name = null, $domain = null)
+    {
+        if (is_null($name)) {
+            return $this->item;
+        }
+
+        $name = strtolower($name);
+
+        if (isset($this->item[$name])) {
+            if (is_null($domain)) {
+                $result = $this->item[$name];
+            } else {
+                $result = [];
+                foreach ($this->item[$name] as $item) {
+                    if ($item[2] == $domain) {
+                        $result[] = $item;
+                    }
+                }
+            }
+        } else {
+            $result = null;
+        }
+
+        return $result;
+    }
+
+}
diff --git a/thinkphp/library/think/route/dispatch/Callback.php b/thinkphp/library/think/route/dispatch/Callback.php
new file mode 100644
index 0000000000000000000000000000000000000000..ca76fc99363e0c4594f59df486b92259551b0277
--- /dev/null
+++ b/thinkphp/library/think/route/dispatch/Callback.php
@@ -0,0 +1,26 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route\dispatch;
+
+use think\route\Dispatch;
+
+class Callback extends Dispatch
+{
+    public function exec()
+    {
+        // 执行回调方法
+        $vars = array_merge($this->request->param(), $this->param);
+
+        return $this->app->invoke($this->dispatch, $vars);
+    }
+
+}
diff --git a/thinkphp/library/think/route/dispatch/Controller.php b/thinkphp/library/think/route/dispatch/Controller.php
new file mode 100644
index 0000000000000000000000000000000000000000..1de82992630ab81d2243429e52f2190a4a7046af
--- /dev/null
+++ b/thinkphp/library/think/route/dispatch/Controller.php
@@ -0,0 +1,30 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route\dispatch;
+
+use think\route\Dispatch;
+
+class Controller extends Dispatch
+{
+    public function exec()
+    {
+        // 执行控制器的操作方法
+        $vars = array_merge($this->request->param(), $this->param);
+
+        return $this->app->action(
+            $this->dispatch, $vars,
+            $this->rule->getConfig('url_controller_layer'),
+            $this->rule->getConfig('controller_suffix')
+        );
+    }
+
+}
diff --git a/thinkphp/library/think/route/dispatch/Module.php b/thinkphp/library/think/route/dispatch/Module.php
new file mode 100644
index 0000000000000000000000000000000000000000..4224b362f58f84616de7438cbea9f5d884341716
--- /dev/null
+++ b/thinkphp/library/think/route/dispatch/Module.php
@@ -0,0 +1,136 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route\dispatch;
+
+use ReflectionMethod;
+use think\exception\ClassNotFoundException;
+use think\exception\HttpException;
+use think\Loader;
+use think\Request;
+use think\route\Dispatch;
+
+class Module extends Dispatch
+{
+    protected $controller;
+    protected $actionName;
+
+    public function init()
+    {
+        parent::init();
+
+        $result = $this->dispatch;
+
+        if (is_string($result)) {
+            $result = explode('/', $result);
+        }
+
+        if ($this->rule->getConfig('app_multi_module')) {
+            // 多模块部署
+            $module    = strip_tags(strtolower($result[0] ?: $this->rule->getConfig('default_module')));
+            $bind      = $this->rule->getRouter()->getBind();
+            $available = false;
+
+            if ($bind && preg_match('/^[a-z]/is', $bind)) {
+                // 绑定模块
+                list($bindModule) = explode('/', $bind);
+                if (empty($result[0])) {
+                    $module = $bindModule;
+                }
+                $available = true;
+            } elseif (!in_array($module, $this->rule->getConfig('deny_module_list')) && is_dir($this->app->getAppPath() . $module)) {
+                $available = true;
+            } elseif ($this->rule->getConfig('empty_module')) {
+                $module    = $this->rule->getConfig('empty_module');
+                $available = true;
+            }
+
+            // 模块初始化
+            if ($module && $available) {
+                // 初始化模块
+                $this->request->setModule($module);
+                $this->app->init($module);
+            } else {
+                throw new HttpException(404, 'module not exists:' . $module);
+            }
+        }
+
+        // 是否自动转换控制器和操作名
+        $convert = is_bool($this->convert) ? $this->convert : $this->rule->getConfig('url_convert');
+        // 获取控制器名
+        $controller       = strip_tags($result[1] ?: $this->rule->getConfig('default_controller'));
+        $this->controller = $convert ? strtolower($controller) : $controller;
+
+        // 获取操作名
+        $this->actionName = strip_tags($result[2] ?: $this->rule->getConfig('default_action'));
+
+        // 设置当前请求的控制器、操作
+        $this->request
+            ->setController(Loader::parseName($this->controller, 1))
+            ->setAction($this->actionName);
+
+        return $this;
+    }
+
+    public function exec()
+    {
+        // 监听module_init
+        $this->app['hook']->listen('module_init');
+
+        try {
+            // 实例化控制器
+            $instance = $this->app->controller($this->controller,
+                $this->rule->getConfig('url_controller_layer'),
+                $this->rule->getConfig('controller_suffix'),
+                $this->rule->getConfig('empty_controller'));
+        } catch (ClassNotFoundException $e) {
+            throw new HttpException(404, 'controller not exists:' . $e->getClass());
+        }
+
+        $this->app['middleware']->controller(function (Request $request, $next) use ($instance) {
+            // 获取当前操作名
+            $action = $this->actionName . $this->rule->getConfig('action_suffix');
+
+            if (is_callable([$instance, $action])) {
+                // 执行操作方法
+                $call = [$instance, $action];
+
+                // 严格获取当前操作方法名
+                $reflect    = new ReflectionMethod($instance, $action);
+                $methodName = $reflect->getName();
+                $suffix     = $this->rule->getConfig('action_suffix');
+                $actionName = $suffix ? substr($methodName, 0, -strlen($suffix)) : $methodName;
+                $this->request->setAction($actionName);
+
+                // 自动获取请求变量
+                $vars = $this->rule->getConfig('url_param_type')
+                ? $this->request->route()
+                : $this->request->param();
+            } elseif (is_callable([$instance, '_empty'])) {
+                // 空操作
+                $call    = [$instance, '_empty'];
+                $vars    = [$this->actionName];
+                $reflect = new ReflectionMethod($instance, '_empty');
+            } else {
+                // 操作不存在
+                throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()');
+            }
+
+            $this->app['hook']->listen('action_begin', $call);
+
+            $data = $this->app->invokeReflectMethod($instance, $reflect, $vars);
+
+            return $this->autoResponse($data);
+        });
+
+        return $this->app['middleware']->dispatch($this->request, 'controller');
+    }
+}
diff --git a/thinkphp/library/think/route/dispatch/Redirect.php b/thinkphp/library/think/route/dispatch/Redirect.php
new file mode 100644
index 0000000000000000000000000000000000000000..fae2c9a65f3414c8f568caf74f385f3fbdb72f4c
--- /dev/null
+++ b/thinkphp/library/think/route/dispatch/Redirect.php
@@ -0,0 +1,23 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route\dispatch;
+
+use think\Response;
+use think\route\Dispatch;
+
+class Redirect extends Dispatch
+{
+    public function exec()
+    {
+        return Response::create($this->dispatch, 'redirect')->code($this->code);
+    }
+}
diff --git a/thinkphp/library/think/route/dispatch/Response.php b/thinkphp/library/think/route/dispatch/Response.php
new file mode 100644
index 0000000000000000000000000000000000000000..66f4e5abb9ba18b10c467e5176213c3f464aaf9a
--- /dev/null
+++ b/thinkphp/library/think/route/dispatch/Response.php
@@ -0,0 +1,23 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route\dispatch;
+
+use think\route\Dispatch;
+
+class Response extends Dispatch
+{
+    public function exec()
+    {
+        return $this->dispatch;
+    }
+
+}
diff --git a/thinkphp/library/think/route/dispatch/Url.php b/thinkphp/library/think/route/dispatch/Url.php
new file mode 100644
index 0000000000000000000000000000000000000000..0fb6e0c25ef1c9a91c596cce5e964cca5bf62f85
--- /dev/null
+++ b/thinkphp/library/think/route/dispatch/Url.php
@@ -0,0 +1,163 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route\dispatch;
+
+use think\exception\HttpException;
+use think\Loader;
+use think\route\Dispatch;
+
+class Url extends Dispatch
+{
+    public function init()
+    {
+        // 解析默认的URL规则
+        $result = $this->parseUrl($this->dispatch);
+
+        return (new Module($this->request, $this->rule, $result))->init();
+    }
+
+    public function exec()
+    {}
+
+    /**
+     * 解析URL地址
+     * @access protected
+     * @param  string   $url URL
+     * @return array
+     */
+    protected function parseUrl($url)
+    {
+        $depr = $this->rule->getConfig('pathinfo_depr');
+        $bind = $this->rule->getRouter()->getBind();
+
+        if (!empty($bind) && preg_match('/^[a-z]/is', $bind)) {
+            $bind = str_replace('/', $depr, $bind);
+            // 如果有模块/控制器绑定
+            $url = $bind . ('.' != substr($bind, -1) ? $depr : '') . ltrim($url, $depr);
+        }
+
+        list($path, $var) = $this->rule->parseUrlPath($url);
+        if (empty($path)) {
+            return [null, null, null];
+        }
+
+        // 解析模块
+        $module = $this->rule->getConfig('app_multi_module') ? array_shift($path) : null;
+
+        if ($this->param['auto_search']) {
+            $controller = $this->autoFindController($module, $path);
+        } else {
+            // 解析控制器
+            $controller = !empty($path) ? array_shift($path) : null;
+        }
+
+        // 解析操作
+        $action = !empty($path) ? array_shift($path) : null;
+
+        // 解析额外参数
+        if ($path) {
+            if ($this->rule->getConfig('url_param_type')) {
+                $var += $path;
+            } else {
+                preg_replace_callback('/(\w+)\|([^\|]+)/', function ($match) use (&$var) {
+                    $var[$match[1]] = strip_tags($match[2]);
+                }, implode('|', $path));
+            }
+        }
+
+        $panDomain = $this->request->panDomain();
+
+        if ($panDomain && $key = array_search('*', $var)) {
+            // 泛域名赋值
+            $var[$key] = $panDomain;
+        }
+
+        // 设置当前请求的参数
+        $this->request->setRouteVars($var);
+
+        // 封装路由
+        $route = [$module, $controller, $action];
+
+        if ($this->hasDefinedRoute($route, $bind)) {
+            throw new HttpException(404, 'invalid request:' . str_replace('|', $depr, $url));
+        }
+
+        return $route;
+    }
+
+    /**
+     * 检查URL是否已经定义过路由
+     * @access protected
+     * @param  string    $route  路由信息
+     * @param  string    $bind   绑定信息
+     * @return bool
+     */
+    protected function hasDefinedRoute($route, $bind)
+    {
+        list($module, $controller, $action) = $route;
+
+        // 检查地址是否被定义过路由
+        $name = strtolower($module . '/' . Loader::parseName($controller, 1) . '/' . $action);
+
+        $name2 = '';
+
+        if (empty($module) || $module == $bind) {
+            $name2 = strtolower(Loader::parseName($controller, 1) . '/' . $action);
+        }
+
+        $host = $this->request->host(true);
+
+        if ($this->rule->getRouter()->getName($name, $host) || $this->rule->getRouter()->getName($name2, $host)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * 自动定位控制器类
+     * @access protected
+     * @param  string    $module 模块名
+     * @param  array     $path   URL
+     * @return string
+     */
+    protected function autoFindController($module, &$path)
+    {
+        $dir    = $this->app->getAppPath() . ($module ? $module . '/' : '') . $this->rule->getConfig('url_controller_layer');
+        $suffix = $this->app->getSuffix() || $this->rule->getConfig('controller_suffix') ? ucfirst($this->rule->getConfig('url_controller_layer')) : '';
+
+        $item = [];
+        $find = false;
+
+        foreach ($path as $val) {
+            $item[] = $val;
+            $file   = $dir . '/' . str_replace('.', '/', $val) . $suffix . '.php';
+            $file   = pathinfo($file, PATHINFO_DIRNAME) . '/' . Loader::parseName(pathinfo($file, PATHINFO_FILENAME), 1) . '.php';
+            if (is_file($file)) {
+                $find = true;
+                break;
+            } else {
+                $dir .= '/' . Loader::parseName($val);
+            }
+        }
+
+        if ($find) {
+            $controller = implode('.', $item);
+            $path       = array_slice($path, count($item));
+        } else {
+            $controller = array_shift($path);
+        }
+
+        return $controller;
+    }
+
+}
diff --git a/thinkphp/library/think/route/dispatch/View.php b/thinkphp/library/think/route/dispatch/View.php
new file mode 100644
index 0000000000000000000000000000000000000000..ea3ef11b024d6a46fc797638b73d53e75f4835c1
--- /dev/null
+++ b/thinkphp/library/think/route/dispatch/View.php
@@ -0,0 +1,26 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\route\dispatch;
+
+use think\Response;
+use think\route\Dispatch;
+
+class View extends Dispatch
+{
+    public function exec()
+    {
+        // 渲染模板输出
+        $vars = array_merge($this->request->param(), $this->param);
+
+        return Response::create($this->dispatch, 'view')->assign($vars);
+    }
+}
diff --git a/thinkphp/library/think/session/driver/Memcache.php b/thinkphp/library/think/session/driver/Memcache.php
new file mode 100644
index 0000000000000000000000000000000000000000..40d7bb8251359ea7c93118ab595e2a413555851b
--- /dev/null
+++ b/thinkphp/library/think/session/driver/Memcache.php
@@ -0,0 +1,124 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\session\driver;
+
+use SessionHandlerInterface;
+use think\Exception;
+
+class Memcache implements SessionHandlerInterface
+{
+    protected $handler = null;
+    protected $config  = [
+        'host'         => '127.0.0.1', // memcache主机
+        'port'         => 11211, // memcache端口
+        'expire'       => 3600, // session有效期
+        'timeout'      => 0, // 连接超时时间（单位：毫秒）
+        'persistent'   => true, // 长连接
+        'session_name' => '', // memcache key前缀
+    ];
+
+    public function __construct($config = [])
+    {
+        $this->config = array_merge($this->config, $config);
+    }
+
+    /**
+     * 打开Session
+     * @access public
+     * @param  string    $savePath
+     * @param  mixed     $sessName
+     */
+    public function open($savePath, $sessName)
+    {
+        // 检测php环境
+        if (!extension_loaded('memcache')) {
+            throw new Exception('not support:memcache');
+        }
+
+        $this->handler = new \Memcache;
+
+        // 支持集群
+        $hosts = explode(',', $this->config['host']);
+        $ports = explode(',', $this->config['port']);
+
+        if (empty($ports[0])) {
+            $ports[0] = 11211;
+        }
+
+        // 建立连接
+        foreach ((array) $hosts as $i => $host) {
+            $port = isset($ports[$i]) ? $ports[$i] : $ports[0];
+            $this->config['timeout'] > 0 ?
+            $this->handler->addServer($host, $port, $this->config['persistent'], 1, $this->config['timeout']) :
+            $this->handler->addServer($host, $port, $this->config['persistent'], 1);
+        }
+
+        return true;
+    }
+
+    /**
+     * 关闭Session
+     * @access public
+     */
+    public function close()
+    {
+        $this->gc(ini_get('session.gc_maxlifetime'));
+        $this->handler->close();
+        $this->handler = null;
+
+        return true;
+    }
+
+    /**
+     * 读取Session
+     * @access public
+     * @param  string $sessID
+     */
+    public function read($sessID)
+    {
+        return (string) $this->handler->get($this->config['session_name'] . $sessID);
+    }
+
+    /**
+     * 写入Session
+     * @access public
+     * @param  string    $sessID
+     * @param  string    $sessData
+     * @return bool
+     */
+    public function write($sessID, $sessData)
+    {
+        return $this->handler->set($this->config['session_name'] . $sessID, $sessData, 0, $this->config['expire']);
+    }
+
+    /**
+     * 删除Session
+     * @access public
+     * @param  string $sessID
+     * @return bool
+     */
+    public function destroy($sessID)
+    {
+        return $this->handler->delete($this->config['session_name'] . $sessID);
+    }
+
+    /**
+     * Session 垃圾回收
+     * @access public
+     * @param  string $sessMaxLifeTime
+     * @return true
+     */
+    public function gc($sessMaxLifeTime)
+    {
+        return true;
+    }
+}
diff --git a/thinkphp/library/think/session/driver/Memcached.php b/thinkphp/library/think/session/driver/Memcached.php
new file mode 100644
index 0000000000000000000000000000000000000000..074b2ff73658cd7fcfe84921572a013a2b5a401c
--- /dev/null
+++ b/thinkphp/library/think/session/driver/Memcached.php
@@ -0,0 +1,135 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\session\driver;
+
+use SessionHandlerInterface;
+use think\Exception;
+
+class Memcached implements SessionHandlerInterface
+{
+    protected $handler = null;
+    protected $config  = [
+        'host'         => '127.0.0.1', // memcache主机
+        'port'         => 11211, // memcache端口
+        'expire'       => 3600, // session有效期
+        'timeout'      => 0, // 连接超时时间（单位：毫秒）
+        'session_name' => '', // memcache key前缀
+        'username'     => '', //账号
+        'password'     => '', //密码
+    ];
+
+    public function __construct($config = [])
+    {
+        $this->config = array_merge($this->config, $config);
+    }
+
+    /**
+     * 打开Session
+     * @access public
+     * @param  string    $savePath
+     * @param  mixed     $sessName
+     */
+    public function open($savePath, $sessName)
+    {
+        // 检测php环境
+        if (!extension_loaded('memcached')) {
+            throw new Exception('not support:memcached');
+        }
+
+        $this->handler = new \Memcached;
+
+        // 设置连接超时时间（单位：毫秒）
+        if ($this->config['timeout'] > 0) {
+            $this->handler->setOption(\Memcached::OPT_CONNECT_TIMEOUT, $this->config['timeout']);
+        }
+
+        // 支持集群
+        $hosts = explode(',', $this->config['host']);
+        $ports = explode(',', $this->config['port']);
+
+        if (empty($ports[0])) {
+            $ports[0] = 11211;
+        }
+
+        // 建立连接
+        $servers = [];
+        foreach ((array) $hosts as $i => $host) {
+            $servers[] = [$host, (isset($ports[$i]) ? $ports[$i] : $ports[0]), 1];
+        }
+
+        $this->handler->addServers($servers);
+
+        if ('' != $this->config['username']) {
+            $this->handler->setOption(\Memcached::OPT_BINARY_PROTOCOL, true);
+            $this->handler->setSaslAuthData($this->config['username'], $this->config['password']);
+        }
+
+        return true;
+    }
+
+    /**
+     * 关闭Session
+     * @access public
+     */
+    public function close()
+    {
+        $this->gc(ini_get('session.gc_maxlifetime'));
+        $this->handler->quit();
+        $this->handler = null;
+
+        return true;
+    }
+
+    /**
+     * 读取Session
+     * @access public
+     * @param  string $sessID
+     */
+    public function read($sessID)
+    {
+        return (string) $this->handler->get($this->config['session_name'] . $sessID);
+    }
+
+    /**
+     * 写入Session
+     * @access public
+     * @param  string $sessID
+     * @param  string $sessData
+     * @return bool
+     */
+    public function write($sessID, $sessData)
+    {
+        return $this->handler->set($this->config['session_name'] . $sessID, $sessData, $this->config['expire']);
+    }
+
+    /**
+     * 删除Session
+     * @access public
+     * @param  string $sessID
+     * @return bool
+     */
+    public function destroy($sessID)
+    {
+        return $this->handler->delete($this->config['session_name'] . $sessID);
+    }
+
+    /**
+     * Session 垃圾回收
+     * @access public
+     * @param  string $sessMaxLifeTime
+     * @return true
+     */
+    public function gc($sessMaxLifeTime)
+    {
+        return true;
+    }
+}
diff --git a/thinkphp/library/think/session/driver/Redis.php b/thinkphp/library/think/session/driver/Redis.php
new file mode 100644
index 0000000000000000000000000000000000000000..a521ca0f716cffe82196b5215425ab34b5a3b722
--- /dev/null
+++ b/thinkphp/library/think/session/driver/Redis.php
@@ -0,0 +1,177 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\session\driver;
+
+use SessionHandlerInterface;
+use think\Exception;
+
+class Redis implements SessionHandlerInterface
+{
+    /** @var \Redis */
+    protected $handler = null;
+    protected $config  = [
+        'host'         => '127.0.0.1', // redis主机
+        'port'         => 6379, // redis端口
+        'password'     => '', // 密码
+        'select'       => 0, // 操作库
+        'expire'       => 3600, // 有效期(秒)
+        'timeout'      => 0, // 超时时间(秒)
+        'persistent'   => true, // 是否长连接
+        'session_name' => '', // sessionkey前缀
+    ];
+
+    public function __construct($config = [])
+    {
+        $this->config = array_merge($this->config, $config);
+    }
+
+    /**
+     * 打开Session
+     * @access public
+     * @param  string $savePath
+     * @param  mixed  $sessName
+     * @return bool
+     * @throws Exception
+     */
+    public function open($savePath, $sessName)
+    {
+        if (extension_loaded('redis')) {
+            $this->handler = new \Redis;
+
+            // 建立连接
+            $func = $this->config['persistent'] ? 'pconnect' : 'connect';
+            $this->handler->$func($this->config['host'], $this->config['port'], $this->config['timeout']);
+
+            if ('' != $this->config['password']) {
+                $this->handler->auth($this->config['password']);
+            }
+
+            if (0 != $this->config['select']) {
+                $this->handler->select($this->config['select']);
+            }
+        } elseif (class_exists('\Predis\Client')) {
+            $params = [];
+            foreach ($this->config as $key => $val) {
+                if (in_array($key, ['aggregate', 'cluster', 'connections', 'exceptions', 'prefix', 'profile', 'replication'])) {
+                    $params[$key] = $val;
+                    unset($this->config[$key]);
+                }
+            }
+            $this->handler = new \Predis\Client($this->config, $params);
+        } else {
+            throw new \BadFunctionCallException('not support: redis');
+        }
+
+        return true;
+    }
+
+    /**
+     * 关闭Session
+     * @access public
+     */
+    public function close()
+    {
+        $this->gc(ini_get('session.gc_maxlifetime'));
+        $this->handler->close();
+        $this->handler = null;
+
+        return true;
+    }
+
+    /**
+     * 读取Session
+     * @access public
+     * @param  string $sessID
+     * @return string
+     */
+    public function read($sessID)
+    {
+        return (string) $this->handler->get($this->config['session_name'] . $sessID);
+    }
+
+    /**
+     * 写入Session
+     * @access public
+     * @param  string $sessID
+     * @param  string $sessData
+     * @return bool
+     */
+    public function write($sessID, $sessData)
+    {
+        if ($this->config['expire'] > 0) {
+            return $this->handler->setex($this->config['session_name'] . $sessID, $this->config['expire'], $sessData);
+        } else {
+            return $this->handler->set($this->config['session_name'] . $sessID, $sessData);
+        }
+    }
+
+    /**
+     * 删除Session
+     * @access public
+     * @param  string $sessID
+     * @return bool
+     */
+    public function destroy($sessID)
+    {
+        return $this->handler->delete($this->config['session_name'] . $sessID) > 0;
+    }
+
+    /**
+     * Session 垃圾回收
+     * @access public
+     * @param  string $sessMaxLifeTime
+     * @return bool
+     */
+    public function gc($sessMaxLifeTime)
+    {
+        return true;
+    }
+
+    /**
+     * Redis Session 驱动的加锁机制
+     * @access public
+     * @param  string  $sessID   用于加锁的sessID
+     * @param  integer $timeout 默认过期时间
+     * @return bool
+     */
+    public function lock($sessID, $timeout = 10)
+    {
+        if (null == $this->handler) {
+            $this->open('', '');
+        }
+
+        $lockKey = 'LOCK_PREFIX_' . $sessID;
+        // 使用setnx操作加锁
+        $isLock = $this->handler->setnx($lockKey, 1);
+        if ($isLock) {
+            // 设置过期时间，防止死任务的出现
+            $this->handler->expire($lockKey, $timeout);
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Redis Session 驱动的解锁机制
+     * @access public
+     * @param  string  $sessID   用于解锁的sessID
+     */
+    public function unlock($sessID)
+    {
+        if (null == $this->handler) {
+            $this->open('', '');
+        }
+
+        $this->handler->del('LOCK_PREFIX_' . $sessID);
+    }
+}
diff --git a/thinkphp/library/think/template/TagLib.php b/thinkphp/library/think/template/TagLib.php
new file mode 100644
index 0000000000000000000000000000000000000000..3653b7d2f322882d5743bdc8be92088ab50bf884
--- /dev/null
+++ b/thinkphp/library/think/template/TagLib.php
@@ -0,0 +1,351 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\template;
+
+use think\Exception;
+
+/**
+ * ThinkPHP标签库TagLib解析基类
+ * @category   Think
+ * @package  Think
+ * @subpackage  Template
+ * @author    liu21st <liu21st@gmail.com>
+ */
+class TagLib
+{
+
+    /**
+     * 标签库定义XML文件
+     * @var string
+     * @access protected
+     */
+    protected $xml  = '';
+    protected $tags = []; // 标签定义
+    /**
+     * 标签库名称
+     * @var string
+     * @access protected
+     */
+    protected $tagLib = '';
+
+    /**
+     * 标签库标签列表
+     * @var array
+     * @access protected
+     */
+    protected $tagList = [];
+
+    /**
+     * 标签库分析数组
+     * @var array
+     * @access protected
+     */
+    protected $parse = [];
+
+    /**
+     * 标签库是否有效
+     * @var bool
+     * @access protected
+     */
+    protected $valid = false;
+
+    /**
+     * 当前模板对象
+     * @var object
+     * @access protected
+     */
+    protected $tpl;
+
+    protected $comparison = [' nheq ' => ' !== ', ' heq ' => ' === ', ' neq ' => ' != ', ' eq ' => ' == ', ' egt ' => ' >= ', ' gt ' => ' > ', ' elt ' => ' <= ', ' lt ' => ' < '];
+
+    /**
+     * 架构函数
+     * @access public
+     * @param  \stdClass $template 模板引擎对象
+     */
+    public function __construct($template)
+    {
+        $this->tpl = $template;
+    }
+
+    /**
+     * 按签标库替换页面中的标签
+     * @access public
+     * @param  string $content 模板内容
+     * @param  string $lib 标签库名
+     * @return void
+     */
+    public function parseTag(&$content, $lib = '')
+    {
+        $tags = [];
+        $lib  = $lib ? strtolower($lib) . ':' : '';
+
+        foreach ($this->tags as $name => $val) {
+            $close                      = !isset($val['close']) || $val['close'] ? 1 : 0;
+            $tags[$close][$lib . $name] = $name;
+            if (isset($val['alias'])) {
+                // 别名设置
+                $array = (array) $val['alias'];
+                foreach (explode(',', $array[0]) as $v) {
+                    $tags[$close][$lib . $v] = $name;
+                }
+            }
+        }
+
+        // 闭合标签
+        if (!empty($tags[1])) {
+            $nodes = [];
+            $regex = $this->getRegex(array_keys($tags[1]), 1);
+            if (preg_match_all($regex, $content, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) {
+                $right = [];
+                foreach ($matches as $match) {
+                    if ('' == $match[1][0]) {
+                        $name = strtolower($match[2][0]);
+                        // 如果有没闭合的标签头则取出最后一个
+                        if (!empty($right[$name])) {
+                            // $match[0][1]为标签结束符在模板中的位置
+                            $nodes[$match[0][1]] = [
+                                'name'  => $name,
+                                'begin' => array_pop($right[$name]), // 标签开始符
+                                'end'   => $match[0], // 标签结束符
+                            ];
+                        }
+                    } else {
+                        // 标签头压入栈
+                        $right[strtolower($match[1][0])][] = $match[0];
+                    }
+                }
+                unset($right, $matches);
+                // 按标签在模板中的位置从后向前排序
+                krsort($nodes);
+            }
+
+            $break = '<!--###break###--!>';
+            if ($nodes) {
+                $beginArray = [];
+                // 标签替换 从后向前
+                foreach ($nodes as $pos => $node) {
+                    // 对应的标签名
+                    $name  = $tags[1][$node['name']];
+                    $alias = $lib . $name != $node['name'] ? ($lib ? strstr($node['name'], $lib) : $node['name']) : '';
+
+                    // 解析标签属性
+                    $attrs  = $this->parseAttr($node['begin'][0], $name, $alias);
+                    $method = 'tag' . $name;
+
+                    // 读取标签库中对应的标签内容 replace[0]用来替换标签头，replace[1]用来替换标签尾
+                    $replace = explode($break, $this->$method($attrs, $break));
+
+                    if (count($replace) > 1) {
+                        while ($beginArray) {
+                            $begin = end($beginArray);
+                            // 判断当前标签尾的位置是否在栈中最后一个标签头的后面，是则为子标签
+                            if ($node['end'][1] > $begin['pos']) {
+                                break;
+                            } else {
+                                // 不为子标签时，取出栈中最后一个标签头
+                                $begin = array_pop($beginArray);
+                                // 替换标签头部
+                                $content = substr_replace($content, $begin['str'], $begin['pos'], $begin['len']);
+                            }
+                        }
+                        // 替换标签尾部
+                        $content = substr_replace($content, $replace[1], $node['end'][1], strlen($node['end'][0]));
+                        // 把标签头压入栈
+                        $beginArray[] = ['pos' => $node['begin'][1], 'len' => strlen($node['begin'][0]), 'str' => $replace[0]];
+                    }
+                }
+
+                while ($beginArray) {
+                    $begin = array_pop($beginArray);
+                    // 替换标签头部
+                    $content = substr_replace($content, $begin['str'], $begin['pos'], $begin['len']);
+                }
+            }
+        }
+        // 自闭合标签
+        if (!empty($tags[0])) {
+            $regex   = $this->getRegex(array_keys($tags[0]), 0);
+            $content = preg_replace_callback($regex, function ($matches) use (&$tags, &$lib) {
+                // 对应的标签名
+                $name  = $tags[0][strtolower($matches[1])];
+                $alias = $lib . $name != $matches[1] ? ($lib ? strstr($matches[1], $lib) : $matches[1]) : '';
+                // 解析标签属性
+                $attrs  = $this->parseAttr($matches[0], $name, $alias);
+                $method = 'tag' . $name;
+                return $this->$method($attrs, '');
+            }, $content);
+        }
+
+        return;
+    }
+
+    /**
+     * 按标签生成正则
+     * @access public
+     * @param  array|string     $tags 标签名
+     * @param  boolean          $close 是否为闭合标签
+     * @return string
+     */
+    public function getRegex($tags, $close)
+    {
+        $begin   = $this->tpl->config('taglib_begin');
+        $end     = $this->tpl->config('taglib_end');
+        $single  = strlen(ltrim($begin, '\\')) == 1 && strlen(ltrim($end, '\\')) == 1 ? true : false;
+        $tagName = is_array($tags) ? implode('|', $tags) : $tags;
+
+        if ($single) {
+            if ($close) {
+                // 如果是闭合标签
+                $regex = $begin . '(?:(' . $tagName . ')\b(?>[^' . $end . ']*)|\/(' . $tagName . '))' . $end;
+            } else {
+                $regex = $begin . '(' . $tagName . ')\b(?>[^' . $end . ']*)' . $end;
+            }
+        } else {
+            if ($close) {
+                // 如果是闭合标签
+                $regex = $begin . '(?:(' . $tagName . ')\b(?>(?:(?!' . $end . ').)*)|\/(' . $tagName . '))' . $end;
+            } else {
+                $regex = $begin . '(' . $tagName . ')\b(?>(?:(?!' . $end . ').)*)' . $end;
+            }
+        }
+
+        return '/' . $regex . '/is';
+    }
+
+    /**
+     * 分析标签属性 正则方式
+     * @access public
+     * @param  string $str 标签属性字符串
+     * @param  string $name 标签名
+     * @param  string $alias 别名
+     * @return array
+     */
+    public function parseAttr($str, $name, $alias = '')
+    {
+        $regex  = '/\s+(?>(?P<name>[\w-]+)\s*)=(?>\s*)([\"\'])(?P<value>(?:(?!\\2).)*)\\2/is';
+        $result = [];
+
+        if (preg_match_all($regex, $str, $matches)) {
+            foreach ($matches['name'] as $key => $val) {
+                $result[$val] = $matches['value'][$key];
+            }
+
+            if (!isset($this->tags[$name])) {
+                // 检测是否存在别名定义
+                foreach ($this->tags as $key => $val) {
+                    if (isset($val['alias'])) {
+                        $array = (array) $val['alias'];
+                        if (in_array($name, explode(',', $array[0]))) {
+                            $tag           = $val;
+                            $type          = !empty($array[1]) ? $array[1] : 'type';
+                            $result[$type] = $name;
+                            break;
+                        }
+                    }
+                }
+            } else {
+                $tag = $this->tags[$name];
+                // 设置了标签别名
+                if (!empty($alias) && isset($tag['alias'])) {
+                    $type          = !empty($tag['alias'][1]) ? $tag['alias'][1] : 'type';
+                    $result[$type] = $alias;
+                }
+            }
+
+            if (!empty($tag['must'])) {
+                $must = explode(',', $tag['must']);
+                foreach ($must as $name) {
+                    if (!isset($result[$name])) {
+                        throw new Exception('tag attr must:' . $name);
+                    }
+                }
+            }
+        } else {
+            // 允许直接使用表达式的标签
+            if (!empty($this->tags[$name]['expression'])) {
+                static $_taglibs;
+                if (!isset($_taglibs[$name])) {
+                    $_taglibs[$name][0] = strlen($this->tpl->config('taglib_begin_origin') . $name);
+                    $_taglibs[$name][1] = strlen($this->tpl->config('taglib_end_origin'));
+                }
+                $result['expression'] = substr($str, $_taglibs[$name][0], -$_taglibs[$name][1]);
+                // 清除自闭合标签尾部/
+                $result['expression'] = rtrim($result['expression'], '/');
+                $result['expression'] = trim($result['expression']);
+            } elseif (empty($this->tags[$name]) || !empty($this->tags[$name]['attr'])) {
+                throw new Exception('tag error:' . $name);
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * 解析条件表达式
+     * @access public
+     * @param  string $condition 表达式标签内容
+     * @return string
+     */
+    public function parseCondition($condition)
+    {
+        if (strpos($condition, ':')) {
+            $condition = ' ' . substr(strstr($condition, ':'), 1);
+        }
+
+        $condition = str_ireplace(array_keys($this->comparison), array_values($this->comparison), $condition);
+        $this->tpl->parseVar($condition);
+
+        // $this->tpl->parseVarFunction($condition); // XXX: 此句能解析表达式中用|分隔的函数，但表达式中如果有|、||这样的逻辑运算就产生了歧异
+        return $condition;
+    }
+
+    /**
+     * 自动识别构建变量
+     * @access public
+     * @param  string    $name       变量描述
+     * @return string
+     */
+    public function autoBuildVar(&$name)
+    {
+        $flag = substr($name, 0, 1);
+
+        if (':' == $flag) {
+            // 以:开头为函数调用，解析前去掉:
+            $name = substr($name, 1);
+        } elseif ('$' != $flag && preg_match('/[a-zA-Z_]/', $flag)) {
+            // XXX: 这句的写法可能还需要改进
+            // 常量不需要解析
+            if (defined($name)) {
+                return $name;
+            }
+
+            // 不以$开头并且也不是常量，自动补上$前缀
+            $name = '$' . $name;
+        }
+
+        $this->tpl->parseVar($name);
+        $this->tpl->parseVarFunction($name, false);
+
+        return $name;
+    }
+
+    /**
+     * 获取标签列表
+     * @access public
+     * @return array
+     */
+    public function getTags()
+    {
+        return $this->tags;
+    }
+}
diff --git a/thinkphp/library/think/template/driver/File.php b/thinkphp/library/think/template/driver/File.php
new file mode 100644
index 0000000000000000000000000000000000000000..3b96a0f3ba927d910532b632e7c07e30389cb73e
--- /dev/null
+++ b/thinkphp/library/think/template/driver/File.php
@@ -0,0 +1,83 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\template\driver;
+
+use think\Exception;
+
+class File
+{
+    protected $cacheFile;
+
+    /**
+     * 写入编译缓存
+     * @access public
+     * @param  string $cacheFile 缓存的文件名
+     * @param  string $content 缓存的内容
+     * @return void|array
+     */
+    public function write($cacheFile, $content)
+    {
+        // 检测模板目录
+        $dir = dirname($cacheFile);
+
+        if (!is_dir($dir)) {
+            mkdir($dir, 0755, true);
+        }
+
+        // 生成模板缓存文件
+        if (false === file_put_contents($cacheFile, $content)) {
+            throw new Exception('cache write error:' . $cacheFile, 11602);
+        }
+    }
+
+    /**
+     * 读取编译编译
+     * @access public
+     * @param  string  $cacheFile 缓存的文件名
+     * @param  array   $vars 变量数组
+     * @return void
+     */
+    public function read($cacheFile, $vars = [])
+    {
+        $this->cacheFile = $cacheFile;
+
+        if (!empty($vars) && is_array($vars)) {
+            // 模板阵列变量分解成为独立变量
+            extract($vars, EXTR_OVERWRITE);
+        }
+
+        //载入模版缓存文件
+        include $this->cacheFile;
+    }
+
+    /**
+     * 检查编译缓存是否有效
+     * @access public
+     * @param  string  $cacheFile 缓存的文件名
+     * @param  int     $cacheTime 缓存时间
+     * @return boolean
+     */
+    public function check($cacheFile, $cacheTime)
+    {
+        // 缓存文件不存在, 直接返回false
+        if (!file_exists($cacheFile)) {
+            return false;
+        }
+
+        if (0 != $cacheTime && time() > filemtime($cacheFile) + $cacheTime) {
+            // 缓存是否在有效期
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/thinkphp/library/think/template/taglib/Cx.php b/thinkphp/library/think/template/taglib/Cx.php
new file mode 100644
index 0000000000000000000000000000000000000000..ad741f289ab3a3809442ef6863b97a223b8168f3
--- /dev/null
+++ b/thinkphp/library/think/template/taglib/Cx.php
@@ -0,0 +1,724 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK IT ]
+// +----------------------------------------------------------------------
+// | 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\template\taglib;
+
+use think\template\TagLib;
+
+/**
+ * CX标签库解析类
+ * @category   Think
+ * @package  Think
+ * @subpackage  Driver.Taglib
+ * @author    liu21st <liu21st@gmail.com>
+ */
+class Cx extends Taglib
+{
+
+    // 标签定义
+    protected $tags = [
+        // 标签定义： attr 属性列表 close 是否闭合（0 或者1 默认1） alias 标签别名 level 嵌套层次
+        'php'        => ['attr' => ''],
+        'volist'     => ['attr' => 'name,id,offset,length,key,mod', 'alias' => 'iterate'],
+        'foreach'    => ['attr' => 'name,id,item,key,offset,length,mod', 'expression' => true],
+        'if'         => ['attr' => 'condition', 'expression' => true],
+        'elseif'     => ['attr' => 'condition', 'close' => 0, 'expression' => true],
+        'else'       => ['attr' => '', 'close' => 0],
+        'switch'     => ['attr' => 'name', 'expression' => true],
+        'case'       => ['attr' => 'value,break', 'expression' => true],
+        'default'    => ['attr' => '', 'close' => 0],
+        'compare'    => ['attr' => 'name,value,type', 'alias' => ['eq,equal,notequal,neq,gt,lt,egt,elt,heq,nheq', 'type']],
+        'range'      => ['attr' => 'name,value,type', 'alias' => ['in,notin,between,notbetween', 'type']],
+        'empty'      => ['attr' => 'name'],
+        'notempty'   => ['attr' => 'name'],
+        'present'    => ['attr' => 'name'],
+        'notpresent' => ['attr' => 'name'],
+        'defined'    => ['attr' => 'name'],
+        'notdefined' => ['attr' => 'name'],
+        'load'       => ['attr' => 'file,href,type,value,basepath', 'close' => 0, 'alias' => ['import,css,js', 'type']],
+        'assign'     => ['attr' => 'name,value', 'close' => 0],
+        'define'     => ['attr' => 'name,value', 'close' => 0],
+        'for'        => ['attr' => 'start,end,name,comparison,step'],
+        'url'        => ['attr' => 'link,vars,suffix,domain', 'close' => 0, 'expression' => true],
+        'function'   => ['attr' => 'name,vars,use,call'],
+    ];
+
+    /**
+     * php标签解析
+     * 格式：
+     * {php}echo $name{/php}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagPhp($tag, $content)
+    {
+        $parseStr = '<?php ' . $content . ' ?>';
+        return $parseStr;
+    }
+
+    /**
+     * volist标签解析 循环输出数据集
+     * 格式：
+     * {volist name="userList" id="user" empty=""}
+     * {user.username}
+     * {user.email}
+     * {/volist}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string|void
+     */
+    public function tagVolist($tag, $content)
+    {
+        $name   = $tag['name'];
+        $id     = $tag['id'];
+        $empty  = isset($tag['empty']) ? $tag['empty'] : '';
+        $key    = !empty($tag['key']) ? $tag['key'] : 'i';
+        $mod    = isset($tag['mod']) ? $tag['mod'] : '2';
+        $offset = !empty($tag['offset']) && is_numeric($tag['offset']) ? intval($tag['offset']) : 0;
+        $length = !empty($tag['length']) && is_numeric($tag['length']) ? intval($tag['length']) : 'null';
+        // 允许使用函数设定数据集 <volist name=":fun('arg')" id="vo">{$vo.name}</volist>
+        $parseStr = '<?php ';
+        $flag     = substr($name, 0, 1);
+
+        if (':' == $flag) {
+            $name = $this->autoBuildVar($name);
+            $parseStr .= '$_result=' . $name . ';';
+            $name = '$_result';
+        } else {
+            $name = $this->autoBuildVar($name);
+        }
+
+        $parseStr .= 'if(is_array(' . $name . ') || ' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator): $' . $key . ' = 0;';
+
+        // 设置了输出数组长度
+        if (0 != $offset || 'null' != $length) {
+            $parseStr .= '$__LIST__ = is_array(' . $name . ') ? array_slice(' . $name . ',' . $offset . ',' . $length . ', true) : ' . $name . '->slice(' . $offset . ',' . $length . ', true); ';
+        } else {
+            $parseStr .= ' $__LIST__ = ' . $name . ';';
+        }
+
+        $parseStr .= 'if( count($__LIST__)==0 ) : echo "' . $empty . '" ;';
+        $parseStr .= 'else: ';
+        $parseStr .= 'foreach($__LIST__ as $key=>$' . $id . '): ';
+        $parseStr .= '$mod = ($' . $key . ' % ' . $mod . ' );';
+        $parseStr .= '++$' . $key . ';?>';
+        $parseStr .= $content;
+        $parseStr .= '<?php endforeach; endif; else: echo "' . $empty . '" ;endif; ?>';
+
+        if (!empty($parseStr)) {
+            return $parseStr;
+        }
+
+        return;
+    }
+
+    /**
+     * foreach标签解析 循环输出数据集
+     * 格式：
+     * {foreach name="userList" id="user" key="key" index="i" mod="2" offset="3" length="5" empty=""}
+     * {user.username}
+     * {/foreach}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string|void
+     */
+    public function tagForeach($tag, $content)
+    {
+        // 直接使用表达式
+        if (!empty($tag['expression'])) {
+            $expression = ltrim(rtrim($tag['expression'], ')'), '(');
+            $expression = $this->autoBuildVar($expression);
+            $parseStr   = '<?php foreach(' . $expression . '): ?>';
+            $parseStr .= $content;
+            $parseStr .= '<?php endforeach; ?>';
+            return $parseStr;
+        }
+
+        $name   = $tag['name'];
+        $key    = !empty($tag['key']) ? $tag['key'] : 'key';
+        $item   = !empty($tag['id']) ? $tag['id'] : $tag['item'];
+        $empty  = isset($tag['empty']) ? $tag['empty'] : '';
+        $offset = !empty($tag['offset']) && is_numeric($tag['offset']) ? intval($tag['offset']) : 0;
+        $length = !empty($tag['length']) && is_numeric($tag['length']) ? intval($tag['length']) : 'null';
+
+        $parseStr = '<?php ';
+
+        // 支持用函数传数组
+        if (':' == substr($name, 0, 1)) {
+            $var  = '$_' . uniqid();
+            $name = $this->autoBuildVar($name);
+            $parseStr .= $var . '=' . $name . '; ';
+            $name = $var;
+        } else {
+            $name = $this->autoBuildVar($name);
+        }
+
+        $parseStr .= 'if(is_array(' . $name . ') || ' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator): ';
+
+        // 设置了输出数组长度
+        if (0 != $offset || 'null' != $length) {
+            if (!isset($var)) {
+                $var = '$_' . uniqid();
+            }
+            $parseStr .= $var . ' = is_array(' . $name . ') ? array_slice(' . $name . ',' . $offset . ',' . $length . ', true) : ' . $name . '->slice(' . $offset . ',' . $length . ', true); ';
+        } else {
+            $var = &$name;
+        }
+
+        $parseStr .= 'if( count(' . $var . ')==0 ) : echo "' . $empty . '" ;';
+        $parseStr .= 'else: ';
+
+        // 设置了索引项
+        if (isset($tag['index'])) {
+            $index = $tag['index'];
+            $parseStr .= '$' . $index . '=0; ';
+        }
+
+        $parseStr .= 'foreach(' . $var . ' as $' . $key . '=>$' . $item . '): ';
+
+        // 设置了索引项
+        if (isset($tag['index'])) {
+            $index = $tag['index'];
+            if (isset($tag['mod'])) {
+                $mod = (int) $tag['mod'];
+                $parseStr .= '$mod = ($' . $index . ' % ' . $mod . '); ';
+            }
+            $parseStr .= '++$' . $index . '; ';
+        }
+
+        $parseStr .= '?>';
+        // 循环体中的内容
+        $parseStr .= $content;
+        $parseStr .= '<?php endforeach; endif; else: echo "' . $empty . '" ;endif; ?>';
+
+        if (!empty($parseStr)) {
+            return $parseStr;
+        }
+
+        return;
+    }
+
+    /**
+     * if标签解析
+     * 格式：
+     * {if condition=" $a eq 1"}
+     * {elseif condition="$a eq 2" /}
+     * {else /}
+     * {/if}
+     * 表达式支持 eq neq gt egt lt elt == > >= < <= or and || &&
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagIf($tag, $content)
+    {
+        $condition = !empty($tag['expression']) ? $tag['expression'] : $tag['condition'];
+        $condition = $this->parseCondition($condition);
+        $parseStr  = '<?php if(' . $condition . '): ?>' . $content . '<?php endif; ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * elseif标签解析
+     * 格式：见if标签
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagElseif($tag, $content)
+    {
+        $condition = !empty($tag['expression']) ? $tag['expression'] : $tag['condition'];
+        $condition = $this->parseCondition($condition);
+        $parseStr  = '<?php elseif(' . $condition . '): ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * else标签解析
+     * 格式：见if标签
+     * @access public
+     * @param  array $tag 标签属性
+     * @return string
+     */
+    public function tagElse($tag)
+    {
+        $parseStr = '<?php else: ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * switch标签解析
+     * 格式：
+     * {switch name="a.name"}
+     * {case value="1" break="false"}1{/case}
+     * {case value="2" }2{/case}
+     * {default /}other
+     * {/switch}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagSwitch($tag, $content)
+    {
+        $name     = !empty($tag['expression']) ? $tag['expression'] : $tag['name'];
+        $name     = $this->autoBuildVar($name);
+        $parseStr = '<?php switch(' . $name . '): ?>' . $content . '<?php endswitch; ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * case标签解析 需要配合switch才有效
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagCase($tag, $content)
+    {
+        $value = isset($tag['expression']) ? $tag['expression'] : $tag['value'];
+        $flag  = substr($value, 0, 1);
+
+        if ('$' == $flag || ':' == $flag) {
+            $value = $this->autoBuildVar($value);
+            $value = 'case ' . $value . ':';
+        } elseif (strpos($value, '|')) {
+            $values = explode('|', $value);
+            $value  = '';
+            foreach ($values as $val) {
+                $value .= 'case "' . addslashes($val) . '":';
+            }
+        } else {
+            $value = 'case "' . $value . '":';
+        }
+
+        $parseStr = '<?php ' . $value . ' ?>' . $content;
+        $isBreak  = isset($tag['break']) ? $tag['break'] : '';
+
+        if ('' == $isBreak || $isBreak) {
+            $parseStr .= '<?php break; ?>';
+        }
+
+        return $parseStr;
+    }
+
+    /**
+     * default标签解析 需要配合switch才有效
+     * 使用： {default /}ddfdf
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagDefault($tag)
+    {
+        $parseStr = '<?php default: ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * compare标签解析
+     * 用于值的比较 支持 eq neq gt lt egt elt heq nheq 默认是eq
+     * 格式： {compare name="" type="eq" value="" }content{/compare}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagCompare($tag, $content)
+    {
+        $name  = $tag['name'];
+        $value = $tag['value'];
+        $type  = isset($tag['type']) ? $tag['type'] : 'eq'; // 比较类型
+        $name  = $this->autoBuildVar($name);
+        $flag  = substr($value, 0, 1);
+
+        if ('$' == $flag || ':' == $flag) {
+            $value = $this->autoBuildVar($value);
+        } else {
+            $value = '\'' . $value . '\'';
+        }
+
+        switch ($type) {
+            case 'equal':
+                $type = 'eq';
+                break;
+            case 'notequal':
+                $type = 'neq';
+                break;
+        }
+        $type     = $this->parseCondition(' ' . $type . ' ');
+        $parseStr = '<?php if(' . $name . ' ' . $type . ' ' . $value . '): ?>' . $content . '<?php endif; ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * range标签解析
+     * 如果某个变量存在于某个范围 则输出内容 type= in 表示在范围内 否则表示在范围外
+     * 格式： {range name="var|function"  value="val" type='in|notin' }content{/range}
+     * example: {range name="a"  value="1,2,3" type='in' }content{/range}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagRange($tag, $content)
+    {
+        $name  = $tag['name'];
+        $value = $tag['value'];
+        $type  = isset($tag['type']) ? $tag['type'] : 'in'; // 比较类型
+
+        $name = $this->autoBuildVar($name);
+        $flag = substr($value, 0, 1);
+
+        if ('$' == $flag || ':' == $flag) {
+            $value = $this->autoBuildVar($value);
+            $str   = 'is_array(' . $value . ')?' . $value . ':explode(\',\',' . $value . ')';
+        } else {
+            $value = '"' . $value . '"';
+            $str   = 'explode(\',\',' . $value . ')';
+        }
+
+        if ('between' == $type) {
+            $parseStr = '<?php $_RANGE_VAR_=' . $str . ';if(' . $name . '>= $_RANGE_VAR_[0] && ' . $name . '<= $_RANGE_VAR_[1]):?>' . $content . '<?php endif; ?>';
+        } elseif ('notbetween' == $type) {
+            $parseStr = '<?php $_RANGE_VAR_=' . $str . ';if(' . $name . '<$_RANGE_VAR_[0] || ' . $name . '>$_RANGE_VAR_[1]):?>' . $content . '<?php endif; ?>';
+        } else {
+            $fun      = ('in' == $type) ? 'in_array' : '!in_array';
+            $parseStr = '<?php if(' . $fun . '((' . $name . '), ' . $str . ')): ?>' . $content . '<?php endif; ?>';
+        }
+
+        return $parseStr;
+    }
+
+    /**
+     * present标签解析
+     * 如果某个变量已经设置 则输出内容
+     * 格式： {present name="" }content{/present}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagPresent($tag, $content)
+    {
+        $name     = $tag['name'];
+        $name     = $this->autoBuildVar($name);
+        $parseStr = '<?php if(isset(' . $name . ')): ?>' . $content . '<?php endif; ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * notpresent标签解析
+     * 如果某个变量没有设置，则输出内容
+     * 格式： {notpresent name="" }content{/notpresent}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagNotpresent($tag, $content)
+    {
+        $name     = $tag['name'];
+        $name     = $this->autoBuildVar($name);
+        $parseStr = '<?php if(!isset(' . $name . ')): ?>' . $content . '<?php endif; ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * empty标签解析
+     * 如果某个变量为empty 则输出内容
+     * 格式： {empty name="" }content{/empty}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagEmpty($tag, $content)
+    {
+        $name     = $tag['name'];
+        $name     = $this->autoBuildVar($name);
+        $parseStr = '<?php if(empty(' . $name . ') || ((' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator ) && ' . $name . '->isEmpty())): ?>' . $content . '<?php endif; ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * notempty标签解析
+     * 如果某个变量不为empty 则输出内容
+     * 格式： {notempty name="" }content{/notempty}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagNotempty($tag, $content)
+    {
+        $name     = $tag['name'];
+        $name     = $this->autoBuildVar($name);
+        $parseStr = '<?php if(!(empty(' . $name . ') || ((' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator ) && ' . $name . '->isEmpty()))): ?>' . $content . '<?php endif; ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * 判断是否已经定义了该常量
+     * {defined name='TXT'}已定义{/defined}
+     * @access public
+     * @param  array $tag
+     * @param  string $content
+     * @return string
+     */
+    public function tagDefined($tag, $content)
+    {
+        $name     = $tag['name'];
+        $parseStr = '<?php if(defined("' . $name . '")): ?>' . $content . '<?php endif; ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * 判断是否没有定义了该常量
+     * {notdefined name='TXT'}已定义{/notdefined}
+     * @access public
+     * @param  array $tag
+     * @param  string $content
+     * @return string
+     */
+    public function tagNotdefined($tag, $content)
+    {
+        $name     = $tag['name'];
+        $parseStr = '<?php if(!defined("' . $name . '")): ?>' . $content . '<?php endif; ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * load 标签解析 {load file="/static/js/base.js" /}
+     * 格式：{load file="/static/css/base.css" /}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagLoad($tag, $content)
+    {
+        $file = isset($tag['file']) ? $tag['file'] : $tag['href'];
+        $type = isset($tag['type']) ? strtolower($tag['type']) : '';
+
+        $parseStr = '';
+        $endStr   = '';
+
+        // 判断是否存在加载条件 允许使用函数判断(默认为isset)
+        if (isset($tag['value'])) {
+            $name = $tag['value'];
+            $name = $this->autoBuildVar($name);
+            $name = 'isset(' . $name . ')';
+            $parseStr .= '<?php if(' . $name . '): ?>';
+            $endStr = '<?php endif; ?>';
+        }
+
+        // 文件方式导入
+        $array = explode(',', $file);
+
+        foreach ($array as $val) {
+            $type = strtolower(substr(strrchr($val, '.'), 1));
+            switch ($type) {
+                case 'js':
+                    $parseStr .= '<script type="text/javascript" src="' . $val . '"></script>';
+                    break;
+                case 'css':
+                    $parseStr .= '<link rel="stylesheet" type="text/css" href="' . $val . '" />';
+                    break;
+                case 'php':
+                    $parseStr .= '<?php include "' . $val . '"; ?>';
+                    break;
+            }
+        }
+
+        return $parseStr . $endStr;
+    }
+
+    /**
+     * assign标签解析
+     * 在模板中给某个变量赋值 支持变量赋值
+     * 格式： {assign name="" value="" /}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagAssign($tag, $content)
+    {
+        $name = $this->autoBuildVar($tag['name']);
+        $flag = substr($tag['value'], 0, 1);
+
+        if ('$' == $flag || ':' == $flag) {
+            $value = $this->autoBuildVar($tag['value']);
+        } else {
+            $value = '\'' . $tag['value'] . '\'';
+        }
+
+        $parseStr = '<?php ' . $name . ' = ' . $value . '; ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * define标签解析
+     * 在模板中定义常量 支持变量赋值
+     * 格式： {define name="" value="" /}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagDefine($tag, $content)
+    {
+        $name = '\'' . $tag['name'] . '\'';
+        $flag = substr($tag['value'], 0, 1);
+
+        if ('$' == $flag || ':' == $flag) {
+            $value = $this->autoBuildVar($tag['value']);
+        } else {
+            $value = '\'' . $tag['value'] . '\'';
+        }
+
+        $parseStr = '<?php define(' . $name . ', ' . $value . '); ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * for标签解析
+     * 格式：
+     * {for start="" end="" comparison="" step="" name=""}
+     * content
+     * {/for}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagFor($tag, $content)
+    {
+        //设置默认值
+        $start      = 0;
+        $end        = 0;
+        $step       = 1;
+        $comparison = 'lt';
+        $name       = 'i';
+        $rand       = rand(); //添加随机数，防止嵌套变量冲突
+
+        //获取属性
+        foreach ($tag as $key => $value) {
+            $value = trim($value);
+            $flag  = substr($value, 0, 1);
+            if ('$' == $flag || ':' == $flag) {
+                $value = $this->autoBuildVar($value);
+            }
+
+            switch ($key) {
+                case 'start':
+                    $start = $value;
+                    break;
+                case 'end':
+                    $end = $value;
+                    break;
+                case 'step':
+                    $step = $value;
+                    break;
+                case 'comparison':
+                    $comparison = $value;
+                    break;
+                case 'name':
+                    $name = $value;
+                    break;
+            }
+        }
+
+        $parseStr = '<?php $__FOR_START_' . $rand . '__=' . $start . ';$__FOR_END_' . $rand . '__=' . $end . ';';
+        $parseStr .= 'for($' . $name . '=$__FOR_START_' . $rand . '__;' . $this->parseCondition('$' . $name . ' ' . $comparison . ' $__FOR_END_' . $rand . '__') . ';$' . $name . '+=' . $step . '){ ?>';
+        $parseStr .= $content;
+        $parseStr .= '<?php } ?>';
+
+        return $parseStr;
+    }
+
+    /**
+     * url函数的tag标签
+     * 格式：{url link="模块/控制器/方法" vars="参数" suffix="true或者false 是否带有后缀" domain="true或者false 是否携带域名" /}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagUrl($tag, $content)
+    {
+        $url    = isset($tag['link']) ? $tag['link'] : '';
+        $vars   = isset($tag['vars']) ? $tag['vars'] : '';
+        $suffix = isset($tag['suffix']) ? $tag['suffix'] : 'true';
+        $domain = isset($tag['domain']) ? $tag['domain'] : 'false';
+
+        return '<?php echo url("' . $url . '","' . $vars . '",' . $suffix . ',' . $domain . ');?>';
+    }
+
+    /**
+     * function标签解析 匿名函数，可实现递归
+     * 使用：
+     * {function name="func" vars="$data" call="$list" use="&$a,&$b"}
+     *      {if is_array($data)}
+     *          {foreach $data as $val}
+     *              {~func($val) /}
+     *          {/foreach}
+     *      {else /}
+     *          {$data}
+     *      {/if}
+     * {/function}
+     * @access public
+     * @param  array $tag 标签属性
+     * @param  string $content 标签内容
+     * @return string
+     */
+    public function tagFunction($tag, $content)
+    {
+        $name = !empty($tag['name']) ? $tag['name'] : 'func';
+        $vars = !empty($tag['vars']) ? $tag['vars'] : '';
+        $call = !empty($tag['call']) ? $tag['call'] : '';
+        $use  = ['&$' . $name];
+
+        if (!empty($tag['use'])) {
+            foreach (explode(',', $tag['use']) as $val) {
+                $use[] = '&' . ltrim(trim($val), '&');
+            }
+        }
+
+        $parseStr = '<?php $' . $name . '=function(' . $vars . ') use(' . implode(',', $use) . ') {';
+        $parseStr .= ' ?>' . $content . '<?php }; ';
+        $parseStr .= $call ? '$' . $name . '(' . $call . '); ?>' : '?>';
+
+        return $parseStr;
+    }
+}
diff --git a/thinkphp/library/think/validate/ValidateRule.php b/thinkphp/library/think/validate/ValidateRule.php
new file mode 100644
index 0000000000000000000000000000000000000000..5253465fad5aad309bbffcbd5fe9ad374ce46431
--- /dev/null
+++ b/thinkphp/library/think/validate/ValidateRule.php
@@ -0,0 +1,171 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\validate;
+
+/**
+ * Class ValidateRule
+ * @package think\validate
+ * @method ValidateRule confirm(mixed $rule, string $msg = '') static 验证是否和某个字段的值一致
+ * @method ValidateRule different(mixed $rule, string $msg = '') static 验证是否和某个字段的值是否不同
+ * @method ValidateRule egt(mixed $rule, string $msg = '') static 验证是否大于等于某个值
+ * @method ValidateRule gt(mixed $rule, string $msg = '') static 验证是否大于某个值
+ * @method ValidateRule elt(mixed $rule, string $msg = '') static 验证是否小于等于某个值
+ * @method ValidateRule lt(mixed $rule, string $msg = '') static 验证是否小于某个值
+ * @method ValidateRule eg(mixed $rule, string $msg = '') static 验证是否等于某个值
+ * @method ValidateRule in(mixed $rule, string $msg = '') static 验证是否在范围内
+ * @method ValidateRule notIn(mixed $rule, string $msg = '') static 验证是否不在某个范围
+ * @method ValidateRule between(mixed $rule, string $msg = '') static 验证是否在某个区间
+ * @method ValidateRule notBetween(mixed $rule, string $msg = '') static 验证是否不在某个区间
+ * @method ValidateRule length(mixed $rule, string $msg = '') static 验证数据长度
+ * @method ValidateRule max(mixed $rule, string $msg = '') static 验证数据最大长度
+ * @method ValidateRule min(mixed $rule, string $msg = '') static 验证数据最小长度
+ * @method ValidateRule after(mixed $rule, string $msg = '') static 验证日期
+ * @method ValidateRule before(mixed $rule, string $msg = '') static 验证日期
+ * @method ValidateRule expire(mixed $rule, string $msg = '') static 验证有效期
+ * @method ValidateRule allowIp(mixed $rule, string $msg = '') static 验证IP许可
+ * @method ValidateRule denyIp(mixed $rule, string $msg = '') static 验证IP禁用
+ * @method ValidateRule regex(mixed $rule, string $msg = '') static 使用正则验证数据
+ * @method ValidateRule token(mixed $rule='__token__', string $msg = '') static 验证表单令牌
+ * @method ValidateRule is(mixed $rule, string $msg = '') static 验证字段值是否为有效格式
+ * @method ValidateRule isRequire(mixed $rule, string $msg = '') static 验证字段必须
+ * @method ValidateRule isNumber(mixed $rule, string $msg = '') static 验证字段值是否为数字
+ * @method ValidateRule isArray(mixed $rule, string $msg = '') static 验证字段值是否为数组
+ * @method ValidateRule isInteger(mixed $rule, string $msg = '') static 验证字段值是否为整形
+ * @method ValidateRule isFloat(mixed $rule, string $msg = '') static 验证字段值是否为浮点数
+ * @method ValidateRule isMobile(mixed $rule, string $msg = '') static 验证字段值是否为手机
+ * @method ValidateRule isIdCard(mixed $rule, string $msg = '') static 验证字段值是否为身份证号码
+ * @method ValidateRule isChs(mixed $rule, string $msg = '') static 验证字段值是否为中文
+ * @method ValidateRule isChsDash(mixed $rule, string $msg = '') static 验证字段值是否为中文字母及下划线
+ * @method ValidateRule isChsAlpha(mixed $rule, string $msg = '') static 验证字段值是否为中文和字母
+ * @method ValidateRule isChsAlphaNum(mixed $rule, string $msg = '') static 验证字段值是否为中文字母和数字
+ * @method ValidateRule isDate(mixed $rule, string $msg = '') static 验证字段值是否为有效格式
+ * @method ValidateRule isBool(mixed $rule, string $msg = '') static 验证字段值是否为布尔值
+ * @method ValidateRule isAlpha(mixed $rule, string $msg = '') static 验证字段值是否为字母
+ * @method ValidateRule isAlphaDash(mixed $rule, string $msg = '') static 验证字段值是否为字母和下划线
+ * @method ValidateRule isAlphaNum(mixed $rule, string $msg = '') static 验证字段值是否为字母和数字
+ * @method ValidateRule isAccepted(mixed $rule, string $msg = '') static 验证字段值是否为yes, on, 或是 1
+ * @method ValidateRule isEmail(mixed $rule, string $msg = '') static 验证字段值是否为有效邮箱格式
+ * @method ValidateRule isUrl(mixed $rule, string $msg = '') static 验证字段值是否为有效URL地址
+ * @method ValidateRule activeUrl(mixed $rule, string $msg = '') static 验证是否为合格的域名或者IP
+ * @method ValidateRule ip(mixed $rule, string $msg = '') static 验证是否有效IP
+ * @method ValidateRule fileExt(mixed $rule, string $msg = '') static 验证文件后缀
+ * @method ValidateRule fileMime(mixed $rule, string $msg = '') static 验证文件类型
+ * @method ValidateRule fileSize(mixed $rule, string $msg = '') static 验证文件大小
+ * @method ValidateRule image(mixed $rule, string $msg = '') static 验证图像文件
+ * @method ValidateRule method(mixed $rule, string $msg = '') static 验证请求类型
+ * @method ValidateRule dateFormat(mixed $rule, string $msg = '') static 验证时间和日期是否符合指定格式
+ * @method ValidateRule unique(mixed $rule, string $msg = '') static 验证是否唯一
+ * @method ValidateRule behavior(mixed $rule, string $msg = '') static 使用行为类验证
+ * @method ValidateRule filter(mixed $rule, string $msg = '') static 使用filter_var方式验证
+ * @method ValidateRule requireIf(mixed $rule, string $msg = '') static 验证某个字段等于某个值的时候必须
+ * @method ValidateRule requireCallback(mixed $rule, string $msg = '') static 通过回调方法验证某个字段是否必须
+ * @method ValidateRule requireWith(mixed $rule, string $msg = '') static 验证某个字段有值的情况下必须
+ * @method ValidateRule must(mixed $rule=null, string $msg = '') static 必须验证
+ */
+class ValidateRule
+{
+    // 验证字段的名称
+    protected $title;
+
+    // 当前验证规则
+    protected $rule = [];
+
+    // 验证提示信息
+    protected $message = [];
+
+    /**
+     * 添加验证因子
+     * @access protected
+     * @param  string    $name  验证名称
+     * @param  mixed     $rule  验证规则
+     * @param  string    $msg   提示信息
+     * @return $this
+     */
+    protected function addItem($name, $rule = null, $msg = '')
+    {
+        if ($rule || 0 === $rule) {
+            $this->rule[$name] = $rule;
+        } else {
+            $this->rule[] = $name;
+        }
+
+        $this->message[] = $msg;
+
+        return $this;
+    }
+
+    /**
+     * 获取验证规则
+     * @access public
+     * @return array
+     */
+    public function getRule()
+    {
+        return $this->rule;
+    }
+
+    /**
+     * 获取验证字段名称
+     * @access public
+     * @return string
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * 获取验证提示
+     * @access public
+     * @return array
+     */
+    public function getMsg()
+    {
+        return $this->message;
+    }
+
+    /**
+     * 设置验证字段名称
+     * @access public
+     * @return $this
+     */
+    public function title($title)
+    {
+        $this->title = $title;
+
+        return $this;
+    }
+
+    public function __call($method, $args)
+    {
+        if ('is' == strtolower(substr($method, 0, 2))) {
+            $method = substr($method, 2);
+        }
+
+        array_unshift($args, lcfirst($method));
+
+        return call_user_func_array([$this, 'addItem'], $args);
+    }
+
+    public static function __callStatic($method, $args)
+    {
+        $rule = new static();
+
+        if ('is' == strtolower(substr($method, 0, 2))) {
+            $method = substr($method, 2);
+        }
+
+        array_unshift($args, lcfirst($method));
+
+        return call_user_func_array([$rule, 'addItem'], $args);
+    }
+}
diff --git a/thinkphp/library/think/view/driver/Php.php b/thinkphp/library/think/view/driver/Php.php
new file mode 100644
index 0000000000000000000000000000000000000000..b6f6a3d074d944584a9d9d44578d60da16c10b55
--- /dev/null
+++ b/thinkphp/library/think/view/driver/Php.php
@@ -0,0 +1,179 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\view\driver;
+
+use think\App;
+use think\exception\TemplateNotFoundException;
+use think\Loader;
+
+class Php
+{
+    // 模板引擎参数
+    protected $config = [
+        // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写
+        'auto_rule'   => 1,
+        // 视图基础目录（集中式）
+        'view_base'   => '',
+        // 模板起始路径
+        'view_path'   => '',
+        // 模板文件后缀
+        'view_suffix' => 'php',
+        // 模板文件名分隔符
+        'view_depr'   => DIRECTORY_SEPARATOR,
+    ];
+
+    protected $template;
+    protected $app;
+    protected $content;
+
+    public function __construct(App $app, $config = [])
+    {
+        $this->app    = $app;
+        $this->config = array_merge($this->config, (array) $config);
+    }
+
+    /**
+     * 检测是否存在模板文件
+     * @access public
+     * @param  string $template 模板文件或者模板规则
+     * @return bool
+     */
+    public function exists($template)
+    {
+        if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
+            // 获取模板文件名
+            $template = $this->parseTemplate($template);
+        }
+
+        return is_file($template);
+    }
+
+    /**
+     * 渲染模板文件
+     * @access public
+     * @param  string    $template 模板文件
+     * @param  array     $data 模板变量
+     * @return void
+     */
+    public function fetch($template, $data = [])
+    {
+        if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
+            // 获取模板文件名
+            $template = $this->parseTemplate($template);
+        }
+
+        // 模板不存在 抛出异常
+        if (!is_file($template)) {
+            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+        }
+
+        $this->template = $template;
+
+        // 记录视图信息
+        $this->app
+            ->log('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
+
+        extract($data, EXTR_OVERWRITE);
+        include $this->template;
+    }
+
+    /**
+     * 渲染模板内容
+     * @access public
+     * @param  string    $content 模板内容
+     * @param  array     $data 模板变量
+     * @return void
+     */
+    public function display($content, $data = [])
+    {
+        $this->content = $content;
+
+        extract($data, EXTR_OVERWRITE);
+        eval('?>' . $this->content);
+    }
+
+    /**
+     * 自动定位模板文件
+     * @access private
+     * @param  string $template 模板文件规则
+     * @return string
+     */
+    private function parseTemplate($template)
+    {
+        if (empty($this->config['view_path'])) {
+            $this->config['view_path'] = $this->app->getModulePath() . 'view' . DIRECTORY_SEPARATOR;
+        }
+
+        $request = $this->app['request'];
+
+        // 获取视图根目录
+        if (strpos($template, '@')) {
+            // 跨模块调用
+            list($module, $template) = explode('@', $template);
+        }
+
+        if ($this->config['view_base']) {
+            // 基础视图目录
+            $module = isset($module) ? $module : $request->module();
+            $path   = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : '');
+        } else {
+            $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR : $this->config['view_path'];
+        }
+
+        $depr = $this->config['view_depr'];
+
+        if (0 !== strpos($template, '/')) {
+            $template   = str_replace(['/', ':'], $depr, $template);
+            $controller = Loader::parseName($request->controller());
+
+            if ($controller) {
+                if ('' == $template) {
+                    // 如果模板文件名为空 按照默认规则定位
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $this->getActionTemplate($request);
+                } elseif (false === strpos($template, $depr)) {
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                }
+            }
+        } else {
+            $template = str_replace(['/', ':'], $depr, substr($template, 1));
+        }
+
+        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+    }
+
+    protected function getActionTemplate($request)
+    {
+        $rule = [$request->action(true), Loader::parseName($request->action(true)), $request->action()];
+        $type = $this->config['auto_rule'];
+
+        return isset($rule[$type]) ? $rule[$type] : $rule[0];
+    }
+
+    /**
+     * 配置模板引擎
+     * @access private
+     * @param  string|array  $name 参数名
+     * @param  mixed         $value 参数值
+     * @return void
+     */
+    public function config($name, $value = null)
+    {
+        if (is_array($name)) {
+            $this->config = array_merge($this->config, $name);
+        } elseif (is_null($value)) {
+            return isset($this->config[$name]) ? $this->config[$name] : null;
+        } else {
+            $this->config[$name] = $value;
+        }
+    }
+
+}
diff --git a/thinkphp/library/think/view/driver/Think.php b/thinkphp/library/think/view/driver/Think.php
new file mode 100644
index 0000000000000000000000000000000000000000..9ea068266fab9c32988753700d0cbba08765a7fd
--- /dev/null
+++ b/thinkphp/library/think/view/driver/Think.php
@@ -0,0 +1,187 @@
+<?php
+// +----------------------------------------------------------------------
+// | ThinkPHP [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2006~2018 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace think\view\driver;
+
+use think\App;
+use think\exception\TemplateNotFoundException;
+use think\Loader;
+use think\Template;
+
+class Think
+{
+    // 模板引擎实例
+    private $template;
+    private $app;
+
+    // 模板引擎参数
+    protected $config = [
+        // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写
+        'auto_rule'   => 1,
+        // 视图基础目录（集中式）
+        'view_base'   => '',
+        // 模板起始路径
+        'view_path'   => '',
+        // 模板文件后缀
+        'view_suffix' => 'html',
+        // 模板文件名分隔符
+        'view_depr'   => DIRECTORY_SEPARATOR,
+        // 是否开启模板编译缓存,设为false则每次都会重新编译
+        'tpl_cache'   => true,
+    ];
+
+    public function __construct(App $app, $config = [])
+    {
+        $this->app    = $app;
+        $this->config = array_merge($this->config, (array) $config);
+
+        if (empty($this->config['view_path'])) {
+            $this->config['view_path'] = $app->getModulePath() . 'view' . DIRECTORY_SEPARATOR;
+        }
+
+        $this->template = new Template($app, $this->config);
+    }
+
+    /**
+     * 检测是否存在模板文件
+     * @access public
+     * @param  string $template 模板文件或者模板规则
+     * @return bool
+     */
+    public function exists($template)
+    {
+        if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
+            // 获取模板文件名
+            $template = $this->parseTemplate($template);
+        }
+
+        return is_file($template);
+    }
+
+    /**
+     * 渲染模板文件
+     * @access public
+     * @param  string    $template 模板文件
+     * @param  array     $data 模板变量
+     * @param  array     $config 模板参数
+     * @return void
+     */
+    public function fetch($template, $data = [], $config = [])
+    {
+        if ('' == pathinfo($template, PATHINFO_EXTENSION)) {
+            // 获取模板文件名
+            $template = $this->parseTemplate($template);
+        }
+
+        // 模板不存在 抛出异常
+        if (!is_file($template)) {
+            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+        }
+
+        // 记录视图信息
+        $this->app
+            ->log('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
+
+        $this->template->fetch($template, $data, $config);
+    }
+
+    /**
+     * 渲染模板内容
+     * @access public
+     * @param  string    $template 模板内容
+     * @param  array     $data 模板变量
+     * @param  array     $config 模板参数
+     * @return void
+     */
+    public function display($template, $data = [], $config = [])
+    {
+        $this->template->display($template, $data, $config);
+    }
+
+    /**
+     * 自动定位模板文件
+     * @access private
+     * @param  string $template 模板文件规则
+     * @return string
+     */
+    private function parseTemplate($template)
+    {
+        // 分析模板文件规则
+        $request = $this->app['request'];
+
+        // 获取视图根目录
+        if (strpos($template, '@')) {
+            // 跨模块调用
+            list($module, $template) = explode('@', $template);
+        }
+
+        if ($this->config['view_base']) {
+            // 基础视图目录
+            $module = isset($module) ? $module : $request->module();
+            $path   = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : '');
+        } else {
+            $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR : $this->config['view_path'];
+        }
+
+        $depr = $this->config['view_depr'];
+
+        if (0 !== strpos($template, '/')) {
+            $template   = str_replace(['/', ':'], $depr, $template);
+            $controller = Loader::parseName($request->controller());
+
+            if ($controller) {
+                if ('' == $template) {
+                    // 如果模板文件名为空 按照默认规则定位
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $this->getActionTemplate($request);
+                } elseif (false === strpos($template, $depr)) {
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                }
+            }
+        } else {
+            $template = str_replace(['/', ':'], $depr, substr($template, 1));
+        }
+
+        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+    }
+
+    protected function getActionTemplate($request)
+    {
+        $rule = [$request->action(true), Loader::parseName($request->action(true)), $request->action()];
+        $type = $this->config['auto_rule'];
+
+        return isset($rule[$type]) ? $rule[$type] : $rule[0];
+    }
+
+    /**
+     * 配置或者获取模板引擎参数
+     * @access private
+     * @param  string|array  $name 参数名
+     * @param  mixed         $value 参数值
+     * @return mixed
+     */
+    public function config($name, $value = null)
+    {
+        if (is_array($name)) {
+            $this->template->config($name);
+            $this->config = array_merge($this->config, $name);
+        } elseif (is_null($value)) {
+            return $this->template->config($name);
+        } else {
+            $this->template->$name = $value;
+            $this->config[$name]   = $value;
+        }
+    }
+
+    public function __call($method, $params)
+    {
+        return call_user_func_array([$this->template, $method], $params);
+    }
+}
diff --git a/thinkphp/library/traits/controller/Jump.php b/thinkphp/library/traits/controller/Jump.php
new file mode 100644
index 0000000000000000000000000000000000000000..41f7e930a9245cbca24bdfb96b1772e06e14b0a3
--- /dev/null
+++ b/thinkphp/library/traits/controller/Jump.php
@@ -0,0 +1,168 @@
+<?php
+
+/**
+ * 用法：
+ * class index
+ * {
+ *     use \traits\controller\Jump;
+ *     public function index(){
+ *         $this->error();
+ *         $this->redirect();
+ *     }
+ * }
+ */
+namespace traits\controller;
+
+use think\Container;
+use think\exception\HttpResponseException;
+use think\Response;
+use think\response\Redirect;
+
+trait Jump
+{
+    /**
+     * 应用实例
+     * @var \think\App
+     */
+    protected $app;
+
+    /**
+     * 操作成功跳转的快捷方法
+     * @access protected
+     * @param  mixed     $msg 提示信息
+     * @param  string    $url 跳转的URL地址
+     * @param  mixed     $data 返回的数据
+     * @param  integer   $wait 跳转等待时间
+     * @param  array     $header 发送的Header信息
+     * @return void
+     */
+    protected function success($msg = '', $url = null, $data = '', $wait = 3, array $header = [])
+    {
+        if (is_null($url) && isset($_SERVER["HTTP_REFERER"])) {
+            $url = $_SERVER["HTTP_REFERER"];
+        } elseif ('' !== $url) {
+            $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : Container::get('url')->build($url);
+        }
+
+        $result = [
+            'code' => 1,
+            'msg'  => $msg,
+            'data' => $data,
+            'url'  => $url,
+            'wait' => $wait,
+        ];
+
+        $type = $this->getResponseType();
+        // 把跳转模板的渲染下沉，这样在 response_send 行为里通过getData()获得的数据是一致性的格式
+        if ('html' == strtolower($type)) {
+            $type = 'jump';
+        }
+
+        $response = Response::create($result, $type)->header($header)->options(['jump_template' => $this->app['config']->get('dispatch_success_tmpl')]);
+
+        throw new HttpResponseException($response);
+    }
+
+    /**
+     * 操作错误跳转的快捷方法
+     * @access protected
+     * @param  mixed     $msg 提示信息
+     * @param  string    $url 跳转的URL地址
+     * @param  mixed     $data 返回的数据
+     * @param  integer   $wait 跳转等待时间
+     * @param  array     $header 发送的Header信息
+     * @return void
+     */
+    protected function error($msg = '', $url = null, $data = '', $wait = 3, array $header = [])
+    {
+        $type = $this->getResponseType();
+        if (is_null($url)) {
+            $url = $this->app['request']->isAjax() ? '' : 'javascript:history.back(-1);';
+        } elseif ('' !== $url) {
+            $url = (strpos($url, '://') || 0 === strpos($url, '/')) ? $url : $this->app['url']->build($url);
+        }
+
+        $result = [
+            'code' => 0,
+            'msg'  => $msg,
+            'data' => $data,
+            'url'  => $url,
+            'wait' => $wait,
+        ];
+
+        if ('html' == strtolower($type)) {
+            $type = 'jump';
+        }
+
+        $response = Response::create($result, $type)->header($header)->options(['jump_template' => $this->app['config']->get('dispatch_error_tmpl')]);
+
+        throw new HttpResponseException($response);
+    }
+
+    /**
+     * 返回封装后的API数据到客户端
+     * @access protected
+     * @param  mixed     $data 要返回的数据
+     * @param  integer   $code 返回的code
+     * @param  mixed     $msg 提示信息
+     * @param  string    $type 返回数据格式
+     * @param  array     $header 发送的Header信息
+     * @return void
+     */
+    protected function result($data, $code = 0, $msg = '', $type = '', array $header = [])
+    {
+        $result = [
+            'code' => $code,
+            'msg'  => $msg,
+            'time' => time(),
+            'data' => $data,
+        ];
+
+        $type     = $type ?: $this->getResponseType();
+        $response = Response::create($result, $type)->header($header);
+
+        throw new HttpResponseException($response);
+    }
+
+    /**
+     * URL重定向
+     * @access protected
+     * @param  string         $url 跳转的URL表达式
+     * @param  array|integer  $params 其它URL参数
+     * @param  integer        $code http code
+     * @param  array          $with 隐式传参
+     * @return void
+     */
+    protected function redirect($url, $params = [], $code = 302, $with = [])
+    {
+        $response = new Redirect($url);
+
+        if (is_integer($params)) {
+            $code   = $params;
+            $params = [];
+        }
+
+        $response->code($code)->params($params)->with($with);
+
+        throw new HttpResponseException($response);
+    }
+
+    /**
+     * 获取当前的response 输出类型
+     * @access protected
+     * @return string
+     */
+    protected function getResponseType()
+    {
+        if (!$this->app) {
+            $this->app = Container::get('app');
+        }
+
+        $isAjax = $this->app['request']->isAjax();
+        $config = $this->app['config'];
+
+        return $isAjax
+        ? $config->get('default_ajax_return')
+        : $config->get('default_return_type');
+    }
+}
diff --git a/thinkphp/logo.png b/thinkphp/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..25fd0593688de5c9f4cd321da1a72ab9566fe331
Binary files /dev/null and b/thinkphp/logo.png differ
diff --git a/thinkphp/phpunit.xml.dist b/thinkphp/phpunit.xml.dist
new file mode 100644
index 0000000000000000000000000000000000000000..37c3d2b53bc6ad79920cf78cf8b8ddfd56654548
--- /dev/null
+++ b/thinkphp/phpunit.xml.dist
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="./base.php"
+         failOnRisky="true"
+         failOnWarning="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+        <ini name="intl.default_locale" value="en" />
+        <ini name="intl.error_level" value="0" />
+        <ini name="memory_limit" value="-1" />
+        <env name="DUMP_LIGHT_ARRAY" value="" />
+        <env name="DUMP_STRING_LENGTH" value="" />
+        <env name="LDAP_HOST" value="127.0.0.1" />
+        <env name="LDAP_PORT" value="3389" />
+        <env name="REDIS_HOST" value="localhost" />
+        <env name="MEMCACHED_HOST" value="localhost" />
+    </php>
+
+    <testsuites>
+        <testsuite name="ThinkPHP Test Suite">
+            <directory>./library/think/*/tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./library/</directory>
+            <exclude>
+                <directory>./library/think/*/tests</directory>
+                <directory>./library/think/*/assets</directory>
+                <directory>./library/think/*/resources</directory>
+                <directory>./library/think/*/vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
\ No newline at end of file
diff --git a/thinkphp/tpl/default_index.tpl b/thinkphp/tpl/default_index.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..e5c1363ac6d80f02698a7f77f63f13bc2cf7e693
--- /dev/null
+++ b/thinkphp/tpl/default_index.tpl
@@ -0,0 +1,10 @@
+<?php
+namespace {$app}\{$module}{layer};
+
+class Index{$suffix}
+{
+    public function index()
+    {
+        return '<style type="text/css">*{ padding: 0; margin: 0; } div{ padding: 4px 48px;} a{color:#2E5CD5;cursor: pointer;text-decoration: none} a:hover{text-decoration:underline; } body{ background: #fff; font-family: "Century Gothic","Microsoft yahei"; color: #333;font-size:18px;} h1{ font-size: 100px; font-weight: normal; margin-bottom: 12px; } p{ line-height: 1.6em; font-size: 42px }</style><div style="padding: 24px 48px;"> <h1>:) </h1><p> ThinkPHP V5.1<br/><span style="font-size:30px">12载初心不改（2006-2018） - 你值得信赖的PHP框架</span></p></div><script type="text/javascript" src="https://tajs.qq.com/stats?sId=64890268" charset="UTF-8"></script><script type="text/javascript" src="https://e.topthink.com/Public/static/client.js"></script><think id="eab4b9f840753f8e7"></think>';
+    }
+}
diff --git a/thinkphp/tpl/dispatch_jump.tpl b/thinkphp/tpl/dispatch_jump.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..583376bbb694e26c82a5852645745f93a0f9fda7
--- /dev/null
+++ b/thinkphp/tpl/dispatch_jump.tpl
@@ -0,0 +1,49 @@
+{__NOLAYOUT__}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no"/>
+    <title>跳转提示</title>
+    <style type="text/css">
+        *{ padding: 0; margin: 0; }
+        body{ background: #fff; font-family: "Microsoft Yahei","Helvetica Neue",Helvetica,Arial,sans-serif; color: #333; font-size: 16px; }
+        .system-message{ padding: 24px 48px; }
+        .system-message h1{ font-size: 100px; font-weight: normal; line-height: 120px; margin-bottom: 12px; }
+        .system-message .jump{ padding-top: 10px; }
+        .system-message .jump a{ color: #333; }
+        .system-message .success,.system-message .error{ line-height: 1.8em; font-size: 36px; }
+        .system-message .detail{ font-size: 12px; line-height: 20px; margin-top: 12px; display: none; }
+    </style>
+</head>
+<body>
+    <div class="system-message">
+        <?php switch ($code) {?>
+            <?php case 1:?>
+            <h1>:)</h1>
+            <p class="success"><?php echo(strip_tags($msg));?></p>
+            <?php break;?>
+            <?php case 0:?>
+            <h1>:(</h1>
+            <p class="error"><?php echo(strip_tags($msg));?></p>
+            <?php break;?>
+        <?php } ?>
+        <p class="detail"></p>
+        <p class="jump">
+            页面自动 <a id="href" href="<?php echo($url);?>">跳转</a> 等待时间： <b id="wait"><?php echo($wait);?></b>
+        </p>
+    </div>
+    <script type="text/javascript">
+        (function(){
+            var wait = document.getElementById('wait'),
+                href = document.getElementById('href').href;
+            var interval = setInterval(function(){
+                var time = --wait.innerHTML;
+                if(time <= 0) {
+                    location.href = href;
+                    clearInterval(interval);
+                };
+            }, 1000);
+        })();
+    </script>
+</body>
+</html>
diff --git a/thinkphp/tpl/page_trace.tpl b/thinkphp/tpl/page_trace.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..2e5afbab9886e5c16e0ea8f100111bad30714d05
--- /dev/null
+++ b/thinkphp/tpl/page_trace.tpl
@@ -0,0 +1,71 @@
+<div id="think_page_trace" style="position: fixed;bottom:0;right:0;font-size:14px;width:100%;z-index: 999999;color: #000;text-align:left;font-family:'微软雅黑';">
+    <div id="think_page_trace_tab" style="display: none;background:white;margin:0;height: 250px;">
+        <div id="think_page_trace_tab_tit" style="height:30px;padding: 6px 12px 0;border-bottom:1px solid #ececec;border-top:1px solid #ececec;font-size:16px">
+            <?php foreach ($trace as $key => $value) {?>
+            <span style="color:#000;padding-right:12px;height:30px;line-height:30px;display:inline-block;margin-right:3px;cursor:pointer;font-weight:700"><?php echo $key ?></span>
+            <?php }?>
+        </div>
+        <div id="think_page_trace_tab_cont" style="overflow:auto;height:212px;padding:0;line-height: 24px">
+            <?php foreach ($trace as $info) {?>
+            <div style="display:none;">
+                <ol style="padding: 0; margin:0">
+                    <?php
+                    if (is_array($info)) {
+                        foreach ($info as $k => $val) {
+                            echo '<li style="border-bottom:1px solid #EEE;font-size:14px;padding:0 12px">' . (is_numeric($k) ? '' : $k.' : ') . htmlentities(print_r($val,true), ENT_COMPAT, 'utf-8') . '</li>';
+                        }
+                    }
+                    ?>
+                </ol>
+            </div>
+            <?php }?>
+        </div>
+    </div>
+    <div id="think_page_trace_close" style="display:none;text-align:right;height:15px;position:absolute;top:10px;right:12px;cursor:pointer;"><img style="vertical-align:top;" src="data:image/gif;base64,R0lGODlhDwAPAJEAAAAAAAMDA////wAAACH/C1hNUCBEYXRhWE1QPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENvcmUgNS4wLWMwNjAgNjEuMTM0Nzc3LCAyMDEwLzAyLzEyLTE3OjMyOjAwICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOnhtcE1NPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvbW0vIiB4bWxuczpzdFJlZj0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL3NUeXBlL1Jlc291cmNlUmVmIyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MUQxMjc1MUJCQUJDMTFFMTk0OUVGRjc3QzU4RURFNkEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MUQxMjc1MUNCQUJDMTFFMTk0OUVGRjc3QzU4RURFNkEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoxRDEyNzUxOUJBQkMxMUUxOTQ5RUZGNzdDNThFREU2QSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDoxRDEyNzUxQUJBQkMxMUUxOTQ5RUZGNzdDNThFREU2QSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PgH//v38+/r5+Pf29fTz8vHw7+7t7Ovq6ejn5uXk4+Lh4N/e3dzb2tnY19bV1NPS0dDPzs3My8rJyMfGxcTDwsHAv769vLu6ubi3trW0s7KxsK+urayrqqmop6alpKOioaCfnp2cm5qZmJeWlZSTkpGQj46NjIuKiYiHhoWEg4KBgH9+fXx7enl4d3Z1dHNycXBvbm1sa2ppaGdmZWRjYmFgX15dXFtaWVhXVlVUU1JRUE9OTUxLSklIR0ZFRENCQUA/Pj08Ozo5ODc2NTQzMjEwLy4tLCsqKSgnJiUkIyIhIB8eHRwbGhkYFxYVFBMSERAPDg0MCwoJCAcGBQQDAgEAACH5BAAAAAAALAAAAAAPAA8AAAIdjI6JZqotoJPR1fnsgRR3C2jZl3Ai9aWZZooV+RQAOw==" /></div>
+</div>
+<div id="think_page_trace_open" style="height:30px;float:right;text-align:right;overflow:hidden;position:fixed;bottom:0;right:0;color:#000;line-height:30px;cursor:pointer;">
+    <div style="background:#232323;color:#FFF;padding:0 6px;float:right;line-height:30px;font-size:14px"><?php echo \think\Container::get('debug')->getUseTime().'s ';?></div>
+    <img width="30" style="" title="ShowPageTrace" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyBpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNSBXaW5kb3dzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjVERDVENkZGQjkyNDExRTE5REY3RDQ5RTQ2RTRDQUJCIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjVERDVENzAwQjkyNDExRTE5REY3RDQ5RTQ2RTRDQUJCIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NURENUQ2RkRCOTI0MTFFMTlERjdENDlFNDZFNENBQkIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NURENUQ2RkVCOTI0MTFFMTlERjdENDlFNDZFNENBQkIiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5fx6IRAAAMCElEQVR42sxae3BU1Rk/9+69+8xuNtkHJAFCSIAkhMgjCCJQUi0GtEIVbP8Qq9LH2No6TmfaztjO2OnUdvqHFMfOVFTqIK0vUEEeqUBARCsEeYQkEPJoEvIiELLvvc9z+p27u2F3s5tsBB1OZiebu5dzf7/v/L7f952zMM8cWIwY+Mk2ulCp92Fnq3XvnzArr2NZnYNldDp0Gw+/OEQ4+obQn5D+4Ubb22+YOGsWi/Todh8AHglKEGkEsnHBQ162511GZFgW6ZCBM9/W4H3iNSQqIe09O196dLKX7d1O39OViP/wthtkND62if/wj/DbMpph8BY/m9xy8BoBmQk+mHqZQGNy4JYRwCoRbwa8l4JXw6M+orJxpU0U6ToKy/5bQsAiTeokGKkTx46RRxxEUgrwGgF4MWNNEJCGgYTvpgnY1IJWg5RzfqLgvcIgktX0i8dmMlFA8qCQ5L0Z/WObPLUxT1i4lWSYDISoEfBYGvM+LlMQQdkLHoWRRZ8zYQI62Thswe5WTORGwNXDcGjqeOA9AF7B8rhzsxMBEoJ8oJKaqPu4hblHMCMPwl9XeNWyb8xkB/DDGYKfMAE6aFL7xesZ389JlgG3XHEMI6UPDOP6JHHu67T2pwNPI69mCP4rEaBDUAJaKc/AOuXiwH07VCS3w5+UQMAuF/WqGI+yFIwVNBwemBD4r0wgQiKoFZa00sEYTwss32lA1tPwVxtc8jQ5/gWCwmGCyUD8vRT0sHBFW4GJDvZmrJFWRY1EkrGA6ZB8/10fOZSSj0E6F+BSP7xidiIzhBmKB09lEwHPkG+UQIyEN44EBiT5vrv2uJXyPQqSqO930fxvcvwbR/+JAkD9EfASgI9EHlp6YiHO4W+cAB20SnrFqxBbNljiXf1Pl1K2S0HCWfiog3YlAD5RGwwxK6oUjTweuVigLjyB0mX410mAFnMoVK1lvvUvgt8fUJH0JVyjuvcmg4dE5mUiFtD24AZ4qBVELxXKS+pMxN43kSdzNwudJ+bQbLlmnxvPOQoCugSap1GnSRoG8KOiKbH+rIA0lEeSAg3y6eeQ6XI2nrYnrPM89bUTgI0Pdqvl50vlNbtZxDUBcLBK0kPd5jPziyLdojJIN0pq5/mdzwL4UVvVInV5ncQEPNOUxa9d0TU+CW5l+FoI0GSDKHVVSOs+0KOsZoxwOzSZNFGv0mQ9avyLCh2Hpm+70Y0YJoJVgmQv822wnDC8Miq6VjJ5IFed0QD1YiAbT+nQE8v/RMZfmgmcCRHIIu7Bmcp39oM9fqEychcA747KxQ/AEyqQonl7hATtJmnhO2XYtgcia01aSbVMenAXrIomPcLgEBA4liGBzFZAT8zBYqW6brI67wg8sFVhxBhwLwBP2+tqBQqqK7VJKGh/BRrfTr6nWL7nYBaZdBJHqrX3kPEPap56xwE/GvjJTRMADeMCdcGpGXL1Xh4ZL8BDOlWkUpegfi0CeDzeA5YITzEnddv+IXL+UYCmqIvqC9UlUC/ki9FipwVjunL3yX7dOTLeXmVMAhbsGporPfyOBTm/BJ23gTVehsvXRnSewagUfpBXF3p5pygKS7OceqTjb7h2vjr/XKm0ZofKSI2Q/J102wHzatZkJPYQ5JoKsuK+EoHJakVzubzuLQDepCKllTZi9AG0DYg9ZLxhFaZsOu7bvlmVI5oPXJMQJcHxHClSln1apFTvAimeg48u0RWFeZW4lVcjbQWZuIQK1KozZfIDO6CSQmQQXdpBaiKZyEWThVK1uEc6v7V7uK0ysduExPZx4vysDR+4SelhBYm0R6LBuR4PXts8MYMcJPsINo4YZCDLj0sgB0/vLpPXvA2Tn42Cv5rsLulGubzW0sEd3d4W/mJt2Kck+DzDMijfPLOjyrDhXSh852B+OvflqAkoyXO1cYfujtc/i3jJSAwhgfFlp20laMLOku/bC7prgqW7lCn4auE5NhcXPd3M7x70+IceSgZvNljCd9k3fLjYsPElqLR14PXQZqD2ZNkkrAB79UeJUebFQmXpf8ZcAQt2XrMQdyNUVBqZoUzAFyp3V3xi/MubUA/mCT4Fhf038PC8XplhWnCmnK/ZzyC2BSTRSqKVOuY2kB8Jia0lvvRIVoP+vVWJbYarf6p655E2/nANBMCWkgD49DA0VAMyI1OLFMYCXiU9bmzi9/y5i/vsaTpHPHidTofzLbM65vMPva9HlovgXp0AvjtaqYMfDD0/4mAsYE92pxa+9k1QgCnRVObCpojpzsKTPvayPetTEgBdwnssjuc0kOBFX+q3HwRQxdrOLAqeYRjkMk/trTSu2Z9Lik7CfF0AvjtqAhS4NHobGXUnB5DQs8hG8p/wMX1r4+8xkmyvQ50JVq72TVeXbz3HvpWaQJi57hJYTw4kGbtS+C2TigQUtZUX+X27QQq2ePBZBru/0lxTm8fOOQ5yaZOZMAV+he4FqIMB+LQB0UgMSajANX29j+vbmly8ipRvHeSQoQOkM5iFXcPQCVwDMs5RBCQmaPOyvbNd6uwvQJ183BZQG3Zc+Eiv7vQOKu8YeDmMcJlt2ckyftVeMIGLBCmdMHl/tFILYwGPjXWO3zOfSq/+om+oa7Mlh2fpSsRGLp7RAW3FUVjNHgiMhyE6zBFjM2BdkdJGO7nP1kJXWAtBuBpPIAu7f+hhu7bFXIuC5xWrf0X2xreykOsUyKkF2gwadbrXDcXrfKxR43zGcSj4t/cCgr+a1iy6EjE5GYktUCl9fwfMeylyooGF48bN2IGLTw8x7StS7sj8TF9FmPGWQhm3rRR+o9lhvjJvSYAdfDUevI1M6bnX/OwWaDMOQ8RPgKRo0eulBTdT8AW2kl8e9L7UHghHwMfLiZPNoSpx0yugpQZaFqKWqxVSM3a2pN1SAhC2jf94I7ybBI7EL5A2Wvu5ht3xsoEt4+Ay/abXgCQAxyOeDsDlTCQzy75ohcGgv9Tra9uiymRUYTLrswOLlCdfAQf7HPDQQ4ErAH5EDXB9cMxWYpjtXApRncojS0sbV/cCgHTHwGNBJy+1PQE2x56FpaVR7wfQGZ37V+V+19EiHNvR6q1fRUjqvbjbMq1/qfHxbTrE10ePY2gPFk48D2CVMTf1AF4PXvyYR9dV6Wf7H413m3xTWQvYGhQ7mfYwA5mAX+18Vue05v/8jG/fZX/IW5MKPKtjSYlt0ellxh+/BOCPAwYaeVr0QofZFxJWVWC8znG70au6llVmktsF0bfHF6k8fvZ5esZJbwHwwnjg59tXz6sL/P0NUZDuSNu1mnJ8Vab17+cy005A9wtOpp3i0bZdpJLUil00semAwN45LgEViZYe3amNye0B6A9chviSlzXVsFtyN5/1H3gaNmMpn8Fz0GpYFp6Zw615H/LpUuRQQDMCL82n5DpBSawkvzIdN2ypiT8nSLth8Pk9jnjwdFzH3W4XW6KMBfwB569NdcGX93mC16tTflcArcYUc/mFuYbV+8zY0SAjAVoNErNgWjtwumJ3wbn/HlBFYdxHvSkJJEc+Ngal9opSwyo9YlITX2C/P/+gf8sxURSLR+mcZUmeqaS9wrh6vxW5zxFCOqFi90RbDWq/YwZmnu1+a6OvdpvRqkNxxe44lyl4OobEnpKA6Uox5EfH9xzPs/HRKrTPWdIQrK1VZDU7ETiD3Obpl+8wPPCRBbkbwNtpW9AbBe5L1SMlj3tdTxk/9W47JUmqS5HU+JzYymUKXjtWVmT9RenIhgXc+nroWLyxXJhmL112OdB8GCsk4f8oZJucnvmmtR85mBn10GZ0EKSCMUSAR3ukcXd5s7LvLD3me61WkuTCpJzYAyRurMB44EdEJzTfU271lUJC03YjXJXzYOGZwN4D8eB5jlfLrdWfzGRW7icMPfiSO6Oe7s20bmhdgLX4Z23B+s3JgQESzUDiMboSzDMHFpNMwccGePauhfwjzwnI2wu9zKGgEFg80jcZ7MHllk07s1H+5yojtUQTlH4nFdLKTGwDmPbIklOb1L1zO4T6N8NCuDLFLS/C63c0eNRimZ++s5BMBHxU11jHchI9oFVUxRh/eMDzHEzGYu0Lg8gJ7oS/tFCwoic44fyUtix0n/46vP4bf+//BRgAYwDDar4ncHIAAAAASUVORK5CYII=">
+</div>
+
+<script type="text/javascript">
+    (function(){
+        var tab_tit  = document.getElementById('think_page_trace_tab_tit').getElementsByTagName('span');
+        var tab_cont = document.getElementById('think_page_trace_tab_cont').getElementsByTagName('div');
+        var open     = document.getElementById('think_page_trace_open');
+        var close    = document.getElementById('think_page_trace_close').children[0];
+        var trace    = document.getElementById('think_page_trace_tab');
+        var cookie   = document.cookie.match(/thinkphp_show_page_trace=(\d\|\d)/);
+        var history  = (cookie && typeof cookie[1] != 'undefined' && cookie[1].split('|')) || [0,0];
+        open.onclick = function(){
+            trace.style.display = 'block';
+            this.style.display = 'none';
+            close.parentNode.style.display = 'block';
+            history[0] = 1;
+            document.cookie = 'thinkphp_show_page_trace='+history.join('|')
+        }
+        close.onclick = function(){
+            trace.style.display = 'none';
+            this.parentNode.style.display = 'none';
+            open.style.display = 'block';
+            history[0] = 0;
+            document.cookie = 'thinkphp_show_page_trace='+history.join('|')
+        }
+        for(var i = 0; i < tab_tit.length; i++){
+            tab_tit[i].onclick = (function(i){
+                return function(){
+                    for(var j = 0; j < tab_cont.length; j++){
+                        tab_cont[j].style.display = 'none';
+                        tab_tit[j].style.color = '#999';
+                    }
+                    tab_cont[i].style.display = 'block';
+                    tab_tit[i].style.color = '#000';
+                    history[1] = i;
+                    document.cookie = 'thinkphp_show_page_trace='+history.join('|')
+                }
+            })(i)
+        }
+        parseInt(history[0]) && open.click();
+        tab_tit[history[1]].click();
+    })();
+</script>
diff --git a/thinkphp/tpl/think_exception.tpl b/thinkphp/tpl/think_exception.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..19ecbdc1bf4cc76baab846badc7bfe65399dd6da
--- /dev/null
+++ b/thinkphp/tpl/think_exception.tpl
@@ -0,0 +1,507 @@
+<?php
+    if(!function_exists('parse_padding')){
+        function parse_padding($source)
+        {
+            $length  = strlen(strval(count($source['source']) + $source['first']));
+            return 40 + ($length - 1) * 8;
+        }
+    }
+
+    if(!function_exists('parse_class')){
+        function parse_class($name)
+        {
+            $names = explode('\\', $name);
+            return '<abbr title="'.$name.'">'.end($names).'</abbr>';
+        }
+    }
+
+    if(!function_exists('parse_file')){
+        function parse_file($file, $line)
+        {
+            return '<a class="toggle" title="'."{$file} line {$line}".'">'.basename($file)." line {$line}".'</a>';
+        }
+    }
+
+    if(!function_exists('parse_args')){
+        function parse_args($args)
+        {
+            $result = [];
+
+            foreach ($args as $key => $item) {
+                switch (true) {
+                    case is_object($item):
+                        $value = sprintf('<em>object</em>(%s)', parse_class(get_class($item)));
+                        break;
+                    case is_array($item):
+                        if(count($item) > 3){
+                            $value = sprintf('[%s, ...]', parse_args(array_slice($item, 0, 3)));
+                        } else {
+                            $value = sprintf('[%s]', parse_args($item));
+                        }
+                        break;
+                    case is_string($item):
+                        if(strlen($item) > 20){
+                            $value = sprintf(
+                                '\'<a class="toggle" title="%s">%s...</a>\'',
+                                htmlentities($item),
+                                htmlentities(substr($item, 0, 20))
+                            );
+                        } else {
+                            $value = sprintf("'%s'", htmlentities($item));
+                        }
+                        break;
+                    case is_int($item):
+                    case is_float($item):
+                        $value = $item;
+                        break;
+                    case is_null($item):
+                        $value = '<em>null</em>';
+                        break;
+                    case is_bool($item):
+                        $value = '<em>' . ($item ? 'true' : 'false') . '</em>';
+                        break;
+                    case is_resource($item):
+                        $value = '<em>resource</em>';
+                        break;
+                    default:
+                        $value = htmlentities(str_replace("\n", '', var_export(strval($item), true)));
+                        break;
+                }
+
+                $result[] = is_int($key) ? $value : "'{$key}' => {$value}";
+            }
+
+            return implode(', ', $result);
+        }
+    }
+?>
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>系统发生错误</title>
+    <meta name="robots" content="noindex,nofollow" />
+    <style>
+        /* Base */
+        body {
+            color: #333;
+            font: 16px Verdana, "Helvetica Neue", helvetica, Arial, 'Microsoft YaHei', sans-serif;
+            margin: 0;
+            padding: 0 20px 20px;
+        }
+        h1{
+            margin: 10px 0 0;
+            font-size: 28px;
+            font-weight: 500;
+            line-height: 32px;
+        }
+        h2{
+            color: #4288ce;
+            font-weight: 400;
+            padding: 6px 0;
+            margin: 6px 0 0;
+            font-size: 18px;
+            border-bottom: 1px solid #eee;
+        }
+        h3{
+            margin: 12px;
+            font-size: 16px;
+            font-weight: bold;
+        }
+        abbr{
+            cursor: help;
+            text-decoration: underline;
+            text-decoration-style: dotted;
+        }
+        a{
+            color: #868686;
+            cursor: pointer;
+        }
+        a:hover{
+            text-decoration: underline;
+        }
+        .line-error{
+            background: #f8cbcb;
+        }
+
+        .echo table {
+            width: 100%;
+        }
+
+        .echo pre {
+            padding: 16px;
+            overflow: auto;
+            font-size: 85%;
+            line-height: 1.45;
+            background-color: #f7f7f7;
+            border: 0;
+            border-radius: 3px;
+            font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
+        }
+
+        .echo pre > pre {
+            padding: 0;
+            margin: 0;
+        }
+    
+        /* Exception Info */
+        .exception {
+            margin-top: 20px;
+        }
+        .exception .message{
+            padding: 12px;
+            border: 1px solid #ddd;
+            border-bottom: 0 none;
+            line-height: 18px;
+            font-size:16px;
+            border-top-left-radius: 4px;
+            border-top-right-radius: 4px;
+            font-family: Consolas,"Liberation Mono",Courier,Verdana,"微软雅黑";
+        }
+
+        .exception .code{
+            float: left;
+            text-align: center;
+            color: #fff;
+            margin-right: 12px;
+            padding: 16px;
+            border-radius: 4px;
+            background: #999;
+        }
+        .exception .source-code{
+            padding: 6px;
+            border: 1px solid #ddd;
+
+            background: #f9f9f9;
+            overflow-x: auto;
+
+        }
+        .exception .source-code pre{
+            margin: 0;
+        }
+        .exception .source-code pre ol{
+            margin: 0;
+            color: #4288ce;
+            display: inline-block;
+            min-width: 100%;
+            box-sizing: border-box;
+        font-size:14px;
+            font-family: "Century Gothic",Consolas,"Liberation Mono",Courier,Verdana;
+            padding-left: <?php echo (isset($source) && !empty($source)) ? parse_padding($source) : 40;  ?>px;
+        }
+        .exception .source-code pre li{
+            border-left: 1px solid #ddd;
+            height: 18px;
+            line-height: 18px;
+        }
+        .exception .source-code pre code{
+            color: #333;
+            height: 100%;
+            display: inline-block;
+            border-left: 1px solid #fff;
+        font-size:14px;
+            font-family: Consolas,"Liberation Mono",Courier,Verdana,"微软雅黑";
+        }
+        .exception .trace{
+            padding: 6px;
+            border: 1px solid #ddd;
+            border-top: 0 none;
+            line-height: 16px;
+        font-size:14px;
+            font-family: Consolas,"Liberation Mono",Courier,Verdana,"微软雅黑";
+        }
+        .exception .trace ol{
+            margin: 12px;
+        }
+        .exception .trace ol li{
+            padding: 2px 4px;
+        }
+        .exception div:last-child{
+            border-bottom-left-radius: 4px;
+            border-bottom-right-radius: 4px;
+        }
+
+        /* Exception Variables */
+        .exception-var table{
+            width: 100%;
+            margin: 12px 0;
+            box-sizing: border-box;
+            table-layout:fixed;
+            word-wrap:break-word;            
+        }
+        .exception-var table caption{
+            text-align: left;
+            font-size: 16px;
+            font-weight: bold;
+            padding: 6px 0;
+        }
+        .exception-var table caption small{
+            font-weight: 300;
+            display: inline-block;
+            margin-left: 10px;
+            color: #ccc;
+        }
+        .exception-var table tbody{
+            font-size: 13px;
+            font-family: Consolas,"Liberation Mono",Courier,"微软雅黑";
+        }
+        .exception-var table td{
+            padding: 0 6px;
+            vertical-align: top;
+            word-break: break-all;
+        }
+        .exception-var table td:first-child{
+            width: 28%;
+            font-weight: bold;
+            white-space: nowrap;
+        }
+        .exception-var table td pre{
+            margin: 0;
+        }
+
+        /* Copyright Info */
+        .copyright{
+            margin-top: 24px;
+            padding: 12px 0;
+            border-top: 1px solid #eee;
+        }
+
+        /* SPAN elements with the classes below are added by prettyprint. */
+        pre.prettyprint .pln { color: #000 }  /* plain text */
+        pre.prettyprint .str { color: #080 }  /* string content */
+        pre.prettyprint .kwd { color: #008 }  /* a keyword */
+        pre.prettyprint .com { color: #800 }  /* a comment */
+        pre.prettyprint .typ { color: #606 }  /* a type name */
+        pre.prettyprint .lit { color: #066 }  /* a literal value */
+        /* punctuation, lisp open bracket, lisp close bracket */
+        pre.prettyprint .pun, pre.prettyprint .opn, pre.prettyprint .clo { color: #660 }
+        pre.prettyprint .tag { color: #008 }  /* a markup tag name */
+        pre.prettyprint .atn { color: #606 }  /* a markup attribute name */
+        pre.prettyprint .atv { color: #080 }  /* a markup attribute value */
+        pre.prettyprint .dec, pre.prettyprint .var { color: #606 }  /* a declaration; a variable name */
+        pre.prettyprint .fun { color: red }  /* a function name */
+    </style>
+</head>
+<body>
+    <div class="echo">
+        <?php echo $echo;?>
+    </div>
+    <?php if(\think\facade\App::isDebug()) { ?>
+    <div class="exception">
+    <div class="message">
+        
+            <div class="info">
+                <div>
+                    <h2>[<?php echo $code; ?>]&nbsp;<?php echo sprintf('%s in %s', parse_class($name), parse_file($file, $line)); ?></h2>
+                </div>
+                <div><h1><?php echo nl2br(htmlentities($message)); ?></h1></div>
+            </div>
+        
+    </div>
+	<?php if(!empty($source)){?>
+        <div class="source-code">
+            <pre class="prettyprint lang-php"><ol start="<?php echo $source['first']; ?>"><?php foreach ((array) $source['source'] as $key => $value) { ?><li class="line-<?php echo $key + $source['first']; ?>"><code><?php echo htmlentities($value); ?></code></li><?php } ?></ol></pre>
+        </div>
+	<?php }?>
+        <div class="trace">
+            <h2>Call Stack</h2>
+            <ol>
+                <li><?php echo sprintf('in %s', parse_file($file, $line)); ?></li>
+                <?php foreach ((array) $trace as $value) { ?>
+                <li>
+                <?php 
+                    // Show Function
+                    if($value['function']){
+                        echo sprintf(
+                            'at %s%s%s(%s)', 
+                            isset($value['class']) ? parse_class($value['class']) : '',
+                            isset($value['type'])  ? $value['type'] : '', 
+                            $value['function'], 
+                            isset($value['args'])?parse_args($value['args']):''
+                        );
+                    }
+
+                    // Show line
+                    if (isset($value['file']) && isset($value['line'])) {
+                        echo sprintf(' in %s', parse_file($value['file'], $value['line']));
+                    }
+                ?>
+                </li>
+                <?php } ?>
+            </ol>
+        </div>
+    </div>
+    <?php } else { ?>
+    <div class="exception">
+        
+            <div class="info"><h1><?php echo htmlentities($message); ?></h1></div>
+        
+    </div>
+    <?php } ?>
+    
+    <?php if(!empty($datas)){ ?>
+    <div class="exception-var">
+        <h2>Exception Datas</h2>
+        <?php foreach ((array) $datas as $label => $value) { ?>
+        <table>
+            <?php if(empty($value)){ ?>
+            <caption><?php echo $label; ?><small>empty</small></caption>
+            <?php } else { ?>
+            <caption><?php echo $label; ?></caption>
+            <tbody>
+                <?php foreach ((array) $value as $key => $val) { ?>
+                <tr>
+                    <td><?php echo htmlentities($key); ?></td>
+                    <td>
+                        <?php 
+                            if(is_array($val) || is_object($val)){ 
+                                echo htmlentities(json_encode($val, JSON_PRETTY_PRINT));
+                            } else if(is_bool($val)) { 
+                                echo $val ? 'true' : 'false';
+                            } else if(is_scalar($val)) {
+                                echo htmlentities($val);
+                            } else {
+                                echo 'Resource';
+                            }
+                        ?>
+                    </td>
+                </tr>
+                <?php } ?>
+            </tbody>
+            <?php } ?>
+        </table>
+        <?php } ?>
+    </div>
+    <?php } ?>
+
+    <?php if(!empty($tables)){ ?>
+    <div class="exception-var">
+        <h2>Environment Variables</h2>
+        <?php foreach ((array) $tables as $label => $value) { ?>
+        <table>
+            <?php if(empty($value)){ ?>
+            <caption><?php echo $label; ?><small>empty</small></caption>
+            <?php } else { ?>
+            <caption><?php echo $label; ?></caption>
+            <tbody>
+                <?php foreach ((array) $value as $key => $val) { ?>
+                <tr>
+                    <td><?php echo htmlentities($key); ?></td>
+                    <td>
+                        <?php 
+                            if(is_array($val) || is_object($val)){ 
+                                echo htmlentities(json_encode($val, JSON_PRETTY_PRINT));
+                            } else if(is_bool($val)) { 
+                                echo $val ? 'true' : 'false';
+                            } else if(is_scalar($val)) {
+                                echo htmlentities($val);
+                            } else {
+                                echo 'Resource';
+                            }
+                        ?>
+                    </td>
+                </tr>
+                <?php } ?>
+            </tbody>
+            <?php } ?>
+        </table>
+        <?php } ?>
+    </div>
+    <?php } ?>
+
+    <div class="copyright">
+        <a title="官方网站" href="http://www.thinkphp.cn">ThinkPHP</a> 
+        <span>V<?php echo \think\facade\App::version(); ?></span> 
+        <span>{ 十年磨一剑-为API开发设计的高性能框架 }</span>
+    </div>
+    <?php if(\think\facade\App::isDebug()) { ?>
+    <script>
+        var LINE = <?php echo $line; ?>;
+
+        function $(selector, node){
+            var elements;
+
+            node = node || document;
+            if(document.querySelectorAll){
+                elements = node.querySelectorAll(selector);
+            } else {
+                switch(selector.substr(0, 1)){
+                    case '#':
+                        elements = [node.getElementById(selector.substr(1))];
+                        break;
+                    case '.':
+                        if(document.getElementsByClassName){
+                            elements = node.getElementsByClassName(selector.substr(1));
+                        } else {
+                            elements = get_elements_by_class(selector.substr(1), node);
+                        }
+                        break;
+                    default:
+                        elements = node.getElementsByTagName();
+                }
+            }
+            return elements;
+
+            function get_elements_by_class(search_class, node, tag) {
+                var elements = [], eles, 
+                    pattern  = new RegExp('(^|\\s)' + search_class + '(\\s|$)');
+
+                node = node || document;
+                tag  = tag  || '*';
+
+                eles = node.getElementsByTagName(tag);
+                for(var i = 0; i < eles.length; i++) {
+                    if(pattern.test(eles[i].className)) {
+                        elements.push(eles[i])
+                    }
+                }
+
+                return elements;
+            }
+        }
+
+        $.getScript = function(src, func){
+            var script = document.createElement('script');
+            
+            script.async  = 'async';
+            script.src    = src;
+            script.onload = func || function(){};
+            
+            $('head')[0].appendChild(script);
+        }
+
+        ;(function(){
+            var files = $('.toggle');
+            var ol    = $('ol', $('.prettyprint')[0]);
+            var li    = $('li', ol[0]);   
+
+            // 短路径和长路径变换
+            for(var i = 0; i < files.length; i++){
+                files[i].ondblclick = function(){
+                    var title = this.title;
+
+                    this.title = this.innerHTML;
+                    this.innerHTML = title;
+                }
+            }
+
+            // 设置出错行
+            var err_line = $('.line-' + LINE, ol[0])[0];
+            err_line.className = err_line.className + ' line-error';
+
+            $.getScript('//cdn.bootcss.com/prettify/r298/prettify.min.js', function(){
+                prettyPrint();
+
+                // 解决Firefox浏览器一个很诡异的问题
+                // 当代码高亮后，ol的行号莫名其妙的错位
+                // 但是只要刷新li里面的html重新渲染就没有问题了
+                if(window.navigator.userAgent.indexOf('Firefox') >= 0){
+                    ol[0].innerHTML = ol[0].innerHTML;
+                }
+            });
+
+        })();
+    </script>
+    <?php } ?>
+</body>
+</html>
diff --git a/vendor/.gitignore b/vendor/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..c96a04f008ee21e260b28f7701595ed59e2839e3
--- /dev/null
+++ b/vendor/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file