From 5c4df0ce080f686c6a2b0581f2c6f8aff30f574a Mon Sep 17 00:00:00 2001
From: hooklife <miaogaopeng123@gmail.com>
Date: Tue, 10 Jan 2017 15:48:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=B6=E6=9E=84=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E4=B8=BA=20=20=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Controller.php                    | 2 +-
 library/think/Model.php                         | 2 +-
 library/think/Request.php                       | 2 +-
 library/think/Response.php                      | 2 +-
 library/think/Template.php                      | 2 +-
 library/think/Validate.php                      | 2 +-
 library/think/View.php                          | 2 +-
 library/think/cache/driver/File.php             | 2 +-
 library/think/cache/driver/Lite.php             | 2 +-
 library/think/cache/driver/Memcache.php         | 2 +-
 library/think/cache/driver/Memcached.php        | 2 +-
 library/think/cache/driver/Redis.php            | 2 +-
 library/think/cache/driver/Sqlite.php           | 2 +-
 library/think/cache/driver/Wincache.php         | 2 +-
 library/think/cache/driver/Xcache.php           | 2 +-
 library/think/controller/Rest.php               | 2 +-
 library/think/controller/Yar.php                | 2 +-
 library/think/db/Builder.php                    | 2 +-
 library/think/db/Connection.php                 | 2 +-
 library/think/db/Query.php                      | 2 +-
 library/think/log/driver/Socket.php             | 2 +-
 library/think/model/Merge.php                   | 2 +-
 library/think/model/Pivot.php                   | 2 +-
 library/think/model/relation/BelongsTo.php      | 2 +-
 library/think/model/relation/BelongsToMany.php  | 2 +-
 library/think/model/relation/HasMany.php        | 2 +-
 library/think/model/relation/HasManyThrough.php | 2 +-
 library/think/model/relation/HasOne.php         | 2 +-
 library/think/model/relation/MorphMany.php      | 2 +-
 library/think/model/relation/MorphTo.php        | 2 +-
 library/think/template/TagLib.php               | 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/library/think/Controller.php b/library/think/Controller.php
index 69db0a1d..7aba39cd 100644
--- a/library/think/Controller.php
+++ b/library/think/Controller.php
@@ -40,7 +40,7 @@ class Controller
     protected $beforeActionList = [];
 
     /**
-     * 架构函数
+     * 构造方法
      * @param Request $request Request对象
      * @access public
      */
diff --git a/library/think/Model.php b/library/think/Model.php
index 0491e551..e875d252 100644
--- a/library/think/Model.php
+++ b/library/think/Model.php
@@ -118,7 +118,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
     protected static $initialized = [];
 
     /**
-     * 架构函数
+     * 构造方法
      * @access public
      * @param array|object $data 数据
      */
diff --git a/library/think/Request.php b/library/think/Request.php
index b72a5aaf..a405763e 100644
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -120,7 +120,7 @@ class Request
     protected $isCheckCache;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access protected
      * @param array $options 参数
      */
diff --git a/library/think/Response.php b/library/think/Response.php
index 656198f0..d0345782 100644
--- a/library/think/Response.php
+++ b/library/think/Response.php
@@ -40,7 +40,7 @@ class Response
     protected $content = null;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access   public
      * @param mixed $data    输出数据
      * @param int   $code
diff --git a/library/think/Template.php b/library/think/Template.php
index 66ba9e18..7e20407c 100644
--- a/library/think/Template.php
+++ b/library/think/Template.php
@@ -57,7 +57,7 @@ class Template
     protected $storage;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      */
     public function __construct(array $config = [])
diff --git a/library/think/Validate.php b/library/think/Validate.php
index e3bc9db6..b4443a0c 100644
--- a/library/think/Validate.php
+++ b/library/think/Validate.php
@@ -102,7 +102,7 @@ class Validate
     protected $batch = false;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param array $rules 验证规则
      * @param array $message 验证提示信息
diff --git a/library/think/View.php b/library/think/View.php
index 020e5789..96ae56c9 100644
--- a/library/think/View.php
+++ b/library/think/View.php
@@ -25,7 +25,7 @@ class View
     protected $replace = [];
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param array $engine  模板引擎参数
      * @param array $replace  字符串替换参数
diff --git a/library/think/cache/driver/File.php b/library/think/cache/driver/File.php
index dba02c3e..4c3c49e0 100644
--- a/library/think/cache/driver/File.php
+++ b/library/think/cache/driver/File.php
@@ -28,7 +28,7 @@ class File extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options
      */
     public function __construct($options = [])
