From 9eb6077149651d139d0806ab0562da84e8164875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Fri, 28 Oct 2022 10:22:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                          |  2 +-
 composer.json                                       |  1 -
 .../20221013031926_install_admin_data.php           | 13 +++++++------
 .../20221013045830_install_wechat_data.php          | 12 +++---------
 .../20221013045840_install_user_region.php          |  8 ++++----
 5 files changed, 15 insertions(+), 21 deletions(-)

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 @@
 <?php
 
 use think\admin\extend\ToolsExtend;
-use think\admin\model\SystemMenu;
 use think\migration\Migrator;
 
 /**
@@ -21,17 +20,12 @@ class InstallWechatData extends Migrator
 
     /**
      * 初始化菜单
-     * @return void
-     * @throws \think\db\exception\DbException
+     * @return bool
      */
-    private function createMenu()
+    private function createMenu(): bool
     {
-        // 检查菜单数据
-        $map = ['node' => '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 @@
 <?php
 
-use think\admin\Library;
 use think\migration\Migrator;
 
 /**
@@ -9,12 +8,13 @@ use think\migration\Migrator;
 class InstallUserRegion extends Migrator
 {
     /**
+     * 写入默认区域数据
      * @return void
      * @throws \think\db\exception\DbException
      */
     public function change()
     {
-        $this->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(<<<SQL