diff --git a/database/migrations/20221013031926_install_admin_data.php b/database/migrations/20221013031926_install_admin_data.php index 7021b7977..c9f3a6f06 100644 --- a/database/migrations/20221013031926_install_admin_data.php +++ b/database/migrations/20221013031926_install_admin_data.php @@ -17,9 +17,9 @@ class InstallAdminData extends Migrator */ public function change() { - $this->createUser(); - $this->createMenu(); - $this->createConf(); + $this->insertUser(); + $this->insertMenu(); + $this->insertConf(); } /** @@ -27,7 +27,7 @@ class InstallAdminData extends Migrator * @return void * @throws \think\db\exception\DbException */ - private function createUser() + private function insertUser() { // 检查是否存在 $map = ['username' => 'admin']; @@ -37,7 +37,7 @@ class InstallAdminData extends Migrator // 初始化默认数据 SystemUser::mk()->save([ - 'id' => 10000, + 'id' => '10000', 'username' => 'admin', 'nickname' => '超级管理员', 'password' => '21232f297a57a5a743894a0e4a801fc3', @@ -47,12 +47,12 @@ class InstallAdminData extends Migrator /** * 初始化系统菜单 - * @return bool + * @return void */ - private function createMenu(): bool + private function insertMenu() { // 初始化菜单数据 - return ToolsExtend::write2menu([ + ToolsExtend::write2menu([ [ 'name' => '系统管理', 'sort' => '100', @@ -85,7 +85,7 @@ class InstallAdminData extends Migrator * @return void * @throws \think\db\exception\DbException */ - private function createConf() + private function insertConf() { // 检查数据 if (SystemConfig::mk()->count()) return; diff --git a/database/migrations/20221013045830_install_wechat_data.php b/database/migrations/20221013045830_install_wechat_data.php index 3f269c686..8b98c80eb 100644 --- a/database/migrations/20221013045830_install_wechat_data.php +++ b/database/migrations/20221013045830_install_wechat_data.php @@ -11,21 +11,19 @@ class InstallWechatData extends Migrator /** * 初始化数据 * @return void - * @throws \think\db\exception\DbException */ public function change() { - $this->createMenu(); + $this->insertMenu(); } /** * 初始化菜单 - * @return bool */ - private function createMenu(): bool + private function insertMenu() { // 写入微信菜单 - return ToolsExtend::write2menu([ + ToolsExtend::write2menu([ [ 'name' => '微信管理', 'sort' => '200', diff --git a/database/migrations/20221013045839_install_user_data.php b/database/migrations/20221013045839_install_user_data.php index 796e64d8f..cb5c393ff 100644 --- a/database/migrations/20221013045839_install_user_data.php +++ b/database/migrations/20221013045839_install_user_data.php @@ -13,16 +13,16 @@ class InstallUserData extends Migrator */ public function change() { - $this->createMenu(); + $this->insertMenu(); } /** * 创建菜单 - * @return boolean + * @return void */ - protected function createMenu(): bool + protected function insertMenu() { - return ToolsExtend::write2menu([ + ToolsExtend::write2menu([ [ 'name' => '控制台', 'sort' => '300', diff --git a/database/migrations/20221013045840_install_user_region.php b/database/migrations/20221013045840_install_user_region.php index 82f4401b1..e28fa863c 100644 --- a/database/migrations/20221013045840_install_user_region.php +++ b/database/migrations/20221013045840_install_user_region.php @@ -26,7 +26,8 @@ class InstallUserRegion extends Migrator { // 检查数据 $table = 'base_postage_region'; - if (app()->db->table($table)->count() > 0) return; + $result = $this->fetchRow("select count(1) _count from $table"); + if (isset($result['_count']) && $result['_count'] > 0) return; // 写入数据 $this->execute(<<