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

Application/Sdk/Controller/BaseController.class.php

@@ -51,8 +51,8 @@ class BaseController extends RestController{
 	       		if (!$userToken || $userToken != $data['user_token']) {
 	       			echo base64_encode (json_encode(array(
 	       				"code" => 9999,
-	       				"msg" => $data['user_token']."您已下线，请重新登入".$userToken,
+	       				"msg" => "您已下线，请重新登入",
-	       				"return_msg" => $data['user_token']."您已下线，请重新登入".$userToken,
+	       				"return_msg" => "您已下线，请重新登入",
 	       				"data" => ""
 	       			)));
 	       			exit ();

Application/Sdk/Controller/UserController.class.php

@@ -1248,7 +1248,7 @@ class UserController extends BaseController
         $map['user_id'] = $user_id;
         $map['game_id'] = $request['game_id'];
         $map['server_id'] = $request['server_id'];
-        $map['server_name'] = $request['server_name'];
+//         $map['server_name'] = $request['server_name'];
         $user_play = M('user_play_info', 'tab_');
         $res = $data = $user_play -> where($map) -> find();
         $user = M('user', 'tab_');