diff --git a/library/think/Controller.php b/library/think/Controller.php index 6a7ca43c..00019de7 100644 --- a/library/think/Controller.php +++ b/library/think/Controller.php @@ -11,13 +11,13 @@ namespace think; -T('controller/view'); -T('controller/jump'); +T('controller/View'); +T('controller/Jump'); class Controller { - use \traits\controller\jump; - use \traits\controller\view; + use \traits\controller\Jump; + use \traits\controller\View; /** * 前置操作方法列表 diff --git a/library/think/model/Adv.php b/library/think/model/Adv.php index c51cab13..fe99f771 100644 --- a/library/think/model/Adv.php +++ b/library/think/model/Adv.php @@ -11,11 +11,11 @@ namespace think\model; -T('model/adv'); -T('model/query'); +T('model/Adv'); +T('model/Query'); -class Adv extends \think\model +class Adv extends \think\Model { - use \traits\model\adv; - use \traits\model\query; + use \traits\model\Adv; + use \traits\model\Query; } diff --git a/library/think/model/Mongo.php b/library/think/model/Mongo.php index e858f66c..ae798276 100644 --- a/library/think/model/Mongo.php +++ b/library/think/model/Mongo.php @@ -13,15 +13,15 @@ namespace think\model; use think\Lang; use think\Loader; -T('modle/adv'); +T('modle/Adv'); /** * MongoModel模型类 * 实现了ODM和ActiveRecords模式 */ -class Mongo extends \Think\Model +class Mongo extends \think\Model { - use \traits\model\adv; + use \traits\model\Adv; // 主键类型 const TYPE_OBJECT = 1; @@ -243,7 +243,7 @@ class Mongo extends \Think\Model if (true !== $sepa) { // 当sepa指定为true的时候 返回所有数据 $options['limit'] = is_numeric($sepa) ? $sepa : 1; - } + } // 查找一条记录 $result = $this->db->find($options); if (!empty($result)) { diff --git a/library/think/model/Relation.php b/library/think/model/Relation.php index 95252b45..8190923a 100644 --- a/library/think/model/Relation.php +++ b/library/think/model/Relation.php @@ -11,8 +11,8 @@ namespace think\model; -T('model/relation'); -class Relation extends \think\model +T('model/Relation'); +class Relation extends \think\Model { - use \traits\model\relation; + use \traits\model\Relation; } diff --git a/library/think/model/View.php b/library/think/model/View.php index 50d0a2fe..05e9da07 100644 --- a/library/think/model/View.php +++ b/library/think/model/View.php @@ -11,8 +11,8 @@ namespace think\model; -T('model/view'); -class View extends \think\model +T('model/View'); +class View extends \think\Model { - use \traits\model\view; + use \traits\model\View; }