Merge branch 'beta'

vanjoge · Oct 18, 2023 · 1483bf0 · 1483bf0
2 parents b9c244d + 048c01e
commit 1483bf0
Show file tree

Hide file tree

Showing 14 changed files with 430 additions and 245 deletions.
diff --git a/JsAccess.md b/JsAccess.md
@@ -728,6 +728,30 @@ CvNetVideo.GovPlay(
             );
 ```
 
+#### 下载历史视频文件
+     接口
+```
+DownLoadVideo(Sim, Channel, MediaType, StreamType = 0, StorageType = 0, PlaybackMode = 0, Multiple = 0, StartTime, EndTime, config = {}, DataSource = 0, Speed = 4, VideoFormat = 0) ;
+
+```
+   参数说明
+```
+Sim:sim卡号
+Channel:通道号不支持0
+MediaType：音视频资源类型（0：音视频，1：音频，2：视频，3：视频或音视频）
+StreamType：码流类型（0：主码流或子码流，1：主码流，2：子码流）
+StorageType：存储器类型（0：主存储器或灾备存储器，1：主存储器，2：灾备存储器）
+PlaybackMode:回放模式（0：正常回放，1：快进回放，2：关键帧快退回放，3：关键帧播放，4：单帧上传）
+Multiple:倍速（0：无效，1：1倍，2：2倍，3：4倍，4：8倍，5：16倍）
+StartTime:开始时间
+EndTime:结束时间
+config:配置项 与Init一致
+DataSource:0自动 1设备 2服务端缓存
+Speed:下载倍速，仅28181有效
+VideoFormat:文件格式（0：FMP4格式，1：FLV格式）
+```
+
+
 #### 下载FMP4文件
      接口
 ```

diff --git a/Platform808Access.md b/Platform808Access.md
@@ -965,7 +965,30 @@ RTVS转码MP4并上传FTP完成后，会通过TranscodeUploadStart指定的方
     http://[GOV服务地址]/[SIM]_[通道]_[开始UTC时间]_[结束UTC时间].mp4?MediaType=[音视频类型]&StreamType=[码流类型]&PlaybackMode=[回放方式]&Multiple=[倍数]&DataSource=[来源]&CTags=[CTags]
 
 
-    例:http://10.10.10.228:6035/111111111112_1_1651745996_0?MediaType=0&StreamType=1&PlaybackMode=0&Multiple=1&DataSource=1&CTags=test
+    例:http://10.10.10.228:6035/111111111112_1_1651745996_0.mp4?MediaType=0&StreamType=1&PlaybackMode=0&Multiple=1&DataSource=1&CTags=test
+
+
+    MediaType、StreamType、PlaybackMode和Multiple数值定义见1078协议9201，DataSource为来源 0自动 1设备 2服务端缓存
+
+### GOV服务获取FLV HTTP流(实时)
+
+接口地址：
+
+    http://[GOV服务地址]/[SIM]_[通道]_real.flv?DataType=[数据类型]&StreamType=[码流类型]&CTags=[CTags]
+
+
+    例:http://10.10.10.228:6035/111111111112_1_real.flv?DataType=0&StreamType=0&CTags=test
+
+    DataType和StreamType数值定义见1078协议9101
+
+### GOV服务获取FLV HTTP流(历史)
+
+接口地址：
+
+    http://[GOV服务地址]/[SIM]_[通道]_[开始UTC时间]_[结束UTC时间].flv?MediaType=[音视频类型]&StreamType=[码流类型]&PlaybackMode=[回放方式]&Multiple=[倍数]&DataSource=[来源]&CTags=[CTags]
+
+
+    例:http://10.10.10.228:6035/111111111112_1_1651745996_0.flv?MediaType=0&StreamType=1&PlaybackMode=0&Multiple=1&DataSource=1&CTags=test
 
 
     MediaType、StreamType、PlaybackMode和Multiple数值定义见1078协议9201，DataSource为来源 0自动 1设备 2服务端缓存

