diff --git a/base.php b/base.php
index 28de4b51..bf1276f2 100644
--- a/base.php
+++ b/base.php
@@ -38,16 +38,18 @@ define('IS_WIN', strpos(PHP_OS, 'WIN') !== false);
 require CORE_PATH . 'Loader.php';
 
 // 加载环境变量配置文件
-if (is_file(ROOT_PATH . 'env' . EXT)) {
-    $env = include ROOT_PATH . 'env' . EXT;
+if (is_file(ROOT_PATH . '.env')) {
+    $env = parse_ini_file(ROOT_PATH . '.env', true);
     foreach ($env as $key => $val) {
         $name = ENV_PREFIX . strtoupper($key);
-        if (is_bool($val)) {
-            $val = $val ? 1 : 0;
-        } elseif (!is_scalar($val)) {
-            continue;
+        if (is_array($val)) {
+            foreach ($val as $k => $v) {
+                $item = $name . '_' . strtoupper($k);
+                putenv("$item=$v");
+            }
+        } else {
+            putenv("$name=$val");
         }
-        putenv("$name=$val");
     }
 }
 
diff --git a/library/think/db/Query.php b/library/think/db/Query.php
index 35cb5dd4..a88fc13d 100644
--- a/library/think/db/Query.php
+++ b/library/think/db/Query.php
@@ -1227,7 +1227,7 @@ class Query
     /**
      * 设置查询数据不存在是否抛出异常
      * @access public
-     * @param bool $fail 是否严格检查字段
+     * @param bool $fail 数据不存在是否抛出异常
      * @return $this
      */
     public function failException($fail = true)