Merge pull request #774 from gaoxun1937/wvp-28181-2.0

648540858

2023-03-13 292c36f1c1397e6ba3f621ac43f521ab884551f2

 pom.xml

@@ -11,9 +11,10 @@

   <groupId>com.genersoft</groupId>
   <artifactId>wvp-pro</artifactId>
   <version>2.3.1</version>
   <version>2.6.7</version>
   <name>web video platform</name>
   <description>国标28181视频平台</description>
   <packaging>${project.packaging}</packaging>

   <repositories>
      <repository>
@@ -56,24 +57,46 @@
      <asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory>
   </properties>

   <profiles>
      <profile>
         <id>jar</id>
         <activation>
            <activeByDefault>true</activeByDefault>
         </activation>
         <properties>
            <project.packaging>jar</project.packaging>
         </properties>
      </profile>
      <profile>
         <id>war</id>
         <properties>
            <project.packaging>war</project.packaging>
         </properties>
         <dependencies>
            <dependency>
               <groupId>org.springframework.boot</groupId>
               <artifactId>spring-boot-starter-web</artifactId>
               <exclusions>
                  <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-jetty</artifactId>
                  </exclusion>
               </exclusions>
            </dependency>
            <dependency>
               <groupId>javax.servlet</groupId>
               <artifactId>javax.servlet-api</artifactId>
               <version>3.1.0</version>
               <scope>provided</scope>
            </dependency>
         </dependencies>
      </profile>
   </profiles>

   <dependencies>
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-data-redis</artifactId>
         <exclusions>
            <exclusion>
               <groupId>redis.clients</groupId>
               <artifactId>jedis</artifactId>
            </exclusion>
            <exclusion>
               <groupId>io.lettuce</groupId>
               <artifactId>lettuce-core</artifactId>
            </exclusion>
         </exclusions>
      </dependency>
      <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-pool2</artifactId>
      </dependency>
      <dependency>
         <groupId>org.springframework.boot</groupId>
@@ -167,13 +190,17 @@
         <version>2.1.3</version>
      </dependency>

      <!-- json解析库fastjson -->
      <!-- json解析库fastjson2 -->
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>fastjson</artifactId>
         <version>1.2.83</version>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2</artifactId>
         <version>2.0.17</version>
      </dependency>

      <dependency>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-extension</artifactId>
         <version>2.0.17</version>
      </dependency>

      <!-- okhttp -->
      <dependency>
@@ -252,8 +279,8 @@
         <artifactId>spring-boot-starter-test</artifactId>
<!--         <scope>test</scope>-->
      </dependency>
   </dependencies>

   </dependencies>


   <build>
@@ -277,14 +304,16 @@
            </configuration>
         </plugin>

   <!--      <plugin>
         <plugin>
            <groupId>pl.project13.maven</groupId>
            <artifactId>git-commit-id-plugin</artifactId>
            <version>3.0.1</version>
            <configuration>
               <offline>true</offline>
               <failOnNoGitDirectory>false</failOnNoGitDirectory>
               <dateFormat>yyyyMMdd</dateFormat>
            </configuration>
         </plugin>-->
         </plugin>

         <plugin>
            <groupId>org.apache.maven.plugins</groupId>