From 4d854edbeb1830418e21ae9dafc95d3ca5e6bd29 Mon Sep 17 00:00:00 2001
From: xiaochong0302 <xiaochong0302@gmail.com>
Date: Mon, 7 Jul 2025 11:20:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8E=B7=E5=8F=96=E7=9B=B4?=
 =?UTF-8?q?=E6=92=AD=E4=BF=A1=E6=81=AF=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Admin/Controllers/TestController.php          | 6 +++---
 app/Http/Admin/Views/setting/live_push_test.volt       | 6 +++---
 app/Http/Home/Controllers/TeacherConsoleController.php | 4 ++--
 app/Http/Home/Views/teacher/console/live.volt          | 6 +++---
 app/Repos/Nav.php                                      | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

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 @@
         <div class="layui-form-item">
             <label class="layui-form-label">推流地址</label>
             <div class="layui-input-inline" style="width:350px;">
-                <input id="tc1" class="layui-input" type="text" name="obs_fms_url" value="{{ obs.fms_url }}" readonly="readonly">
+                <input id="tc1" class="layui-input" type="text" name="stream_url" value="{{ obs.stream_url }}" readonly="readonly">
             </div>
             <div class="layui-input-inline" style="width:100px;">
                 <span class="kg-copy layui-btn" data-clipboard-target="#tc1">复制</span>
@@ -26,7 +26,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">推流名称</label>
             <div class="layui-input-inline" style="width:350px;">
-                <input id="tc2" class="layui-input" type="text" name="obs_stream_code" value="{{ obs.stream_code }}" readonly="readonly">
+                <input id="tc2" class="layui-input" type="text" name="stream_key" value="{{ obs.stream_key }}" readonly="readonly">
             </div>
             <div class="layui-input-inline" style="width:100px;">
                 <span class="kg-copy layui-btn" data-clipboard-target="#tc2">复制</span>
@@ -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 @@
         <div class="layui-form-item">
             <label class="layui-form-label">推流地址</label>
             <div class="layui-input-inline" style="width:350px;">
-                <input id="tc1" class="layui-input" type="text" name="obs_fms_url" value="{{ obs.fms_url }}" readonly="readonly">
+                <input id="tc1" class="layui-input" type="text" name="stream_url" value="{{ obs.stream_url }}" readonly="readonly">
             </div>
             <div class="layui-input-inline" style="width:100px;">
                 <span class="kg-copy layui-btn" data-clipboard-target="#tc1">复制</span>
@@ -26,7 +26,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">推流名称</label>
             <div class="layui-input-inline" style="width:350px;">
-                <input id="tc2" class="layui-input" type="text" name="obs_stream_code" value="{{ obs.stream_code }}" readonly="readonly">
+                <input id="tc2" class="layui-input" type="text" name="stream_key" value="{{ obs.stream_key }}" readonly="readonly">
             </div>
             <div class="layui-input-inline" style="width:100px;">
                 <span class="kg-copy layui-btn" data-clipboard-target="#tc2">复制</span>
@@ -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],
         ]);
     }