diff --git a/app/Builders/ImMessageList.php b/app/Builders/ImMessageList.php
index f71b7fc1..486feb25 100644
--- a/app/Builders/ImMessageList.php
+++ b/app/Builders/ImMessageList.php
@@ -7,20 +7,20 @@ use App\Repos\User as UserRepo;
 class ImMessageList extends Builder
 {
 
-    public function handleUsers(array $messages)
+    public function handleSenders(array $messages)
     {
-        $users = $this->getUsers($messages);
+        $users = $this->getSenders($messages);
 
         foreach ($messages as $key => $message) {
-            $messages[$key]['user'] = $users[$message['user_id']] ?? new \stdClass();
+            $messages[$key]['sender'] = $users[$message['sender_id']] ?? new \stdClass();
         }
 
         return $messages;
     }
 
-    public function getUsers(array $messages)
+    public function getSenders(array $messages)
     {
-        $ids = kg_array_column($messages, 'user_id');
+        $ids = kg_array_column($messages, 'sender_id');
 
         $userRepo = new UserRepo();
 
diff --git a/app/Http/Web/Controllers/MessengerController.php b/app/Http/Web/Controllers/MessengerController.php
index d58e8e5e..116e7e49 100644
--- a/app/Http/Web/Controllers/MessengerController.php
+++ b/app/Http/Web/Controllers/MessengerController.php
@@ -38,12 +38,56 @@ class MessengerController extends LayerController
         return $this->jsonSuccess(['data' => ['list' => $list]]);
     }
 
+    /**
+     * @Get("/msg/unread/count", name="web.im.unread_msg_count")
+     */
+    public function unreadMessagesCountAction()
+    {
+        $service = new MessengerService();
+
+        $count = $service->getUnreadSystemMessagesCount();
+
+        return $this->jsonSuccess(['count' => $count]);
+    }
+
+    /**
+     * @Post("/msg/read", name="web.im.read_msg")
+     */
+    public function markMessagesAsReadAction()
+    {
+        $service = new MessengerService();
+
+        $service->markSystemMessagesAsRead();
+
+        return $this->jsonSuccess();
+    }
+
     /**
      * @Get("/msg/box", name="web.im.msg_box")
      */
     public function messageBoxAction()
     {
+        $service = new MessengerService();
 
+        $pager = $service->getSystemMessages();
+
+        $this->view->pick('messenger/msg_box');
+        $this->view->setVar('pager', $pager);
+    }
+
+    /**
+     * @Get("/msg/sys", name="web.im.sys_msg")
+     */
+    public function systemMessagesAction()
+    {
+        $service = new MessengerService();
+
+        $pager = $service->getSystemMessages();
+
+        $pager->items = kg_array_object($pager->items);
+
+        $this->view->pick('messenger/sys_messages');
+        $this->view->setVar('pager', $pager);
     }
 
     /**
@@ -53,7 +97,7 @@ class MessengerController extends LayerController
     {
         $service = new MessengerService();
 
-        $pager = $service->getChatLog();
+        $pager = $service->getChatMessages();
 
         $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
         $this->view->pick('messenger/chat_log');
@@ -67,7 +111,7 @@ class MessengerController extends LayerController
     {
         $service = new MessengerService();
 
-        $pager = $service->getChatLog();
+        $pager = $service->getChatMessages();
 
         return $this->jsonPaginate($pager);
     }
diff --git a/app/Http/Web/Services/Messenger.php b/app/Http/Web/Services/Messenger.php
index 195fc5af..4a8d8d67 100644
--- a/app/Http/Web/Services/Messenger.php
+++ b/app/Http/Web/Services/Messenger.php
@@ -8,12 +8,14 @@ use App\Caches\ImHotUserList as ImHotUserListCache;
 use App\Library\Paginator\Query as PagerQuery;
 use App\Models\ImFriendMessage as ImFriendMessageModel;
 use App\Models\ImFriendUser as ImFriendUserModel;
+use App\Models\ImGroupMessage as ImGroupMessageModel;
 use App\Models\ImSystemMessage as ImSystemMessageModel;
 use App\Models\User as UserModel;
 use App\Repos\ImChatGroup as ImChatGroupRepo;
 use App\Repos\ImFriendMessage as ImFriendMessageRepo;
 use App\Repos\ImFriendUser as ImFriendUserRepo;
 use App\Repos\ImGroupMessage as ImGroupMessageRepo;
+use App\Repos\ImSystemMessage as ImSystemMessageRepo;
 use App\Repos\User as UserRepo;
 use App\Validators\ImChatGroup as ImChatGroupValidator;
 use App\Validators\ImFriendUser as ImFriendUserValidator;
@@ -148,7 +150,35 @@ class Messenger extends Service
         return $result;
     }
 
-    public function getChatLog()
+    public function getUnreadSystemMessagesCount()
+    {
+        $user = $this->getLoginUser();
+
+        $userRepo = new UserRepo();
+
+        return $userRepo->countUnreadImSystemMessages($user->id);
+    }
+
+    public function getSystemMessages()
+    {
+        $user = $this->getLoginUser();
+
+        $pagerQuery = new PagerQuery();
+
+        $params = $pagerQuery->getParams();
+
+        $params['receiver_id'] = $user->id;
+
+        $sort = $pagerQuery->getSort();
+        $page = $pagerQuery->getPage();
+        $limit = $pagerQuery->getLimit();
+
+        $messageRepo = new ImSystemMessageRepo();
+
+        return $messageRepo->paginate($params, $sort, $page, $limit);
+    }
+
+    public function getChatMessages()
     {
         $user = $this->getLoginUser();
 
@@ -172,7 +202,7 @@ class Messenger extends Service
 
             $pager = $messageRepo->paginate($params, $sort, $page, $limit);
 
-            return $this->handleChatLogPager($pager);
+            return $this->handleChatMessagePager($pager);
 
         } elseif ($params['type'] == 'group') {
 
@@ -182,7 +212,7 @@ class Messenger extends Service
 
             $pager = $messageRepo->paginate($params, $sort, $page, $limit);
 
-            return $this->handleChatLogPager($pager);
+            return $this->handleChatMessagePager($pager);
         }
     }
 
@@ -222,7 +252,13 @@ class Messenger extends Service
         $from = $this->request->getPost('from');
         $to = $this->request->getPost('to');
 
-        $content = [
+        $validator = new ImMessageValidator();
+
+        $validator->checkReceiver($to['id'], $to['type']);
+
+        $from['content'] = $validator->checkContent($from['content']);
+
+        $message = [
             'username' => $from['username'],
             'avatar' => $from['avatar'],
             'content' => $from['content'],
@@ -237,9 +273,9 @@ class Messenger extends Service
             $content['id'] = $to['id'];
         }
 
-        $message = json_encode([
+        $content = json_encode([
             'type' => 'show_chat_msg',
-            'content' => $content,
+            'message' => $message,
         ]);
 
         Gateway::$registerAddress = '127.0.0.1:1238';
@@ -250,11 +286,33 @@ class Messenger extends Service
              * 不推送自己给自己发送的消息
              */
             if ($user->id != $to['id']) {
-                Gateway::sendToUid($to['id'], $message);
+
+                $online = Gateway::isUidOnline($to['id']);
+
+                $messageModel = new ImFriendMessageModel();
+
+                $messageModel->sender_id = $from['id'];
+                $messageModel->receiver_id = $to['id'];
+                $messageModel->content = $from['content'];
+                $messageModel->viewed = $online ? 1 : 0;
+
+                $messageModel->create();
+
+                if ($online) {
+                    Gateway::sendToUid($to['id'], $content);
+                }
             }
 
         } elseif ($to['type'] == 'group') {
 
+            $messageModel = new ImGroupMessageModel();
+
+            $messageModel->sender_id = $from['id'];
+            $messageModel->group_id = $to['id'];
+            $messageModel->content = $from['content'];
+
+            $messageModel->create();
+
             $excludeClientId = null;
 
             /**
@@ -266,7 +324,23 @@ class Messenger extends Service
 
             $groupName = $this->getGroupName($to['id']);
 
-            Gateway::sendToGroup($groupName, $message, $excludeClientId);
+            Gateway::sendToGroup($groupName, $content, $excludeClientId);
+        }
+    }
+
+    public function markSystemMessagesAsRead()
+    {
+        $user = $this->getLoginUser();
+
+        $userRepo = new UserRepo();
+
+        $messages = $userRepo->findUnreadImSystemMessages($user->id);
+
+        if ($messages->count() > 0) {
+            foreach ($messages as $message) {
+                $message->viewed = 1;
+                $message->update();
+            }
         }
     }
 
@@ -458,7 +532,7 @@ class Messenger extends Service
         return $result;
     }
 
-    protected function handleChatLogPager($pager)
+    protected function handleChatMessagePager($pager)
     {
         if ($pager->total_items == 0) {
             return $pager;
@@ -468,20 +542,17 @@ class Messenger extends Service
 
         $builder = new ImMessageListBuilder();
 
-        $users = $builder->getUsers($messages);
+        $senders = $builder->getSenders($messages);
 
         $items = [];
 
         foreach ($messages as $message) {
-
-            $user = $user = $users[$message['user_id']] ?? new \stdClass();
-
+            $sender = $senders[$message['sender_id']] ?? new \stdClass();
             $items[] = [
                 'id' => $message['id'],
                 'content' => $message['content'],
-                'create_time' => $message['create_time'],
                 'timestamp' => $message['create_time'] * 1000,
-                'user' => $user,
+                'user' => $sender,
             ];
         }
 
@@ -550,36 +621,56 @@ class Messenger extends Service
         return $pager;
     }
 
-    protected function handleApplyFriendNotice(UserModel $user, UserModel $friend, $remark)
+    protected function handleApplyFriendNotice(UserModel $sender, UserModel $receiver, $remark)
     {
+        $userRepo = new UserRepo();
+
+        $itemType = ImSystemMessageModel::TYPE_FRIEND_REQUEST;
+
+        $message = $userRepo->findImSystemMessage($receiver->id, $itemType);
+
+        if ($message) {
+
+            /**
+             * 请求未过期
+             */
+            if (time() - $message->create_time < 3 * 86400) {
+                return;
+            }
+
+            if ($message->item_type['accepted'] == 1) {
+                return;
+            }
+        }
+
+        $senderInfo = [
+            'id' => $sender->id,
+            'name' => $sender->name,
+            'avatar' => $sender->avatar,
+        ];
+
         $sysMsgModel = new ImSystemMessageModel();
 
