Merge branch 'xinchuang' into wvp-28181-2.0

648540858

2023-09-15 2d423d9668312fe75986af3c78c0228ce352e48d

 pom.xml

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

   <groupId>com.genersoft</groupId>
   <artifactId>wvp-pro</artifactId>
   <version>2.6.7</version>
   <version>2.6.9</version>
   <name>web video platform</name>
   <description>国标28181视频平台</description>
   <packaging>${project.packaging}</packaging>
@@ -123,11 +123,9 @@
         <artifactId>spring-boot-starter-security</artifactId>
      </dependency>

      <!-- druid数据库连接池 -->
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>druid-spring-boot-starter</artifactId>
         <version>1.2.11</version>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-jdbc</artifactId>
      </dependency>

      <!-- mysql数据库 -->
@@ -137,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>

      <!--在线文档 -->
@@ -216,8 +233,6 @@
         <version>4.10.0</version>
      </dependency>



      <!-- okhttp-digest -->
      <dependency>
         <groupId>io.github.rburgst</groupId>
@@ -226,10 +241,17 @@
      </dependency>

      <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
<!--      <dependency>-->
<!--         <groupId>net.sf.kxml</groupId>-->
<!--         <artifactId>kxml2</artifactId>-->
<!--         <version>2.3.0</version>-->
<!--      </dependency>-->

      <!-- jwt实现 -->
      <dependency>
         <groupId>net.sf.kxml</groupId>
         <artifactId>kxml2</artifactId>
         <version>2.3.0</version>
         <groupId>org.bitbucket.b_c</groupId>
         <artifactId>jose4j</artifactId>
         <version>0.9.3</version>
      </dependency>

      <!--反向代理-->
@@ -289,7 +311,7 @@
         <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <version>2.3.5.RELEASE</version>
            <version>2.7.2</version>
            <configuration>
               <includeSystemScope>true</includeSystemScope>
            </configuration>