Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0

lawrencehj

2021-07-23 506f60bb0fd433d2d79111a7f4dac57d871b3aed

 pom.xml

@@ -10,8 +10,8 @@
   </parent>

   <groupId>com.genersoft</groupId>
   <artifactId>wvp</artifactId>
   <version>2.0.0</version>
   <artifactId>wvp-pro</artifactId>
   <version>2.0</version>
   <name>web video platform</name>

   <repositories>
@@ -44,6 +44,8 @@

   <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      <maven.build.timestamp.format>MMddHHmm</maven.build.timestamp.format>
      <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>

      <!-- 依赖版本 -->
      <pagehelper.version>5.2.0</pagehelper.version>
@@ -62,6 +64,11 @@
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-web</artifactId>
      </dependency>
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-configuration-processor</artifactId>
         <optional>true</optional>
      </dependency>
      <dependency>
         <groupId>org.mybatis.spring.boot</groupId>
@@ -167,14 +174,59 @@
         <artifactId>okhttp</artifactId>
         <version>4.9.0</version>
      </dependency>
    </dependencies>

      <!-- okhttp-digest -->
      <dependency>
         <groupId>com.burgstaller</groupId>
         <artifactId>okhttp-digest</artifactId>
         <version>2.1</version>
      </dependency>

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

      <!--反向代理-->
      <dependency>
         <groupId>org.mitre.dsmiley.httpproxy</groupId>
         <artifactId>smiley-http-proxy-servlet</artifactId>
         <version>1.12</version>
      </dependency>

<!--      &lt;!&ndash; 检测文件编码 &ndash;&gt;-->
<!--      &lt;!&ndash; https://mvnrepository.com/artifact/cpdetector/cpdetector &ndash;&gt;-->
<!--      <dependency>-->
<!--         <groupId>cpdetector</groupId>-->
<!--         <artifactId>cpdetector</artifactId>-->
<!--         <version>1.0.8</version>-->
<!--      </dependency>-->



      <!-- onvif协议栈 -->
      <dependency>
         <groupId>be.teletask</groupId>
         <artifactId>onvif-java</artifactId>
         <version>1.0.2</version>
         <scope>system</scope>
         <systemPath>${project.basedir}/libs/onvif-java-1.0.2.jar</systemPath>
      </dependency>
   </dependencies>


   
   <build>
      <finalName>wvp-2.0</finalName>
      <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
      <plugins>
         <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <configuration>
               <includeSystemScope>true</includeSystemScope>
            </configuration>
         </plugin>
         <plugin>
            <groupId>org.apache.maven.plugins</groupId>