diff --git a/vendor/autoload.php b/vendor/autoload.php
index 31c2da545..7085f19f9 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit70149920d09f8ca3335ec7e02d2d8da0::getLoader();
+return ComposerAutoloaderInit5b4c05ba2bf255c33d322ad9a32e91db::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 60948e2c7..50135ab4d 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit70149920d09f8ca3335ec7e02d2d8da0
+class ComposerAutoloaderInit5b4c05ba2bf255c33d322ad9a32e91db
 {
     private static $loader;
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit70149920d09f8ca3335ec7e02d2d8da0
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit70149920d09f8ca3335ec7e02d2d8da0', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit5b4c05ba2bf255c33d322ad9a32e91db', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit70149920d09f8ca3335ec7e02d2d8da0', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit5b4c05ba2bf255c33d322ad9a32e91db', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit70149920d09f8ca3335ec7e02d2d8da0::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit5b4c05ba2bf255c33d322ad9a32e91db::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -48,19 +48,19 @@ class ComposerAutoloaderInit70149920d09f8ca3335ec7e02d2d8da0
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit70149920d09f8ca3335ec7e02d2d8da0::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit5b4c05ba2bf255c33d322ad9a32e91db::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequire70149920d09f8ca3335ec7e02d2d8da0($fileIdentifier, $file);
+            composerRequire5b4c05ba2bf255c33d322ad9a32e91db($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequire70149920d09f8ca3335ec7e02d2d8da0($fileIdentifier, $file)
+function composerRequire5b4c05ba2bf255c33d322ad9a32e91db($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 613494db0..3fea6e670 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit70149920d09f8ca3335ec7e02d2d8da0
+class ComposerStaticInit5b4c05ba2bf255c33d322ad9a32e91db
 {
     public static $files = array (
         '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php',
@@ -384,9 +384,9 @@ class ComposerStaticInit70149920d09f8ca3335ec7e02d2d8da0
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit70149920d09f8ca3335ec7e02d2d8da0::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit70149920d09f8ca3335ec7e02d2d8da0::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit70149920d09f8ca3335ec7e02d2d8da0::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit5b4c05ba2bf255c33d322ad9a32e91db::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit5b4c05ba2bf255c33d322ad9a32e91db::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit5b4c05ba2bf255c33d322ad9a32e91db::$classMap;
 
         }, null, ClassLoader::class);
     }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index f0b2488b3..33bacfb0d 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -12,7 +12,13 @@
             "type": "zip",
             "url": "https://api.github.com/repos/aliyun/aliyun-oss-php-sdk/zipball/053d7ba9e798e4c09b9c5c1edab153d25ea9643a",
             "reference": "053d7ba9e798e4c09b9c5c1edab153d25ea9643a",
-            "shasum": ""
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
         "require": {
             "php": ">=5.3"
@@ -55,7 +61,13 @@
             "type": "zip",
             "url": "https://api.github.com/repos/endroid/qr-code/zipball/c9644bec2a9cc9318e98d1437de3c628dcd1ef93",
             "reference": "c9644bec2a9cc9318e98d1437de3c628dcd1ef93",
-            "shasum": ""
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
         "require": {
             "ext-gd": "*",
@@ -117,7 +129,13 @@
             "type": "zip",
             "url": "https://api.github.com/repos/qiniu/php-sdk/zipball/d89987163f560ebf9dfa5bb25de9bd9b1a3b2bd8",
             "reference": "d89987163f560ebf9dfa5bb25de9bd9b1a3b2bd8",
-            "shasum": ""
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
         "require": {
             "php": ">=5.3.3"
@@ -159,8 +177,8 @@
     },
     {
         "name": "symfony/options-resolver",
-        "version": "v3.4.35",
-        "version_normalized": "3.4.35.0",
+        "version": "v3.4.36",
+        "version_normalized": "3.4.36.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/options-resolver.git",
@@ -170,7 +188,13 @@
             "type": "zip",
             "url": "https://api.github.com/repos/symfony/options-resolver/zipball/b224d20be60e6f7b55cd66914379a13a0b28651a",
             "reference": "b224d20be60e6f7b55cd66914379a13a0b28651a",
-            "shasum": ""
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
         "require": {
             "php": "^5.5.9|>=7.0.8"
@@ -226,7 +250,13 @@
             "type": "zip",
             "url": "https://api.github.com/repos/top-think/framework/zipball/c255c22b2f5fa30f320ecf6c1d29f7740eb3e8be",
             "reference": "c255c22b2f5fa30f320ecf6c1d29f7740eb3e8be",
-            "shasum": ""
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
         "require": {
             "php": ">=5.4.0",
@@ -279,7 +309,13 @@
             "type": "zip",
             "url": "https://api.github.com/repos/top-think/think-captcha/zipball/1d64363c814c92f6086c4fa5e3223fe7e23db09d",
             "reference": "1d64363c814c92f6086c4fa5e3223fe7e23db09d",
-            "shasum": ""
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
         "require": {
             "topthink/framework": "~5.0.0",
@@ -321,7 +357,13 @@
             "type": "zip",
             "url": "https://api.github.com/repos/top-think/think-installer/zipball/1be326e68f63de4e95977ed50f46ae75f017556d",
             "reference": "1be326e68f63de4e95977ed50f46ae75f017556d",
-            "shasum": ""
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
         "require": {
             "composer-plugin-api": "^1.0"
@@ -353,20 +395,26 @@
     },
     {
         "name": "topthink/think-mongo",
-        "version": "v1.8.5",
-        "version_normalized": "1.8.5.0",
+        "version": "v1.1",
+        "version_normalized": "1.1.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/top-think/think-mongo.git",
-            "reference": "657cc79bd5f090a58b0cc83776073dd69c83a3d1"
+            "reference": "04548b89d283a15e4b3fc040cd0b3832efba15c5"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/top-think/think-mongo/zipball/657cc79bd5f090a58b0cc83776073dd69c83a3d1",
-            "reference": "657cc79bd5f090a58b0cc83776073dd69c83a3d1",
-            "shasum": ""
+            "url": "https://api.github.com/repos/top-think/think-mongo/zipball/04548b89d283a15e4b3fc040cd0b3832efba15c5",
+            "reference": "04548b89d283a15e4b3fc040cd0b3832efba15c5",
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
-        "time": "2018-06-03T01:51:27+00:00",
+        "time": "2016-11-04T02:10:44+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -400,7 +448,13 @@
             "type": "zip",
             "url": "https://api.github.com/repos/top-think/think-queue/zipball/bd0cf0f18146fafd4314c30a26b105d8b71f72b2",
             "reference": "bd0cf0f18146fafd4314c30a26b105d8b71f72b2",
-            "shasum": ""
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
         "time": "2016-11-25T03:41:00+00:00",
         "type": "library",
@@ -438,7 +492,13 @@
             "type": "zip",
             "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/f898a7d90cfacd54433de4028190c336164f2ae4",
             "reference": "f898a7d90cfacd54433de4028190c336164f2ae4",
-            "shasum": ""
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
         "require": {
             "php": ">=5.3"
@@ -481,7 +541,13 @@
             "type": "zip",
             "url": "https://api.github.com/repos/zoujingli/wechat-php-sdk/zipball/d37d0c1919ede2ee54e65100ac3792e947b1e0ef",
             "reference": "d37d0c1919ede2ee54e65100ac3792e947b1e0ef",
-            "shasum": ""
+            "shasum": "",
+            "mirrors": [
+                {
+                    "url": "https://mirrors.aliyun.com/composer/dists/%package%/%reference%.%type%",
+                    "preferred": true
+                }
+            ]
         },
         "require": {
             "ext-json": "*",
diff --git a/vendor/topthink/think-mongo/.gitignore b/vendor/topthink/think-mongo/.gitignore
deleted file mode 100644
index 485dee64b..000000000
--- a/vendor/topthink/think-mongo/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.idea
diff --git a/vendor/topthink/think-mongo/README.md b/vendor/topthink/think-mongo/README.md
index 07f52c941..45e4bb1a2 100644
--- a/vendor/topthink/think-mongo/README.md
+++ b/vendor/topthink/think-mongo/README.md
@@ -21,6 +21,3 @@ Db::name('demo')
     ->order('id','desc')
     ->select();
 ~~~
-
-1.*版本支持ThinkPHP 5.0
-2.*版本支持ThinkPHP 5.1 
diff --git a/vendor/topthink/think-mongo/src/Builder.php b/vendor/topthink/think-mongo/src/Builder.php
index ff3f003dc..977b654a0 100644
--- a/vendor/topthink/think-mongo/src/Builder.php
+++ b/vendor/topthink/think-mongo/src/Builder.php
@@ -2,6 +2,8 @@
 // +----------------------------------------------------------------------
 // | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
+// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
@@ -14,9 +16,10 @@ use MongoDB\BSON\ObjectID;
 use MongoDB\BSON\Regex;
 use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\Command;
-use MongoDB\Driver\Exception\InvalidArgumentException;
 use MongoDB\Driver\Query as MongoQuery;
 use think\Exception;
+use think\mongo\Connection;
+use think\mongo\Query;
 
 class Builder
 {
@@ -29,7 +32,7 @@ class Builder
     // 最后插入ID
     protected $insertId = [];
     // 查询表达式
-    protected $exp = ['<>' => 'ne', 'neq' => 'ne', '=' => 'eq', '>' => 'gt', '>=' => 'gte', '<' => 'lt', '<=' => 'lte', 'in' => 'in', 'not in' => 'nin', 'nin' => 'nin', 'mod' => 'mod', 'exists' => 'exists', 'null' => 'null', 'notnull' => 'not null', 'not null' => 'not null', 'regex' => 'regex', 'type' => 'type', 'all' => 'all', '> time' => '> time', '< time' => '< time', 'between' => 'between', 'not between' => 'not between', 'between time' => 'between time', 'not between time' => 'not between time', 'notbetween time' => 'not between time', 'like' => 'like', 'near' => 'near', 'size' => 'size'];
+    protected $exp = ['<>' => 'ne', 'neq' => 'ne', '=' => 'eq', '>' => 'gt', '>=' => 'gte', '<' => 'lt', '<=' => 'lte', 'in' => 'in', 'not in' => 'nin', 'nin' => 'nin', 'mod' => 'mod', 'exists' => 'exists', 'regex' => 'regex', 'type' => 'type', 'all' => 'all', '> time' => '> time', '< time' => '< time', 'between' => 'between', 'not between' => 'not between', 'between time' => 'between time', 'not between time' => 'not between time', 'notbetween time' => 'not between time', 'like' => 'like', 'near' => 'near'];
 
     /**
      * 架构函数
@@ -51,9 +54,6 @@ class Builder
      */
     protected function parseKey($key)
     {
-        if (0 === strpos($key, '__TABLE__.')) {
-            list($collection, $key) = explode('.', $key, 2);
-        }
         if ('id' == $key && $this->connection->getConfig('pk_convert_id')) {
             $key = '_id';
         }
@@ -69,12 +69,8 @@ class Builder
      */
     protected function parseValue($value, $field = '')
     {
-        if ('_id' == $field && 'ObjectID' == $this->connection->getConfig('pk_type') && is_string($value)) {
-            try {
-                return new ObjectID($value);
-            } catch (InvalidArgumentException $e) {
-                return new ObjectID();
-            }
+        if ('_id' == $field && !($value instanceof ObjectID)) {
+            return new ObjectID($value);
         }
         return $value;
     }
@@ -124,7 +120,7 @@ class Builder
         $result = [];
         foreach ($data as $key => $val) {
             $item = $this->parseKey($key);
-            if (is_array($val) && isset($val[0]) && is_string($val[0]) && 0 === strpos($val[0], '$')) {
+            if (is_array($val) && isset($val[0]) && in_array($val[0], ['$inc', '$set', '$unset', '$push', '$pushall', '$addtoset', '$pop', '$pull', '$pullall'])) {
                 $result[$val[0]][$item] = $this->parseValue($val[1], $key);
             } else {
                 $result['$set'][$item] = $this->parseValue($val, $key);
@@ -139,7 +135,7 @@ class Builder
      * @param mixed $where
      * @return array
      */
-    public function parseWhere($where, $options = [])
+    public function parseWhere($where)
     {
         if (empty($where)) {
             $where = [];
@@ -152,7 +148,7 @@ class Builder
                     // 使用闭包查询
                     $query = new Query($this->connection);
                     call_user_func_array($value, [ & $query]);
-                    $filter[$logic][] = $this->parseWhere($query->getOptions('where'), $options);
+                    $filter[$logic][] = $this->parseWhere($query->getOptions('where')[$logic]);
                 } else {
                     if (strpos($field, '|')) {
                         // 不同字段使用相同查询条件（OR）
@@ -174,14 +170,6 @@ class Builder
                 }
             }
         }
-
-        if (!empty($options['soft_delete'])) {
-            // 附加软删除条件
-            list($field, $condition) = $options['soft_delete'];
-
-            $filter['$and'][] = $this->parseWhereItem($field, $condition);
-        }
-
         return $filter;
     }
 
@@ -197,22 +185,14 @@ class Builder
 
         // 对一个字段使用多个查询条件
         if (is_array($exp)) {
-            $data = [];
-            foreach ($val as $value) {
-                $exp   = $value[0];
-                $value = $value[1];
-                if (!in_array($exp, $this->exp)) {
-                    $exp = strtolower($exp);
-                    if (isset($this->exp[$exp])) {
-                        $exp = $this->exp[$exp];
-                    }
-                }
-                $k        = '$' . $exp;
-                $data[$k] = $value;
+            foreach ($val as $item) {
+                $str[] = $this->parseWhereItem($key, $item);
             }
-            $query[$key] = $data;
-            return $query;
-        } elseif (!in_array($exp, $this->exp)) {
+            return $str;
+        }
+
+        // 检测操作符
+        if (!in_array($exp, $this->exp)) {
             $exp = strtolower($exp);
             if (isset($this->exp[$exp])) {
                 $exp = $this->exp[$exp];
@@ -229,11 +209,6 @@ class Builder
             // 比较运算
             $k           = '$' . $exp;
             $query[$key] = [$k => $this->parseValue($value, $key)];
-        } elseif ('null' == $exp) {
-            // NULL 查询
-            $query[$key] = null;
-        } elseif ('not null' == $exp) {
-            $query[$key] = ['$ne' => null];
         } elseif ('all' == $exp) {
             // 满足所有指定条件
             $query[$key] = ['$all', $this->parseValue($value, $key)];
@@ -281,9 +256,6 @@ class Builder
         } elseif ('near' == $exp) {
             // 经纬度查询
             $query[$key] = ['$near' => $this->parseValue($value, $key)];
-        } elseif ('size' == $exp) {
-            // 元素长度查询
-            $query[$key] = ['$size' => intval($value)];
         } else {
             // 普通查询
             $query[$key] = $this->parseValue($value, $key);
@@ -354,8 +326,6 @@ class Builder
     public function insertAll($dataSet, $options = [])
     {
         $bulk = new BulkWrite;
-
-        $this->insertId = [];
         foreach ($dataSet as $data) {
             // 分析并处理数据
             $data = $this->parseData($data, $options);
@@ -377,7 +347,7 @@ class Builder
     public function update($data, $options = [])
     {
         $data  = $this->parseSet($data, $options);
-        $where = $this->parseWhere($options['where'], $options);
+        $where = $this->parseWhere($options['where']);
 
         if (1 == $options['limit']) {
             $updateOptions = ['multi' => false];
@@ -398,7 +368,7 @@ class Builder
      */
     public function delete($options)
     {
-        $where = $this->parseWhere($options['where'], $options);
+        $where = $this->parseWhere($options['where']);
         $bulk  = new BulkWrite;
         if (1 == $options['limit']) {
             $deleteOptions = ['limit' => 1];
@@ -418,7 +388,7 @@ class Builder
      */
     public function select($options)
     {
-        $where = $this->parseWhere($options['where'], $options);
+        $where = $this->parseWhere($options['where']);
         $query = new MongoQuery($where, $options);
         $this->log('find', $where, $options);
         return $query;
@@ -433,7 +403,7 @@ class Builder
     public function count($options)
     {
         $cmd['count'] = $options['table'];
-        $cmd['query'] = $this->parseWhere($options['where'], $options);
+        $cmd['query'] = $this->parseWhere($options['where']);
         foreach (['hint', 'limit', 'maxTimeMS', 'skip'] as $option) {
             if (isset($options[$option])) {
                 $cmd[$option] = $options[$option];
@@ -444,76 +414,6 @@ class Builder
         return $command;
     }
 
-    /**
-     * 聚合查询命令
-     * @access public
-     * @param array $options 参数
-     * @param array $extra   指令和字段
-     * @return Command
-     */
-    public function aggregate($options, $extra)
-    {
-        list($fun, $field) = $extra;
-        $pipeline          = [
-            ['$match' => (object) $this->parseWhere($options['where'], $options)],
-            ['$group' => ['_id' => null, 'aggregate' => ['$' . $fun => '$' . $field]]],
-        ];
-        $cmd = [
-            'aggregate'    => $options['table'],
-            'allowDiskUse' => true,
-            'pipeline'     => $pipeline,
-            'cursor'       => new \stdClass,
-        ];
-
-        foreach (['explain', 'collation', 'bypassDocumentValidation', 'readConcern'] as $option) {
-            if (isset($options[$option])) {
-                $cmd[$option] = $options[$option];
-            }
-        }
-        $command = new Command($cmd);
-        $this->log('aggregate', $cmd);
-        return $command;
-    }
-
-    /**
-     * 多聚合查询命令, 可以对多个字段进行 group by 操作
-     *
-     * @param array $options 参数
-     * @param array $extra 指令和字段
-     * @return Command
-     */
-    public function multiAggregate($options, $extra)
-    {
-        list($aggregate, $groupBy) = $extra;
-        $groups                    = ['_id' => []];
-        foreach ($groupBy as $field) {
-            $groups['_id'][$field] = '$' . $field;
-        }
-
-        foreach ($aggregate as $fun => $field) {
-            $groups[$field . '_' . $fun] = ['$' . $fun => '$' . $field];
-        }
-        $pipeline = [
-            ['$match' => (object) $this->parseWhere($options['where'], $options)],
-            ['$group' => $groups],
-        ];
-        $cmd = [
-            'aggregate'    => $options['table'],
-            'allowDiskUse' => true,
-            'pipeline'     => $pipeline,
-            'cursor'       => new \stdClass,
-        ];
-
-        foreach (['explain', 'collation', 'bypassDocumentValidation', 'readConcern'] as $option) {
-            if (isset($options[$option])) {
-                $cmd[$option] = $options[$option];
-            }
-        }
-        $command = new Command($cmd);
-        $this->log('group', $cmd);
-        return $command;
-    }
-
     /**
      * 生成distinct命令
      * @access public
@@ -529,7 +429,7 @@ class Builder
         ];
 
         if (!empty($options['where'])) {
-            $cmd['query'] = $this->parseWhere($options['where'], $options);
+            $cmd['query'] = $this->parseWhere($options['where']);
         }
 
         if (isset($options['maxTimeMS'])) {
diff --git a/vendor/topthink/think-mongo/src/Connection.php b/vendor/topthink/think-mongo/src/Connection.php
index 351e18c75..fb219a880 100644
--- a/vendor/topthink/think-mongo/src/Connection.php
+++ b/vendor/topthink/think-mongo/src/Connection.php
@@ -2,6 +2,8 @@
 // +----------------------------------------------------------------------
 // | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
+// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
@@ -9,9 +11,9 @@
 
 namespace think\mongo;
 
-use MongoDB\BSON\ObjectID;
 use MongoDB\Driver\BulkWrite;
 use MongoDB\Driver\Command;
+use MongoDB\Driver\Cursor;
 use MongoDB\Driver\Exception\AuthenticationException;
 use MongoDB\Driver\Exception\BulkWriteException;
 use MongoDB\Driver\Exception\ConnectionException;
@@ -21,10 +23,12 @@ use MongoDB\Driver\Manager;
 use MongoDB\Driver\Query as MongoQuery;
 use MongoDB\Driver\ReadPreference;
 use MongoDB\Driver\WriteConcern;
+use think\Collection;
 use think\Db;
 use think\Debug;
 use think\Exception;
 use think\Log;
+use think\mongo\Query as Query;
 
 /**
  * Mongo数据库驱动
@@ -34,6 +38,8 @@ class Connection
     protected $dbName = ''; // dbName
     /** @var string 当前SQL指令 */
     protected $queryStr = '';
+    // 查询数据集类型
+    protected $resultSetType = 'array';
     // 查询数据类型
     protected $typeMap = 'array';
     protected $mongo; // MongoDb Object
@@ -59,57 +65,51 @@ class Connection
     // 数据库连接参数配置
     protected $config = [
         // 数据库类型
-        'type'            => '',
+        'type'           => '',
         // 服务器地址
-        'hostname'        => '',
+        'hostname'       => '',
         // 数据库名
-        'database'        => '',
-        // 是否是复制集
-        'is_replica_set'  => false,
+        'database'       => '',
         // 用户名
-        'username'        => '',
+        'username'       => '',
         // 密码
-        'password'        => '',
+        'password'       => '',
         // 端口
-        'hostport'        => '',
+        'hostport'       => '',
         // 连接dsn
-        'dsn'             => '',
+        'dsn'            => '',
         // 数据库连接参数
-        'params'          => [],
+        'params'         => [],
         // 数据库编码默认采用utf8
-        'charset'         => 'utf8',
+        'charset'        => 'utf8',
         // 主键名
-        'pk'              => '_id',
-        // 主键类型
-        'pk_type'         => 'ObjectID',
+        'pk'             => '_id',
         // 数据库表前缀
-        'prefix'          => '',
+        'prefix'         => '',
         // 数据库调试模式
-        'debug'           => false,
+        'debug'          => false,
         // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器)
-        'deploy'          => 0,
+        'deploy'         => 0,
         // 数据库读写是否分离 主从式有效
-        'rw_separate'     => false,
+        'rw_separate'    => false,
         // 读写分离后 主服务器数量
-        'master_num'      => 1,
+        'master_num'     => 1,
         // 指定从服务器序号
-        'slave_no'        => '',
+        'slave_no'       => '',
         // 是否严格检查字段是否存在
-        'fields_strict'   => true,
+        'fields_strict'  => true,
         // 数据集返回类型
-        'resultset_type'  => 'array',
+        'resultset_type' => 'array',
         // 自动写入时间戳字段
-        'auto_timestamp'  => false,
-        // 时间字段取出后的默认时间格式
-        'datetime_format' => 'Y-m-d H:i:s',
+        'auto_timestamp' => false,
         // 是否需要进行SQL性能分析
-        'sql_explain'     => false,
+        'sql_explain'    => false,
         // 是否_id转换为id
-        'pk_convert_id'   => false,
+        'pk_convert_id'  => false,
         // typeMap
-        'type_map'        => ['root' => 'array', 'document' => 'array'],
+        'type_map'       => ['root' => 'array', 'document' => 'array'],
         // Query对象
-        'query'           => '\\think\\mongo\\Query',
+        'query'          => '\\think\\mongo\\Query',
     ];
 
     /**
@@ -145,11 +145,14 @@ class Connection
             }
             $this->dbName  = $config['database'];
             $this->typeMap = $config['type_map'];
-
+            // 记录数据集返回类型
+            if (isset($config['resultset_type'])) {
+                $this->resultSetType = $config['resultset_type'];
+            }
             if ($config['pk_convert_id'] && '_id' == $config['pk']) {
                 $this->config['pk'] = 'id';
             }
-            $host = 'mongodb://' . ($config['username'] ? "{$config['username']}" : '') . ($config['password'] ? ":{$config['password']}@" : '') . $config['hostname'] . ($config['hostport'] ? ":{$config['hostport']}" : '');
+            $host = 'mongodb://' . ($config['username'] ? "{$config['username']}" : '') . ($config['password'] ? ":{$config['password']}@" : '') . $config['hostname'] . ($config['hostport'] ? ":{$config['hostport']}" : '') . '/' . ($config['database'] ? "{$config['database']}" : '');
             if ($config['debug']) {
                 $startTime = microtime(true);
             }
@@ -162,18 +165,6 @@ class Connection
         return $this->links[$linkNum];
     }
 
-    /**
-     * 指定当前使用的查询对象
-     * @access public
-     * @param Query $query 查询对象
-     * @return $this
-     */
-    public function setQuery($query, $model = 'db')
-    {
-        $this->query[$model] = $query;
-        return $this;
-    }
-
     /**
      * 创建指定模型的查询对象
      * @access public
@@ -181,11 +172,11 @@ class Connection
      * @param string $queryClass 查询对象类名
      * @return Query
      */
-    public function getQuery($model = 'db', $queryClass = '')
+    public function model($model, $queryClass = '')
     {
         if (!isset($this->query[$model])) {
             $class               = $queryClass ?: $this->config['query'];
-            $this->query[$model] = new $class($this, 'db' == $model ? '' : $model);
+            $this->query[$model] = new $class($this, $model);
         }
         return $this->query[$model];
     }
@@ -199,7 +190,11 @@ class Connection
      */
     public function __call($method, $args)
     {
-        return call_user_func_array([$this->getQuery(), $method], $args);
+        if (!isset($this->query['database'])) {
+            $class                   = $this->config['query'];
+            $this->query['database'] = new $class($this);
+        }
+        return call_user_func_array([$this->query['database'], $method], $args);
     }
 
     /**
@@ -233,7 +228,7 @@ class Connection
     public function getMongo()
     {
         if (!$this->mongo) {
-            return;
+            return null;
         } else {
             return $this->mongo;
         }
@@ -300,7 +295,7 @@ class Connection
      * @throws ConnectionException
      * @throws RuntimeException
      */
-    public function command(Command $command, $dbName = '', ReadPreference $readPreference = null, $class = false, $typeMap = null)
+    public function command(Command $command, $dbName = '', ReadPreference $readPreference = null, $class = false, $typeMap)
     {
         $this->initConnect(false);
         Db::$queryTimes++;
@@ -308,7 +303,7 @@ class Connection
         $this->debug(true);
         $dbName = $dbName ?: $this->dbName;
         if ($this->config['debug'] && !empty($this->queryStr)) {
-            $this->queryStr = 'db.' . $this->queryStr;
+            $this->queryStr = 'db.' . $dbName . '.' . $this->queryStr;
         }
         $this->cursor = $this->mongo->executeCommand($dbName, $command, $readPreference);
         $this->debug(false);
@@ -344,7 +339,13 @@ class Connection
             }
         }
         $this->numRows = count($result);
-
+        if (!empty($class)) {
+            // 返回指定数据集对象类
+            $result = new $class($result);
+        } elseif ('collection' == $this->resultSetType) {
+            // 返回数据集Collection对象
+            $result = new Collection($result);
+        }
         return $result;
     }
 
@@ -415,9 +416,6 @@ class Connection
             });
         }
         switch (strtolower($type)) {
-            case 'aggregate':
-                $this->queryStr = 'runCommand(' . ($data ? json_encode($data) : '') . ');';
-                break;
             case 'find':
                 $this->queryStr = $type . '(' . ($data ? json_encode($data) : '') . ')';
                 if (isset($options['sort'])) {
@@ -524,11 +522,10 @@ class Connection
      */
     public function close()
     {
-        $this->mongo     = null;
-        $this->cursor    = null;
-        $this->linkRead  = null;
-        $this->linkWrite = null;
-        $this->links     = [];
+        if ($this->mongo) {
+            $this->mongo  = null;
+            $this->cursor = null;
+        }
     }
 
     /**
@@ -579,11 +576,7 @@ class Connection
             // 主从式采用读写分离
             if ($master) // 主服务器写入
             {
-                if ($this->config['is_replica_set']) {
-                    return $this->replicaSetConnect();
-                } else {
-                    $r = $m;
-                }
+                $r = $m;
             } elseif (is_numeric($this->config['slave_no'])) {
                 // 指定服务器读
                 $r = $this->config['slave_no'];
@@ -602,69 +595,6 @@ class Connection
         return $this->connect($dbConfig, $r);
     }
 
-    /**
-     * 创建基于复制集的连接
-     * @return Manager
-     */
-    public function replicaSetConnect()
-    {
-        $this->dbName  = $this->config['database'];
-        $this->typeMap = $this->config['type_map'];
-        if ($this->config['debug']) {
-            $startTime = microtime(true);
-        }
-        $this->config['params']['replicaSet'] = $this->config['database'];
-        $manager                              = new Manager($this->buildUrl(), $this->config['params']);
-        if ($this->config['debug']) {
-            // 记录数据库连接信息
-            Log::record('[ DB ] CONNECT:[ UseTime:' . number_format(microtime(true) - $startTime, 6) . 's ] ' . $this->config['dsn'], 'sql');
-        }
-        return $manager;
-    }
-
-    /**
-     * 根据配置信息 生成适用于链接复制集的 URL
-     * @return string
-     */
-    private function buildUrl()
-    {
-        $url      = 'mongodb://' . ($this->config['username'] ? "{$this->config['username']}" : '') . ($this->config['password'] ? ":{$this->config['password']}@" : '');
-        $hostList = explode(',', $this->config['hostname']);
-        $portList = explode(',', $this->config['hostport']);
-        for ($i = 0; $i < count($hostList); $i++) {
-            $url = $url . $hostList[$i] . ':' . $portList[0] . ',';
-        }
-        return rtrim($url, ",") . '/';
-    }
-
-    /**
-     * 启动事务
-     * @access public
-     * @return void
-     * @throws \PDOException
-     * @throws \Exception
-     */
-    public function startTrans()
-    {}
-
-    /**
-     * 用于非自动提交状态下面的查询提交
-     * @access public
-     * @return void
-     * @throws PDOException
-     */
-    public function commit()
-    {}
-
-    /**
-     * 事务回滚
-     * @access public
-     * @return void
-     * @throws PDOException
-     */
-    public function rollback()
-    {}
-
     /**
      * 析构方法
      * @access public
diff --git a/vendor/topthink/think-mongo/src/Query.php b/vendor/topthink/think-mongo/src/Query.php
index b99e46e5c..f5163a547 100644
--- a/vendor/topthink/think-mongo/src/Query.php
+++ b/vendor/topthink/think-mongo/src/Query.php
@@ -2,6 +2,8 @@
 // +----------------------------------------------------------------------
 // | ThinkPHP [ WE CAN DO IT JUST THINK ]
 // +----------------------------------------------------------------------
+// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
+// +----------------------------------------------------------------------
 // | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
@@ -31,14 +33,16 @@ use think\Exception;
 use think\exception\DbException;
 use think\Loader;
 use think\Model;
+use think\mongo\Builder;
+use think\mongo\Connection;
 use think\Paginator;
 
 class Query
 {
     // 数据库Connection对象实例
     protected $connection;
-    // 数据库Builder对象实例
-    protected $builder;
+    // 数据库驱动类型
+    protected $driver;
     // 当前模型类名称
     protected $model;
     // 当前数据表名称（含前缀）
@@ -53,8 +57,6 @@ class Query
     protected $options = [];
     // 数据表信息
     protected static $info = [];
-    // 回调事件
-    private static $event = [];
 
     /**
      * 架构函数
@@ -67,8 +69,7 @@ class Query
         $this->connection = $connection ?: Db::connect([], true);
         $this->prefix     = $this->connection->getConfig('prefix');
         $this->model      = $model;
-        // 设置当前连接的Builder对象
-        $this->setBuilder();
+        $this->builder    = new Builder($this->connection, $this);
     }
 
     /**
@@ -116,20 +117,9 @@ class Query
     public function connect($config)
     {
         $this->connection = Db::connect($config);
-        $this->setBuilder();
         return $this;
     }
 
-    /**
-     * 设置当前的数据库Builder对象
-     * @access protected
-     * @return void
-     */
-    protected function setBuilder()
-    {
-        $this->builder = new Builder($this->connection, $this);
-    }
-
     /**
      * 指定默认的数据表名（不含前缀）
      * @access public
@@ -186,38 +176,6 @@ class Query
         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][$field])) {
-            unset($this->options['where'][$logic][$field]);
-        }
-        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;
-    }
-
     /**
      * 将SQL语句中的__TABLE_NAME__字符串替换成带前缀的表名（小写）
      * @access public
@@ -356,7 +314,7 @@ class Query
             $result    = $data[$field];
             if (isset($cache)) {
                 // 缓存数据
-                $this->cacheData($key, $result, $cache);
+                Cache::set($key, $result, $cache['expire']);
             }
         } else {
             // 清空查询条件
@@ -385,8 +343,8 @@ class Query
             $result = Cache::get($guid);
         }
         if (!$result) {
-            if (isset($this->options['projection'])) {
-                unset($this->options['projection']);
+            if (isset($this->options['field'])) {
+                unset($this->options['field']);
             }
             if ($key && '*' != $field) {
                 $field = $key . ',' . $field;
@@ -419,7 +377,7 @@ class Query
 
             if (isset($cache) && isset($guid)) {
                 // 缓存数据
-                $this->cacheData($guid, $result, $cache);
+                Cache::set($guid, $result, $cache['expire']);
             }
         } else {
             // 清空查询条件
@@ -491,85 +449,6 @@ class Query
         return $result[0]['n'];
     }
 
-    /**
-     * 多聚合操作
-     *
-     * @param array $aggregate 聚合指令, 可以聚合多个参数, 如 ['sum' => 'field1', 'avg' => 'field2']
-     * @param array $groupBy 类似mysql里面的group字段, 可以传入多个字段, 如 ['field_a', 'field_b', 'field_c']
-     * @return array 查询结果
-     */
-    public function multiAggregate($aggregate, $groupBy)
-    {
-        $result = $this->cmd('multiAggregate', [$aggregate, $groupBy]);
-        $result = isset($result[0]['result']) ? $result[0]['result'] : [];
-        foreach ($result as &$row) {
-            if (isset($row['_id']) && !empty($row['_id'])) {
-                foreach ($row['_id'] as $k => $v) {
-                    $row[$k] = $v;
-                }
-                unset($row['_id']);
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * 聚合查询
-     * @access public
-     * @param string $aggregate 聚合指令
-     * @param string $field     字段名
-     * @return mixed
-     */
-    public function aggregate($aggregate, $field)
-    {
-        $result = $this->cmd('aggregate', [$aggregate, $field]);
-        return isset($result[0]['aggregate']) ? $result[0]['aggregate'] : 0;
-    }
-
-    /**
-     * MAX查询
-     * @access public
-     * @param string $field   字段名
-     * @return float
-     */
-    public function max($field)
-    {
-        return $this->aggregate('max', $field);
-    }
-
-    /**
-     * MIN查询
-     * @access public
-     * @param string $field   字段名
-     * @return mixed
-     */
-    public function min($field)
-    {
-        return $this->aggregate('min', $field);
-    }
-
-    /**
-     * SUM查询
-     * @access public
-     * @param string $field   字段名
-     * @return float
-     */
-    public function sum($field)
-    {
-        return $this->aggregate('sum', $field);
-    }
-
-    /**
-     * AVG查询
-     * @access public
-     * @param string $field   字段名
-     * @return float
-     */
-    public function avg($field)
-    {
-        return $this->aggregate('avg', $field);
-    }
-
     /**
      * 设置记录的某个字段值
      * 支持使用数据库字段和方法
@@ -674,55 +553,6 @@ class Query
         }
     }
 
-    /**
-     * 设置数据
-     * @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)
-    {
-        $fields = is_string($field) ? explode(',', $field) : $field;
-        foreach ($fields as $field) {
-            $this->data($field, ['$inc', $step]);
-        }
-        return $this;
-    }
-
-    /**
-     * 字段值减少
-     * @access public
-     * @param string|array $field 字段名
-     * @param integer      $step  减少值
-     * @return $this
-     */
-    public function dec($field, $step = 1)
-    {
-        $fields = is_string($field) ? explode(',', $field) : $field;
-        foreach ($fields as $field) {
-            $this->data($field, ['$inc', -1 * $step]);
-        }
-        return $this;
-    }
-
     /**
      * 指定AND查询条件
      * @access public
@@ -735,7 +565,7 @@ class Query
     {
         $param = func_get_args();
         array_shift($param);
-        $this->parseWhereExp('and', $field, $op, $condition, $param);
+        $this->parseWhereExp('$and', $field, $op, $condition, $param);
         return $this;
     }
 
@@ -751,7 +581,7 @@ class Query
     {
         $param = func_get_args();
         array_shift($param);
-        $this->parseWhereExp('or', $field, $op, $condition, $param);
+        $this->parseWhereExp('$or', $field, $op, $condition, $param);
         return $this;
     }
 
@@ -767,117 +597,7 @@ class Query
     {
         $param = func_get_args();
         array_shift($param);
-        $this->parseWhereExp('nor', $field, $op, $condition, $param);
-        return $this;
-    }
-
-    /**
-     * 指定Null查询条件
-     * @access public
-     * @param mixed  $field 查询字段
-     * @param string $logic 查询逻辑 and or xor
-     * @return $this
-     */
-    public function whereNull($field, $logic = 'and')
-    {
-        $this->parseWhereExp($logic, $field, 'null', null);
-        return $this;
-    }
-
-    /**
-     * 指定NotNull查询条件
-     * @access public
-     * @param mixed  $field 查询字段
-     * @param string $logic 查询逻辑 and or xor
-     * @return $this
-     */
-    public function whereNotNull($field, $logic = 'and')
-    {
-        $this->parseWhereExp($logic, $field, 'notnull', null);
-        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')
-    {
-        $this->parseWhereExp($logic, $field, 'in', $condition);
-        return $this;
-    }
-
-    /**
-     * 指定NotIn查询条件
-     * @access public
-     * @param mixed  $field     查询字段
-     * @param mixed  $condition 查询条件
-     * @param string $logic     查询逻辑 and or xor
-     * @return $this
-     */
-    public function whereNotIn($field, $condition, $logic = 'and')
-    {
-        $this->parseWhereExp($logic, $field, 'not in', $condition);
-        return $this;
-    }
-
-    /**
-     * 指定Like查询条件
-     * @access public
-     * @param mixed  $field     查询字段
-     * @param mixed  $condition 查询条件
-     * @param string $logic     查询逻辑 and or xor
-     * @return $this
-     */
-    public function whereLike($field, $condition, $logic = 'and')
-    {
-        $this->parseWhereExp($logic, $field, 'like', $condition);
-        return $this;
-    }
-
-    /**
-     * 指定Between查询条件
-     * @access public
-     * @param mixed  $field     查询字段
-     * @param mixed  $condition 查询条件
-     * @param string $logic     查询逻辑 and or xor
-     * @return $this
-     */
-    public function whereBetween($field, $condition, $logic = 'and')
-    {
-        $this->parseWhereExp($logic, $field, 'between', $condition);
-        return $this;
-    }
-
-    /**
-     * 指定NotBetween查询条件
-     * @access public
-     * @param mixed  $field     查询字段
-     * @param mixed  $condition 查询条件
-     * @param string $logic     查询逻辑 and or xor
-     * @return $this
-     */
-    public function whereNotBetween($field, $condition, $logic = 'and')
-    {
-        $this->parseWhereExp($logic, $field, 'not between', $condition);
-        return $this;
-    }
-
-    /**
-     * 指定Exp查询条件
-     * @access public
-     * @param mixed  $field     查询字段
-     * @param mixed  $condition 查询条件
-     * @param string $logic     查询逻辑 and or xor
-     * @return $this
-     */
-    public function whereExp($field, $condition, $logic = 'and')
-    {
-        $this->parseWhereExp($logic, $field, 'exp', $condition);
+        $this->parseWhereExp('$nor', $field, $op, $condition, $param);
         return $this;
     }
 
@@ -893,7 +613,6 @@ class Query
      */
     protected function parseWhereExp($logic, $field, $op, $condition, $param = [])
     {
-        $logic = '$' . strtolower($logic);
         if ($field instanceof \Closure) {
             $this->options['where'][$logic][] = is_string($op) ? [$op, $field] : $field;
             return;
@@ -911,9 +630,6 @@ class Query
             }
         } elseif (is_array($op)) {
             $where[$field] = $param;
-        } elseif (in_array(strtolower($op), ['null', 'notnull', 'not null'])) {
-            // null查询
-            $where[$field] = [$op, ''];
         } elseif (is_null($condition)) {
             // 字段相等查询
             $where[$field] = ['=', $op];
@@ -945,7 +661,7 @@ class Query
             switch (strtolower($op)) {
                 case 'today':
                 case 'd':
-                    $range = ['today', 'tomorrow'];
+                    $range = 'today';
                     break;
                 case 'week':
                 case 'w':
@@ -971,8 +687,6 @@ class Query
                 case 'last year':
                     $range = [mktime(0, 0, 0, 1, 1, $date['year'] - 1), mktime(0, 0, 0, 1, 1, $date['year'])];
                     break;
-                default:
-                    $range = $op;
             }
             $op = is_array($range) ? 'between' : '>';
         }
@@ -993,7 +707,7 @@ class Query
      *                      list_rows:每页数量
      *                      type:分页类名,
      *                      namespace:分页类命名空间
-     * @return \think\Paginator
+     * @return \think\paginator\Collection
      * @throws DbException
      */
     public function paginate($listRows = null, $simple = false, $config = [])
@@ -1034,26 +748,14 @@ class Query
         return $this;
     }
 
-    /**
-     * 指定当前操作的collection
-     * @access public
-     * @param string $collection
-     * @return $this
-     */
-    public function collection($collection)
-    {
-        return $this->table($collection);
-    }
-
     /**
      * 查询缓存
      * @access public
-     * @param mixed   $key    缓存key
-     * @param integer $expire 缓存有效期
-     * @param string  $tag    缓存标签
+     * @param mixed     $key
+     * @param integer   $expire
      * @return $this
      */
-    public function cache($key = true, $expire = null, $tag = null)
+    public function cache($key = true, $expire = null)
     {
         // 增加快捷调用方式 cache(10) 等同于 cache(true, 10)
         if (is_numeric($key) && is_null($expire)) {
@@ -1061,22 +763,11 @@ class Query
             $key    = true;
         }
         if (false !== $key) {
-            $this->options['cache'] = ['key' => $key, 'expire' => $expire, 'tag' => $tag];
+            $this->options['cache'] = ['key' => $key, 'expire' => $expire];
         }
         return $this;
     }
 
-    /**
-     * 设置软删除字段及条件（暂无支持）
-     * @access public
-     * @param false|string  $field     查询字段
-     * @param mixed         $condition 查询条件
-     * @return $this
-     */
-    public function useSoftDelete($field, $condition = null)
-    {
-    }
-
     /**
      * 不主动获取数据集
      * @access public
@@ -1085,7 +776,19 @@ class Query
      */
     public function fetchCursor($cursor = true)
     {
-        $this->options['fetch_cursor'] = $cursor;
+        $this->options['fetch_class'] = $cursor;
+        return $this;
+    }
+
+    /**
+     * 指定数据集返回对象
+     * @access public
+     * @param string $class 指定返回的数据集对象类名
+     * @return $this
+     */
+    public function fetchClass($class)
+    {
+        $this->options['fetch_class'] = $class;
         return $this;
     }
 
@@ -1125,7 +828,7 @@ class Query
     }
 
     /**
-     * awaitData
+     * 设置查询数据不存在是否抛出异常
      * @access public
      * @param bool $awaitData
      * @return $this
@@ -1232,18 +935,6 @@ class Query
         return $this;
     }
 
-    /**
-     * collation
-     * @access public
-     * @param array $collation
-     * @return $this
-     */
-    public function collation($collation)
-    {
-        $this->options['collation'] = $collation;
-        return $this;
-    }
-
     /**
      * 设置返回字段
      * @access public
@@ -1300,19 +991,6 @@ class Query
      */
     public function with($with)
     {
-        $this->options['with'] = $with;
-        return $this;
-    }
-
-    /**
-     * 关联统计
-     * @access public
-     * @param string|array $relation 关联方法名
-     * @return $this
-     */
-    public function withCount($relation)
-    {
-        $this->options['with_count'] = $relation;
         return $this;
     }
 
@@ -1475,9 +1153,7 @@ class Query
     /**
      * 插入记录
      * @access public
-     * @param mixed     $data 数据
-     * @param boolean   $replace      是否replace（目前无效）
-     * @param boolean   $getLastInsID 返回自增主键
+     * @param mixed $data 数据
      * @return WriteResult
      * @throws AuthenticationException
      * @throws InvalidArgumentException
@@ -1485,33 +1161,18 @@ class Query
      * @throws RuntimeException
      * @throws BulkWriteException
      */
-    public function insert(array $data, $replace = null, $getLastInsID = false)
+    public function insert(array $data)
     {
         if (empty($data)) {
             throw new Exception('miss data to insert');
         }
         // 分析查询表达式
         $options = $this->parseExpress();
-        $data    = array_merge($options['data'], $data);
         // 生成bulk对象
         $bulk         = $this->builder->insert($data, $options);
         $writeConcern = isset($options['writeConcern']) ? $options['writeConcern'] : null;
         $writeResult  = $this->execute($options['table'], $bulk, $writeConcern);
-        $result       = $writeResult->getInsertedCount();
-        if ($result) {
-            $lastInsId = $this->getLastInsID();
-            if ($lastInsId) {
-                $pk        = $this->getPk();
-                $data[$pk] = $lastInsId;
-            }
-            $options['data'] = $data;
-            $this->trigger('after_insert', $options);
-
-            if ($getLastInsID) {
-                return $lastInsId;
-            }
-        }
-        return $result;
+        return $writeResult->getInsertedCount();
     }
 
     /**
@@ -1527,7 +1188,8 @@ class Query
      */
     public function insertGetId(array $data)
     {
-        return $this->insert($data, null, true);
+        $this->insert($data);
+        return $this->getLastInsID();
     }
 
     /**
@@ -1571,12 +1233,8 @@ class Query
     public function update(array $data)
     {
         $options = $this->parseExpress();
-        $data    = array_merge($options['data'], $data);
-        if (isset($options['cache']) && is_string($options['cache']['key'])) {
-            $key = $options['cache']['key'];
-        }
-        $pk = $this->getPk();
         if (empty($options['where'])) {
+            $pk = $this->getPk();
             // 如果存在主键数据 则自动作为更新条件
             if (is_string($pk) && isset($data[$pk])) {
                 $where[$pk] = $data[$pk];
@@ -1600,8 +1258,6 @@ class Query
             } else {
                 $options['where']['$and'] = $where;
             }
-        } elseif (!isset($key) && is_string($pk) && isset($options['where']['$and'][$pk])) {
-            $key = $this->getCacheKey($options['where']['$and'][$pk], $options);
         }
 
         // 生成bulkWrite对象
@@ -1613,18 +1269,7 @@ class Query
             // 删除缓存
             Cache::rm($key);
         }
-        $result = $writeResult->getModifiedCount();
-        if ($result) {
-            if (isset($where[$pk])) {
-                $data[$pk] = $where[$pk];
-            } elseif (is_string($pk) && isset($key) && strpos($key, '|')) {
-                list($a, $val) = explode('|', $key);
-                $data[$pk]     = $val;
-            }
-            $options['data'] = $data;
-            $this->trigger('after_update', $options);
-        }
-        return $result;
+        return $writeResult->getModifiedCount();
     }
 
     /**
@@ -1643,7 +1288,7 @@ class Query
     {
         // 分析查询表达式
         $options = $this->parseExpress();
-        $pk      = $this->getPk();
+
         if (!is_null($data) && true !== $data) {
             if (!is_array($data)) {
                 // 缓存标识
@@ -1651,8 +1296,6 @@ class Query
             }
             // AR模式分析主键条件
             $this->parsePkWhere($data, $options);
-        } elseif (!isset($key) && is_string($pk) && isset($options['where']['$and'][$pk])) {
-            $key = $this->getCacheKey($options['where']['$and'][$pk], $options);
         }
 
         if (true !== $data && empty($options['where'])) {
@@ -1670,33 +1313,7 @@ class Query
             // 删除缓存
             Cache::rm($key);
         }
-        $result = $writeResult->getDeletedCount();
-        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;
-            $this->trigger('after_delete', $options);
-        }
-        return $result;
-    }
-
-    /**
-     * 执行查询但只返回Cursor对象
-     * @access public
-     * @return Cursor
-     */
-    public function getCursor()
-    {
-        // 分析查询表达式
-        $options = $this->parseExpress();
-        // 生成MongoQuery对象
-        $query = $this->builder->select($options);
-        // 执行查询操作
-        $readPreference = isset($options['readPreference']) ? $options['readPreference'] : null;
-        return $this->query($options['table'], $query, $readPreference, true, $options['typeMap']);
+        return $writeResult->getDeletedCount();
     }
 
     /**
@@ -1737,103 +1354,53 @@ class Query
         if (!$resultSet) {
             // 生成MongoQuery对象
             $query = $this->builder->select($options);
+            // 执行查询操作
+            $readPreference = isset($options['readPreference']) ? $options['readPreference'] : null;
+            $resultSet      = $this->query($options['table'], $query, $readPreference, $options['fetch_class'], $options['typeMap']);
 
-            $options['data'] = $data;
-            if ($resultSet = $this->trigger('before_select', $options)) {
-            } else {
-                // 执行查询操作
-                $readPreference = isset($options['readPreference']) ? $options['readPreference'] : null;
-                $resultSet      = $this->query($options['table'], $query, $readPreference, $options['fetch_cursor'], $options['typeMap']);
-
-                if ($resultSet instanceof Cursor) {
-                    // 返回MongoDB\Driver\Cursor对象
-                    return $resultSet;
-                }
+            if ($resultSet instanceof Cursor) {
+                // 返回MongoDB\Driver\Cursor对象
+                return $resultSet;
             }
+
             if (isset($cache)) {
                 // 缓存数据集
-                $this->cacheData($key, $resultSet, $cache);
+                Cache::set($key, $resultSet, $cache['expire']);
             }
         }
 
-        // 数据列表读取后的处理
-        if (!empty($this->model)) {
-            // 生成模型对象
-            $modelName = $this->model;
-            if (count($resultSet) > 0) {
+        // 返回结果处理
+        if ($resultSet) {
+            // 数据列表读取后的处理
+            if (!empty($this->model)) {
+                // 生成模型对象
+                $model = $this->model;
                 foreach ($resultSet as $key => $result) {
                     /** @var Model $result */
-                    $model = new $modelName($result);
-                    $model->isUpdate(true);
-
+                    $result = new $model($result);
+                    $result->isUpdate(true);
                     // 关联查询
                     if (!empty($options['relation'])) {
-                        $model->relationQuery($options['relation']);
+                        $result->relationQuery($options['relation']);
                     }
-                    // 关联统计
-                    if (!empty($options['with_count'])) {
-                        $model->relationCount($model, $options['with_count']);
-                    }
-                    $resultSet[$key] = $model;
+                    $resultSet[$key] = $result;
                 }
                 if (!empty($options['with'])) {
                     // 预载入
-                    $model->eagerlyResultSet($resultSet, $options['with']);
+                    $resultSet = $result->eagerlyResultSet($resultSet, $options['with'], is_object($resultSet) ? get_class($resultSet) : '');
                 }
-                // 模型数据集转换
-                $resultSet = $model->toCollection($resultSet);
-            } else {
-                $resultSet = (new $modelName)->toCollection($resultSet);
             }
-        } elseif ('collection' == $this->connection->getConfig('resultset_type')) {
-            // 返回Collection对象
-            $resultSet = new Collection($resultSet);
-        }
-        if (!empty($options['fail']) && count($resultSet) == 0) {
+        } elseif (!empty($options['fail'])) {
             $this->throwNotFound($options);
         }
         return $resultSet;
     }
 
-    /**
-     * 缓存数据
-     * @access public
-     * @param string    $key    缓存标识
-     * @param mixed     $data   缓存数据
-     * @param array     $config 缓存参数
-     */
-    protected function cacheData($key, $data, $config = [])
-    {
-        if (isset($config['tag'])) {
-            Cache::tag($config['tag'])->set($key, $data, $config['expire']);
-        } else {
-            Cache::set($key, $data, $config['expire']);
-        }
-    }
-
-    /**
-     * 生成缓存标识
-     * @access public
-     * @param mixed     $value   缓存数据
-     * @param array     $options 缓存参数
-     */
-    protected function getCacheKey($value, $options)
-    {
-        if (is_scalar($value)) {
-            $data = $value;
-        } elseif (is_array($value) && '=' == $value[0]) {
-            $data = $value[1];
-        }
-        if (isset($data)) {
-            return 'mongo:' . $options['table'] . '|' . $data;
-        }
-    }
-
     /**
      * 查找单条记录
      * @access public
      * @param array|string|Query|\Closure $data
-     * @return array|null|Cursor|string|Model
+     * @return array|false|Cursor|string|Model
      * @throws ModelNotFoundException
      * @throws DataNotFoundException
      * @throws AuthenticationException
@@ -1851,12 +1418,10 @@ class Query
         }
         // 分析查询表达式
         $options = $this->parseExpress();
-        $pk      = $this->getPk();
+
         if (!is_null($data)) {
             // AR模式分析主键条件
             $this->parsePkWhere($data, $options);
-        } elseif (!empty($options['cache']) && true === $options['cache']['key'] && is_string($pk) && isset($options['where']['$and'][$pk])) {
-            $key = $this->getCacheKey($options['where']['$and'][$pk], $options);
         }
 
         $options['limit'] = 1;
@@ -1866,69 +1431,52 @@ class Query
             $cache = $options['cache'];
             if (true === $cache['key'] && !is_null($data) && !is_array($data)) {
                 $key = 'mongo:' . $options['table'] . '|' . $data;
-            } elseif (!isset($key)) {
+            } else {
                 $key = is_string($cache['key']) ? $cache['key'] : md5(serialize($options));
             }
             $result = Cache::get($key);
         }
-        if (false === $result) {
+        if (!$result) {
             // 生成查询SQL
             $query = $this->builder->select($options);
-            if (is_string($pk)) {
-                if (!is_array($data)) {
-                    if (isset($key) && strpos($key, '|')) {
-                        list($a, $val) = explode('|', $key);
-                        $item[$pk]     = $val;
-                    } else {
-                        $item[$pk] = $data;
-                    }
-                    $data = $item;
-                }
-            }
-            $options['data'] = $data;
-            // 事件回调
-            if ($result = $this->trigger('before_find', $options)) {
-            } else {
-                // 执行查询
-                $readPreference = isset($options['readPreference']) ? $options['readPreference'] : null;
-                $resultSet      = $this->query($options['table'], $query, $readPreference, $options['fetch_cursor'], $options['typeMap']);
+            // 执行查询
+            $readPreference = isset($options['readPreference']) ? $options['readPreference'] : null;
+            $result         = $this->query($options['table'], $query, $readPreference, $options['fetch_class'], $options['typeMap']);
 
-                if ($resultSet instanceof Cursor) {
-                    // 返回MongoDB\Driver\Cursor对象
-                    return $resultSet;
-                }
-                $result = isset($resultSet[0]) ? $resultSet[0] : null;
+            if ($result instanceof Cursor) {
+                // 返回MongoDB\Driver\Cursor对象
+                return $result;
             }
+
             if (isset($cache)) {
                 // 缓存数据
-                $this->cacheData($key, $result, $cache);
+                Cache::set($key, $result, $cache['expire']);
             }
         }
 
         // 数据处理
-        if (!empty($result)) {
+        if (!empty($result[0])) {
+            $data = $result[0];
             if (!empty($this->model)) {
                 // 返回模型对象
-                $model  = $this->model;
-                $result = new $model($result);
-                $result->isUpdate(true, isset($options['where']['$and']) ? $options['where']['$and'] : null);
+                $model = $this->model;
+                $data  = new $model($data);
+                $data->isUpdate(true, isset($options['where']['$and']) ? $options['where']['$and'] : null);
                 // 关联查询
                 if (!empty($options['relation'])) {
-                    $result->relationQuery($options['relation']);
+                    $data->relationQuery($options['relation']);
                 }
                 if (!empty($options['with'])) {
                     // 预载入
-                    $result->eagerlyResult($result, $options['with']);
-                }
-                // 关联统计
-                if (!empty($options['with_count'])) {
-                    $result->relationCount($result, $options['with_count']);
+                    $data->eagerlyResult($data, $options['with'], is_object($result) ? get_class($result) : '');
                 }
             }
         } elseif (!empty($options['fail'])) {
             $this->throwNotFound($options);
+        } else {
+            $data = null;
         }
-        return $result;
+        return $data;
     }
 
     /**
@@ -2036,11 +1584,6 @@ class Query
         $guid = md5($tableName);
         if (!isset(self::$info[$guid])) {
             $result = $this->table($tableName)->find();
-            if ($result instanceof Model) {
-                $result = $result->toArray();
-            } elseif (!$result) {
-                $result = [];
-            }
             $fields = array_keys($result);
             $type   = [];
             foreach ($result as $key => $val) {
@@ -2074,10 +1617,8 @@ class Query
             $options['table'] = $this->getTable();
         }
 
-        foreach (['where', 'data'] as $name) {
-            if (!isset($options[$name])) {
-                $options[$name] = [];
-            }
+        if (!isset($options['where'])) {
+            $options['where'] = [];
         }
 
         $modifiers = empty($options['modifiers']) ? [] : $options['modifiers'];
@@ -2105,7 +1646,7 @@ class Query
             $options['limit'] = 0;
         }
 
-        foreach (['master', 'fetch_cursor'] as $name) {
+        foreach (['master', 'fetch_class'] as $name) {
             if (!isset($options[$name])) {
                 $options[$name] = false;
             }
@@ -2125,33 +1666,4 @@ class Query
         return $options;
     }
 
-    /**
-     * 注册回调方法
-     * @access public
-     * @param string   $event    事件名
-     * @param callable $callback 回调方法
-     * @return void
-     */
-    public static function event($event, $callback)
-    {
-        self::$event[$event] = $callback;
-    }
-
-    /**
-     * 触发事件
-     * @access protected
-     * @param string $event   事件名
-     * @param mixed  $params  额外参数
-     * @return bool
-     */
-    protected function trigger($event, $params = [])
-    {
-        $result = false;
-        if (isset(self::$event[$event])) {
-            $callback = self::$event[$event];
-            $result   = call_user_func_array($callback, [$params, $this]);
-        }
-        return $result;
-    }
-
 }