阶段更新

modules/User/Http/Controllers/Api/Auth/SmsController.php

@@ -5,12 +5,14 @@ namespace Modules\User\Http\Controllers\Api\Auth;
 use App\Api\Controllers\Controller;
 use Exception;
 use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Arr;
 use Jason\Api\Api;
 use Modules\User\Events\UserLoginSuccess;
 use Modules\User\Facades\Sms;
 use Modules\User\Http\Requests\LoginSmsRequest;
 use Modules\User\Http\Requests\SmsRequest;
 use Modules\User\Models\User;
+use Vinkla\Hashids\Facades\Hashids;
 
 class SmsController extends Controller
 {
@@ -30,9 +32,14 @@ class SmsController extends Controller
         try {
             Sms::sendVerificationCode($mobile);
             $isExists = User::where('username', $mobile)->exists();
+            if (Arr::get(Sms::getConfig(), 'debug')) {
+                $message = '短信发送成功，测试短信码'.Arr::get(Sms::getConfig(), 'debug_code');
+            } else {
+                $message = '短信发送成功';
+            }
             return $this->success([
                 'new'     => ! $isExists,
-                'message' => '短信发送成功',
+                'message' => $message,
             ]);
         } catch (Exception $exception) {
             return $this->failed($exception->getException('aliyun')->getMessage());
@@ -49,18 +56,10 @@ class SmsController extends Controller
      */
     public function login(LoginSmsRequest $request): JsonResponse
     {
-        $mobileNo     = $request->mobileNo;
-        $code         = $request->code;
-        $invite_code  = $request->invite ?? '';
-        $channel_code = $request->channel ?? '';//渠道
-        $channel      = '';
-        if ($channel_code) {
-            $channel = UserChannel::query()
-                ->where('code', $channel_code)
-                ->first();
-        }
-
-        $parent = 0;
+        $mobileNo    = $request->mobileNo;
+        $code        = $request->code;
+        $invite_code = $request->invite ?? '';
+        $parent      = 0;
 
         if ($invite_code) {
             $invite = Hashids::connection('code')->decode($invite_code);
@@ -84,9 +83,9 @@ class SmsController extends Controller
         $user = User::firstOrCreate([
             'username' => $mobileNo,
         ], [
-            'parent_id'  => $parent,            
-	    'password'   => 111111,
-	]);
+            'parent_id' => $parent,
+            'password'  => 111111,
+        ]);
 
         $is_new = $user->wasRecentlyCreated;
 
@@ -95,10 +94,8 @@ class SmsController extends Controller
             if ($user->parent && $parent && $user->parent->id != $parent) {
                 $message = "您已与用户{$user->parent->info->nickname}绑定隶属关系，此次邀请码无效";
             }
-            
         }
 
-
         $token = Api::login($user);
 
         event(new UserLoginSuccess($user, $request, '手机验证码'));