diff --git a/app/Http/Admin/Controllers/TestController.php b/app/Http/Admin/Controllers/TestController.php index 3954d4af..15d3698a 100644 --- a/app/Http/Admin/Controllers/TestController.php +++ b/app/Http/Admin/Controllers/TestController.php @@ -92,8 +92,8 @@ class TestController extends Controller $pos = strrpos($pushUrl, '/'); $obs = [ - 'fms_url' => substr($pushUrl, 0, $pos + 1), - 'stream_code' => substr($pushUrl, $pos + 1), + 'stream_url' => substr($pushUrl, 0, $pos + 1), + 'stream_key' => substr($pushUrl, $pos + 1), ]; $this->view->pick('setting/live_push_test'); @@ -242,4 +242,4 @@ class TestController extends Controller } } -} \ No newline at end of file +} diff --git a/app/Http/Admin/Views/setting/live_push_test.volt b/app/Http/Admin/Views/setting/live_push_test.volt index 969c162f..a70a696a 100644 --- a/app/Http/Admin/Views/setting/live_push_test.volt +++ b/app/Http/Admin/Views/setting/live_push_test.volt @@ -17,7 +17,7 @@
- +
复制 @@ -26,7 +26,7 @@
- +
复制 @@ -49,4 +49,4 @@ {{ js_include('lib/clipboard.min.js') }} {{ js_include('admin/js/copy.js') }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/Http/Home/Controllers/TeacherConsoleController.php b/app/Http/Home/Controllers/TeacherConsoleController.php index e91565aa..4bb1bac4 100644 --- a/app/Http/Home/Controllers/TeacherConsoleController.php +++ b/app/Http/Home/Controllers/TeacherConsoleController.php @@ -109,8 +109,8 @@ class TeacherConsoleController extends Controller $pos = strrpos($pushUrl, '/'); $obs = [ - 'fms_url' => substr($pushUrl, 0, $pos + 1), - 'stream_code' => substr($pushUrl, $pos + 1), + 'stream_url' => substr($pushUrl, 0, $pos + 1), + 'stream_key' => substr($pushUrl, $pos + 1), ]; $this->view->pick('teacher/console/live'); diff --git a/app/Http/Home/Views/teacher/console/live.volt b/app/Http/Home/Views/teacher/console/live.volt index 497d459b..3d950cc1 100644 --- a/app/Http/Home/Views/teacher/console/live.volt +++ b/app/Http/Home/Views/teacher/console/live.volt @@ -17,7 +17,7 @@
- +
复制 @@ -26,7 +26,7 @@
- +
复制 @@ -41,4 +41,4 @@ {{ js_include('lib/clipboard.min.js') }} {{ js_include('home/js/copy.js') }} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/Repos/Nav.php b/app/Repos/Nav.php index d12def82..909e5378 100644 --- a/app/Repos/Nav.php +++ b/app/Repos/Nav.php @@ -78,7 +78,7 @@ class Nav extends Repository public function countChildNavs($navId) { return (int)NavModel::count([ - 'conditions' => 'parent_id = :parent_id: AND published = 1', + 'conditions' => 'parent_id = :parent_id: AND published = 1 AND deleted = 0', 'bind' => ['parent_id' => $navId], ]); }