From ebc26f90430e0fe5c2d29a911fb12524fc3e3d87 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 11 Dec 2015 14:14:24 +0800
Subject: [PATCH] =?UTF-8?q?traits=E7=9B=AE=E5=BD=95=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=88=B0library=E4=B8=8B=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base.php                                             | 2 +-
 library/think/loader.php                             | 6 +++---
 {traits => library/traits}/think/controller/ajax.php | 0
 {traits => library/traits}/think/controller/view.php | 0
 {traits => library/traits}/think/model/adv.php       | 0
 {traits => library/traits}/think/model/auto.php      | 0
 {traits => library/traits}/think/model/query.php     | 0
 {traits => library/traits}/think/model/relation.php  | 0
 {traits => library/traits}/think/model/view.php      | 0
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename {traits => library/traits}/think/controller/ajax.php (100%)
 rename {traits => library/traits}/think/controller/view.php (100%)
 rename {traits => library/traits}/think/model/adv.php (100%)
 rename {traits => library/traits}/think/model/auto.php (100%)
 rename {traits => library/traits}/think/model/query.php (100%)
 rename {traits => library/traits}/think/model/relation.php (100%)
 rename {traits => library/traits}/think/model/view.php (100%)

diff --git a/base.php b/base.php
index 07b1776e..ce42b226 100644
--- a/base.php
+++ b/base.php
@@ -16,9 +16,9 @@ defined('DS') or define('DS', DIRECTORY_SEPARATOR);
 defined('THINK_PATH') or define('THINK_PATH', dirname(__FILE__) . DS);
 defined('LIB_PATH') or define('LIB_PATH', THINK_PATH . 'library' . DS);
 defined('MODE_PATH') or define('MODE_PATH', THINK_PATH . 'mode' . DS); // 系统应用模式目录
-defined('TRAIT_PATH') or define('TRAIT_PATH', THINK_PATH . 'traits' . DS);
 defined('CORE_PATH') or define('CORE_PATH', LIB_PATH . 'think' . DS);
 defined('ORG_PATH') or define('ORG_PATH', LIB_PATH . 'org' . DS);
+defined('TRAIT_PATH') or define('TRAIT_PATH', LIB_PATH . 'traits' . DS);
 defined('APP_PATH') or define('APP_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . DS);
 defined('COMMON_MODULE') or define('COMMON_MODULE', 'common');
 defined('RUNTIME_PATH') or define('RUNTIME_PATH', realpath(APP_PATH) . DS . 'runtime' . DS);
diff --git a/library/think/loader.php b/library/think/loader.php
index bcde291d..d8739b37 100644
--- a/library/think/loader.php
+++ b/library/think/loader.php
@@ -30,7 +30,7 @@ class Loader
             if (isset(self::$namespace[$name])) {
                 // 注册的命名空间
                 $path = dirname(self::$namespace[$name]) . DS;
-            } elseif (in_array($name, ['think', 'org', 'behavior', 'com']) || is_dir(LIB_PATH . $name)) {
+            } elseif (in_array($name, ['think', 'org', 'behavior', 'com', 'traits']) || is_dir(LIB_PATH . $name)) {
                 // Library目录下面的命名空间自动定位
                 $path = LIB_PATH;
             } else {
@@ -89,10 +89,10 @@ class Loader
                 //加载当前项目应用类库
                 $class   = substr_replace($class, '', 0, strlen($class_strut[0]) + 1);
                 $baseUrl = MODULE_PATH;
-            } elseif (in_array($class_strut[0], ['think', 'behavior', 'org', 'com'])) {
+            } elseif (in_array($class_strut[0], ['traits', 'think', 'behavior', 'org', 'com'])) {
                 // org 第三方公共类库 com 企业公共类库
                 $baseUrl = LIB_PATH;
-            } elseif (in_array($class_strut[0], ['vendor', 'traits'])) {
+            } elseif (in_array($class_strut[0], ['vendor'])) {
                 $baseUrl = THINK_PATH;
             } else {
                 // 加载其他项目应用类库
diff --git a/traits/think/controller/ajax.php b/library/traits/think/controller/ajax.php
similarity index 100%
rename from traits/think/controller/ajax.php
rename to library/traits/think/controller/ajax.php
diff --git a/traits/think/controller/view.php b/library/traits/think/controller/view.php
similarity index 100%
rename from traits/think/controller/view.php
rename to library/traits/think/controller/view.php
diff --git a/traits/think/model/adv.php b/library/traits/think/model/adv.php
similarity index 100%
rename from traits/think/model/adv.php
rename to library/traits/think/model/adv.php
diff --git a/traits/think/model/auto.php b/library/traits/think/model/auto.php
similarity index 100%
rename from traits/think/model/auto.php
rename to library/traits/think/model/auto.php
diff --git a/traits/think/model/query.php b/library/traits/think/model/query.php
similarity index 100%
rename from traits/think/model/query.php
rename to library/traits/think/model/query.php
diff --git a/traits/think/model/relation.php b/library/traits/think/model/relation.php
similarity index 100%
rename from traits/think/model/relation.php
rename to library/traits/think/model/relation.php
diff --git a/traits/think/model/view.php b/library/traits/think/model/view.php
similarity index 100%
rename from traits/think/model/view.php
rename to library/traits/think/model/view.php