From 207a77420ec534f3a3f568873b609b4dee0fe318 Mon Sep 17 00:00:00 2001
From: yunwuxin <448901948@qq.com>
Date: Wed, 29 Jun 2016 18:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Loader::import?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Loader.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/library/think/Loader.php b/library/think/Loader.php
index 00ee74d3..4c5e2293 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -253,16 +253,18 @@ class Loader
     public static function import($class, $baseUrl = '', $ext = EXT)
     {
         static $_file = [];
+        $key   = $class . $baseUrl;
         $class = str_replace(['.', '#'], [DS, '.'], $class);
-        if (isset($_file[$class . $baseUrl])) {
+        if (isset($_file[$key])) {
             return true;
         }
 
         if (empty($baseUrl)) {
             list($name, $class) = explode(DS, $class, 2);
-            if (isset(self::$prefixDirsPsr4[$name])) {
+
+            if (isset(self::$prefixDirsPsr4[$name . '\\'])) {
                 // 注册的命名空间
-                $baseUrl = self::$prefixDirsPsr4[$name];
+                $baseUrl = self::$prefixDirsPsr4[$name . '\\'];
             } elseif ('@' == $name) {
                 //加载当前模块应用类库
                 $baseUrl = App::$modulePath;
@@ -293,7 +295,7 @@ class Loader
                 return false;
             }
             includeFile($filename);
-            $_file[$class . $baseUrl] = true;
+            $_file[$key] = true;
             return true;
         }
         return false;