Merge remote-tracking branch 'origin/master'

app/DbCoroutineContext.php

@@ -83,14 +83,6 @@ class DbCoroutineContext
 
     public static function clearList()
     {
-        foreach (self::getList() as $conn) {
-            try {
-                $conn->query('SELECT 1');
-                $conn->close();
-                // 连接正常
-            } catch (\Exception $e) {
-            }
-        }
         $cid = self::getCid();
         if ($cid !== null) {
             unset(self::$list[$cid]);
@@ -112,7 +104,6 @@ class DbCoroutineContext
         foreach (self::getList() as $conn) {
             try {
                 $conn->query('SELECT 1');
-                $conn->close();
                 // 连接正常
             } catch (\Exception $e) {
             }

app/common/library/DatabaseRoute.php

@@ -161,7 +161,6 @@ class DatabaseRoute
             ->page($currPage, $pageSize)
             ->select()
             ->toArray();
-        $query->getConnection()->close();
 
         return [
             'totalCount' => $totalCount,
@@ -204,7 +203,6 @@ class DatabaseRoute
                 // 不要order，避免报错
                 $query->removeOption('order');
                 $count = $query->count();
-                $query->getConnection()->close();
                 $counts[$connName] = $count;
                 $total += $count;
             }
@@ -258,7 +256,6 @@ class DatabaseRoute
                 ->limit($localOffset, $localLimit)
                 ->select()
                 ->toArray();
-            $query->getConnection()->close();
 
             $allRows = array_merge($allRows, $rows);
 
@@ -375,7 +372,6 @@ class DatabaseRoute
             $query = Db::connect($connName)->name($table);
             $query = call_user_func($builder, $query);
             $deleted = $query->delete();
-            $query->getConnection()->close();
             $totalDeleted += $deleted;
         }
 
@@ -415,13 +411,11 @@ class DatabaseRoute
                                 if (method_exists($query, $method)) {
                                     $result = call_user_func_array([$query, $method], $args);
                                     $finalResult = $result;
-                                    $query->getConnection()->close();
                                     // find 返回 null，select 返回空数组，count 返回数字
                                     if ($result || $result === 0) {
                                         return $result;
                                     }
                                 }else {
-                                    $query->getConnection()->close();
                                 }
                             }
                         }
@@ -436,7 +430,6 @@ class DatabaseRoute
                                     $result = call_user_func_array([$query, $method], $args);
                                     // find 返回 null，select 返回空数组，count 返回数字
                                     $finalResult = $result;
-                                    $query->getConnection()->close();
                                     if ($result instanceof Collection) {
                                         if (!$result->isEmpty()) {
                                             return $result;
@@ -447,7 +440,6 @@ class DatabaseRoute
                                         return $result;
                                     }
                                 }else {
-                                    $query->getConnection()->close();
                                 }
                             }
                         }