-        $sysMsgModel->user_id = $friend->id;
-        $sysMsgModel->item_id = $user->id;
-        $sysMsgModel->item_type = ImSystemMessageModel::TYPE_APPLY_FRIEND;
+        $sysMsgModel->sender_id = $sender->id;
+        $sysMsgModel->receiver_id = $receiver->id;
+        $sysMsgModel->item_type = ImSystemMessageModel::TYPE_FRIEND_REQUEST;
         $sysMsgModel->item_info = [
-            'user' => ['id' => $user->id, 'name' => $user->name, 'avatar' => $user->avatar],
+            'sender' => $senderInfo,
             'remark' => $remark,
+            'accepted' => 0,
         ];
 
         $sysMsgModel->create();
 
         Gateway::$registerAddress = '127.0.0.1:1238';
 
-        $online = Gateway::isUidOnline($friend->id);
+        $online = Gateway::isUidOnline($receiver->id);
 
         if ($online) {
 
-            $userRepo = new UserRepo();
+            $content = kg_json_encode(['type' => 'show_msg_box']);
 
-            $msgCount = $userRepo->countUnreadImSystemMessages($friend->id);
-
-            $message = kg_json_encode([
-                'type' => 'show_msg_box',
-                'content' => ['msg_count' => $msgCount],
-            ]);
-
-            Gateway::sendToUid($friend->id, $message);
+            Gateway::sendToUid($receiver->id, $content);
         }
     }
 
