init saas support

app/Console/Commands/CreateTenant.php

@@ -11,11 +11,11 @@ class CreateTenant extends Command
 {
     /**
      * The name and signature of the console command.
-     * use php artisan create-tenant {tenantCode} {--db-connection=} {--db-name=} {--db-username=} {--db-password=}
-     * eg: php artisan create-tenant test --db-connection=central --db-name=tenant_test --db-username=root --db-password=root
+     * use php artisan create-tenant {tenantCode} {--db-connection=} {--db-name=}
+     * eg: php artisan create-tenant test --db-connection=central --db-name=tenant_test
      * @var string
      */
-    protected $signature = 'create-tenant {tenantCode} {--db-connection=} {--db-name=} {--db-username=} {--db-password=}';
+    protected $signature = 'create-tenant {tenantCode} {--db-connection=} {--db-name=}';
 
     /**
      * The console command description.
@@ -37,24 +37,29 @@ class CreateTenant extends Command
 
         $this->info("creating tenant $tenantCode");
         $tenant = [
-            'id' => $tenantCode,
-            'tenancy_db_username' => $this->option('db-username') ?? $tenantCode,
-            'tenancy_db_password' => $this->option('db-password') ?? $tenantCode,
+            'id' => $tenantCode
         ];
-        // 默认值为 tenancy.database.prefix配置 + 租户 ID +tenancy.database.suffix配置
-        if (!empty($this->option('db-name'))) {
-            $tenant['tenancy_db_name'] = $this->option('db-name');
-        }
         // 默认值为 tenancy.database.template_connection配置
+        $tenant['tenancy_db_connection'] = config('tenancy.database.template_connection');
+
         if (!empty($this->option('db-connection'))) {
             $tenant['tenancy_db_connection'] = $this->option('db-connection');
         }
+
+        $tenant['tenancy_db_username'] = config("database.connections.{$tenant['tenancy_db_connection']}.username");
+        $tenant['tenancy_db_password'] = config("database.connections.{$tenant['tenancy_db_connection']}.password");
+
+        // 默认值为 tenancy.database.prefix配置 + 租户 ID +tenancy.database.suffix配置
+        if (!empty($this->option('db-name'))) {
+            $tenant['tenancy_db_name'] = $this->option('db-name');
+        }
+
         try {
             Tenant::create($tenant);
+            $this->info("create tenant $tenantCode success");
+            $this->info("database info: " . json_encode($tenant, 256));
         } catch (\Exception $e) {
-            // TODO: handle exception
             $this->error("create tenant $tenantCode fail:" . $e->getMessage());
         }
-        $this->info("create tenant $tenantCode success");
     }
 }

app/Console/Commands/InitializeRoutePermission.php

@@ -52,7 +52,13 @@ class InitializeRoutePermission extends Command
             ]);
         }
 
-        $role = Role::query()->find(config("auth.super_admin_role_id"));
+        $superAdminRoleId = config("auth.super_admin_role_id");
+        $superAdminRole = [
+            'id' => $superAdminRoleId,
+            'name' => 'admin',
+            'description' => '管理员权限'
+        ];
+        $role = Role::query()->firstOrCreate(['id' => $superAdminRoleId], $superAdminRole);
         $role?->syncPermissions(Permission::query()->pluck("name")->toArray());
     }
 }

app/Jobs/InitTenantData.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Artisan;
+use Stancl\Tenancy\Contracts\TenantWithDatabase;
+
+class InitTenantData implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    protected TenantWithDatabase $tenant;
+
+    public function __construct(TenantWithDatabase $tenant)
+    {
+        $this->tenant = $tenant;
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        Artisan::call('tenants:run', [
+            'commandname' => 'lpc:initialize-route-permission',
+            '--tenants' => [$this->tenant->getTenantKey()],
+        ]);
+    }
+}

app/Providers/TenancyServiceProvider.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace App\Providers;
 
 use App\Http\Middleware\GetTenancyByUsername;
+use App\Jobs\InitTenantData;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\ServiceProvider;
@@ -28,7 +29,7 @@ class TenancyServiceProvider extends ServiceProvider
                 JobPipeline::make([
                     Jobs\CreateDatabase::class,
                     Jobs\MigrateDatabase::class,
-                    // Jobs\SeedDatabase::class,
+                    Jobs\SeedDatabase::class,
 
                     // Your own jobs to prepare the tenant.
                     // Provision API keys, create S3 buckets, anything you want!
@@ -63,6 +64,13 @@ class TenancyServiceProvider extends ServiceProvider
             // Database events
             Events\DatabaseCreated::class => [],
             Events\DatabaseMigrated::class => [],
+            Events\SeedingDatabase::class => [
+                JobPipeline::make([
+                    InitTenantData::class,
+                ])->send(function (Events\SeedingDatabase $event) {
+                    return $event->tenant;
+                })->shouldBeQueued(false)
+            ],
             Events\DatabaseSeeded::class => [],
             Events\DatabaseRolledBack::class => [],
             Events\DatabaseDeleted::class => [],

database/migrations/tenant/2018_08_08_100000_create_telescope_entries_table.php

@@ -6,14 +6,6 @@ use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
-    /**
-     * Get the migration connection name.
-     */
-    public function getConnection(): ?string
-    {
-        return config('telescope.storage.database.connection');
-    }
-
     /**
      * Run the migrations.
      */