From f671c2b2cae2ff823cb74340e277c868a02ce2d6 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 5 Feb 2018 12:05:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3composer=20files=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Loader.php b/library/think/Loader.php
index a54230f4..141f8200 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -301,6 +301,16 @@ class Loader
             } else {
                 self::registerComposerLoader();
             }
+
+            if (is_file(VENDOR_PATH . 'composer/autoload_files.php')) {
+                $includeFiles = require VENDOR_PATH . 'composer/autoload_files.php';
+                foreach ($includeFiles as $fileIdentifier => $file) {
+                    if (empty(self::$autoloadFiles[$fileIdentifier])) {
+                        __require_file($file);
+                        self::$autoloadFiles[$fileIdentifier] = true;
+                    }
+                }
+            }
         }
 
         // 注册命名空间定义
@@ -345,17 +355,6 @@ class Loader
             if ($classMap) {
                 self::addClassMap($classMap);
             }
-
-        }
-
-        if (is_file(VENDOR_PATH . 'composer/autoload_files.php')) {
-            $includeFiles = require VENDOR_PATH . 'composer/autoload_files.php';
-            foreach ($includeFiles as $fileIdentifier => $file) {
-                if (empty(self::$autoloadFiles[$fileIdentifier])) {
-                    __require_file($file);
-                    self::$autoloadFiles[$fileIdentifier] = true;
-                }
-            }
         }
     }