diff --git a/script/clusterMyData/ClusterConfVer.json b/script/clusterMyData/ClusterConfVer.json
@@ -1 +1 @@
-[{"Type":1001,"NowVer":"1.3.9"},{"Type":1002,"NowVer":"1.3.9"},{"Type":1003,"NowVer":"1.3.9"},{"Type":1004,"NowVer":"1.3.9"},{"Type":1005,"NowVer":"1.3.9"},{"Type":1006,"NowVer":"1.3.9"}]
+[{"Type":1001,"NowVer":"1.3.10"},{"Type":1002,"NowVer":"1.3.10"},{"Type":1003,"NowVer":"1.3.10"},{"Type":1004,"NowVer":"1.3.10"},{"Type":1005,"NowVer":"1.3.10"},{"Type":1006,"NowVer":"1.3.10"}]
diff --git a/script/default_args.sh b/script/default_args.sh
@@ -55,9 +55,13 @@ Webrtc_Port_Start=${Webrtc_Port_Start:-14001}
 Webrtc_Port_End=${Webrtc_Port_End:-65535}
 PORT_DEV_BINDPORT_START=${PORT_DEV_BINDPORT_START:-0}
 
+DOCKER_RTSP_PORT_RANGE_UDP=${DOCKER_RTSP_PORT_RANGE_UDP:-"14100-14200"}
+
 #其他
 APIAuthorization=${APIAuthorization:-"12345678"}
 RTVS_UPDATECHECK_DOCKER=${RTVS_UPDATECHECK_DOCKER:-"true"}
+SwaggerUI=${SwaggerUI:-"true"}
+VerifyHttpVideo=${VerifyHttpVideo:-"false"}
 
 #
 DOCKER_CLUSTER_NAME=${DOCKER_CLUSTER_NAME:-"cvcluster-1"}
@@ -129,7 +133,7 @@ RUN_GRAFANA=${RUN_GRAFANA:-"false"}
 RTVSWEB_DOCKER_CONTAINER_NAME_TEMPLATE=${RTVSWEB_DOCKER_CONTAINER_NAME_TEMPLATE:-"rtvsweb-publish-"}
 RTVSWEB_DOCKER_PATH_TEMPLATE=${RTVSWEB_DOCKER_PATH_TEMPLATE:-"/etc/service/rtvs-"}
 RTVSWEB_DOCKER_IMAGE_NAME=${RTVSWEB_DOCKER_IMAGE_NAME:-"vanjoge/rtvs"}
-RTVSWEB_VERSION=${RTVSWEB_VERSION:-"1.3.9"}
+RTVSWEB_VERSION=${RTVSWEB_VERSION:-"1.3.10"}
 MatchSim12And20=${MatchSim12And20:-"true"}
 QueryVideoListTimeOutSec=${QueryVideoListTimeOutSec:-"60"}
 DomainToIP=${DomainToIP:-"true"}

diff --git a/script/gb28181/Setting.xml b/script/gb28181/Setting.xml
@@ -12,4 +12,5 @@
   <WebUsrName>gbsip</WebUsrName>
   <WebUsrPwd>admin</WebUsrPwd>
   <APIAuthorization>12345678</APIAuthorization>
+  <SwaggerDoc>true</SwaggerDoc>
 </Setting>
diff --git a/script/gw808/SettingConfig.xml b/script/gw808/SettingConfig.xml
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ConfigModel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
 	<PortClient>9300</PortClient>
+	<ShowNetLog>true</ShowNetLog>
+	<HexAddSpace>true</HexAddSpace>
+	<RedisExchangeHosts>172.29.108.245:6379,connectTimeout=20000,syncTimeout=20000,responseTimeout=20000</RedisExchangeHosts>
+	<RTVSAPI>http://172.29.108.11/api/GB/</RTVSAPI>
 </ConfigModel>
diff --git a/script/pull_all.sh b/script/pull_all.sh
@@ -47,10 +47,12 @@ function main(){
     auto_pull_docker_image $DOCKER_GW_IMAGE_NAME $PL_RTVS
 
     auto_pull_docker_image $RTVSWEB_DOCKER_IMAGE_NAME:$RTVSWEB_VERSION $PL_RTVS
+
+    auto_pull_docker_image $NGINX_DOCKER_IMAGE_NAME $PL_RTVS
 
     auto_pull_docker_image $WEBRTC_DOCKER_IMAGE_NAME $PL_RTVS
 
-    
+
 }
 ###################################脚本入口#######################################
 PL_BASE=0