|
@@ -22,12 +22,18 @@ class GameController extends Controller
|
|
|
$response['msg'] = '请先登录';
|
|
|
return response()->json($response);
|
|
|
}
|
|
|
- if(!$request->session()->has('room_id')){
|
|
|
+ $room_id = $request->input('room_id');
|
|
|
+ // if(!$request->session()->has('room_id')){
|
|
|
+ // $response['code'] = 400;
|
|
|
+ // $response['msg'] = '请先匹配对手';
|
|
|
+ // return response()->json($response);
|
|
|
+ // }
|
|
|
+ if(!$room_id){
|
|
|
$response['code'] = 400;
|
|
|
- $response['msg'] = '请先匹配对手';
|
|
|
+ $response['msg'] = '缺少房间参数';
|
|
|
return response()->json($response);
|
|
|
}
|
|
|
- $room_id = $request->session()->get('room_id');
|
|
|
+ // $room_id = $request->session()->get('room_id');
|
|
|
//获取当前房间问题
|
|
|
$questions = Redis::smembers($room_id);
|
|
|
$question = Question::inRandomOrder()->select('question_id','title')->where("is_released",1)->whereNotIn("question_id", $questions)->first();
|