diff --git a/README.md b/README.md index 6c3bc45..4f9232d 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ ## 事件 -- 用户注册成功: `Peidikeji\User\Events\UserRegister` +- 用户注册成功: `Peidikeji\User\Events\UserCreated` ## 测试数据 diff --git a/src/Events/UserRegister.php b/src/Events/UserCreated.php similarity index 95% rename from src/Events/UserRegister.php rename to src/Events/UserCreated.php index a4f1cdf..e11b42d 100644 --- a/src/Events/UserRegister.php +++ b/src/Events/UserCreated.php @@ -7,7 +7,7 @@ use Illuminate\Foundation\Events\Dispatchable; use Illuminate\Queue\SerializesModels; use Peidikeji\User\Models\User; -class UserRegister +class UserCreated { use Dispatchable, InteractsWithSockets, SerializesModels; diff --git a/src/Http/Admin/UserController.php b/src/Http/Admin/UserController.php index 965157b..7f72844 100644 --- a/src/Http/Admin/UserController.php +++ b/src/Http/Admin/UserController.php @@ -127,7 +127,10 @@ class UserController extends AdminController $form->disableViewButton(); $form->saving(function (Form $form) { - $form->inviter_path = $form->inviter_id ? User::where('id', $form->inviter_id)->value('inviter_path') . $form->inviter_id.'-' : '-'; + $request = request(); + if ($request->filled('inviter_id')) { + $form->inviter_path = $form->inviter_id ? User::where('id', $form->inviter_id)->value('inviter_path') . $form->inviter_id.'-' : '-'; + } if ($form->isCreating() && !$form->invite_code) { do { $invite_code = strtoupper(Str::random(6)); diff --git a/src/Http/Api/AuthController.php b/src/Http/Api/AuthController.php index 78eab94..d5dc241 100644 --- a/src/Http/Api/AuthController.php +++ b/src/Http/Api/AuthController.php @@ -8,7 +8,6 @@ use Illuminate\Support\Facades\Hash; use Illuminate\Validation\Rules\Password; use Overtrue\LaravelWeChat\EasyWeChat; use Peidikeji\User\Enums\SocialiteType; -use Peidikeji\User\Events\UserRegister; use Peidikeji\User\Models\User; use Peidikeji\User\Models\UserSocialite; @@ -191,8 +190,6 @@ class AuthController extends Controller } $user = User::create($attributes); - event(new UserRegister($user)); - return $user; } } diff --git a/src/Models/User.php b/src/Models/User.php index 1652592..2982757 100644 --- a/src/Models/User.php +++ b/src/Models/User.php @@ -10,6 +10,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Support\Str; use Peidikeji\Coupon\Models\UserCoupon; use Peidikeji\Order\Models\Order; +use Peidikeji\User\Events\UserCreated; class User extends Authenticatable { @@ -19,6 +20,10 @@ class User extends Authenticatable protected $fillable = ['username', 'password', 'avatar', 'balance', 'invite_code', 'inviter_id', 'inviter_path', 'name', 'gender', 'phone', 'created_at']; + protected $dispatchesEvents = [ + 'created' => UserCreated::class, + ]; + protected static function booted() { static::creating(function ($model) {