From 63f4ed0f37e1de0befd38989b19fa5ab3680c4f1 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 26 Apr 2016 23:46:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=AE=9A=E4=B9=89=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helper.php      |  8 ++++----
 mode/common.php | 12 +++++++++---
 mode/sae.php    | 10 +++++++++-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/helper.php b/helper.php
index a46259bf..ef75f58e 100644
--- a/helper.php
+++ b/helper.php
@@ -250,10 +250,10 @@ function session($name, $value = '', $prefix = null)
         // 判断或获取
         return 0 === strpos($name, '?') ? Session::has(substr($name, 1), $prefix) : Session::get($name, $prefix);
     } elseif (is_null($value)) {
-        // 删除session
+        // 删除
         return Session::delete($name, $prefix);
     } else {
-        // 设置session
+        // 设置
         return Session::set($name, $value, $prefix);
     }
 }
@@ -277,10 +277,10 @@ function cookie($name, $value = '', $option = null)
         // 获取
         return Cookie::get($name);
     } elseif (is_null($value)) {
-        // 删除session
+        // 删除
         return Cookie::delete($name);
     } else {
-        // 设置session
+        // 设置
         return Cookie::set($name, $value, $option);
     }
 }
diff --git a/mode/common.php b/mode/common.php
index 465617b3..a53c4a0f 100644
--- a/mode/common.php
+++ b/mode/common.php
@@ -30,6 +30,7 @@ return [
         'think\Build'                => CORE_PATH . 'Build' . EXT,
         'think\Cache'                => CORE_PATH . 'Cache' . EXT,
         'think\Config'               => CORE_PATH . 'Config' . EXT,
+        'think\Console'              => CORE_PATH . 'Console' . EXT,
         'think\Controller'           => CORE_PATH . 'Controller' . EXT,
         'think\Cookie'               => CORE_PATH . 'Cookie' . EXT,
         'think\Db'                   => CORE_PATH . 'Db' . EXT,
@@ -40,14 +41,19 @@ return [
         'think\Input'                => CORE_PATH . 'Input' . EXT,
         'think\Lang'                 => CORE_PATH . 'Lang' . EXT,
         'think\Log'                  => CORE_PATH . 'Log' . EXT,
-        'think\Model'                => CORE_PATH . 'Model' . EXT,
+        'think\model\Relation'       => CORE_PATH . 'model' . DS . 'Relation.' . EXT,
+        'think\model\Merge'          => CORE_PATH . 'model' . DS . 'Merge.' . EXT,
+        'think\model\Pivot'          => CORE_PATH . 'model' . DS . 'Pivot.' . EXT,
         'think\Response'             => CORE_PATH . 'Response' . EXT,
+        'think\Process'              => CORE_PATH . 'Process' . EXT,
         'think\Route'                => CORE_PATH . 'Route' . EXT,
         'think\Session'              => CORE_PATH . 'Session' . EXT,
         'think\Template'             => CORE_PATH . 'Template' . EXT,
-        'think\Url'                  => CORE_PATH . 'Url' . EXT,
+        'think\Validate'             => CORE_PATH . 'Validate' . EXT,
         'think\View'                 => CORE_PATH . 'View' . EXT,
-        'think\db\Driver'            => CORE_PATH . 'db' . DS . 'Driver' . EXT,
+        'think\db\Connection'        => CORE_PATH . 'db' . DS . 'Connection' . EXT,
+        'think\db\Builder'           => CORE_PATH . 'db' . DS . 'Builder' . EXT,
+        'think\db\Query'             => CORE_PATH . 'db' . DS . 'Query' . EXT,
         'think\view\driver\Think'    => CORE_PATH . 'view' . DS . 'driver' . DS . 'Think' . EXT,
         'think\template\driver\File' => CORE_PATH . 'template' . DS . 'driver' . DS . 'File' . EXT,
         'think\log\driver\File'      => CORE_PATH . 'log' . DS . 'driver' . DS . 'File' . EXT,
diff --git a/mode/sae.php b/mode/sae.php
index 79ea9f31..6255230f 100644
--- a/mode/sae.php
+++ b/mode/sae.php
@@ -74,6 +74,7 @@ return [
         'think\Build'                => CORE_PATH . 'Build' . EXT,
         'think\Cache'                => CORE_PATH . 'Cache' . EXT,
         'think\Config'               => CORE_PATH . 'Config' . EXT,
+        'think\Console'              => CORE_PATH . 'Console' . EXT,
         'think\Controller'           => CORE_PATH . 'Controller' . EXT,
         'think\Cookie'               => CORE_PATH . 'Cookie' . EXT,
         'think\Db'                   => CORE_PATH . 'Db' . EXT,
@@ -85,13 +86,20 @@ return [
         'think\Lang'                 => CORE_PATH . 'Lang' . EXT,
         'think\Log'                  => CORE_PATH . 'Log' . EXT,
         'think\Model'                => CORE_PATH . 'Model' . EXT,
+        'think\model\Relation'       => CORE_PATH . 'model' . DS . 'Relation.' . EXT,
+        'think\model\Merge'          => CORE_PATH . 'model' . DS . 'Merge.' . EXT,
+        'think\model\Pivot'          => CORE_PATH . 'model' . DS . 'Pivot.' . EXT,
+        'think\Process'              => CORE_PATH . 'Process' . EXT,
         'think\Response'             => CORE_PATH . 'Response' . EXT,
         'think\Route'                => CORE_PATH . 'Route' . EXT,
         'think\Session'              => CORE_PATH . 'Session' . EXT,
         'think\Template'             => CORE_PATH . 'Template' . EXT,
         'think\Url'                  => CORE_PATH . 'Url' . EXT,
+        'think\Validate'             => CORE_PATH . 'Validate' . EXT,
         'think\View'                 => CORE_PATH . 'View' . EXT,
-        'think\db\Driver'            => CORE_PATH . 'db' . DS . 'Driver' . EXT,
+        'think\db\Connection'        => CORE_PATH . 'db' . DS . 'Connection' . EXT,
+        'think\db\Builder'           => CORE_PATH . 'db' . DS . 'Builder' . EXT,
+        'think\db\Query'             => CORE_PATH . 'db' . DS . 'Query' . EXT,
         'think\view\driver\Think'    => CORE_PATH . 'view' . DS . 'driver' . DS . 'Think' . EXT,
         'think\template\driver\File' => CORE_PATH . 'template' . DS . 'driver' . DS . 'File' . EXT,
         'think\log\driver\File'      => CORE_PATH . 'log' . DS . 'driver' . DS . 'File' . EXT,