修改mysql脚本

648540858
1 parent 3f5e885e
Showing 5 changed files with 11 additions and 28 deletions
sql/mysql.sql
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
src/main/resources/all-application.yml
src/main/resources/application-dev.yml
web_src/src/components/dialog/chooseChannelForCatalog.vue
@@ -259,8 +259,8 @@ insert into user (username, password, roleId, createTime, updateTime) values (&#39;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
 );
@@ -53,8 +53,8 @@ public interface StreamPushMapper {
             "REPLACE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
             "createStamp, aliveSecond, mediaServerId) " +
             "VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
-            "( '${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}' )" +
             " </foreach>" +
             "</script>")
     void addAll(List<StreamPushItem> streamPushItems);
@@ -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@"
 spring:
-    # 上传文件大小限制
+    # [可选]上传文件大小限制
     servlet:
         multipart:
             max-file-size: 10MB
@@ -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;