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

Application/Sdk/Controller/UserController.class.php

@@ -1246,6 +1246,7 @@ class UserController extends BaseController
         $map['user_id'] = $user_id;
         $map['game_id'] = $request['game_id'];
         $map['server_id'] = $request['server_id'];
+        $map['role_id'] = $request['game_player_id'];
 //         $map['server_name'] = $request['server_name'];
         $user_play = M('user_play_info', 'tab_');
         $res = $data = $user_play -> where($map) -> find();
@@ -1282,6 +1283,7 @@ class UserController extends BaseController
 			// 修改重复插入问题  增加唯一索引  记录重复插入异常
             try {
             	$user_play->add($data);
+            	$this -> set_message(200, "success", $user_play->_sql());
             } catch (\Exception $e) {
             	Log::write('Duplicate Exception:' .json_encode($e->getMessage()), Log::ERR);
             }