diff --git a/app/Http/Web/Views/messenger/chat_log.volt b/app/Http/Web/Views/messenger/chat_log.volt
index 151c5bf7..a664cca5 100644
--- a/app/Http/Web/Views/messenger/chat_log.volt
+++ b/app/Http/Web/Views/messenger/chat_log.volt
@@ -9,7 +9,6 @@
         body .layim-chat-main {
             height: auto;
         }
-
         #LAY_page {
             margin-bottom: 20px;
             text-align: center;
@@ -22,7 +21,7 @@
     <ul id="LAY_view"></ul>
 </div>
 
-<div id="LAY_page"></div>
+<div id="LAY_page" data-count="{{ pager.total_items }}"></div>
 
 <textarea title="消息模版" id="LAY_tpl" style="display:none;">
 <%# layui.each(d.data, function(index, item) {
@@ -37,7 +36,7 @@
 <script src="/static/lib/layui/layui.js"></script>
 
 <script>
-    layui.use(['layim', 'laypage'], function () {
+    layui.use(['jquery', 'layim', 'laytpl', 'laypage'], function () {
 
         var $ = layui.jquery;
         var layim = layui.layim;
@@ -49,38 +48,50 @@
             close: '%>'
         });
 
-        var chatHistoryUrl = '/im/chat/history';
+        var $target = $('#LAY_view');
+        var $page = $('#LAY_page');
+        var $tpl = $('#LAY_tpl');
 
-        var currentUrl = layui.url();
+        var count = $page.data('count');
+        var limit = 15;
 
         var params = {
-            id: currentUrl.search.id,
-            type: currentUrl.search.type,
-            page: 1,
-            limit: 15,
-            sort: 'oldest'
+            id: layui.url().search.id,
+            type: layui.url().search.type,
+            limit: limit,
+            sort: 'oldest',
+            page: 1
         };
 
-        loadChatHistoryHtml(params);
+        /**
+         * 加载第一页数据
+         */
+        loadPageHtml($target, params);
 
-        laypage.render({
-            elem: 'LAY_page',
-            limit: 30,
-            count: {{ pager.total_items }},
-            jump: function (obj, first) {
-                if (!first) {
-                    params.page = obj.curr;
-                    loadChatHistoryHtml(params);
+        /**
+         * 两页以上才显示分页
+         */
+        if (count > limit) {
+            laypage.render({
+                elem: $page.attr('id'),
+                limit: limit,
+                count: count,
+                layout: ['page', 'count'],
+                jump: function (obj, first) {
+                    if (!first) {
+                        params.page = obj.curr;
+                        loadPageHtml($target, params);
+                    }
                 }
-            }
-        });
+            });
+        }
 
-        function loadChatHistoryHtml(params) {
-            $.get(chatHistoryUrl, params, function (res) {
-                var html = laytpl(LAY_tpl.value).render({
+        function loadPageHtml(target, params) {
+            $.get('/im/chat/history', params, function (res) {
+                var html = laytpl($tpl.val()).render({
                     data: res.items
                 });
-                $('#LAY_view').html(html);
+                target.html(html);
             });
         }
 
diff --git a/app/Http/Web/Views/messenger/msg_box.volt b/app/Http/Web/Views/messenger/msg_box.volt
new file mode 100644
index 00000000..3870cdaa
--- /dev/null
+++ b/app/Http/Web/Views/messenger/msg_box.volt
@@ -0,0 +1,15 @@
+{% extends 'templates/layer.volt' %}
+
+{% block content %}
+
+    <div id="LAY_view"></div>
+
+    <div id="LAY_page" class="pager" data-count="{{ pager.total_items }}"></div>
+
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('web/js/im.msgbox.js') }}
+
+{% endblock %}
\ No newline at end of file
diff --git a/app/Http/Web/Views/messenger/sys_messages.volt b/app/Http/Web/Views/messenger/sys_messages.volt
new file mode 100644
index 00000000..135d89bc
--- /dev/null
+++ b/app/Http/Web/Views/messenger/sys_messages.volt
@@ -0,0 +1,20 @@
+{% if pager.total_pages > 0 %}
+    <div class="im-user-list clearfix">
+        <div class="layui-row layui-col-space20">
+            {% for item in pager.items %}
+                <div class="layui-col-md2">
+                    <div class="user-card" title="{{ item.about|e }}">
+                        <div class="avatar">
+                            <a href="javascript:"><img src="{{ item.avatar }}" alt="{{ item.name }}"></a>
+                        </div>
+                        <div class="name layui-elip" title="{{ item.name|e }}">{{ item.name }}</div>
+                        <div class="action">
+                            <a href="javascript:" class="layui-badge-rim apply-group" data-id="{{ item.id }}">加入群组</a>
+                        </div>
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+    {{ partial('partials/pager_ajax') }}
+{% endif %}
\ No newline at end of file
diff --git a/app/Models/ImFriendMessage.php b/app/Models/ImFriendMessage.php
index 28f3dede..6aa00e6d 100644
--- a/app/Models/ImFriendMessage.php
+++ b/app/Models/ImFriendMessage.php
@@ -26,14 +26,14 @@ class ImFriendMessage extends Model
      *
      * @var integer
      */
-    public $user_id;
+    public $sender_id;
 
     /**
      * 接收方编号
      *
      * @var integer
      */
-    public $target_id;
+    public $receiver_id;
 
     /**
      * 内容
@@ -90,6 +90,8 @@ class ImFriendMessage extends Model
     public function beforeCreate()
     {
         $this->create_time = time();
+
+        $this->chat_id = self::getChatId($this->sender_id, $this->receiver_id);
     }
 
     public function beforeUpdate()
diff --git a/app/Models/ImGroupMessage.php b/app/Models/ImGroupMessage.php
index 693c79a7..080105a8 100644
--- a/app/Models/ImGroupMessage.php
+++ b/app/Models/ImGroupMessage.php
@@ -22,11 +22,11 @@ class ImGroupMessage extends Model
     public $group_id;
 
     /**
-     * 用户编号
+     * 发送方编号
      *
      * @var integer
      */
-    public $user_id;
+    public $sender_id;
 
     /**
      * 内容
diff --git a/app/Models/ImSystemMessage.php b/app/Models/ImSystemMessage.php
index c16621cf..8b54c27d 100644
--- a/app/Models/ImSystemMessage.php
+++ b/app/Models/ImSystemMessage.php
@@ -7,8 +7,8 @@ use Phalcon\Mvc\Model\Behavior\SoftDelete;
 class ImSystemMessage extends Model
 {
 
-    const TYPE_APPLY_FRIEND = 1;
-    const TYPE_APPLY_GROUP = 2;
+    const TYPE_FRIEND_REQUEST = 1;
+    const TYPE_GROUP_REQUEST = 2;
     const TYPE_FRIEND_ACCEPTED = 3;
     const TYPE_FRIEND_REFUSED = 4;
     const TYPE_GROUP_ACCEPTED = 5;
diff --git a/app/Repos/ImFriendMessage.php b/app/Repos/ImFriendMessage.php
index 878241b5..2d9beabf 100644
--- a/app/Repos/ImFriendMessage.php
+++ b/app/Repos/ImFriendMessage.php
@@ -23,8 +23,12 @@ class ImFriendMessage extends Repository
             $builder->andWhere('chat_id = :chat_id:', ['chat_id' => $where['chat_id']]);
         }
 
-        if (!empty($where['user_id'])) {
-            $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
+        if (!empty($where['sender_id'])) {
+            $builder->andWhere('sender_id = :sender_id:', ['sender_id' => $where['sender_id']]);
+        }
+
+        if (!empty($where['receiver_id'])) {
+            $builder->andWhere('receiver_id = :receiver_id:', ['receiver_id' => $where['receiver_id']]);
         }
 
         if (isset($where['deleted'])) {
diff --git a/app/Repos/ImGroupMessage.php b/app/Repos/ImGroupMessage.php
index c23179fc..e9795d9c 100644
--- a/app/Repos/ImGroupMessage.php
+++ b/app/Repos/ImGroupMessage.php
@@ -23,8 +23,8 @@ class ImGroupMessage extends Repository
             $builder->andWhere('group_id = :group_id:', ['group_id' => $where['group_id']]);
         }
 
-        if (!empty($where['user_id'])) {
-            $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
+        if (!empty($where['sender_id'])) {
+            $builder->andWhere('sender_id = :sender_id:', ['sender_id' => $where['sender_id']]);
         }
 
         if (isset($where['deleted'])) {
diff --git a/app/Repos/ImSystemMessage.php b/app/Repos/ImSystemMessage.php
new file mode 100644
index 00000000..83e194f6
--- /dev/null
+++ b/app/Repos/ImSystemMessage.php
@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Repos;
+
+use App\Library\Paginator\Adapter\QueryBuilder as PagerQueryBuilder;
+use App\Models\ImSystemMessage as ImSystemMessageModel;
+use Phalcon\Mvc\Model;
+use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\ResultsetInterface;
+
+class ImSystemMessage extends Repository
+{
+
+    public function paginate($where = [], $sort = 'latest', $page = 1, $limit = 15)
+    {
+        $builder = $this->modelsManager->createBuilder();
+
+        $builder->from(ImSystemMessageModel::class);
+
+        $builder->where('1 = 1');
+
+        if (!empty($where['sender_id'])) {
+            $builder->andWhere('sender_id = :sender_id:', ['sender_id' => $where['sender_id']]);
+        }
+
+        if (!empty($where['receiver_id'])) {
+            $builder->andWhere('receiver_id = :receiver_id:', ['receiver_id' => $where['receiver_id']]);
+        }
+
+        if (isset($where['deleted'])) {
+            $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
+        }
+
+        switch ($sort) {
+            case 'oldest':
+                $orderBy = 'id ASC';
+                break;
+            default:
+                $orderBy = 'id DESC';
+                break;
+        }
+
+        $builder->orderBy($orderBy);
+
+        $pager = new PagerQueryBuilder([
+            'builder' => $builder,
+            'page' => $page,
+            'limit' => $limit,
+        ]);
+
+        return $pager->paginate();
+    }
+
+    /**
+     * @param int $id
+     * @return ImSystemMessageModel|Model|bool
+     */
+    public function findById($id)
+    {
+        return ImSystemMessageModel::findFirst($id);
+    }
+
+    /**
+     * @param array $ids
+     * @param string|array $columns
+     * @return ResultsetInterface|Resultset|ImSystemMessageModel[]
+     */
+    public function findByIds($ids, $columns = '*')
+    {
+        return ImSystemMessageModel::query()
+            ->columns($columns)
+            ->inWhere('id', $ids)
+            ->execute();
+    }
+
+    public function findUserMessage($userId, $itemType)
+    {
+    }
+
+}
diff --git a/app/Repos/User.php b/app/Repos/User.php
index cb3c5453..a187d0ef 100644
--- a/app/Repos/User.php
+++ b/app/Repos/User.php
@@ -157,10 +157,36 @@ class User extends Repository
             ->getQuery()->execute();
     }
 
+    /**
+     * @param int $userId
+     * @param int $itemType
+     * @return Model|bool|ImSystemMessageModel
+     */
+    public function findImSystemMessage($userId, $itemType)
+    {
+        return ImSystemMessageModel::findFirst([
+            'conditions' => 'receiver_id = ?1 AND item_type = ?2',
+            'bind' => [1 => $userId, 2 => $itemType],
+            'order' => 'id DESC',
+        ]);
+    }
+
+    /**
+     * @param int $userId
+     * @return ResultsetInterface|Resultset|ImSystemMessageModel[]
+     */
+    public function findUnreadImSystemMessages($userId)
+    {
+        return ImSystemMessageModel::find([
+            'conditions' => 'receiver_id = ?1 AND viewed = ?2',
+            'bind' => [1 => $userId, 2 => 0],
+        ]);
+    }
+
     public function countUnreadImSystemMessages($userId)
     {
         return ImSystemMessageModel::count([
-            'conditions' => 'user_id = ?1 AND viewed = ?2',
+            'conditions' => 'receiver_id = ?1 AND viewed = ?2',
             'bind' => [1 => $userId, 2 => 0],
         ]);
     }
diff --git a/app/Validators/ImMessage.php b/app/Validators/ImMessage.php
index 2e24cdfa..119c325b 100644
--- a/app/Validators/ImMessage.php
+++ b/app/Validators/ImMessage.php
@@ -2,6 +2,8 @@
 
 namespace App\Validators;
 
+use App\Caches\ImChatGroup as ImChatGroupCache;
+use App\Caches\User as UserCache;
 use App\Exceptions\BadRequest as BadRequestException;
 use App\Repos\ImFriendMessage as ImFriendMessageRepo;
 use App\Repos\ImGroupMessage as ImGroupMessageRepo;
@@ -9,11 +11,19 @@ use App\Repos\ImGroupMessage as ImGroupMessageRepo;
 class ImMessage extends Validator
 {
 
-    public function checkFriendMessage($id)
+    public function checkMessage($id, $type)
     {
-        $messageRepo = new ImFriendMessageRepo();
+        $this->checkType($type);
 
-        $message = $messageRepo->findById($id);
+        $message = null;
+
+        if ($type == 'friend') {
+            $repo = new ImFriendMessageRepo();
+            $message = $repo->findById($id);
+        } elseif ($type == 'group') {
+            $repo = new ImGroupMessageRepo();
+            $message = $repo->findById($id);
+        }
 
         if (!$message) {
             throw new BadRequestException('im_message.not_found');
@@ -22,17 +32,27 @@ class ImMessage extends Validator
         return $message;
     }
 
-    public function checkGroupMessage($id)
+    public function checkReceiver($id, $type)
     {
-        $messageRepo = new ImGroupMessageRepo();
+        $this->checkType($type);
 
-        $message = $messageRepo->findById($id);
+        $receiver = null;
 
-        if (!$message) {
-            throw new BadRequestException('im_message.not_found');
+        if ($type == 'friend') {
+            $cache = new UserCache();
+            $receiver = $cache->get($id);
+            if (!$receiver) {
+                throw new BadRequestException('user.not_found');
+            }
+        } elseif ($type == 'group') {
+            $cache = new ImChatGroupCache();
+            $receiver = $cache->get($id);
+            if (!$receiver) {
+                throw new BadRequestException('im_chat_group.not_found');
+            }
         }
 
-        return $message;
+        return $receiver;
     }
 
     public function checkType($type)
diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css
index 1448b815..ae6fc66b 100644
--- a/public/static/web/css/common.css
+++ b/public/static/web/css/common.css
@@ -1311,4 +1311,66 @@
 .im-user-list .name {
     margin-bottom: 10px;
     padding: 0 5px;
+}
+
+.layim-msgbox {
+    margin: 15px;
+}
+
+.layim-msgbox li {
+    position: relative;
+    margin-bottom: 10px;
+    padding: 0 130px 10px 60px;
+    line-height: 22px;
+    border-bottom: 1px dotted #e2e2e2;
+}
+
+.layim-msgbox .layim-msgbox-tips {
+    margin: 0;
+    padding: 10px 0;
+    border: none;
+    text-align: center;
+    color: #999;
+}
+
+.layim-msgbox .layim-msgbox-system {
+    padding: 0 10px 10px 10px;
+}
+
+.layim-msgbox li p span {
+    padding-left: 5px;
+    color: #999;
+}
+
+.layim-msgbox li p em {
+    font-style: normal;
+    color: #FF5722;
+}
+
+.layim-msgbox-avatar {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 50px;
+    height: 50px;
+}
+
+.layim-msgbox-user {
+    padding-top: 5px;
+}
+
+.layim-msgbox-content {
+    margin-top: 3px;
+}
+
+.layim-msgbox .layui-btn-small {
+    padding: 0 15px;
+    margin-left: 5px;
+}
+
+.layim-msgbox-btn {
+    position: absolute;
+    right: 0;
+    top: 12px;
+    color: #999;
 }
\ No newline at end of file
diff --git a/public/static/web/js/im.js b/public/static/web/js/im.js
index 168b1b4b..75f03d97 100644
--- a/public/static/web/js/im.js
+++ b/public/static/web/js/im.js
@@ -23,15 +23,16 @@ layui.use(['jquery', 'layim'], function () {
             socket.send('pong...');
         } else if (data.type === 'bind_user') {
             bindUser(data.client_id);
+            refreshMessageBox();
         } else if (data.type === 'show_chat_msg') {
-            showChatMessage(data.content);
+            showChatMessage(data.message);
         } else if (data.type === 'show_msg_box') {
-            showMessageBox(data.content);
+            refreshMessageBox();
         }
     };
 
     layim.config({
-        title: '即时聊天',
+        title: '菜鸟驿站',
         init: {
             url: '/im/init'
         },
@@ -78,12 +79,20 @@ layui.use(['jquery', 'layim'], function () {
         });
     }
 
-    function showChatMessage(content) {
-        layim.getMessage(content);
+    function showChatMessage(message) {
+        layim.getMessage(message);
     }
 
-    function showMessageBox(content) {
-        layim.msgbox(content.msg_count);
+    function refreshMessageBox() {
+        $.ajax({
+            type: 'GET',
+            url: '/im/msg/unread/count',
+            success: function (res) {
+                if (res.count > 0) {
+                    layim.msgbox(res.count);
+                }
+            }
+        });
     }
 
 });
\ No newline at end of file
diff --git a/public/static/web/js/im.msgbox.js b/public/static/web/js/im.msgbox.js
new file mode 100644
index 00000000..e4b466a6
--- /dev/null
+++ b/public/static/web/js/im.msgbox.js
@@ -0,0 +1,132 @@
+layui.use(['jquery', 'layer', 'layim', 'laypage'], function () {
+
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layim = layui.layim;
+    var laypage = layui.laypage;
+
+    var $target = $('#LAY_view');
+    var $page = $('#LAY_page');
+    var count = $page.data('count');
+    var limit = 15;
+
+    /**
+     * 标记信息为已读
+     */
+    markMessageAsRead();
+
+    /**
+     * 加载第一页数据
+     */
+    loadPageHtml($target, 1);
+
+    /**
+     * 两页以上才显示分页
+     */
+    if (count > limit) {
+        laypage.render({
+            elem: $page.attr('id'),
+            limit: limit,
+            count: count,
+            jump: function (obj, first) {
+                if (!first) {
+                    loadPageHtml($target, obj.curr);
+                }
+            }
+        });
+    }
+
+    function loadPageHtml(target, page) {
+        $.get('/im/msg/sys', {page: page}, function (html) {
+            target.html(html);
+        });
+    }
+
+    function markMessageAsRead() {
+        $.post('/im/msg/read');
+    }
+
+    //操作
+    var active = {
+        //同意
+        agree: function (othis) {
+            var li = othis.parents('li')
+                , uid = li.data('uid')
+                , from_group = li.data('fromGroup')
+                , user = cache[uid];
+
+            //选择分组
+            parent.layui.layim.setFriendGroup({
+                type: 'friend'
+                , username: user.username
+                , avatar: user.avatar
+                , group: parent.layui.layim.cache().friend //获取好友分组数据
+                , submit: function (group, index) {
+
+                    //将好友追加到主面板
+                    parent.layui.layim.addList({
+                        type: 'friend'
+                        , avatar: user.avatar //好友头像
+                        , username: user.username //好友昵称
+                        , groupid: group //所在的分组id
+                        , id: uid //好友ID
+                        , sign: user.sign //好友签名
+                    });
+                    parent.layer.close(index);
+                    othis.parent().html('已同意');
+
+
+                    //实际部署时，请开启下述注释，并改成你的接口地址
+                    /*
+                    $.post('/im/agreeFriend', {
+                      uid: uid //对方用户ID
+                      ,from_group: from_group //对方设定的好友分组
+                      ,group: group //我设定的好友分组
+                    }, function(res){
+                      if(res.code != 0){
+                        return layer.msg(res.msg);
+                      }
+
+                      //将好友追加到主面板
+                      parent.layui.layim.addList({
+                        type: 'friend'
+                        ,avatar: user.avatar //好友头像
+                        ,username: user.username //好友昵称
+                        ,groupid: group //所在的分组id
+                        ,id: uid //好友ID
+                        ,sign: user.sign //好友签名
+                      });
+                      parent.layer.close(index);
+                      othis.parent().html('已同意');
+                    });
+                    */
+
+                }
+            });
+        }
+
+        //拒绝
+        , refuse: function (othis) {
+            var li = othis.parents('li')
+                , uid = li.data('uid');
+
+            layer.confirm('确定拒绝吗？', function (index) {
+                $.post('/im/refuseFriend', {
+                    uid: uid //对方用户ID
+                }, function (res) {
+                    if (res.code != 0) {
+                        return layer.msg(res.msg);
+                    }
+                    layer.close(index);
+                    othis.parent().html('<em>已拒绝</em>');
+                });
+            });
+        }
+    };
+
+    $('body').on('click', '.layui-btn', function () {
+        var othis = $(this), type = othis.data('type');
+        active[type] ? active[type].call(this, othis) : '';
+    });
+
+});
\ No newline at end of file