diff --git a/.gitignore b/.gitignore index 529cb5bca..375163ec0 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,4 @@ /public/static/theme/css/package-lock.json /public/static/theme/css/console.*.css /public/static/theme/css/console.*.css.map -/database/sqlite.db \ No newline at end of file +/database/sqlite.* \ No newline at end of file diff --git a/composer.json b/composer.json index 1b3e5bf4f..f75ff2875 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,6 @@ "endroid/qr-code": "^1.9", "topthink/framework": "^6.0", "topthink/think-view": "^1.0", - "topthink/think-migration": "^3.0", "zoujingli/ip2region": "^2.0", "zoujingli/think-library": "6.0.x-dev", "zoujingli/wechat-developer": "^1.2" diff --git a/database/migrations/20221013031926_install_admin_data.php b/database/migrations/20221013031926_install_admin_data.php index f06ef004a..7021b7977 100644 --- a/database/migrations/20221013031926_install_admin_data.php +++ b/database/migrations/20221013031926_install_admin_data.php @@ -47,12 +47,12 @@ class InstallAdminData extends Migrator /** * 初始化系统菜单 - * @return void + * @return bool */ - private function createMenu() + private function createMenu(): bool { // 初始化菜单数据 - ToolsExtend::write2menu([ + return ToolsExtend::write2menu([ [ 'name' => '系统管理', 'sort' => '100', @@ -87,9 +87,10 @@ class InstallAdminData extends Migrator */ private function createConf() { - if (SystemConfig::mk()->count()) { - return; - } + // 检查数据 + if (SystemConfig::mk()->count()) return; + + // 写入数据 SystemConfig::mk()->insertAll([ ['type' => 'base', 'name' => 'app_name', 'value' => 'ThinkAdmin'], ['type' => 'base', 'name' => 'app_version', 'value' => 'v6'], diff --git a/database/migrations/20221013045830_install_wechat_data.php b/database/migrations/20221013045830_install_wechat_data.php index 9c17a9deb..3f269c686 100644 --- a/database/migrations/20221013045830_install_wechat_data.php +++ b/database/migrations/20221013045830_install_wechat_data.php @@ -1,7 +1,6 @@ 'wechat/config/options']; - if (SystemMenu::mk()->where($map)->count() > 0) return; - // 写入微信菜单 - ToolsExtend::write2menu([ + return ToolsExtend::write2menu([ [ 'name' => '微信管理', 'sort' => '200', diff --git a/database/migrations/20221013045840_install_user_region.php b/database/migrations/20221013045840_install_user_region.php index b0d67e3e4..82f4401b1 100644 --- a/database/migrations/20221013045840_install_user_region.php +++ b/database/migrations/20221013045840_install_user_region.php @@ -1,6 +1,5 @@ createRegion(); + $this->installRegion(); } /** @@ -22,11 +22,11 @@ class InstallUserRegion extends Migrator * @return void * @throws \think\db\exception\DbException */ - private function createRegion() + private function installRegion() { // 检查数据 $table = 'base_postage_region'; - if (Library::$sapp->db->table($table)->count() > 0) return; + if (app()->db->table($table)->count() > 0) return; // 写入数据 $this->execute(<<