diff --git a/library/think/lang.php b/library/think/lang.php
index e0c198b1..13d667a0 100644
--- a/library/think/lang.php
+++ b/library/think/lang.php
@@ -16,7 +16,11 @@ class Lang
     // 语言参数
     private static $lang = [];
     // 语言作用域
-    private static $range = '';
+    private static $range = 'zh-cn';
+    // 语言列表
+    private static $list = [];
+    // 语言变量
+    private static $var = 'l';
 
     // 设定语言参数的作用域（语言）
     public static function range($range = '')
@@ -37,7 +41,7 @@ class Lang
      */
     public static function set($name, $value = null, $range = '')
     {
-        $range = $range ? $range : self::$range;
+        $range = $range ?: self::$range;
         // 批量定义
         if (!isset(self::$lang[$range])) {
             self::$lang[$range] = [];
@@ -57,7 +61,7 @@ class Lang
      */
     public static function load($file, $range = '')
     {
-        $range = $range ? $range : self::$range;
+        $range = $range ?: self::$range;
         $lang  = is_file($file) ? include $file : [];
         if (!isset(self::$lang[$range])) {
             self::$lang[$range] = [];
@@ -80,7 +84,7 @@ class Lang
      */
     public static function get($name = null, $range = '')
     {
-        $range = $range ? $range : self::$range;
+        $range = $range ?: self::$range;
         // 空参数返回所有定义
         if (empty($name)) {
             return self::$lang[$range];
@@ -88,4 +92,29 @@ class Lang
         $key = strtolower($name);
         return isset(self::$lang[$range][$key]) ? self::$lang[$range][$key] : $name;
     }
+
+    /**
+     * 自动侦测设置获取语言选择
+     * @return void
+     */
+    public static function detect()
+    {
+        // 自动侦测设置获取语言选择
+        if (isset($_GET[self::$var])) {
+            $langSet = $_GET[self::$var]; // url中设置了语言变量
+            \think\Cookie::set('think_language', $langSet, 3600);
+        } elseif (\think\Cookie::get('think_language')) {
+            // 获取上次用户的选择
+            $langSet = \think\Cookie::get('think_language');
+        } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+            // 自动侦测浏览器语言
+            preg_match('/^([a-z\d\-]+)/i', $_SERVER['HTTP_ACCEPT_LANGUAGE'], $matches);
+            $langSet = $matches[1];
+            \think\Cookie::set('think_language', $langSet, 3600);
+        }
+        if (false !== stripos(self::$list, $langSet)) {
+            // 合法的语言
+            self::$range = $langSet;
+        }
+    }
 }
diff --git a/library/think/loader.php b/library/think/loader.php
index b2a676d2..a9edc1b7 100644
--- a/library/think/loader.php
+++ b/library/think/loader.php
@@ -28,7 +28,7 @@ class Loader
     {
         // 检查是否定义classmap
         if (isset(self::$map[$class])) {
-            if (self::$map[$class]) {
+            if (is_file(self::$map[$class])) {
                 include self::$map[$class];
             }
         } elseif ($file = self::findFileInComposer($class)) {
diff --git a/library/think/route.php b/library/think/route.php
index ffd66316..e84b0ffc 100644
--- a/library/think/route.php
+++ b/library/think/route.php
@@ -665,7 +665,7 @@ class Route
             }
             return $url;
         } else {
-            return null;
+            return false;
         }
     }
 }
diff --git a/library/think/url.php b/library/think/url.php
index a62b9ec8..1157bc9b 100644
--- a/library/think/url.php
+++ b/library/think/url.php
@@ -101,7 +101,11 @@ class Url
     // 根据路由名称和参数生成URL地址
     public static function route($name, $params = [])
     {
-        return Route::getRouteUrl($name, $params);
+        $url = Route::getRouteUrl($name, $params);
+        if (false === $url) {
+            $url = self::build($name, $params);
+        }
+        return $url;
     }
 
     // 解析URL和参数 域名