From 919fcff45bf8d3efa717ac41d7da95f2de383d6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Tue, 27 Jul 2021 23:27:07 +0800
Subject: [PATCH] Fix client register api bug

---
 app/Http/Controllers/Api/Client/V1Controller.php | 16 ++++++----------
 app/Observers/UserObserver.php                   |  5 +----
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/Api/Client/V1Controller.php b/app/Http/Controllers/Api/Client/V1Controller.php
index dabb9f74..b4144438 100644
--- a/app/Http/Controllers/Api/Client/V1Controller.php
+++ b/app/Http/Controllers/Api/Client/V1Controller.php
@@ -10,7 +10,6 @@ use App\Models\Goods;
 use App\Models\GoodsCategory;
 use App\Models\Order;
 use App\Models\ReferralLog;
-use App\Models\User;
 use Exception;
 use Hashids\Hashids;
 use Illuminate\Http\JsonResponse;
@@ -86,7 +85,7 @@ class V1Controller extends Controller
     public function register(Request $request)
     {
         $validator = Validator::make($request->all(), [
-            'name'     => 'required|string|between:2,100',
+            'nickname' => 'required|string|between:2,100',
             'username' => 'required|'.(sysConfig('username_type') ?? 'email').'|max:100|unique:user,username',
             'password' => 'required|string|confirmed|min:6',
         ]);
@@ -94,11 +93,10 @@ class V1Controller extends Controller
         if ($validator->fails()) {
             return response()->json($validator->errors()->all(), 400);
         }
+        $data = $validator->validated();
 
-        $user = User::create(array_merge(
-            $validator->validated(),
-            ['password' => $request->password]
-        ));
+        // 创建新用户
+        $user = Helpers::addUser($data['username'], $data['password'], (int) sysConfig('default_traffic'), sysConfig('default_days'), null, $data['nickname']);
 
         return response()->json(['ret' => 1, 'user' => $user], 201);
     }
@@ -172,14 +170,12 @@ class V1Controller extends Controller
         $pay_type = $request->input('pay_type');
         $amount = 0;
 
-        // 充值余额
-        if ($credit) {
+        if ($credit) { // 充值余额
             if (! is_numeric($credit) || $credit <= 0) {
                 return response()->json(['ret' => 0, 'msg' => trans('user.payment.error')]);
             }
             $amount = $credit;
-        // 购买服务
-        } elseif ($goods_id && self::$method) {
+        } elseif ($goods_id && self::$method) { // 购买服务
             $goods = Goods::find($goods_id);
             if (! $goods || ! $goods->status) {
                 return response()->json(['ret' => 0, 'msg' => '订单创建失败：商品已下架']);
diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php
index 3e2b02aa..59127218 100644
--- a/app/Observers/UserObserver.php
+++ b/app/Observers/UserObserver.php
@@ -14,10 +14,7 @@ class UserObserver
 {
     public function created(User $user): void
     {
-        $subscribe = new UserSubscribe();
-        $subscribe->user_id = $user->id;
-        $subscribe->code = Helpers::makeSubscribeCode();
-        $subscribe->save();
+        $user->subscribe()->create(['code' => Helpers::makeSubscribeCode()]);
 
         $allowNodes = $user->nodes()->whereType(4)->get()->pluck('id');
         if ($allowNodes) {