Merge remote-tracking branch 'origin/master' into wvp-pro-record

648540858

2022-02-22 e861c9dfab7d74444593b3cfa866544d648dca7f

 pom.xml

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

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

@@ -155,7 +155,6 @@
         <version>1.7.35</version>
      </dependency>


      <!-- xml解析库 -->
      <dependency>
         <groupId>org.dom4j</groupId>
@@ -210,6 +209,13 @@
         <groupId>com.alibaba</groupId>
         <artifactId>easyexcel</artifactId>
         <version>3.0.4</version>
      </dependency>

      <!-- 获取系统信息 -->
      <dependency>
         <groupId>com.github.oshi</groupId>
         <artifactId>oshi-core</artifactId>
         <version>6.1.0</version>
      </dependency>

      <dependency>
@@ -271,5 +277,16 @@
         </plugin>

      </plugins>
      <resources>
         <resource>
            <directory>src/main/resources</directory>
         </resource>
         <resource>
            <directory>src/main/java</directory>
            <includes>
               <include>**/*.xml</include>
            </includes>
         </resource>
      </resources>
   </build>
</project>