From f3aa05f8081571bfb733a7347085f088b0d81acb Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 30 Apr 2017 21:45:09 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E6=94=B9=E8=BF=9BRequest=E7=B1=BBfilterV?=
 =?UTF-8?q?alue=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Request.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/Request.php b/library/think/Request.php
index 1eb7f297..803a5240 100644
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -1060,7 +1060,7 @@ class Request
                 // 调用函数或者方法过滤
                 $value = call_user_func($filter, $value);
             } elseif (is_scalar($value)) {
-                if (strpos($filter, '/')) {
+                if (false !== strpos($filter, '/')) {
                     // 正则过滤
                     if (!preg_match($filter, $value)) {
                         // 匹配不成功返回默认值

From 68790e8d9a6b4075b16f15e1bd419492e95fe0ec Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 30 Apr 2017 22:58:49 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Request.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/library/think/Request.php b/library/think/Request.php
index 803a5240..c4dad8b7 100644
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -1034,11 +1034,7 @@ class Request
             $filter = [];
         } else {
             $filter = $filter ?: $this->filter;
-            if (is_string($filter)) {
-                $filter = explode(',', $filter);
-            } else {
-                $filter = (array) $filter;
-            }
+            $filter = (array) $filter;
         }
 
         $filter[] = $default;

From f1b3ab5a3dbceb9292ed6d9ca34cd80cb57c0664 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 3 May 2017 11:22:08 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E6=94=B9=E8=BF=9BRequest=E7=B1=BB?=
 =?UTF-8?q?=E7=9A=84filter=E8=BF=87=E6=BB=A4=E6=9C=BA=E5=88=B6=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=AD=A3=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Request.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/think/Request.php b/library/think/Request.php
index c4dad8b7..583dfb84 100644
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -1034,7 +1034,11 @@ class Request
             $filter = [];
         } else {
             $filter = $filter ?: $this->filter;
-            $filter = (array) $filter;
+            if (is_string($filter) && false === strpos($filter, '/')) {
+                $filter = explode(',', $filter);
+            } else {
+                $filter = (array) $filter;
+            }
         }
 
         $filter[] = $default;

From 2c60d4a13bdbdd9b24fe72fb70aceec607a7001d Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 3 May 2017 15:23:45 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E6=94=B9=E8=BF=9Bmysql=E9=87=8D=E8=BF=9E?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/connector/Mysql.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/library/think/db/connector/Mysql.php b/library/think/db/connector/Mysql.php
index 0081fb2e..4b6e11a2 100644
--- a/library/think/db/connector/Mysql.php
+++ b/library/think/db/connector/Mysql.php
@@ -138,8 +138,13 @@ class Mysql extends Connection
      */
     protected function isBreak($e)
     {
-        if (false !== stripos($e->getMessage(), 'server has gone away')) {
-            return true;
+        $info  = ['server has gone away', 'Error while sending STMT_'];
+        $error = $e->getMessage();
+
+        foreach ($info as $msg) {
+            if (false !== stripos($error, $msg)) {
+                return true;
+            }
         }
         return false;
     }

From 7dc2a9d9750e107e36a9b74517951551ad13620e Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 3 May 2017 15:37:35 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E6=94=B9=E8=BF=9BisBreak=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Connection.php      | 22 +++++++++++++++++++++-
 library/think/db/connector/Mysql.php | 18 ------------------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/library/think/db/Connection.php b/library/think/db/Connection.php
index d2aa6ea9..908384cb 100644
--- a/library/think/db/Connection.php
+++ b/library/think/db/Connection.php
@@ -780,11 +780,31 @@ abstract class Connection
     /**
      * 是否断线
      * @access protected
-     * @param \PDOException  $e 异常
+     * @param \PDOException  $e 异常对象
      * @return bool
      */
     protected function isBreak($e)
     {
+        $info = [
+            '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',
+        ];
+
+        $error = $e->getMessage();
+
+        foreach ($info as $msg) {
+            if (false !== stripos($error, $msg)) {
+                return true;
+            }
+        }
         return false;
     }
 
diff --git a/library/think/db/connector/Mysql.php b/library/think/db/connector/Mysql.php
index 4b6e11a2..dc717532 100644
--- a/library/think/db/connector/Mysql.php
+++ b/library/think/db/connector/Mysql.php
@@ -130,22 +130,4 @@ class Mysql extends Connection
         return true;
     }
 
-    /**
-     * 是否断线
-     * @access protected
-     * @param \PDOException  $e 异常对象
-     * @return bool
-     */
-    protected function isBreak($e)
-    {
-        $info  = ['server has gone away', 'Error while sending STMT_'];
-        $error = $e->getMessage();
-
-        foreach ($info as $msg) {
-            if (false !== stripos($error, $msg)) {
-                return true;
-            }
-        }
-        return false;
-    }
 }

From aa0198a47c735d21c1e874f7d2729fadbeb0b704 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Wed, 3 May 2017 18:13:38 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tpl/think_exception.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tpl/think_exception.tpl b/tpl/think_exception.tpl
index 2d898c30..0c9d31ed 100644
--- a/tpl/think_exception.tpl
+++ b/tpl/think_exception.tpl
@@ -79,7 +79,7 @@
 <html>
 <head>
     <meta charset="UTF-8">
-    <title><?php echo lang('System Error'); ?></title>
+    <title><?php echo \think\Lang::get('System Error'); ?></title>
     <meta name="robots" content="noindex,nofollow" />
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <style>

From fc432d5f5dce0daabf50a668276c4be68f3ef64d Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 5 May 2017 17:01:14 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Model=E7=B1=BB=E7=9A=84?=
 =?UTF-8?q?save=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Model.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/library/think/Model.php b/library/think/Model.php
index 8553fec6..e92a9344 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -995,7 +995,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
             }
 
             // 模型更新
