Merge pull request #786 from zhulangren/wvp-28181-2.0

648540858

2023-03-22 8773864b5b5b3818f0007071d35a2c7c6ca5540b

 pom.xml

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

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

   <repositories>
      <repository>
@@ -55,6 +56,42 @@
      <asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.directory>
      <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>
@@ -153,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>
@@ -175,8 +216,6 @@
         <version>4.10.0</version>
      </dependency>



      <!-- okhttp-digest -->
      <dependency>
         <groupId>io.github.rburgst</groupId>
@@ -185,10 +224,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>

      <!--反向代理-->
@@ -238,8 +284,8 @@
         <artifactId>spring-boot-starter-test</artifactId>
<!--         <scope>test</scope>-->
      </dependency>
   </dependencies>

   </dependencies>


   <build>