From 74c20b6903355a0a9a05cd489545028dd8c0a7ab Mon Sep 17 00:00:00 2001
From: sugar1569 <sugar1569@vip.qq.com>
Date: Wed, 22 Oct 2025 11:14:08 +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=91=E5=AE=89=E8=A3=85=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B9=E4=BE=BF=20docker=20=E8=87=AA=E5=8A=A8=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/public/install/index.php           | 12 ++++++++-
 crmeb/public/install/templates/step3.php | 33 ++++++++++++------------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/crmeb/public/install/index.php b/crmeb/public/install/index.php
index 59d9a5492..b242f2a96 100755
--- a/crmeb/public/install/index.php
+++ b/crmeb/public/install/index.php
@@ -27,7 +27,17 @@ if (phpversion() >= '8.0.0') {
 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')?:'';
 //数据库
 $sqlFile = 'crmeb.sql';
 $configFile = '.env';
diff --git a/crmeb/public/install/templates/step3.php b/crmeb/public/install/templates/step3.php
index 639181b84..6fa408187 100755
--- a/crmeb/public/install/templates/step3.php
+++ b/crmeb/public/install/templates/step3.php
@@ -29,21 +29,21 @@
 
                     <tr>
                         <td class="tar">数据库用户名：</td>
-                        <td><input type="text" name="dbuser" id="dbuser" value="root" class="input"></td>
+                        <td><input type="text" name="dbuser" id="dbuser" value="<?php echo $MYSQL_USER; ?>" class="input"></td>
                         <td>
                             <div id="J_install_tip_dbuser"></div>
                         </td>
                     </tr>
                     <tr>
                         <td class="tar">数据库密码：</td>
-                        <td><input type="password" name="dbpw" id="dbpw" value="" class="input" autoComplete="off"></td>
+                        <td><input type="password" name="dbpw" id="dbpw" value="<?php echo $MYSQL_PASSWORD; ?>" class="input" autoComplete="off"></td>
                         <td>
                             <div id="J_install_tip_dbpw"></div>
                         </td>
                     </tr>
                     <tr>
                         <td class="tar">数据库名：</td>
-                        <td><input type="text" name="dbname" id="dbname" value="crmeb" class="input"></td>
+                        <td><input type="text" name="dbname" id="dbname" value="<?php echo $MYSQL_DATABASE; ?>" class="input"></td>
                         <td>
                             <div id="J_install_tip_dbname"></div>
                         </td>
@@ -62,14 +62,14 @@
                     </tr>
                     <tr v-show="value">
                         <td class="tar">数据库服务器：</td>
-                        <td><input type="text" name="dbhost" id="dbhost" value="127.0.0.1" class="input"></td>
+                        <td><input type="text" name="dbhost" id="dbhost" value="<?php echo $MYSQL_HOST_IP; ?>" class="input"></td>
                         <td>
                             <div id="J_install_tip_dbhost"></div>
                         </td>
                     </tr>
                     <tr v-show="value">
                         <td class="tar">数据库端口：</td>
-                        <td><input type="text" name="dbport" id="dbport" value="3306" class="input"
+                        <td><input type="text" name="dbport" id="dbport" value="<?php echo $MYSQL_PORT; ?>" class="input"
                                    onBlur="mysqlDbPwd(0)"></td>
                         <td>
                             <div id="J_install_tip_dbport"></div>
@@ -81,11 +81,7 @@
                         <td><input type="text" name="dbprefix" id="dbprefix" value="eb_" class="input"></td>
                         <td></td>
                     </tr>
-                    <tr v-show="value">
-                        <td class="tar">演示数据：</td>
-                        <td colspan="2"><input style="width:14px;height:14px;" type="checkbox" id="demo" name="demo"
-                                               value="demo" checked></td>
-                    </tr>
+
                 </table>
                 <table width="100%">
                     <tr>
@@ -104,7 +100,7 @@
                     <tr>
                         <td class="tar">管理员密码：</td>
                         <td><input type="password" name="manager_pwd" id="manager_pwd" class="input" autoComplete="off"
-                                placeholder="请输入密码(至少6个字符)"  placeholder-class="pl-style" onblur="checkForm()">
+                                   placeholder="请输入密码(至少6个字符)"  placeholder-class="pl-style" onblur="checkForm()">
                         </td>
                         <td>
                             <div id="J_install_tip_manager_pwd"><span class="gray">请输入至少6个字符密码</span></div>
@@ -118,6 +114,11 @@
                             <div id="J_install_tip_manager_ckpwd"></div>
                         </td>
                     </tr>
+                    <tr>
+                        <td class="tar">演示数据：</td>
+                        <td colspan="2"><input style="width:14px;height:14px;" type="checkbox" id="demo" name="demo"
+                                               value="demo" checked></td>
+                    </tr>
 
                 </table>
                 <table>
@@ -136,14 +137,14 @@
                     </tr>
                     <tr v-show="radio == 1">
                         <td class="tar">服务器地址：</td>
-                        <td><input type="text" name="rbhost" id="rbhost" value="127.0.0.1" class="input"></td>
+                        <td><input type="text" name="rbhost" id="rbhost" value="<?php echo $REDIS_HOST_IP; ?>" class="input"></td>
                         <td>
                             <div id="J_install_redis_host"><span class="gray">redis服务器地址，一般为127.0.0.1</span></div>
                         </td>
                     </tr>
                     <tr v-show="radio == 1">
                         <td class="tar">端口号：</td>
-                        <td><input type="text" name="rbport" id="rbport" value="6379" class="input" autoComplete="off">
+                        <td><input type="text" name="rbport" id="rbport" value="<?php echo $REDIS_PORT; ?>" class="input" autoComplete="off">
                         </td>
                         <td>
                             <div id="J_install_redis_port"><span class="gray">redis端口,默认为6379</span></div>
@@ -151,7 +152,7 @@
                     </tr>
                     <tr v-show="radio == 1">
                         <td class="tar">数据库：</td>
-                        <td><input type="text" name="rbselect" id="rbselect" value="0" class="input" autoComplete="off">
+                        <td><input type="text" name="rbselect" id="rbselect" value="<?php echo $REDIS_DATABASE; ?>" class="input" autoComplete="off">
                         </td>
                         <td>
                             <div id="J_install_redis_select"><span class="gray">redis数据库，默认为0,一般不做更改</span></div>
@@ -159,7 +160,7 @@
                     </tr>
                     <tr v-show="radio == 1" id="scrollBtn">
                         <td class="tar">数据库密码：</td>
-                        <td><input type="text" name="rbpw" id="rbpw" value="" class="input" autoComplete="off"></td>
+                        <td><input type="text" name="rbpw" id="rbpw" value="<?php echo $REDIS_PASSWORD; ?>" class="input" autoComplete="off"></td>
                         <td>
                             <div id="J_install_redis_dbpw"><span class="gray">redis数据库密码</span></div>
                         </td>
@@ -273,7 +274,7 @@
 
 
                 jumpButton(){
-                   this.$refs.mianscroll.scrollTop = this.$refs.mianscroll.clientHeight
+                    this.$refs.mianscroll.scrollTop = this.$refs.mianscroll.clientHeight
                 },
                 submitForm() {
                     this.mysqlDbPwd().then(res => {