From 4bd4f50b4165953018a9f9174056d29d087fdaee Mon Sep 17 00:00:00 2001
From: szy833 <31844882+szy833@users.noreply.github.com>
Date: 星期日, 16 一月 2022 23:32:51 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
sql/mysql.sql | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/sql/mysql.sql b/sql/mysql.sql
index cd5bbea..8cbd493 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -1,7 +1,7 @@
-- auto-generated definition
-CREATE DATABASE `wvp` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_bin */;
+CREATE DATABASE IF NOT EXISTS `wvp` /*!40100 DEFAULT CHARACTER SET utf8mb3 COLLATE utf8mb3_bin */;
use wvp;
@@ -148,6 +148,7 @@
defaultServer int not null,
createTime varchar(50) not null,
updateTime varchar(50) not null,
+ hookAliveInterval int not null,
constraint media_server_i
unique (ip, httpPort)
);
@@ -170,10 +171,21 @@
keepTimeout varchar(50) null,
transport varchar(50) null,
characterSet varchar(50) null,
+ catalogId varchar(50) not null,
ptz int null,
rtcp int null,
status bit null,
+ shareAllLiveStream int null,
primary key (id, serverGBId)
+);
+
+
+create table platform_catalog
+(
+ id varchar(50) primary key,
+ platformId varchar(50) not null,
+ name varchar(255) not null,
+ parentId varchar(50)
);
create table platform_gb_channel
@@ -182,6 +194,7 @@
deviceId varchar(50) not null,
platformId varchar(50) not null,
deviceAndChannelId varchar(50) not null,
+ catalogId varchar(50) not null,
primary key (deviceAndChannelId, platformId)
);
@@ -190,6 +203,7 @@
platformId varchar(50) not null,
app varchar(255) not null,
stream varchar(255) not null,
+ catalogId varchar(50) not null,
primary key (platformId, app, stream)
);
@@ -208,6 +222,7 @@
enable_hls bit null,
enable_mp4 bit null,
enable bit not null,
+ enable_remove_none_reader bit not null,
createTime varchar(50) not null,
primary key (app, stream)
);
--
Gitblit v1.8.0