diff --git a/library/think/cache/driver/Lite.php b/library/think/cache/driver/Lite.php
index 57727651..eeb96a19 100644
--- a/library/think/cache/driver/Lite.php
+++ b/library/think/cache/driver/Lite.php
@@ -26,7 +26,7 @@ class Lite extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      *
      * @param array $options
diff --git a/library/think/cache/driver/Memcache.php b/library/think/cache/driver/Memcache.php
index d41939d8..1fbd3b08 100644
--- a/library/think/cache/driver/Memcache.php
+++ b/library/think/cache/driver/Memcache.php
@@ -25,7 +25,7 @@ class Memcache extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @access public
      * @throws \BadFunctionCallException
diff --git a/library/think/cache/driver/Memcached.php b/library/think/cache/driver/Memcached.php
index 35fafd07..fa312e8e 100644
--- a/library/think/cache/driver/Memcached.php
+++ b/library/think/cache/driver/Memcached.php
@@ -27,7 +27,7 @@ class Memcached extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @access public
      */
diff --git a/library/think/cache/driver/Redis.php b/library/think/cache/driver/Redis.php
index 360f515a..4f618785 100644
--- a/library/think/cache/driver/Redis.php
+++ b/library/think/cache/driver/Redis.php
@@ -34,7 +34,7 @@ class Redis extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @access public
      */
diff --git a/library/think/cache/driver/Sqlite.php b/library/think/cache/driver/Sqlite.php
index 76c592d8..305fd9e8 100644
--- a/library/think/cache/driver/Sqlite.php
+++ b/library/think/cache/driver/Sqlite.php
@@ -28,7 +28,7 @@ class Sqlite extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @throws \BadFunctionCallException
      * @access public
diff --git a/library/think/cache/driver/Wincache.php b/library/think/cache/driver/Wincache.php
index 5be8d0df..3076fc14 100644
--- a/library/think/cache/driver/Wincache.php
+++ b/library/think/cache/driver/Wincache.php
@@ -25,7 +25,7 @@ class Wincache extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @throws \BadFunctionCallException
      * @access public
diff --git a/library/think/cache/driver/Xcache.php b/library/think/cache/driver/Xcache.php
index 317a4ee3..2a0e07ad 100644
--- a/library/think/cache/driver/Xcache.php
+++ b/library/think/cache/driver/Xcache.php
@@ -25,7 +25,7 @@ class Xcache extends Driver
     ];
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $options 缓存参数
      * @access public
      * @throws \BadFunctionCallException
diff --git a/library/think/controller/Rest.php b/library/think/controller/Rest.php
index c297f4eb..8c5911df 100644
--- a/library/think/controller/Rest.php
+++ b/library/think/controller/Rest.php
@@ -32,7 +32,7 @@ abstract class Rest
     ];
 
     /**
-     * 架构函数 取得模板对象实例
+     * 构造函数 取得模板对象实例
      * @access public
      */
     public function __construct()
