Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改mysql脚本

pull/317/head
648540858 2022-01-21 16:05:02 +08:00
parent 3f5e885e82
commit b6702f7c05
5 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysql.sql
View File

@ -259,8 +259,8 @@ insert into user (username, password, roleId, createTime, updateTime) values ('a
create table role ( create table role (
id int auto_increment id int auto_increment
primary key, primary key,
name TEXT NOT NULL, name varchar(50) NOT NULL,
authority TEXT NOT NULL, authority varchar(50) NOT NULL,
createTime varchar(50) not null, createTime varchar(50) not null,
updateTime varchar(50) not null updateTime varchar(50) not null
); );

4
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
View File

@ -53,8 +53,8 @@ public interface StreamPushMapper {
"REPLACE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " + "REPLACE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
"createStamp, aliveSecond, mediaServerId) " + "createStamp, aliveSecond, mediaServerId) " +
"VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" + "VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
"( '${item.app}', '${item.stream}', '${item.totalReaderCount}', '${item.originType}', " + "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', #{item.originType}, " +
"'${item.originTypeStr}','${item.createStamp}', '${item.aliveSecond}', '${item.mediaServerId}' )" + "'${item.originTypeStr}',#{item.createStamp}, #{item.aliveSecond}, '${item.mediaServerId}' )" +
" </foreach>" + " </foreach>" +
"</script>") "</script>")
void addAll(List<StreamPushItem> streamPushItems); void addAll(List<StreamPushItem> streamPushItems);

5
src/main/resources/all-application.yml
View File

@ -5,6 +5,11 @@
spring: spring:
# [可选]上传文件大小限制
servlet:
multipart:
max-file-size: 10MB
max-request-size: 100MB
# REDIS数据库配置 # REDIS数据库配置
redis: redis:
# [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1 # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1

2
src/main/resources/application-dev.yml
View File

@ -1,5 +1,5 @@
spring: spring:
# 上传文件大小限制 # [可选]上传文件大小限制
servlet: servlet:
multipart: multipart:
max-file-size: 10MB max-file-size: 10MB

22
web_src/src/components/dialog/chooseChannelForCatalog.vue
View File

@ -91,16 +91,6 @@ export default {
if (typeof(callback) === 'function') { if (typeof(callback) === 'function') {
callback(res.data.data) callback(res.data.data)
} }
//
// if (typeof (this.$refs.tree.setCurrentKey) == "undefined") {
// this.$refs.tree.setCurrentKey(this.defaultCatalogId)
// let data = this.$refs.tree.getCurrentNode()
// if (data != null && data.id === this.defaultCatalogId) {
// this.currentCatalogChange(data, this.$refs.tree.getNode(data.id))
// }
// }
} }
}) })
.catch(function (error) { .catch(function (error) {
@ -126,18 +116,6 @@ export default {
let node = this.$refs.tree.getNode(id); let node = this.$refs.tree.getNode(id);
this.refreshCatalog(node); this.refreshCatalog(node);
} }
// if (nodeIds !== null) {
// let refreshNode = {}
// for (let i = 0; i < nodeIds.length; i++) {
// let node = this.$refs.tree.getNode(nodeIds[i]);
// refreshNode[node.parent.data.id] = node.parent
// }
// if (Object.values(refreshNode).length > 0) {
// for (let j = 0; j < Object.values(refreshNode).length; j++) {
// this.refreshCatalog(Object.values(refreshNode)[j]);
// }
// }
// }
}, },
editCatalog: function (data, node){ editCatalog: function (data, node){
let that = this; let that = this;