Merge branch 'master' of D:\idea4\huimv.farm.datacenter with conflicts.

huimv-farm-video/pom.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
 		<artifactId>huimv-farm-datacenter</artifactId>
 		<groupId>com.huimv</groupId>
 		<version>0.0.1-SNAPSHOT</version>
 	</parent>
-	<groupId>huimv-farm-video</groupId>
+    <modelVersion>4.0.0</modelVersion>
+<!--	<groupId>com.huimv</groupId>-->
 	<artifactId>huimv-farm-video</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<name>huimv-farm-video</name>
+<!--	<version>0.0.1-SNAPSHOT</version>-->
+<!--	<name>demo</name>-->
 	<description>Demo project for Spring Boot</description>
 	<properties>
 		<java.version>8</java.version>
 	</properties>
 	<dependencies>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
@@ -33,51 +33,19 @@
 			<version>1.0.8</version>
 			<scope>compile</scope>
 		</dependency>
-
 		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.5.13</version>
+			<groupId>com.huimv</groupId>
+			<artifactId>huimv-common</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+			<scope>system</scope>
+<!--			<systemPath>${basedir}/lib/huimv-common-0.0.1-SNAPSHOT.jar</systemPath>-->
+			<systemPath>${project.basedir}/lib/huimv-common-0.0.1-SNAPSHOT.jar</systemPath>
 		</dependency>
 
 		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>3.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore</artifactId>
-			<version>4.4.4</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpmime</artifactId>
-			<version>4.5.12</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.8.0</version>
-		</dependency>
-		<dependency>
-			<groupId>com.auth0</groupId>
-			<artifactId>java-jwt</artifactId>
-			<version>3.3.0</version>
-		</dependency>
-		<dependency>
-			<groupId>io.jsonwebtoken</groupId>
-			<artifactId>jjwt</artifactId>
-			<version>0.9.1</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.json-lib</groupId>
-			<artifactId>json-lib</artifactId>
-			<version>2.2.3</version>
-			<classifier>jdk15</classifier>
-			<!-- jdk版本 -->
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+			<version>3.7</version>
 		</dependency>
 
 	</dependencies>
@@ -87,6 +55,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<includeSystemScope>true</includeSystemScope>
+				</configuration>
 			</plugin>
 		</plugins>
 	</build>

pom.xml

@@ -10,6 +10,7 @@
         <module>huimv-farm-environ</module>
         <module>huimv-farm-gateway</module>
         <module>huimv-farm-receiver</module>
+        <module>huimv-farm-eartag</module>
     </modules>
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -37,11 +38,13 @@
             <scope>test</scope>
         </dependency>
         <!-- -->
-        <dependency>
-            <groupId>com.huimv</groupId>
-            <artifactId>huimv-common</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.huimv</groupId>-->
+<!--            <artifactId>huimv-common</artifactId>-->
+<!--            <version>0.0.1-SNAPSHOT</version>-->
+<!--            <scope>system</scope>-->
+<!--            <systemPath>${basedir}/lib/huimv-common-0.0.1-SNAPSHOT.jar</systemPath>-->
+<!--        </dependency>-->
         <!--CloseableHttpClient-->
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>