diff --git a/Library/Think/Loader.php b/Library/Think/Loader.php
index c1f836f9..73d161ca 100644
--- a/Library/Think/Loader.php
+++ b/Library/Think/Loader.php
@@ -1,231 +1,231 @@
-<?php
-// +----------------------------------------------------------------------
-// | TOPThink [ WE CAN DO IT JUST THINK ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2011 http://topthink.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
-// +----------------------------------------------------------------------
-// | Author: liu21st <liu21st@gmail.com>
-// +----------------------------------------------------------------------
-
-namespace Think;
-use Think\Config;
-
-class Loader {
-    // 类名映射
-    static protected $map = [];
-    // 命名空间
-    static protected $namespace = [
-        'Think'   => CORE_PATH,
-        'Vendor'  => VENDOR_PATH,
-        'Library' => LIB_PATH,
-    ];
-
-    // 自动加载
-    static public function autoload($class){
-        // 检查是否定义classmap
-        if(isset(self::$map[$class])) {
-            include self::$map[$class];
-        }else{ // 命名空间自动加载
-            $name     = strstr($class, '\\', true);
-            $path     = isset(self::$namespace[$name]) ? dirname(self::$namespace[$name]) . '/' : APP_PATH;
-            $filename = $path . str_replace('\\', '/', $class) . EXT;
-            if(is_file($filename)) {
-                // Win环境下面严格区分大小写
-                if (IS_WIN && false === strpos(str_replace('/', '\\', realpath($filename)), $class . EXT)){
-                    return ;
-                }
-                include $filename;
-            }
-        }
-    }
-
-    // 注册classmap
-    static public function addMap($class, $map=''){
-        if(is_array($class)){
-            self::$map = array_merge(self::$map, $class);
-        }else{
-            self::$map[$class] = $map;
-        }        
-    }
-
-    // 注册命名空间
-    static public function addNamespace($namespace, $path){
-        self::$namespace[$namespace] = $path;
-    }
-
-    // 注册自动加载机制
-    static public function register($autoload = ''){
-        spl_autoload_register($autoload ? $autoload : ['Think\Loader', 'autoload']);
-    }
-
-    /**
-     * 导入所需的类库 同java的Import 本函数有缓存功能
-     * @param string $class 类库命名空间字符串
-     * @param string $baseUrl 起始路径
-     * @param string $ext 导入的文件扩展名
-     * @return boolean
-     */
-    static public function import($class, $baseUrl = '', $ext= EXT ) {
-        static $_file = [];
-        $class = str_replace(['.', '#'], ['/', '.'], $class);
-        if (isset($_file[$class . $baseUrl]))
-            return true;
-        else
-            $_file[$class . $baseUrl] = true;
-        $class_strut = explode('/', $class);
-        if (empty($baseUrl)) {
-            if ('@' == $class_strut[0] || MODULE_NAME == $class_strut[0]) {
-                //加载当前项目应用类库
-                $class   = substr_replace($class, '', 0, strlen($class_strut[0]) + 1);
-                $baseUrl = MODULE_PATH;
-            }elseif (in_array($class_strut[0], ['Org', 'Com'])) {
-                // org 第三方公共类库 com 企业公共类库
-                $baseUrl = LIB_PATH;
-            }elseif(in_array($class_strut[0], ['Think', 'Vendor', 'Library', 'Traits'])){
-                $baseUrl = THINK_PATH;
-            }else { // 加载其他项目应用类库
-                $class   = substr_replace($class, '', 0, strlen($class_strut[0]) + 1);
-                $baseUrl = APP_PATH . $class_strut[0] . '/';
-            }
-        }
-        if (substr($baseUrl, -1) != '/')
-            $baseUrl .= '/';
-        // 如果类不存在 则导入类库文件
-        $filename = $baseUrl . $class . $ext;
-        if(is_file($filename)) {
-            include $filename;
-            return true;
-        }
-        return false; 
-    }
-
-    /**
-     * 实例化一个没有模型文件的Model
-     * @param string $name Model名称 支持指定基础模型 例如 MongoModel:User
-     * @param string $tablePrefix 表前缀
-     * @param mixed $connection 数据库连接信息
-     * @return Model
-     */
-    static public function table($name = '', $tablePrefix = '',$connection = '') {
-        static $_model = [];
-        if(strpos($name, ':')) {
-            list($class, $name) = explode(':', $name);
-        }else{
-            $class = 'Think\Model';
-        }
-        $guid = $tablePrefix . $name . '_' . $class;
-        if (!isset($_model[$guid]))
-            $_model[$guid] = new $class($name, ['table_prefix' => $tablePrefix, 'connection' => $connection]);
-        return $_model[$guid];
-    }
-
-    /**
-     * 实例化（分层）模型
-     * @param string $name Model名称
-     * @param string $layer 业务层名称
-     * @return Object
-     */
-    static public function model($name = '', $layer = 'Model') {
-        if(empty($name)) return new Model;
-        static $_model = [];
-        if(isset($_model[$name . $layer])) return $_model[$name . $layer];
-        if(strpos($name, '/')) {
-            list($module, $name) = explode('/', $name);
-        }else{
-            $module = MODULE_NAME;
-        }
-        $class = $module . '\\' . $layer . '\\' . parse_name($name, 1). $layer;
-        if(class_exists($class)) {
-            $model = new $class($name);
-        }else {
-            Log::record('实例化不存在的类：' . $class, 'NOTIC');
-            $model = new Model($name);
-        }
-        $_model[$name . $layer] = $model;
-        return $model;
-    }
-
-    /**
-     * 实例化（分层）控制器 格式：[模块名/]控制器名
-     * @param string $name 资源地址
-     * @param string $layer 控制层名称
-     * @return Object|false
-     */
-    static public function controller($name, $layer = 'Controller') {
-        static $_instance = [];
-        if(isset($_instance[$name.$layer])) return $_instance[$name . $layer];
-        if(strpos($name, '/')) {
-            list($module,$name) = explode('/', $name);
-        }else{
-            $module = MODULE_NAME;
-        }
-        $class = $module . '\\' . $layer . '\\' . parse_name($name, 1) . $layer;
-        if(class_exists($class)) {
-            $action = new $class;
-            $_instance[$name . $layer] = $action;
-            return $action;
-        }elseif(class_exists($module . '\\' . $layer . '\\Empty' . $layer)){
-            $class = $module . '\\' . $layer . '\\Empty' . $layer;
-            return new $class;
-        }else{
-            return false;
-        }
-    }
-
-    /**
-     * 实例化数据库
-     * @param mixed $config 数据库配置
-     * @param boolean $lite 是否采用lite方式连接
-     * @return object
-     */
-    static public function db($config, $lite = false) {
-        return Db::instance($config, $lite);
-    }
-
-    /**
-     * 远程调用模块的操作方法 参数格式 [模块/控制器/]操作
-     * @param string $url 调用地址
-     * @param string|array $vars 调用参数 支持字符串和数组 
-     * @param string $layer 要调用的控制层名称
-     * @return mixed
-     */
-    static public function action($url, $vars = [], $layer = '') {
-        $info   = pathinfo($url);
-        $action = $info['basename'];
-        $module = '.' != $info['dirname'] ? $info['dirname'] : CONTROLLER_NAME;
-        $class  = self::controller($module, $layer);
-        if($class){
-            if(is_string($vars)) {
-                parse_str($vars, $vars);
-            }
-            return call_user_func_array([&$class, $action . Config::get('action_suffix')], $vars);
-        }else{
-            return false;
-        }
-    }
-
-    /**
-     * 取得对象实例 支持调用类的静态方法
-     * @param string $class 对象类名
-     * @param string $method 类的静态方法名
-     * @return object
-     */
-    static public function instance($class, $method = '') {
-        static $_instance = [];
-        $identify = $class . $method;
-        if(!isset($_instance[$identify])) {
-            if(class_exists($class)){
-                $o = new $class();
-                if(!empty($method) && method_exists($o, $method))
-                    $_instance[$identify] = call_user_func_array([&$o, $method]);
-                else
-                    $_instance[$identify] = $o;
-            }
-            else
-                E('_CLASS_NOT_EXIST_:' . $class);
-        }
-        return $_instance[$identify];
-    }
-}
+<?php
+// +----------------------------------------------------------------------
+// | TOPThink [ WE CAN DO IT JUST THINK ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2011 http://topthink.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+// +----------------------------------------------------------------------
+// | Author: liu21st <liu21st@gmail.com>
+// +----------------------------------------------------------------------
+
+namespace Think;
+use Think\Config;
+
+class Loader {
+    // 类名映射
+    static protected $map = [];
+    // 命名空间
+    static protected $namespace = [
+        'Think'     =>  CORE_PATH,
+        'Vendor'    =>  VENDOR_PATH,
+        'Org'       =>  ORG_PATH,
+    ];
+
+    // 自动加载
+    static public function autoload($class){
+        // 检查是否定义classmap
+        if(isset(self::$map[$class])) {
+            include self::$map[$class];
+        }else{ // 命名空间自动加载
+            $name     = strstr($class, '\\', true);
+            $path     = isset(self::$namespace[$name]) ? dirname(self::$namespace[$name]) . '/' : APP_PATH;
+            $filename = $path . str_replace('\\', '/', $class) . EXT;
+            if(is_file($filename)) {
+                // Win环境下面严格区分大小写
+                if (IS_WIN && false === strpos(str_replace('/', '\\', realpath($filename)), $class . EXT)){
+                    return ;
+                }
+                include $filename;
+            }
+        }
+    }
+
+    // 注册classmap
+    static public function addMap($class, $map=''){
+        if(is_array($class)){
+            self::$map = array_merge(self::$map, $class);
+        }else{
+            self::$map[$class] = $map;
+        }        
+    }
+
+    // 注册命名空间
+    static public function addNamespace($namespace, $path){
+        self::$namespace[$namespace] = $path;
+    }
+
+    // 注册自动加载机制
+    static public function register($autoload = ''){
+        spl_autoload_register($autoload ? $autoload : ['Think\Loader', 'autoload']);
+    }
+
+    /**
+     * 导入所需的类库 同java的Import 本函数有缓存功能
+     * @param string $class 类库命名空间字符串
+     * @param string $baseUrl 起始路径
+     * @param string $ext 导入的文件扩展名
+     * @return boolean
+     */
+    static public function import($class, $baseUrl = '', $ext= EXT ) {
+        static $_file = [];
+        $class = str_replace(['.', '#'], ['/', '.'], $class);
+        if (isset($_file[$class . $baseUrl]))
+            return true;
+        else
+            $_file[$class . $baseUrl] = true;
+        $class_strut = explode('/', $class);
+        if (empty($baseUrl)) {
+            if ('@' == $class_strut[0] || MODULE_NAME == $class_strut[0]) {
+                //加载当前项目应用类库
+                $class   = substr_replace($class, '', 0, strlen($class_strut[0]) + 1);
+                $baseUrl = MODULE_PATH;
+            }elseif (in_array($class_strut[0], ['Org', 'Com'])) {
+                // org 第三方公共类库 com 企业公共类库
+                $baseUrl = LIB_PATH;
+            }elseif(in_array($class_strut[0], ['Think', 'Vendor', 'Library', 'Traits'])){
+                $baseUrl = THINK_PATH;
+            }else { // 加载其他项目应用类库
+                $class   = substr_replace($class, '', 0, strlen($class_strut[0]) + 1);
+                $baseUrl = APP_PATH . $class_strut[0] . '/';
+            }
+        }
+        if (substr($baseUrl, -1) != '/')
+            $baseUrl .= '/';
+        // 如果类不存在 则导入类库文件
+        $filename = $baseUrl . $class . $ext;
+        if(is_file($filename)) {
+            include $filename;
+            return true;
+        }
+        return false; 
+    }
+
+    /**
+     * 实例化一个没有模型文件的Model
+     * @param string $name Model名称 支持指定基础模型 例如 MongoModel:User
+     * @param string $tablePrefix 表前缀
+     * @param mixed $connection 数据库连接信息
+     * @return Model
+     */
+    static public function table($name = '', $tablePrefix = '',$connection = '') {
+        static $_model = [];
+        if(strpos($name, ':')) {
+            list($class, $name) = explode(':', $name);
+        }else{
+            $class = 'Think\Model';
+        }
+        $guid = $tablePrefix . $name . '_' . $class;
+        if (!isset($_model[$guid]))
+            $_model[$guid] = new $class($name, ['table_prefix' => $tablePrefix, 'connection' => $connection]);
+        return $_model[$guid];
+    }
+
+    /**
+     * 实例化（分层）模型
+     * @param string $name Model名称
+     * @param string $layer 业务层名称
+     * @return Object
+     */
+    static public function model($name = '', $layer = 'Model') {
+        if(empty($name)) return new Model;
+        static $_model = [];
+        if(isset($_model[$name . $layer])) return $_model[$name . $layer];
+        if(strpos($name, '/')) {
+            list($module, $name) = explode('/', $name);
+        }else{
+            $module = MODULE_NAME;
+        }
+        $class = $module . '\\' . $layer . '\\' . parse_name($name, 1). $layer;
+        if(class_exists($class)) {
+            $model = new $class($name);
+        }else {
+            Log::record('实例化不存在的类：' . $class, 'NOTIC');
+            $model = new Model($name);
+        }
+        $_model[$name . $layer] = $model;
+        return $model;
+    }
+
+    /**
+     * 实例化（分层）控制器 格式：[模块名/]控制器名
+     * @param string $name 资源地址
+     * @param string $layer 控制层名称
+     * @return Object|false
+     */
+    static public function controller($name, $layer = 'Controller') {
+        static $_instance = [];
+        if(isset($_instance[$name.$layer])) return $_instance[$name . $layer];
+        if(strpos($name, '/')) {
+            list($module,$name) = explode('/', $name);
+        }else{
+            $module = MODULE_NAME;
+        }
+        $class = $module . '\\' . $layer . '\\' . parse_name($name, 1) . $layer;
+        if(class_exists($class)) {
+            $action = new $class;
+            $_instance[$name . $layer] = $action;
+            return $action;
+        }elseif(class_exists($module . '\\' . $layer . '\\Empty' . $layer)){
+            $class = $module . '\\' . $layer . '\\Empty' . $layer;
+            return new $class;
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * 实例化数据库
+     * @param mixed $config 数据库配置
+     * @param boolean $lite 是否采用lite方式连接
+     * @return object
+     */
+    static public function db($config, $lite = false) {
+        return Db::instance($config, $lite);
+    }
+
+    /**
+     * 远程调用模块的操作方法 参数格式 [模块/控制器/]操作
+     * @param string $url 调用地址
+     * @param string|array $vars 调用参数 支持字符串和数组 
+     * @param string $layer 要调用的控制层名称
+     * @return mixed
+     */
+    static public function action($url, $vars = [], $layer = '') {
+        $info   = pathinfo($url);
+        $action = $info['basename'];
+        $module = '.' != $info['dirname'] ? $info['dirname'] : CONTROLLER_NAME;
+        $class  = self::controller($module, $layer);
+        if($class){
+            if(is_string($vars)) {
+                parse_str($vars, $vars);
+            }
+            return call_user_func_array([&$class, $action . Config::get('action_suffix')], $vars);
+        }else{
+            return false;
+        }
+    }
+
+    /**
+     * 取得对象实例 支持调用类的静态方法
+     * @param string $class 对象类名
+     * @param string $method 类的静态方法名
+     * @return object
+     */
+    static public function instance($class, $method = '') {
+        static $_instance = [];
+        $identify = $class . $method;
+        if(!isset($_instance[$identify])) {
+            if(class_exists($class)){
+                $o = new $class();
+                if(!empty($method) && method_exists($o, $method))
+                    $_instance[$identify] = call_user_func_array([&$o, $method]);
+                else
+                    $_instance[$identify] = $o;
+            }
+            else
+                E('_CLASS_NOT_EXIST_:' . $class);
+        }
+        return $_instance[$identify];
+    }
+}