Add getMessage ajax api.
1. Rename old getMessage to showMessageView 2. Add getMessage ajax api 3. Fix CheckSu Middleware
This commit is contained in:
@@ -21,7 +21,7 @@ use App\Http\Controllers\Controller;
|
||||
|
||||
class MessageController extends Controller
|
||||
{
|
||||
public function getMessage(Request $request)
|
||||
public function showMessageView(Request $request)
|
||||
{
|
||||
$data = [];
|
||||
$user_id = $request->session()->get('user_id');
|
||||
@@ -29,6 +29,17 @@ class MessageController extends Controller
|
||||
return View::make('message.message')->with($data);
|
||||
}
|
||||
|
||||
public function getMessage(Request $request)
|
||||
{
|
||||
$user_id = $request->session()->get('user_id');
|
||||
$contact_id = $request->contact_id;
|
||||
$messages = Message::where('receiver_id', $user_id)->where('sender_id', $contact_id)
|
||||
->orWhere('receiver_id', $contact_id)->where('sender_id', $user_id)
|
||||
->orderBy('id', 'desc')
|
||||
->paginate(20);
|
||||
return json_encode($messages);
|
||||
}
|
||||
|
||||
public function getUnreadMsgNum(Request $request)
|
||||
{
|
||||
$user_id = $request->session()->get('user_id');
|
||||
|
||||
@@ -11,18 +11,15 @@ class CheckSu
|
||||
/**
|
||||
* Handle an incoming request.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Closure $next
|
||||
* @return mixed
|
||||
*/
|
||||
public function handle($request, Closure $next)
|
||||
{
|
||||
if($request->session()->has('username')&&$request->session()->get('is_admin')==2)
|
||||
{
|
||||
if ($request->session()->has('user_id') && $request->session()->get('is_admin') == 2) {
|
||||
return $next($request);
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
return Redirect::to('/login');
|
||||
}
|
||||
}
|
||||
|
||||
+2
-1
@@ -66,6 +66,7 @@ Route::group(['middleware' => ['web']],function () {
|
||||
Route::delete('/user/fav/del', "UserController@delFavlist");
|
||||
|
||||
Route::get('/message/contacts', "MessageController@getMessageContact");
|
||||
Route::get('/message/getMessage', "MessageController@getMessage");
|
||||
});
|
||||
|
||||
Route::get('/user/sell', "UserController@mygoods")->middleware('auth');
|
||||
@@ -101,7 +102,7 @@ Route::group(['middleware' => ['web']],function () {
|
||||
|
||||
Route::post('/good/{good_id}/buy', "TransactionController@add")->middleware('auth');
|
||||
|
||||
Route::get('/message', "MessageController@getMessage")->middleware('auth');
|
||||
Route::get('/message', "MessageController@showMessageView")->middleware('auth');
|
||||
Route::get('/test/sendmessagepage', "MessageController@sendMessagepage")->middleware('su');
|
||||
Route::post('/message', "MessageController@sendMessage")->middleware('auth');
|
||||
Route::get('/message/num', "MessageController@getUnreadMsgNum")->middleware('auth');
|
||||
|
||||
Reference in New Issue
Block a user