Browse Source

create tenant

peterguo 2 months ago
parent
commit
064dd219a1

+ 4 - 10
app/Admin/Controllers/TenantController.php

@@ -3,7 +3,6 @@
 namespace App\Admin\Controllers;
 
 
-use App\Models\GlobalUser;
 use App\Models\Tenant;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Form;
@@ -124,24 +123,19 @@ class TenantController extends AdminController
         // 从URL中获取 tenant_id
         $tenantId = request()->route('tenant_id');
 
-        $form->tab('基本信息', function (Form $form) use ($databaseConnections, $tenantId) {
+        $form->tab('basicInfo', function (Form $form) use ($databaseConnections, $tenantId) {
             $form->text('id')->rules('required')->default($tenantId); // 设置默认值为 tenant_id
             $form->text('name');
             $form->text('email');
             $form->radio('tenancy_db_connection')
                 ->options($databaseConnections)->default('mysql');;
             $form->datetime('expired_at');
-        })->tab('域名', function (Form $form) {
-            $form->hasMany('domains', 'domains', function (Form\NestedForm $form) {
-                $form->text('domain');
+        })->tab('domains', function (Form $form) {
+            $form->hasMany('domains', '', function (Form\NestedForm $form) {
+                $form->text('domain')->required();
             });
         });
 
-        $form->hasMany("users", 'users', function (Form\NestedForm $form) {
-            $form->text('username')->value($form->id);
-            $form->text('tenant_id')->value($form->id);
-        });
-
         return $form;
     }
 }

+ 1 - 1
app/Providers/TenancyServiceProvider.php

@@ -35,7 +35,7 @@ class TenancyServiceProvider extends ServiceProvider
 
                 ])->send(function (Events\TenantCreated $event) {
                     return $event->tenant;
-                })->shouldBeQueued(false), // `false` by default, but you probably want to make this `true` for production.
+                })->shouldBeQueued(), // `false` by default, but you probably want to make this `true` for production.
             ],
             Events\SavingTenant::class => [],
             Events\TenantSaved::class => [],