From dc171d9ae5063371e532e4afde055e780fae74b9 Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Thu, 16 Apr 2026 11:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A8=8B=E5=BA=8F=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E3=80=91fix(install):=20=E6=94=B9=E8=BF=9B=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=9A=84=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改安装脚本以优先使用容器环境变量，其次使用系统环境变量，最后使用默认值
添加对.env文件的加载支持，确保配置能正确读取
---
 crmeb/public/install/index.php | 36 ++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/crmeb/public/install/index.php b/crmeb/public/install/index.php
index 0fcdd0b6d..8cee686b9 100755
--- a/crmeb/public/install/index.php
+++ b/crmeb/public/install/index.php
@@ -1,4 +1,13 @@
 <?php
+require dirname(__DIR__, 2) . '/vendor/autoload.php';
+
+use think\facade\Env;
+
+// 不初始化应用容器，直接使用 Env
+$app = new think\App();
+// 单独加载 .env 文件（不连接数据库）
+Env::load(dirname(__DIR__, 2) . '/.env');
+
 //文件签名
 $fileValue = '';
 //最低php版本要求
@@ -23,22 +32,25 @@ if ('7.1.0' > phpversion()) {
 if (phpversion() >= '8.0.0') {
     exit('您的php版本太高，不能安装本软件，兼容php版本7.1~7.4，谢谢！');
 }
-
+// echo '当前php版本:' . phpversion() . '<br>';
 date_default_timezone_set('PRC');
 error_reporting(E_ALL & ~E_NOTICE);
 header('Content-Type: text/html; charset=UTF-8');
 
-//mysql数据库配置容器中获取
-$MYSQL_HOST_IP = getenv('MYSQL_HOST_IP') ?: '127.0.0.1';
-$MYSQL_PORT = getenv('MYSQL_PORT') ?: '3306';
-$MYSQL_USER = getenv('MYSQL_USER') ?: 'root';
-$MYSQL_PASSWORD = getenv('MYSQL_PASSWORD') ?: '123456';
-$MYSQL_DATABASE = getenv('MYSQL_DATABASE') ?: 'crmeb';
-//redis配置容器中获取
-$REDIS_HOST_IP = getenv('REDIS_HOST_IP') ?: '127.0.0.1';
-$REDIS_PORT = getenv('REDIS_PORT') ?: '6379';
-$REDIS_DATABASE = getenv('REDIS_DATABASE') ?: 0;
-$REDIS_PASSWORD = getenv('REDIS_PASSWORD') ?: '';
+//mysql数据库配置,如果容器环境变量有值,则使用容器环境变量,如果容器环境变量不存在,则使用系统环境变量,如果系统环境变量不存在,则使用默认值
+$MYSQL_HOST_IP = getenv('MYSQL_HOST_IP') ?: Env::get('database.hostname', '127.0.0.1');
+$MYSQL_PORT = getenv('MYSQL_PORT') ?: Env::get('database.hostport', '3306');
+$MYSQL_USER = getenv('MYSQL_USER') ?: Env::get('database.username', 'root');
+$MYSQL_PASSWORD = getenv('MYSQL_PASSWORD') ?: Env::get('database.password', '123456');
+$MYSQL_DATABASE = getenv('MYSQL_DATABASE') ?: Env::get('database.database', 'crmeb');
+//redis配置,如果容器环境变量有值,则使用容器环境变量,如果容器环境变量不存在,则使用系统环境变量,如果系统环境变量不存在,则使用默认值
+$REDIS_HOST_IP = getenv('REDIS_HOST_IP') ?: Env::get('redis.redis_hostname', '127.0.0.1');
+$REDIS_PORT = getenv('REDIS_PORT') ?: Env::get('redis.port', '6379');
+$REDIS_DATABASE = getenv('REDIS_DATABASE') ?: Env::get('redis.select', 0);
+$REDIS_PASSWORD = getenv('REDIS_PASSWORD') ?: Env::get('redis.redis_password', '');
+
+
+
 
 //数据库
 $sqlFile = 'crmeb.sql';