把gateway-boot + gyjiot-mq 直接合并到 gyjiot-gateway 里面

gyj-iot-boot/gyjiot-admin/pom.xml

@@ -70,11 +70,13 @@
         <dependency>
             <groupId>com.gyjiot</groupId>
             <artifactId>boot-strap</artifactId>
+            <version>${gyjiot.version}</version>
         </dependency>
         <!--网关集成启动模块-->
         <dependency>
             <groupId>com.gyjiot</groupId>
-            <artifactId>gateway-boot</artifactId>
+            <artifactId>gyjiot-gateway</artifactId>
+            <version>${gyjiot.version}</version>
         </dependency>
 
     </dependencies>

gyj-iot-boot/gyjiot-gateway/gateway-boot/pom.xml

@@ -1,29 +0,0 @@
-<?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>gyjiot-gateway</artifactId>
-        <groupId>com.gyjiot</groupId>
-        <version>${gyjiot.version}</version>
-    </parent>
-    <artifactId>gateway-boot</artifactId>
-
-    <description>网关模块</description>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.gyjiot</groupId>
-            <artifactId>gyjiot-mq</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.gyjiot</groupId>
-            <artifactId>gyjiot-mqtt-client</artifactId>
-        </dependency>
-
-    </dependencies>
-
-
-</project>

gyj-iot-boot/gyjiot-gateway/gyjiot-mq/pom.xml

@@ -1,33 +0,0 @@
-<?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>gyjiot-gateway</artifactId>
-		<groupId>com.gyjiot</groupId>
-		<version>${gyjiot.version}</version>
-	</parent>
-	<artifactId>gyjiot-mq</artifactId>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>com.gyjiot</groupId>
-			<artifactId>gyjiot-protocol</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>cn.hutool</groupId>
-			<artifactId>hutool-all</artifactId>
-		</dependency>
-
-        <dependency>
-            <groupId>com.gyjiot</groupId>
-            <artifactId>gyjiot-mqtt-client</artifactId>
-        </dependency>
-
-
-    </dependencies>
-
-
-</project>

gyj-iot-boot/gyjiot-gateway/pom.xml

@@ -8,13 +8,6 @@
         <version>${gyjiot.version}</version>
     </parent>
 
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>gateway-boot</module>
-        <module>gyjiot-mq</module>
-    </modules>
-
     <artifactId>gyjiot-gateway</artifactId>
     <name>gyjiot-gateway</name>
 
@@ -29,6 +22,15 @@
             <artifactId>gyjiot-iot-service</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.gyjiot</groupId>
+            <artifactId>gyjiot-mqtt-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.gyjiot</groupId>
+            <artifactId>gyjiot-ruleEngine</artifactId>
+        </dependency>
 
     </dependencies>
 

gyj-iot-boot/gyjiot-server/iot-server-core/pom.xml

@@ -18,7 +18,7 @@
         </dependency>
         <dependency>
             <groupId>com.gyjiot</groupId>
-            <artifactId>gyjiot-mq</artifactId>
+            <artifactId>gyjiot-gateway</artifactId>
         </dependency>
     </dependencies>
 

gyj-iot-boot/gyjiot-server/mqtt-broker/pom.xml

@@ -19,14 +19,18 @@
 
 		<dependency>
 			<groupId>com.gyjiot</groupId>
-			<artifactId>gyjiot-mq</artifactId>
+			<artifactId>gyjiot-gateway</artifactId>
 		</dependency>
         <dependency>
             <groupId>com.gyjiot</groupId>
             <artifactId>gyjiot-mqtt-client</artifactId>
         </dependency>
+		<dependency>
+			<groupId>com.gyjiot</groupId>
+			<artifactId>gyjiot-protocol</artifactId>
+		</dependency>
 
-    </dependencies>
+	</dependencies>
 
 
 </project>

gyj-iot-boot/gyjiot-server/sip-server/pom.xml

@@ -66,7 +66,7 @@
 
         <dependency>
             <groupId>com.gyjiot</groupId>
-            <artifactId>gyjiot-mq</artifactId>
+            <artifactId>gyjiot-gateway</artifactId>
         </dependency>
         <dependency>
             <groupId>com.gyjiot</groupId>

gyj-iot-boot/pom.xml

@@ -397,23 +397,10 @@
                 <artifactId>base-server</artifactId>
                 <version>${gyjiot.version}</version>
             </dependency>
-            <!--mq模块-->
-            <dependency>
-                <groupId>com.gyjiot</groupId>
-                <artifactId>gyjiot-mq</artifactId>
-                <version>${gyjiot.version}</version>
-            </dependency>
-            <!--服务启动模块-->
-            <dependency>
-                <groupId>com.gyjiot</groupId>
-                <artifactId>boot-strap</artifactId>
-                <version>${gyjiot.version}</version>
-            </dependency>
-
             <!--网关启动模块-->
             <dependency>
                 <groupId>com.gyjiot</groupId>
-                <artifactId>gateway-boot</artifactId>
+                <artifactId>gyjiot-gateway</artifactId>
                 <version>${gyjiot.version}</version>
             </dependency>