From 4297e931f275dd46a3930050958bbd44ab7e575b Mon Sep 17 00:00:00 2001
From: tpingzhang <635929049@qq.com>
Date: Thu, 21 Nov 2019 17:19:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E5=B9=B3=E5=8F=B0=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E4=BA=92T?=
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 |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Model/UserModel.class.php b/Application/Admin/Model/UserModel.class.php
index 12597eda..fa1e937b 100644
--- a/Application/Admin/Model/UserModel.class.php
+++ b/Application/Admin/Model/UserModel.class.php
@@ -1099,22 +1099,27 @@ class UserModel extends Model{
         $data["token"] = $this->generateToken($uid,$account,$password);
         
         $userToken = $this->generateToken($uid,$account,$password);
+        $relationGameId = M('game', 'tab_')->where([
+        	'id' => $game_id
+        ])->getField('relation_game_id');
+        
         $userTokens = M('user_token','tab_')->where([
         	'user_id' => $uid,
-        	'game_id' => $game_id
+        	'game_id|relation_game_id' => $game_id
         ])->find();
         if (!$userTokens) {
         	M('user_token', 'tab_')->add([
             	'user_id' => $uid,
             	'game_id' => $game_id,
+            	'relation_game_id' => $relationGameId,
             	'user_token' => $userToken,
-            	'login_cnt' => 0,
+            	'login_cnt' => 1,
             	'create_time' => time(),
             	'update_time' => time()
         	]);
         } else {
         	M('user_token', 'tab_')->where([
-				'id' => $userTokens['id']       	
+				'game_id|relation_game_id' => $relationGameId       	
         	])->save([
         		'user_token' => $userToken,
 	        	'login_cnt' => $userTokens['login_cnt'] + 1,
diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index e05f97ce..16255622 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/Application/Sdk/Controller/UserController.class.php
@@ -305,7 +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([
+                    $userToken = M('user_token', 'tab_')->where([
                     	'user_id' => $user['user_id'],
                     	'game_id' => $user['game_id']
                     ])->getField('user_token');