From 155ebeffbce3b93cc75db414b14157b00da38017 Mon Sep 17 00:00:00 2001
From: huangdijia <huangdijia@gmail.com>
Date: Mon, 7 Dec 2015 18:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=AB=98=E7=BA=A7Model?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=90=8E=E7=BC=80?=
 =?UTF-8?q?=20Extend=E6=94=B9=E5=90=8D=EF=BC=8CAdv=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E5=9B=9E=E5=BD=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model/{extend_model.php => adv.php}      | 10 ++++------
 library/think/model/{mongo_model.php => mongo.php}     |  2 +-
 .../think/model/{relation_model.php => relation.php}   |  2 +-
 library/think/model/{view_model.php => view.php}       |  2 +-
 traits/think/model/{extend.php => adv.php}             |  3 +--
 5 files changed, 8 insertions(+), 11 deletions(-)
 rename library/think/model/{extend_model.php => adv.php} (81%)
 rename library/think/model/{mongo_model.php => mongo.php} (99%)
 rename library/think/model/{relation_model.php => relation.php} (94%)
 rename library/think/model/{view_model.php => view.php} (94%)
 rename traits/think/model/{extend.php => adv.php} (99%)

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 = [];
 
     /**