合并主线

648540858

2023-07-19 69bce3b6fe435c05e7a0b3367341e5da0d92f978

 pom.xml

@@ -6,12 +6,12 @@
   <parent>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-parent</artifactId>
      <version>2.7.2</version>
      <version>2.7.9</version>
   </parent>

   <groupId>com.genersoft</groupId>
   <artifactId>wvp-pro</artifactId>
   <version>2.6.8</version>
   <version>2.6.9</version>
   <name>web video platform</name>
   <description>国标28181视频平台</description>
   <packaging>${project.packaging}</packaging>
@@ -135,11 +135,30 @@
         <version>8.0.30</version>
      </dependency>

      <!--postgresql-->
      <dependency>
         <groupId>org.postgresql</groupId>
         <artifactId>postgresql</artifactId>
         <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>

      <!--Mybatis分页插件 -->
      <dependency>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot-starter</artifactId>
         <version>1.4.3</version>
         <version>1.4.6</version>
      </dependency>

      <!--在线文档 -->
@@ -317,7 +336,6 @@
               <dateFormat>yyyyMMdd</dateFormat>
            </configuration>
         </plugin>

         <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-surefire-plugin</artifactId>
@@ -326,7 +344,6 @@
               <skipTests>true</skipTests>
            </configuration>
         </plugin>

      </plugins>
      <resources>
         <resource>