diff --git a/library/think/model/extend_model.php b/library/think/model/adv.php similarity index 81% rename from library/think/model/extend_model.php rename to library/think/model/adv.php index 84709270..73054b37 100644 --- a/library/think/model/extend_model.php +++ b/library/think/model/adv.php @@ -11,13 +11,11 @@ namespace think\model; -use traits\think\model\extend; -use traits\think\model\query; - -T('think/model/extend'); +T('think/model/adv'); T('think/model/query'); -class ExtendModel extends \think\model +class Adv extends \think\model { - use extend, query; + use traits\think\model\adv; + use traits\think\model\query; } diff --git a/library/think/model/mongo_model.php b/library/think/model/mongo.php similarity index 99% rename from library/think/model/mongo_model.php rename to library/think/model/mongo.php index 6958e5c8..d62c7f3c 100644 --- a/library/think/model/mongo_model.php +++ b/library/think/model/mongo.php @@ -17,7 +17,7 @@ use think\Loader; * MongoModel模型类 * 实现了ODM和ActiveRecords模式 */ -class MongoModel extends \Think\Model +class Mongo extends \Think\Model { // 主键类型 const TYPE_OBJECT = 1; diff --git a/library/think/model/relation_model.php b/library/think/model/relation.php similarity index 94% rename from library/think/model/relation_model.php rename to library/think/model/relation.php index 42a9dbcc..76e2cf71 100644 --- a/library/think/model/relation_model.php +++ b/library/think/model/relation.php @@ -12,7 +12,7 @@ namespace think\model; T('think/model/relation'); -class RelationModel extends \think\model +class Relation extends \think\model { use \traits\think\model\relation; } diff --git a/library/think/model/view_model.php b/library/think/model/view.php similarity index 94% rename from library/think/model/view_model.php rename to library/think/model/view.php index d2401a8b..7132d462 100644 --- a/library/think/model/view_model.php +++ b/library/think/model/view.php @@ -12,7 +12,7 @@ namespace think\model; T('think/model/view'); -class ViewModel extends \think\model +class View extends \think\model { use \traits\think\model\view; } diff --git a/traits/think/model/extend.php b/traits/think/model/adv.php similarity index 99% rename from traits/think/model/extend.php rename to traits/think/model/adv.php index 90171fcb..3c991557 100644 --- a/traits/think/model/extend.php +++ b/traits/think/model/adv.php @@ -14,9 +14,8 @@ namespace traits\think\model; use think\Lang; use think\Loader; -trait Extend +trait Adv { - protected $partition = []; /**