-            $result = $this->db()->where($where)->update($data);
+            $result = $this->getQuery()->where($where)->update($data);
 
             // 关联更新
             if (isset($relation)) {
@@ -1022,11 +1022,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
                 return false;
             }
 
-            $result = $this->db()->insert($this->data);
+            $result = $this->getQuery()->insert($this->data);
 
             // 获取自动增长主键
             if ($result && is_string($pk) && (!isset($this->data[$pk]) || '' == $this->data[$pk])) {
-                $insertId = $this->db()->getLastInsID($sequence);
+                $insertId = $this->getQuery()->getLastInsID($sequence);
                 if ($insertId) {
                     $this->data[$pk] = $insertId;
                 }
@@ -1114,7 +1114,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         }
 
         $result = [];
-        $db     = $this->db();
+        $db     = $this->getQuery();
         $db->startTrans();
         try {
             $pk = $this->getPk();
@@ -1228,7 +1228,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
         }
 
         // 删除当前模型数据
-        $result = $this->db()->where($where)->delete();
+        $result = $this->getQuery()->where($where)->delete();
 
         // 关联删除
         if (!empty($this->relationWrite)) {

From bf1ebe8ae1c9291994d0737d2e710ae934ef1075 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 5 May 2017 17:40:58 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E7=9A=84=E8=B7=AF=E7=94=B1=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=86=99=E8=AF=86=E5=88=AB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Route.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/think/Route.php b/library/think/Route.php
index a3001d8f..a5b19327 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -924,7 +924,7 @@ class Route
                 } else {
                     $str = $key;
                 }
-                if (is_string($str) && $str && 0 !== strpos(str_replace('|', '/', $url), $str)) {
+                if (is_string($str) && $str && 0 !== stripos(str_replace('|', '/', $url), $str)) {
                     continue;
                 }
                 self::setOption($option);

From 3dda16bbdad88dd88b6b6720fe1cef9a66dd29c7 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 6 May 2017 09:35:43 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E4=BA=86=E6=89=8B=E5=8A=A8=E5=8F=82=E6=95=B0=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=20=E7=BC=93=E5=AD=98=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E9=97=AE=E9=A2=98=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Query.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index 55b70941..f1e51a68 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -401,7 +401,7 @@ class Query
             if (empty($this->options['table'])) {
                 $this->options['table'] = $this->getTable();
             }
-            $key    = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options));
+            $key    = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options) . serialize($this->bind));
             $result = Cache::get($key);
         }
         if (false === $result) {
@@ -444,7 +444,7 @@ class Query
             if (empty($this->options['table'])) {
                 $this->options['table'] = $this->getTable();
             }
-            $guid   = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options));
+            $guid   = is_string($cache['key']) ? $cache['key'] : md5($field . serialize($this->options) . serialize($this->bind));
             $result = Cache::get($guid);
         }
         if (false === $result) {
@@ -596,7 +596,7 @@ class Query
         }
         if ($lazyTime > 0) {
             // 延迟写入
-            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition) . serialize($this->bind));
             $step = $this->lazyWrite('inc', $guid, $step, $lazyTime);
             if (false === $step) {
                 // 清空查询条件
@@ -625,7 +625,7 @@ class Query
         }
         if ($lazyTime > 0) {
             // 延迟写入
-            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition) . serialize($this->bind));
             $step = $this->lazyWrite('dec', $guid, $step, $lazyTime);
             if (false === $step) {
                 // 清空查询条件
@@ -2205,7 +2205,7 @@ class Query
                 $options['where']['AND'] = $where;
             }
         } elseif (!isset($key) && is_string($pk) && isset($options['where']['AND'][$pk])) {
-            $key = $this->getCacheKey($options['where']['AND'][$pk], $options);
+            $key = $this->getCacheKey($options['where']['AND'][$pk], $options, $this->bind);
         }
 
         // 生成UPDATE SQL语句