diff --git a/library/think/controller/Yar.php b/library/think/controller/Yar.php
index fcf5ced1..af4e9a1a 100644
--- a/library/think/controller/Yar.php
+++ b/library/think/controller/Yar.php
@@ -18,7 +18,7 @@ abstract class Yar
 {
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      */
     public function __construct()
diff --git a/library/think/db/Builder.php b/library/think/db/Builder.php
index 3e7a60e9..d98f4334 100644
--- a/library/think/db/Builder.php
+++ b/library/think/db/Builder.php
@@ -32,7 +32,7 @@ abstract class Builder
     protected $deleteSql    = 'DELETE FROM %TABLE% %USING% %JOIN% %WHERE% %ORDER%%LIMIT% %LOCK%%COMMENT%';
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param Connection    $connection 数据库连接对象实例
      * @param Query         $query      数据库查询对象实例
diff --git a/library/think/db/Connection.php b/library/think/db/Connection.php
index 4e18f812..dd56bd5f 100644
--- a/library/think/db/Connection.php
+++ b/library/think/db/Connection.php
@@ -124,7 +124,7 @@ abstract class Connection
     protected $bind = [];
 
     /**
-     * 架构函数 读取数据库配置信息
+     * 构造函数 读取数据库配置信息
      * @access public
      * @param array $config 数据库配置数组
      */
diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index 263565f9..f63d86a7 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -54,7 +54,7 @@ class Query
     private static $event = [];
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param Connection $connection 数据库对象实例
      * @param string     $model      模型名
diff --git a/library/think/log/driver/Socket.php b/library/think/log/driver/Socket.php
index 08fd8ace..d30bba30 100644
--- a/library/think/log/driver/Socket.php
+++ b/library/think/log/driver/Socket.php
@@ -43,7 +43,7 @@ class Socket
     protected $allowForceClientIds = []; //配置强制推送且被授权的client_id
 
     /**
-     * 架构函数
+     * 构造函数
      * @param array $config 缓存参数
      * @access public
      */
diff --git a/library/think/model/Merge.php b/library/think/model/Merge.php
index b876c2f3..e1070d1d 100644
--- a/library/think/model/Merge.php
+++ b/library/think/model/Merge.php
@@ -23,7 +23,7 @@ class Merge extends Model
     protected $mapFields     = []; //  需要处理的模型映射字段，避免混淆 array( id => 'user.id'  )
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param array|object $data 数据
      */
diff --git a/library/think/model/Pivot.php b/library/think/model/Pivot.php
index 7823370c..9fd45719 100644
--- a/library/think/model/Pivot.php
+++ b/library/think/model/Pivot.php
@@ -17,7 +17,7 @@ class Pivot extends Model
 {
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param array|object $data 数据
      * @param string $table 中间数据表名
diff --git a/library/think/model/relation/BelongsTo.php b/library/think/model/relation/BelongsTo.php
index 8f26d033..373f6cbf 100644
--- a/library/think/model/relation/BelongsTo.php
+++ b/library/think/model/relation/BelongsTo.php
@@ -16,7 +16,7 @@ use think\Model;
 class BelongsTo extends OneToOne
 {
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param Model  $parent 上级模型对象
      * @param string $model 模型名
diff --git a/library/think/model/relation/BelongsToMany.php b/library/think/model/relation/BelongsToMany.php
index 428620a2..88079f56 100644
--- a/library/think/model/relation/BelongsToMany.php
+++ b/library/think/model/relation/BelongsToMany.php
@@ -24,7 +24,7 @@ class BelongsToMany extends Relation
     protected $middle;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param Model  $parent 上级模型对象
      * @param string $model 模型名
diff --git a/library/think/model/relation/HasMany.php b/library/think/model/relation/HasMany.php
index c9235bac..be130287 100644
--- a/library/think/model/relation/HasMany.php
+++ b/library/think/model/relation/HasMany.php
@@ -19,7 +19,7 @@ use think\model\Relation;
 class HasMany extends Relation
 {
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param Model  $parent 上级模型对象
      * @param string $model 模型名
diff --git a/library/think/model/relation/HasManyThrough.php b/library/think/model/relation/HasManyThrough.php
index 2585f354..6c4bdefd 100644
--- a/library/think/model/relation/HasManyThrough.php
+++ b/library/think/model/relation/HasManyThrough.php
@@ -25,7 +25,7 @@ class HasManyThrough extends Relation
     protected $through;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param Model  $parent 上级模型对象
      * @param string $model 模型名
diff --git a/library/think/model/relation/HasOne.php b/library/think/model/relation/HasOne.php
index 41667e2a..49b5bfab 100644
--- a/library/think/model/relation/HasOne.php
+++ b/library/think/model/relation/HasOne.php
@@ -16,7 +16,7 @@ use think\Model;
 class HasOne extends OneToOne
 {
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param Model $parent 上级模型对象
      * @param string $model 模型名
diff --git a/library/think/model/relation/MorphMany.php b/library/think/model/relation/MorphMany.php
index abb32ebd..79aaf02e 100644
--- a/library/think/model/relation/MorphMany.php
+++ b/library/think/model/relation/MorphMany.php
@@ -25,7 +25,7 @@ class MorphMany extends Relation
     protected $type;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param Model  $parent 上级模型对象
      * @param string $model 模型名
diff --git a/library/think/model/relation/MorphTo.php b/library/think/model/relation/MorphTo.php
index e6676574..55e03ac3 100644
--- a/library/think/model/relation/MorphTo.php
+++ b/library/think/model/relation/MorphTo.php
@@ -22,7 +22,7 @@ class MorphTo extends Relation
     protected $morphType;
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param Model  $parent 上级模型对象
      * @param string $morphType 多态字段名
diff --git a/library/think/template/TagLib.php b/library/think/template/TagLib.php
index b3325191..2e0d232f 100644
--- a/library/think/template/TagLib.php
+++ b/library/think/template/TagLib.php
@@ -68,7 +68,7 @@ class TagLib
     protected $comparison = [' nheq ' => ' !== ', ' heq ' => ' === ', ' neq ' => ' != ', ' eq ' => ' == ', ' egt ' => ' >= ', ' gt ' => ' > ', ' elt ' => ' <= ', ' lt ' => ' < '];
 
     /**
-     * 架构函数
+     * 构造函数
      * @access public
      * @param \stdClass $template 模板引擎对象
      */