From f8abd2603002eb6ff296d26f99042681d9b2bc92 Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期五, 23 七月 2021 17:06:49 +0800
Subject: [PATCH] 修正推流列表播放错误
---
sql/mysql.sql | 98 ++++++++++++++++++++++++++++++++----------------
1 files changed, 65 insertions(+), 33 deletions(-)
diff --git a/sql/mysql.sql b/sql/mysql.sql
index bfed62e..0bb4c03 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -5,23 +5,27 @@
(
deviceId varchar(50) not null
primary key,
- name varchar(50) null,
- manufacturer varchar(50) null,
- model varchar(50) null,
- firmware varchar(50) null,
+ name varchar(255) null,
+ manufacturer varchar(255) null,
+ model varchar(255) null,
+ firmware varchar(255) null,
transport varchar(50) null,
streamMode varchar(50) null,
online varchar(50) null,
- registerTimeMillis int null,
+ registerTime varchar(50) null,
+ keepaliveTime varchar(50) null,
ip varchar(50) not null,
+ createTime varchar(50) not null,
+ updateTime varchar(50) not null,
port int not null,
+ expires int not null,
hostAddress varchar(50) not null
);
create table device_channel
(
channelId varchar(50) not null,
- name varchar(50) null,
+ name varchar(255) null,
manufacture varchar(50) null,
model varchar(50) null,
owner varchar(50) null,
@@ -38,7 +42,7 @@
secrecy varchar(50) null,
ipAddress varchar(50) null,
port int null,
- password varchar(50) null,
+ password varchar(255) null,
PTZType int null,
status int null,
longitude double null,
@@ -46,14 +50,16 @@
streamId varchar(50) null,
deviceId varchar(50) not null,
parental varchar(50) null,
- hasAudio tinyint(1) null,
+ hasAudio bit(1) null,
+ createTime varchar(50) not null,
+ updateTime varchar(50) not null,
primary key (channelId, deviceId)
);
create table device_mobile_position
(
deviceId varchar(50) not null,
- deviceName varchar(50) null,
+ deviceName varchar(255) null,
time varchar(50) not null,
longitude double not null,
latitude double not null,
@@ -69,10 +75,10 @@
create table gb_stream
(
- app varchar(50) not null,
- stream varchar(50) not null,
+ app varchar(255) not null,
+ stream varchar(255) not null,
gbId varchar(50) not null,
- name varchar(50) null,
+ name varchar(255) null,
longitude double null,
latitude double null,
streamType varchar(50) null,
@@ -82,17 +88,17 @@
create table parent_platform
(
+ id int auto_increment,
enable int null,
- name varchar(50) null,
- serverGBId varchar(50) not null
- primary key,
+ name varchar(255) null,
+ serverGBId varchar(50) not null,
serverGBDomain varchar(50) null,
serverIP varchar(50) null,
serverPort int null,
deviceGBId varchar(50) not null,
deviceIp varchar(50) null,
devicePort varchar(50) null,
- username varchar(50) null,
+ username varchar(255) null,
password varchar(50) null,
expires varchar(50) null,
keepTimeout varchar(50) null,
@@ -100,7 +106,8 @@
characterSet varchar(50) null,
ptz int null,
rtcp int null,
- status tinyint(1) null
+ status bit(1) null,
+ primary key (id, serverGBId)
);
create table platform_gb_channel
@@ -115,32 +122,33 @@
create table platform_gb_stream
(
platformId varchar(50) not null,
- app varchar(50) not null,
- stream varchar(50) not null,
+ app varchar(255) not null,
+ stream varchar(255) not null,
primary key (platformId, app, stream)
);
create table stream_proxy
(
type varchar(50) not null,
- app varchar(50) not null,
- stream varchar(50) not null,
- url varchar(50) null,
- src_url varchar(50) null,
- dst_url blob null,
+ app varchar(255) not null,
+ stream varchar(255) not null,
+ url varchar(255) null,
+ src_url varchar(255) null,
+ dst_url varchar(255) null,
timeout_ms int null,
- ffmpeg_cmd_key varchar(50) null,
+ ffmpeg_cmd_key varchar(255) null,
rtp_type varchar(50) null,
- enable_hls tinyint(1) null,
- enable_mp4 tinyint(1) null,
- enable tinyint(1) not null,
+ mediaServerId varchar(50) null,
+ enable_hls bit(1) null,
+ enable_mp4 bit(1) null,
+ enable bit(1) not null,
primary key (app, stream)
);
create table stream_push
(
- app varchar(50) not null,
- stream varchar(50) not null,
+ app varchar(255) not null,
+ stream varchar(255) not null,
totalReaderCount varchar(50) null,
originType int null,
originTypeStr varchar(50) null,
@@ -153,10 +161,34 @@
(
id int auto_increment
primary key,
- username varchar(50) not null,
- password varchar(50) not null,
+ username varchar(255) not null,
+ password varchar(255) not null,
roleId int not null,
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