From e4952f638927f833af02541def041a03a9669c5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=80=E6=9C=AF=E8=80=81=E8=83=A1?= <1094551889@qq.com>
Date: Mon, 31 Mar 2025 12:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E8=A3=85=E7=A8=8B=E5=BA=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                 |  1 -
 app/controller/InstallController.php |  2 --
 view/Install/index.html              | 19 ++++++-------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.env b/.env
index 292a32f..cfcbe44 100644
--- a/.env
+++ b/.env
@@ -6,7 +6,6 @@ DB_NAME = mpay
 DB_USER = mpay
 DB_PASS = 123456
 DB_PORT = 3306
-DB_CHARSET = utf8mb4
 DB_PREFIX = mpay_
 
 DEFAULT_LANG = zh-cn
\ No newline at end of file
diff --git a/app/controller/InstallController.php b/app/controller/InstallController.php
index 77115ba..196c4ad 100644
--- a/app/controller/InstallController.php
+++ b/app/controller/InstallController.php
@@ -132,7 +132,6 @@ class InstallController
             'user' => 'require',
             'pass' => 'require',
             'port' => 'require|integer',
-            'charset' => 'require'
         ];
         if (!$validate->rule($rule)->check($dbConfig)) {
             throw new ValidateException($validate->getError());
@@ -187,7 +186,6 @@ DB_NAME = {$dbConfig['name']}
 DB_USER = {$dbConfig['user']}
 DB_PASS = {$dbConfig['pass']}
 DB_PORT = {$dbConfig['port']}
-DB_CHARSET = {$dbConfig['charset']}
 DB_PREFIX = mpay_
 
 DEFAULT_LANG = zh-cn
diff --git a/view/Install/index.html b/view/Install/index.html
index a564bb7..ccde45e 100644
--- a/view/Install/index.html
+++ b/view/Install/index.html
@@ -54,17 +54,10 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">端口</label>
                     <div class="layui-input-block">
-                        <input type="text" name="port" required lay-verify="required" placeholder="请输入数据库名称"
+                        <input type="text" name="port" required lay-verify="required" placeholder="请输入端口号"
                             autocomplete="off" class="layui-input" value="3306">
                     </div>
                 </div>
-                <div class="layui-form-item">
-                    <label class="layui-form-label">编码</label>
-                    <div class="layui-input-block">
-                        <input type="text" name="charset" required lay-verify="required" placeholder="请输入数据库名称"
-                            autocomplete="off" class="layui-input" value="utf8mb4">
-                    </div>
-                </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">数据库</label>
                     <div class="layui-input-block">
@@ -76,7 +69,7 @@
                     <label class="layui-form-label">用户名</label>
                     <div class="layui-input-block">
                         <input type="text" name="user" required lay-verify="required" placeholder="请输入数据库用户名"
-                            autocomplete="off" class="layui-input" value="root">
+                            autocomplete="off" class="layui-input" value="">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -90,21 +83,21 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">管理员昵称</label>
                     <div class="layui-input-block">
-                        <input type="text" name="nickname" required lay-verify="required" placeholder="请输入管理员昵称"
-                            autocomplete="off" class="layui-input" value="勇敢牛牛">
+                        <input type="text" name="nickname" required lay-verify="required" placeholder="设置管理员昵称"
+                            autocomplete="off" class="layui-input" value="Mpay">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">管理员账号</label>
                     <div class="layui-input-block">
-                        <input type="text" name="username" required lay-verify="required" placeholder="请输入管理员用户名"
+                        <input type="text" name="username" required lay-verify="required" placeholder="设置管理员用户名"
                             autocomplete="off" class="layui-input" value="admin">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">管理员密码</label>
                     <div class="layui-input-block">
-                        <input type="password" name="password" required lay-verify="required" placeholder="请输入管理员密码"
+                        <input type="password" name="password" required lay-verify="required" placeholder="设置登陆密码"
                             autocomplete="off" class="layui-input">
                     </div>
                 </div>