From c35932e24cf9dda9ef396ab5a45fb1a6e5539748 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 29 十月 2021 11:22:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
sql/mysql.sql | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/sql/mysql.sql b/sql/mysql.sql
index d5a84c3..4501257 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -23,7 +23,8 @@
updateTime varchar(50) not null,
port int not null,
expires int not null,
- hostAddress varchar(50) not null
+ hostAddress varchar(50) not null,
+ charset varchar(50) not null
);
create table device_channel
@@ -65,6 +66,7 @@
id int auto_increment
primary key,
deviceId varchar(50) not null,
+ channelId varchar(50) not null,
alarmPriority varchar(50) not null,
alarmMethod varchar(50),
alarmTime varchar(50) not null,
@@ -74,11 +76,24 @@
alarmType varchar(50)
);
-
+create table log
+(
+ id int auto_increment
+ primary key,
+ name varchar(50) not null,
+ type varchar(50) not null,
+ uri varchar(200) not null,
+ address varchar(50) not null,
+ result varchar(50) not null,
+ timing bigint not null,
+ username varchar(50) not null,
+ createTime varchar(50) not null
+);
create table device_mobile_position
(
deviceId varchar(50) not null,
+ channelId varchar(50) not null,
deviceName varchar(255) null,
time varchar(50) not null,
longitude double not null,
@@ -127,6 +142,7 @@
streamNoneReaderDelayMS int not null,
rtpEnable int not null,
rtpPortRange varchar(50) not null,
+ sendRtpPortRange varchar(50) not null,
recordAssistPort int not null,
defaultServer int not null,
createTime varchar(50) not null,
@@ -215,8 +231,22 @@
username varchar(255) not null,
password varchar(255) not null,
roleId int not null,
- create_time varchar(50) not null
+ createTime varchar(50) not null,
+ updateTime varchar(50) not null
);
-insert into user (username, password, roleId, create_time) values ('admin', '21232f297a57a5a743894a0e4a801fc3', '0', '2021-04-13 14:14:57');
+create unique index user_username_uindex
+ on user (username);
+
+insert into user (username, password, roleId, createTime, updateTime) values ('admin', '21232f297a57a5a743894a0e4a801fc3', '1', '2021-04-13 14:14:57', '2021-04-13 14:14:57');
+
+create table role (
+ id int auto_increment
+ primary key,
+ name TEXT NOT NULL,
+ authority TEXT NOT NULL,
+ createTime varchar(50) not null,
+ updateTime varchar(50) not null
+);
+insert into role (id, name, authority, createTime, updateTime) values ('1', 'admin', '0', '2021-04-13 14:14:57', '2021-04-13 14:14:57');
--
Gitblit v1.8.0