From cb24ce13da8b97e9e524fae55cd3b5263e6722d6 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Mon, 17 Jul 2023 17:33:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=B0=91?= =?UTF-8?q?=E7=9A=84sql=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/初始化.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/初始化.sql b/sql/初始化.sql index 7b8be660..95104006 100644 --- a/sql/初始化.sql +++ b/sql/初始化.sql @@ -285,6 +285,7 @@ CREATE TABLE `media_server` ( `secret` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `rtpEnable` int NOT NULL, `rtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `sendRtpPortRange` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `recordAssistPort` int NOT NULL, `defaultServer` int NOT NULL, `createTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, From a39ac45bcc7fbddbb578e0ab39fd109e30d214a4 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Thu, 20 Jul 2023 17:18:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=94=AF=E6=8C=81HTTPS=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/impl/NotifyRequestForCatalogProcessor.java | 2 +- .../genersoft/iot/vmp/web/gb28181/ApiStreamController.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java index 90a58936..7a506282 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForCatalogProcessor.java @@ -239,7 +239,7 @@ public class NotifyRequestForCatalogProcessor extends SIPRequestProcessorParent } private void executeSave(){ - System.out.println("定时存储数据"); + executeSaveForAdd(); executeSaveForUpdate(); executeSaveForDelete(); executeSaveForOnline(); diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java index 72a1b5da..8a1d079d 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java +++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java @@ -120,11 +120,17 @@ public class ApiStreamController { result.put("ChannelName", deviceChannel.getName()); result.put("ChannelCustomName", ""); result.put("FLV", streamInfo.getFlv().getUrl()); + result.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl()); result.put("WS_FLV", streamInfo.getWs_flv().getUrl()); + result.put("WSS_FLV", streamInfo.getWss_flv().getUrl()); result.put("RTMP", streamInfo.getRtmp().getUrl()); + result.put("RTMPS", streamInfo.getRtmps().getUrl()); result.put("HLS", streamInfo.getHls().getUrl()); + result.put("HTTPS_HLS", streamInfo.getHttps_hls().getUrl()); result.put("RTSP", streamInfo.getRtsp().getUrl()); + result.put("RTSPS", streamInfo.getRtsps().getUrl()); result.put("WEBRTC", streamInfo.getRtc().getUrl()); + result.put("HTTPS_WEBRTC", streamInfo.getRtcs().getUrl()); result.put("CDN", ""); result.put("SnapURL", ""); result.put("Transport", device.getTransport()); From 48a1a247697b5c25d3803b1d228b6df11c3715bc Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Thu, 20 Jul 2023 17:29:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/all-application.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml index 90cde6f1..ceaa82f7 100644 --- a/src/main/resources/all-application.yml +++ b/src/main/resources/all-application.yml @@ -128,6 +128,8 @@ media: enable: true # [可选] 在此范围内选择端口用于媒体流传输, 必须提前在zlm上配置该属性，不然自动配置此属性可能不成功 port-range: 30000,30500 # 端口范围 + # [可选] 国标级联在此范围内选择端口发送媒体流，请不要与收流端口范围重合 + send-port-range: 50502,50506 # 端口范围 # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用 record-assist-port: 0