diff --git a/app/Http/Api/Controllers/PublicController.php b/app/Http/Api/Controllers/PublicController.php index bc4058e2..aade7fd4 100644 --- a/app/Http/Api/Controllers/PublicController.php +++ b/app/Http/Api/Controllers/PublicController.php @@ -49,8 +49,12 @@ class PublicController extends Controller $content = []; + /** + * ssl通过nginx转发实现 + */ if ($this->request->isSecure()) { - $content['connect_url'] = sprintf('wss://%s/wss', $this->request->getHttpHost()); + list($domain) = explode(':', $websocket->connect_address); + $websocket['connect_url'] = sprintf('wss://%s/wss', $domain); } else { $content['connect_url'] = sprintf('ws://%s', $websocket->connect_address); } diff --git a/app/Http/Home/Controllers/Controller.php b/app/Http/Home/Controllers/Controller.php index 96d1a664..3cd93081 100644 --- a/app/Http/Home/Controllers/Controller.php +++ b/app/Http/Home/Controllers/Controller.php @@ -147,7 +147,8 @@ class Controller extends \Phalcon\Mvc\Controller * ssl通过nginx转发实现 */ if ($this->request->isSecure()) { - $websocket->connect_url = sprintf('wss://%s/wss', $websocket->connect_address); + list($domain) = explode(':', $websocket->connect_address); + $websocket->connect_url = sprintf('wss://%s/wss', $domain); } else { $websocket->connect_url = sprintf('ws://%s', $websocket->connect_address); } diff --git a/app/Http/Home/Controllers/ImController.php b/app/Http/Home/Controllers/ImController.php index 13df71d5..bb530c2d 100644 --- a/app/Http/Home/Controllers/ImController.php +++ b/app/Http/Home/Controllers/ImController.php @@ -145,7 +145,7 @@ class ImController extends Controller } /** - * @Post("/notice/read", name="home.im.read_notice") + * @Get("/notice/read", name="home.im.read_notice") */ public function readNoticeAction() { diff --git a/public/static/home/js/chapter.live.chat.js b/public/static/home/js/chapter.live.chat.js index edb92926..8f2e2662 100644 --- a/public/static/home/js/chapter.live.chat.js +++ b/public/static/home/js/chapter.live.chat.js @@ -13,6 +13,7 @@ layui.use(['jquery', 'form', 'helper'], function () { console.log('socket connect success'); setInterval(function () { socket.send('ping'); + console.log('ping...'); }, 1000 * parseInt(window.im.ws.ping_interval)); }; diff --git a/public/static/home/js/im.cs.js b/public/static/home/js/im.cs.js index f86c831f..17a22417 100644 --- a/public/static/home/js/im.cs.js +++ b/public/static/home/js/im.cs.js @@ -22,6 +22,7 @@ layui.use(['jquery', 'layim'], function () { console.log('socket connect success'); setInterval(function () { socket.send('ping'); + console.log('ping...'); }, 1000 * parseInt(window.im.ws.ping_interval)); }; diff --git a/public/static/home/js/im.msgbox.js b/public/static/home/js/im.msgbox.js index a1420e77..3fb891f6 100644 --- a/public/static/home/js/im.msgbox.js +++ b/public/static/home/js/im.msgbox.js @@ -42,7 +42,7 @@ layui.use(['jquery', 'layer', 'laypage'], function () { } function readNotices() { - $.post('/im/notice/read'); + $.get('/im/notice/read'); } var action = {