From b6702f7c052c25dd263a09d3765c798eb597e0c2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Fri, 21 Jan 2022 16:05:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mysql=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sql/mysql.sql | 4 ++--
.../vmp/storager/dao/StreamPushMapper.java | 4 ++--
src/main/resources/all-application.yml | 7 +++++-
src/main/resources/application-dev.yml | 2 +-
.../dialog/chooseChannelForCatalog.vue | 22 -------------------
5 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/sql/mysql.sql b/sql/mysql.sql
index 8cbd4934..42cc3bfb 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -259,8 +259,8 @@ insert into user (username, password, roleId, createTime, updateTime) values ('a
create table role (
id int auto_increment
primary key,
- name TEXT NOT NULL,
- authority TEXT NOT NULL,
+ name varchar(50) NOT NULL,
+ authority varchar(50) NOT NULL,
createTime varchar(50) not null,
updateTime varchar(50) not null
);
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
index 9a5d3be6..e072e274 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
@@ -53,8 +53,8 @@ public interface StreamPushMapper {
"REPLACE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
"createStamp, aliveSecond, mediaServerId) " +
"VALUES " +
- "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', '${item.originType}', " +
- "'${item.originTypeStr}','${item.createStamp}', '${item.aliveSecond}', '${item.mediaServerId}' )" +
+ "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', #{item.originType}, " +
+ "'${item.originTypeStr}',#{item.createStamp}, #{item.aliveSecond}, '${item.mediaServerId}' )" +
" " +
"")
void addAll(List streamPushItems);
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index c0b2919b..4d49661a 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -5,6 +5,11 @@
spring:
+ # [可选]上传文件大小限制
+ servlet:
+ multipart:
+ max-file-size: 10MB
+ max-request-size: 100MB
# REDIS数据库配置
redis:
# [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
@@ -176,4 +181,4 @@ swagger-ui:
version:
version: "@project.version@"
description: "@project.description@"
- artifact-id: "@project.artifactId@"
\ No newline at end of file
+ artifact-id: "@project.artifactId@"
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index d0c039c8..7829ca45 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
spring:
- # 上传文件大小限制
+ # [可选]上传文件大小限制
servlet:
multipart:
max-file-size: 10MB
diff --git a/web_src/src/components/dialog/chooseChannelForCatalog.vue b/web_src/src/components/dialog/chooseChannelForCatalog.vue
index 4e4339f5..08e180a4 100644
--- a/web_src/src/components/dialog/chooseChannelForCatalog.vue
+++ b/web_src/src/components/dialog/chooseChannelForCatalog.vue
@@ -91,16 +91,6 @@ export default {
if (typeof(callback) === 'function') {
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) {
@@ -126,18 +116,6 @@ export default {
let node = this.$refs.tree.getNode(id);
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){
let that = this;