合并主线

648540858

2022-11-18 ecf84bb0f1952c4a044ff6c8aa18226b31593f3f

 pom.xml

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

   <groupId>com.genersoft</groupId>
   <artifactId>wvp-pro</artifactId>
   <version>2.3.2</version>
   <version>2.6.6</version>
   <name>web video platform</name>
   <description>国标28181视频平台</description>

@@ -153,13 +153,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>
@@ -273,7 +277,6 @@
               <dateFormat>yyyyMMdd</dateFormat>
            </configuration>
         </plugin>

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

      </plugins>
      <resources>
         <resource>