@@ -2293,7 +2293,7 @@ class Query
             // 判断查询缓存
             $cache = $options['cache'];
             unset($options['cache']);
-            $key       = is_string($cache['key']) ? $cache['key'] : md5(serialize($options));
+            $key       = is_string($cache['key']) ? $cache['key'] : md5(serialize($options) . serialize($this->bind));
             $resultSet = Cache::get($key);
         }
         if (!$resultSet) {
@@ -2385,8 +2385,9 @@ class Query
      * @access public
      * @param mixed     $value   缓存数据
      * @param array     $options 缓存参数
+     * @param array     $bind    绑定参数
      */
-    protected function getCacheKey($value, $options)
+    protected function getCacheKey($value, $options, $bind = [])
     {
         if (is_scalar($value)) {
             $data = $value;
@@ -2394,9 +2395,9 @@ class Query
             $data = $value[1];
         }
         if (isset($data)) {
-            return 'think:' . $options['table'] . '|' . $data;
+            return 'think:' . (is_array($options['table']) ? key($options['table']) : $options['table']) . '|' . $data;
         } else {
-            return md5(serialize($options));
+            return md5(serialize($options) . serialize($bind));
         }
     }
 
@@ -2424,7 +2425,7 @@ class Query
             // 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);
+            $key = $this->getCacheKey($options['where']['AND'][$pk], $options, $this->bind);
         }
 
         $options['limit'] = 1;
@@ -2437,7 +2438,7 @@ class Query
             } elseif (is_string($cache['key'])) {
                 $key = $cache['key'];
             } elseif (!isset($key)) {
-                $key = md5(serialize($options));
+                $key = md5(serialize($options) . serialize($this->bind));
             }
             $result = Cache::get($key);
         }
@@ -2648,7 +2649,7 @@ 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);
+            $key = $this->getCacheKey($options['where']['AND'][$pk], $options, $this->bind);
         }
 
         if (true !== $data && empty($options['where'])) {

From df1b3068195edf01ac7c6553a959097241ed9ea6 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 6 May 2017 10:56:24 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E5=88=86=E9=A1=B5=E7=B1=BB=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0each=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Paginator.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/library/think/Paginator.php b/library/think/Paginator.php
index d3547f8b..92d70f04 100644
--- a/library/think/Paginator.php
+++ b/library/think/Paginator.php
@@ -273,6 +273,23 @@ abstract class Paginator implements ArrayAccess, Countable, IteratorAggregate, J
         return $this->items->isEmpty();
     }
 
+    /**
+     * 给每个元素执行个回调
+     *
+     * @param  callable $callback
+     * @return $this
+     */
+    public function each(callable $callback)
+    {
+        foreach ($this->items as $key => $item) {
+            if ($callback($item, $key) === false) {
+                break;
+            }
+        }
+
+        return $this;
+    }
+
     /**
      * Retrieve an external iterator
      * @return Traversable An instance of an object implementing <b>Iterator</b> or

From a9d585167210646040ea0fa294c26dc20cba504e Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 8 May 2017 23:03:39 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E5=AF=B9?=
 =?UTF-8?q?=E4=B8=80=E5=B5=8C=E5=A5=97=E5=85=B3=E8=81=94=E6=95=B0=E7=BB=84?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/db/Query.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index f1e51a68..88fc23a1 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -1902,6 +1902,9 @@ class Query
                 $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);