Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-31 fc74ce9de4c38d56ee429893758776eeb5432e9b

 pom.xml

@@ -11,7 +11,7 @@

    <groupId>com.genersoft</groupId>
    <artifactId>wvp-pro</artifactId>
    <version>2.6.9</version>
    <version>2.7.0</version>
    <name>web video platform</name>
    <description>国标28181视频平台</description>
    <packaging>${project.packaging}</packaging>
@@ -143,17 +143,24 @@
            <version>42.5.1</version>
        </dependency>

        <!-- kingbase人大金仓 -->
        <!-- 手动下载驱动后安装 -->
        <!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8
        -Dversion=8.6.0 -Dpackaging=jar -->
        <dependency>
            <groupId>com.kingbase</groupId>
            <artifactId>kingbase8</artifactId>
            <version>8.6.0</version>
            <scope>system</scope>
            <systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
        </dependency>
      <!-- kingbase人大金仓 -->
      <!-- 手动下载驱动后安装 -->
      <!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar
 -->
      <dependency>
         <groupId>com.kingbase</groupId>
         <artifactId>kingbase8</artifactId>
         <version>8.6.0</version>
         <scope>system</scope>
         <systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
      </dependency>
      <dependency>
         <groupId>com.kingbase</groupId>
         <artifactId>kingbase8</artifactId>
         <version>8.6.0</version>
         <scope>system</scope>
         <systemPath>${basedir}/libs/jdbc-x86/kingbase8-8.6.0.jar</systemPath>
      </dependency>

        <!--Mybatis分页插件 -->
        <dependency>
@@ -174,6 +181,20 @@
            <artifactId>springdoc-openapi-security</artifactId>
            <version>1.6.10</version>
        </dependency>
      <!-- https://mvnrepository.com/artifact/com.baomidou/dynamic-datasource-spring-boot-starter -->
      <dependency>
         <groupId>com.baomidou</groupId>
         <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
         <version>3.6.1</version>
      </dependency>


      <!--在线文档 -->
      <dependency>
         <groupId>org.springdoc</groupId>
         <artifactId>springdoc-openapi-ui</artifactId>
         <version>1.6.10</version>
      </dependency>

        <dependency>
            <groupId>com.github.xiaoymin</groupId>