aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-26 15:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2152 from T0n0T/fix/cloud-record-websocket-and-ptz-cruise-preset

Browse Source 
fix: add WebSocket sub_filter for mp4_record and fix ptzCruising preset label
This commit is contained in:
648540858 2026-05-25 22:16:29 +08:00 committed by GitHub
commit 676a59e5f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/nginx/templates/nginx.conf.template
View File

@ -34,6 +34,10 @@ server {
sub_filter "http://$original_host:80/mp4_record" "mp4_record"; sub_filter "http://$original_host:80/mp4_record" "mp4_record";
sub_filter "https://$original_host/mp4_record" "mp4_record"; sub_filter "https://$original_host/mp4_record" "mp4_record";
sub_filter "https://$original_host:443/mp4_record" "mp4_record"; sub_filter "https://$original_host:443/mp4_record" "mp4_record";
sub_filter "ws://$original_host/mp4_record" "mp4_record";
sub_filter "ws://$original_host:80/mp4_record" "mp4_record";
sub_filter "wss://$original_host/mp4_record" "mp4_record";
sub_filter "wss://$original_host:443/mp4_record" "mp4_record";
# 设置为off表示替换所有匹配项，而不仅仅是第一个 # 设置为off表示替换所有匹配项，而不仅仅是第一个
sub_filter_once off; sub_filter_once off;

4
web/src/views/common/channelPlayer/ptzCruising.vue
View File

@ -26,11 +26,11 @@
<el-form v-if="selectPresetVisible" size="mini" :inline="true"> <el-form v-if="selectPresetVisible" size="mini" :inline="true">
<el-form-item> <el-form-item>
<el-select v-model="selectPreset" placeholder="请选择预置点"> <el-select v-model="selectPreset" value-key="presetId" placeholder="请选择预置点">
<el-option <el-option
v-for="item in allPresetList" v-for="item in allPresetList"
:key="item.presetId" :key="item.presetId"
:label="item.presetName" :label="item.presetName ? item.presetName : item.presetId"
:value="item" :value="item"
/> />
</el-select> </el-select>

4
web/src/views/common/ptzCruising.vue
View File

@ -26,11 +26,11 @@
<el-form v-if="selectPresetVisible" size="mini" :inline="true"> <el-form v-if="selectPresetVisible" size="mini" :inline="true">
<el-form-item> <el-form-item>
<el-select v-model="selectPreset" placeholder="请选择预置点"> <el-select v-model="selectPreset" value-key="presetId" placeholder="请选择预置点">
<el-option <el-option
v-for="item in allPresetList" v-for="item in allPresetList"
:key="item.presetId" :key="item.presetId"
:label="item.presetName" :label="item.presetName ? item.presetName : item.presetId"
:value="item" :value="item"
/> />
</el-select> </el-select>