traits层次调整去掉 think目录 用户自定义的traits可以放到模块目录下面区分

library/traits/controller/ajax.php

@@ -1,17 +1,17 @@
 <?php
+
 /**
  * 用法：
- * T('think/controller/ajax');
+ * T('controller/ajax');
  * class index
  * {
- *     use \traits\think\controller\ajax;
+ *     use \traits\controller\ajax;
  *     public function index(){
  *         $this->result();
  *     }
  * }
  */
-namespace traits\think\controller;
+namespace traits\controller;
-use think\Config;
 
 trait Ajax
 {

library/traits/controller/view.php

@@ -1,17 +1,19 @@
 <?php
+
 /**
  * 用法：
- * T('think/controller/view');
+ * T('controller/view');
  * class index
  * {
- *     use \traits\think\controller\view;
+ *     use \traits\controller\view;
  *     public function index(){
  *         $this->assign();
  *         $this->show();
  *     }
  * }
  */
-namespace traits\think\controller;
+namespace traits\controller;
+
 use think\Config;
 
 trait View

library/traits/model/adv.php

@@ -9,7 +9,7 @@
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 
-namespace traits\think\model;
+namespace traits\model;
 
 use think\Lang;
 use think\Loader;

library/traits/model/auto.php

@@ -9,7 +9,7 @@
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 
-namespace traits\think\model;
+namespace traits\model;
 
 define('EXISTS_VALIDATE', 0);
 define('MUST_VALIDATE', 1);
@@ -62,8 +62,8 @@ trait Auto
                 $fields = explode(',', $fields);
             }
             // 判断令牌验证字段
-            if (C('TOKEN_ON')) {
+            if (Config::get('token_on')) {
-                $fields[] = C('TOKEN_NAME');
+                $fields[] = Config::get('token_name');
             }
 
             foreach ($data as $key => $val) {

library/traits/model/query.php

@@ -9,7 +9,7 @@
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 
-namespace traits\think\model;
+namespace traits\model;
 
 trait Query
 {

library/traits/model/relation.php

@@ -9,7 +9,7 @@
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 
-namespace traits\think\model;
+namespace traits\model;
 
 define('HAS_ONE', 1);
 define('BELONGS_TO', 2);

library/traits/model/view.php

@@ -9,7 +9,7 @@
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
 
-namespace traits\think\model;
+namespace traits\model;
 
 trait View
 {