From 9594e0f4cb3439f0a5ccdf01831910251dda337a Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Thu, 21 Nov 2019 20:06:16 +0800
Subject: [PATCH] =?UTF-8?q?user=5Ftoken=20=E8=AF=BB=E5=86=99=E5=88=86?=
 =?UTF-8?q?=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Model/UserModel.class.php         | 11 ++++++-----
 Application/Sdk/Controller/UserController.class.php |  5 +----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Application/Admin/Model/UserModel.class.php b/Application/Admin/Model/UserModel.class.php
index 8e49a67a..1b24f709 100644
--- a/Application/Admin/Model/UserModel.class.php
+++ b/Application/Admin/Model/UserModel.class.php
@@ -1060,21 +1060,22 @@ class UserModel extends Model{
             /* 验证用户密码 */
             if(think_ucenter_md5($password, UC_AUTH_KEY) === $user['password']||$type==2){
                 $test_resource =  M('test_resource','tab_')->where("user_id=%s and apply_status=2",$user['id'])->find();//测试资源（扶持号）
+                $userToken = 0;
                 if($test_resource){ //扶持号
                     if($user['device_number'] && $unique_code && $user['device_number'] !=$unique_code){ //#当前登录设备信息与历史登录设备信息不一致，触发账户冻结
                         $this->sdklogin_device_error($user,$test_resource,$unique_code);
                         $this->sdklogin_ip_error($user,$test_resource,get_client_ip());
                         return -1;//扶持号被禁用
                     }else{
-                        $token = $this->sdklogin_update($user,$account,$password,$user['fgame_id'],$game_id,$game_name,$unique_code); //更新用户登录信息
+                        $token = $this->sdklogin_update($user,$account,$password,$user['fgame_id'],$game_id,$game_name,$unique_code,$userToken); //更新用户登录信息
                         $this->user_login_record2($user,$type,$game_id,$game_name,$sdk_version);
                         $this->sdklogin_ip_error($user,$test_resource,get_client_ip());
-                        return array("user_id"=>$user['id'],"token"=>$token); //登录成功，返回用户ID
+                        return array("user_id"=>$user['id'],"token"=>$token, "user_token" => $userToken); //登录成功，返回用户ID
                     }
                 }else{
-                    $token = $this->sdklogin_update($user,$account,$password,$user['fgame_id'],$game_id,$game_name,$unique_code); //更新用户登录信息
+                    $token = $this->sdklogin_update($user,$account,$password,$user['fgame_id'],$game_id,$game_name,$unique_code,$userToken); //更新用户登录信息
                     $this->user_login_record2($user,$type,$game_id,$game_name,$sdk_version);
-                    return array("user_id"=>$user['id'],"token"=>$token); //登录成功，返回用户ID
+                    return array("user_id"=>$user['id'],"token"=>$token, "user_token" => $userToken); //登录成功，返回用户ID
                 }
 
             } else {
@@ -1087,7 +1088,7 @@ class UserModel extends Model{
 
 
     //更新用户登录信息
-    protected function sdklogin_update($user,$account,$password,$user_fgame_id,$game_id,$game_name,$unique_code=''){
+    protected function sdklogin_update($user,$account,$password,$user_fgame_id,$game_id,$game_name,$unique_code='',&$userToken=''){
         $model = M('User','tab_');
         $uid = $user['id'];
         $data["id"] = $uid;
diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index 1b1b5628..b8288811 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/Application/Sdk/Controller/UserController.class.php
@@ -305,10 +305,7 @@ class UserController extends BaseController
                     $unread_count += $buddies_request;
                     M('nearby', 'tab_') -> where(['user_id' => $user['user_id']]) -> setField(['game_status' => 1, 'update_time' => time(), 'user_nickname' => $user_res['nickname'], 'head_img' => $user_res['head_img']]);
                     
-                    $userToken = M('user_token', 'tab_')->where([
-                    	'user_id' => $user['user_id'],
-                    	'game_id' => $user['game_id']
-                    ])->getField('user_token');
+                    $userToken = $result['user_token'];
                     $res_msg = array(
                             "status" => 200,
                             "return_code" => "success",