648540858
2022-01-21 b6702f7c052c25dd263a09d3765c798eb597e0c2
修改mysql脚本
5个文件已修改
39 ■■■■ 已修改文件
sql/mysql.sql 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/all-application.yml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-dev.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
web_src/src/components/dialog/chooseChannelForCatalog.vue 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sql/mysql.sql
@@ -259,8 +259,8 @@
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
);
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
@@ -53,8 +53,8 @@
            "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);
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 @@
version:
    version: "@project.version@"
    description: "@project.description@"
    artifact-id: "@project.artifactId@"
    artifact-id: "@project.artifactId@"
src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
spring:
    # 上传文件大小限制
    # [可选]上传文件大小限制
    servlet:
        multipart:
            max-file-size: 10MB
web_src/src/components/dialog/chooseChannelForCatalog.vue
@@ -91,16 +91,6 @@
                    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 @@
            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;