Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

5 years ago · 2a52aa42ae
parent ba6fc9634b 732777305e
commit 2a52aa42ae
1 changed files with 0 additions and 1 deletions
--- a/Application/Admin/Model/UserModel.class.php
+++ b/Application/Admin/Model/UserModel.class.php
@ -1071,7 +1071,6 @@ class UserModel extends Model{
                        return array("user_id"=>$user['id'],"token"=>$token); //登录成功，返回用户ID
                    }
                }else{
-                    Log::write('进入SDK_1' , 'INFO');
                    $token = $this->sdklogin_update($user,$account,$password,$user['fgame_id'],$game_id,$game_name,$unique_code); //更新用户登录信息
                    $this->user_login_record2($user,$type,$game_id,$game_name,$sdk_version);
                    return array("user_id"=>$user['id'],"token"=>$token); //登录成功，返回用户ID