From 506f60bb0fd433d2d79111a7f4dac57d871b3aed Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期五, 23 七月 2021 17:09:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
---
sql/mysql.sql | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/sql/mysql.sql b/sql/mysql.sql
index 21d7a52..0bb4c03 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -138,6 +138,7 @@
timeout_ms int null,
ffmpeg_cmd_key varchar(255) null,
rtp_type varchar(50) null,
+ mediaServerId varchar(50) null,
enable_hls bit(1) null,
enable_mp4 bit(1) null,
enable bit(1) not null,
@@ -166,4 +167,28 @@
create_time varchar(50) not null
);
-insert into user (username, password, roleId, create_time) values ('admin', '21232f297a57a5a743894a0e4a801fc3', '0', '2021-04-13 14:14:57');
\ No newline at end of file
+insert into user (username, password, roleId, create_time) values ('admin', '21232f297a57a5a743894a0e4a801fc3', '0', '2021-04-13 14:14:57');
+
+create table media_server (
+ id varchar(255)
+ primary key,
+ ip varchar(50) NOT NULL,
+ hookIp varchar(50) NOT NULL,
+ sdpIp varchar(50) NOT NULL,
+ streamIp varchar(50) NOT NULL,
+ httpPort int NOT NULL,
+ httpSSlPort int NOT NULL,
+ rtmpPort int NOT NULL,
+ rtmpSSlPort int NOT NULL,
+ rtpProxyPort int NOT NULL,
+ rtspPort int NOT NULL,
+ rtspSSLPort int NOT NULL,
+ autoConfig int NOT NULL,
+ secret varchar(50) NOT NULL,
+ streamNoneReaderDelayMS int NOT NULL,
+ rtpEnable int NOT NULL,
+ rtpPortRange varchar(50) NOT NULL,
+ recordAssistPort int NOT NULL,
+ createTime varchar(50) not null,
+ updateTime varchar(50) not null
+);
\ No newline at end of file
--
Gitblit v1.8.0