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 @@
-
-
- -
- -
-
@@ -76,7 +69,7 @@
+ autocomplete="off" class="layui-input" value="">
@@ -90,21 +83,21 @@
- +
-
-