xiaogang преди 4 години
родител
ревизия
0f4be0694d
променени са 3 файла, в които са добавени 29 реда и са изтрити 4 реда
  1. 27 3
      app/Http/Controllers/Api/AuthorizationsController.php
  2. 1 1
      app/Models/User.php
  3. 1 0
      app/Services/UserService.php

+ 27 - 3
app/Http/Controllers/Api/AuthorizationsController.php

xqd xqd xqd xqd
@@ -66,6 +66,10 @@ class AuthorizationsController extends Controller
         if (!$user->tencent_im_user_id) {
             $user->tencent_im_user_id = $this->tencentImAccountService->accountImport($user);
         }
+        if($user->status!=1){
+            return $this->response->errorForbidden("用户已被禁用,请联系管理员");
+        }
+
         $user->save();
         $token = Auth::guard('api')->fromUser($user);
         self::updateLastLogin($user, $token);
@@ -74,6 +78,15 @@ class AuthorizationsController extends Controller
         $resdata['sex'] = $user->sex;
         $resdata['password'] = $user->password?1:0;
         $resdata['tencent_im_user_id'] =$user->tencent_im_user_id;
+        $resdata['mobile'] =$user->mobile;
+        $resdata['lock_pass'] =$user->lock_pass?$user->lock_pass:false;
+        $resdata['status'] =$user->status;
+        $resdata['is_auth'] =$user->is_auth;
+        $resdata['ycode'] =$user->ycode;
+        $resdata['online'] =$user->online;
+        $resdata['notice_status'] =$user->notice_status;
+
+
         return response()->json($resdata);
     }
 
@@ -113,12 +126,15 @@ class AuthorizationsController extends Controller
             return $this->response()->errorForbidden($validator->messages()->first());
         }
         if (!$user=User::where(['mobile' => $request->mobile])->first()) {
-            return $this->response->errorNotFound('用户不存在!');
+            return $this->response->errorForbidden('用户不存在!');
         }
         $credentials = $request->only('mobile', 'password');
 
         if (!$token = auth('api')->attempt($credentials)) {
-            return $this->response->errorUnauthorized ('用户名或密码错误');
+            return $this->response->errorForbidden ('用户名或密码错误');
+        }
+        if($user->status!=1){
+            return $this->response->errorForbidden("用户已被禁用,请联系管理员");
         }
 
         if (!$user->ycode) {
@@ -128,13 +144,21 @@ class AuthorizationsController extends Controller
         if (!$user->tencent_im_user_id) {
             $user->tencent_im_user_id = $this->tencentImAccountService->accountImport($user);
         }
+
         $user->save();
         self::updateLastLogin($user, $token);
 
-        $resdata['token'] ="Bearer ".$token;
+        $resdata['token'] = "Bearer ".$token;
         $resdata['sex'] = $user->sex;
         $resdata['password'] = $user->password?1:0;
         $resdata['tencent_im_user_id'] =$user->tencent_im_user_id;
+        $resdata['mobile'] =$user->mobile;
+        $resdata['lock_pass'] =$user->lock_pass?$user->lock_pass:false;
+        $resdata['status'] =$user->status;
+        $resdata['is_auth'] =$user->is_auth;
+        $resdata['ycode'] =$user->ycode;
+        $resdata['online'] =$user->online;
+        $resdata['notice_status'] =$user->notice_status;
         return response()->json($resdata);
     }
 

+ 1 - 1
app/Models/User.php

xqd
@@ -20,7 +20,7 @@ class User extends Authenticatable implements JWTSubject
      * @var array
      */
     protected $fillable = [
-        'mobile', 'password', 'pid', 'tencent_im_user_id','sex','status','is_vip','is_auth','remember_token','ycode','latitude','longitude','online','notice_status','like_num','like_me_num','look_num'
+        'mobile', 'password', 'pid', 'tencent_im_user_id','sex','status','is_vip','is_auth','remember_token','ycode','latitude','longitude','online','notice_status','like_num','like_me_num','look_num','lock_pass'
     ];
 
     /**

+ 1 - 0
app/Services/UserService.php

xqd
@@ -126,6 +126,7 @@ class UserService
      */
     public function invite_info(){
         $user = auth('api')->user();
+        //总邀请用户
         $total_user = User::query()->where(['pid'=>$user->id])->count();