浏览代码

调整项目的pom结构,移除gyjiot-protocol-collect模块

jishenghua 2 月之前
父节点
当前提交
a6cd41c066

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

@@ -13,7 +13,7 @@
 
 		<dependency>
 			<groupId>com.gyjiot</groupId>
-			<artifactId>gyjiot-protocol-collect</artifactId>
+			<artifactId>gyjiot-protocol</artifactId>
 		</dependency>
 
 		<dependency>

+ 0 - 20
gyj-iot-boot/gyjiot-protocol/gyjiot-protocol-collect/pom.xml

@@ -1,20 +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-protocol</artifactId>
-        <groupId>com.gyjiot</groupId>
-        <version>${gyjiot.version}</version>
-    </parent>
-
-    <artifactId>gyjiot-protocol-collect</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>com.gyjiot</groupId>
-            <artifactId>gyjiot-iot-service</artifactId>
-        </dependency>
-    </dependencies>
-
-
-</project>

+ 5 - 8
gyj-iot-boot/gyjiot-protocol/pom.xml

@@ -11,12 +11,6 @@
     <artifactId>gyjiot-protocol</artifactId>
     <description>设备协议模块</description>
 
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>gyjiot-protocol-collect</module>
-    </modules>
-
     <dependencies>
 
         <dependency>
@@ -24,8 +18,11 @@
             <artifactId>gyjiot-common</artifactId>
         </dependency>
 
-    </dependencies>
-
+        <dependency>
+            <groupId>com.gyjiot</groupId>
+            <artifactId>gyjiot-iot-service</artifactId>
+        </dependency>
 
+    </dependencies>
 
 </project>

+ 0 - 0
gyj-iot-boot/gyjiot-protocol/gyjiot-protocol-collect/src/main/java/com/gyjiot/common/ProtocolDeCodeService.java → gyj-iot-boot/gyjiot-protocol/src/main/java/com/gyjiot/common/ProtocolDeCodeService.java


+ 0 - 0
gyj-iot-boot/gyjiot-protocol/gyjiot-protocol-collect/src/main/java/com/gyjiot/json/JsonProtocolService.java → gyj-iot-boot/gyjiot-protocol/src/main/java/com/gyjiot/json/JsonProtocolService.java


+ 1 - 1
gyj-iot-boot/gyjiot-server/boot-strap/pom.xml

@@ -19,7 +19,7 @@
 
         <dependency>
             <groupId>com.gyjiot</groupId>
-            <artifactId>gyjiot-protocol-collect</artifactId>
+            <artifactId>gyjiot-protocol</artifactId>
         </dependency>
         <dependency>
             <groupId>com.gyjiot</groupId>

+ 0 - 6
gyj-iot-boot/pom.xml

@@ -385,12 +385,6 @@
                 <artifactId>gyjiot-open-api</artifactId>
                 <version>${gyjiot.version}</version>
             </dependency>
-            <!--modbus协议模块-->
-            <dependency>
-                <groupId>com.gyjiot</groupId>
-                <artifactId>gyjiot-protocol-collect</artifactId>
-                <version>${gyjiot.version}</version>
-            </dependency>
             <!--服务核心模块-->
             <dependency>
                 <groupId>com.gyjiot</groupId>