pom包调整

iot-framework/iot-common/pom.xml → iot-common/iot-common-core/pom.xml

@@ -5,12 +5,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.middle.platform</groupId>
-        <artifactId>iot-framework</artifactId>
+        <artifactId>iot-common</artifactId>
         <version>${revision}</version>
     </parent>
 
-    <artifactId>iot-common</artifactId>
-    <packaging>jar</packaging>
+    <artifactId>iot-common-core</artifactId>
+
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
@@ -82,4 +82,5 @@
             <artifactId>okhttp</artifactId>
         </dependency>
     </dependencies>
+
 </project>

iot-framework/iot-common/src/main/java/com/middle/platform/common/constant/Global.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/constant/Global.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.constant;
+package com.middle.common.core.constant;
 
 /**
  * @author xucaiqin

iot-framework/iot-common/src/main/java/com/middle/platform/common/core/KeyValue.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/constant/KeyValue.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.core;
+package com.middle.common.core.constant;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

iot-framework/iot-common/src/main/java/com/middle/platform/common/constant/RpcConstants.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/constant/RpcConstants.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.constant;
+package com.middle.common.core.constant;
 
 
 public class RpcConstants {

iot-framework/iot-common/src/main/java/com/middle/platform/common/exception/BusinessException.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/exception/BusinessException.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.exception;
+package com.middle.common.core.exception;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

iot-framework/iot-common/src/main/java/com/middle/platform/common/exception/ResultCode.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/exception/ResultCode.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.exception;
+package com.middle.common.core.exception;
 
 /**
  * @author xucaiqin

iot-framework/iot-common/src/main/java/com/middle/platform/common/exception/ServerException.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/exception/ServerException.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.exception;
+package com.middle.common.core.exception;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;

iot-framework/iot-common/src/main/java/com/middle/platform/common/modle/BasePara.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/modle/BasePara.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.modle;
+package com.middle.common.core.modle;
 
 import lombok.Getter;
 import lombok.Setter;

iot-framework/iot-common/src/main/java/com/middle/platform/common/utils/CacheUtils.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/utils/CacheUtils.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.utils;
+package com.middle.common.core.utils;
 
 
 import com.google.common.cache.CacheBuilder;

iot-framework/iot-common/src/main/java/com/middle/platform/common/utils/DateTimeUtil.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/utils/DateTimeUtil.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.utils;
+package com.middle.common.core.utils;
 
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;

iot-framework/iot-common/src/main/java/com/middle/platform/common/utils/HashUtil.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/utils/HashUtil.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.utils;
+package com.middle.common.core.utils;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;

iot-framework/iot-common/src/main/java/com/middle/platform/common/utils/JsonUtils.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/utils/JsonUtils.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.utils;
+package com.middle.common.core.utils;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;

iot-framework/iot-common/src/main/java/com/middle/platform/common/utils/OkHttpUtils.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/utils/OkHttpUtils.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.utils;
+package com.middle.common.core.utils;
 
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;

iot-framework/iot-common/src/main/java/com/middle/platform/common/utils/OrderUtil.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/utils/OrderUtil.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.utils;
+package com.middle.common.core.utils;
 
 import cn.hutool.core.date.LocalDateTimeUtil;
 import com.google.common.cache.CacheBuilder;

iot-framework/iot-common/src/main/java/com/middle/platform/common/utils/ResponseUtil.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/utils/ResponseUtil.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.utils;
+package com.middle.common.core.utils;
 
 import com.alibaba.fastjson.JSON;
 import jakarta.servlet.http.HttpServletResponse;

iot-framework/iot-common/src/main/java/com/middle/platform/common/utils/Result.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/utils/Result.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.utils;
+package com.middle.common.core.utils;
 
 
 import lombok.*;

iot-framework/iot-common/src/main/java/com/middle/platform/common/utils/ServletUtils.java → iot-common/iot-common-core/src/main/java/com/middle/common/core/utils/ServletUtils.java

@@ -1,4 +1,4 @@
-package com.middle.platform.common.utils;
+package com.middle.common.core.utils;
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;

iot-common/iot-common-rabbitmq/pom.xml

@@ -0,0 +1,20 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.middle.platform</groupId>
+        <artifactId>iot-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>iot-common-rabbitmq</artifactId>
+    <packaging>jar</packaging>
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

iot-common/pom.xml

@@ -0,0 +1,26 @@
+<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.middle.platform</groupId>
+        <artifactId>iot-middle-platform</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>iot-common</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>iot-common-rabbitmq</module>
+        <module>iot-common-core</module>
+    </modules>
+
+    <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+</project>

iot-dependencies/pom.xml

@@ -126,10 +126,14 @@
             <!--common模块-->
             <dependency>
                 <groupId>com.middle.platform</groupId>
-                <artifactId>iot-common</artifactId>
+                <artifactId>iot-common-core</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.middle.platform</groupId>
+                <artifactId>iot-common-rabbitmq</artifactId>
                 <version>${revision}</version>
             </dependency>
-
             <!-- 组件 -->
             <dependency>
                 <groupId>com.middle.platform</groupId>

iot-framework/iot-starter-biz-dict/pom.xml

@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.middle.platform</groupId>

iot-framework/iot-starter-excel/pom.xml

@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.middle.platform</groupId>

iot-framework/iot-starter-log/pom.xml

@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

iot-framework/iot-starter-mqtt/pom.xml

@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

iot-framework/iot-starter-satoken/pom.xml

@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

iot-framework/iot-starter-web/pom.xml

@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
         <!-- Spring Boot 配置所需依赖 -->
         <dependency>

iot-framework/pom.xml

@@ -14,7 +14,6 @@
     <description>框架</description>
 
     <modules>
-        <module>iot-common</module>
         <module>iot-starter-es</module>
         <module>iot-starter-feign</module>
         <module>iot-starter-web</module>
@@ -29,6 +28,7 @@
         <module>iot-starter-pagehelper</module>
         <module>iot-starter-biz-dict</module>
         <module>iot-starter-excel</module>
+        <module>iot-starter-kafka</module>
     </modules>
 
     <properties>

iot-gateway/pom.xml

@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

iot-module/iot-module-auth/iot-module-auth-api/pom.xml

@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
     </dependencies>
 </project>

iot-module/iot-module-auth/iot-module-auth-biz/pom.xml

@@ -37,7 +37,7 @@
 
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
         <!--认证-->
         <dependency>

iot-module/iot-module-data/iot-module-data-api/pom.xml

@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
     </dependencies>
 </project>

iot-module/iot-module-data/iot-module-data-biz/pom.xml

@@ -19,7 +19,7 @@
     <dependencies>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
         <!-- Spring Cloud 基础 -->
         <dependency>

iot-module/iot-module-manage/iot-module-manage-api/pom.xml

@@ -24,7 +24,7 @@
         </dependency>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
     </dependencies>
 </project>

iot-module/iot-module-system/iot-module-system-api/pom.xml

@@ -20,7 +20,7 @@
     <dependencies>
         <dependency>
             <groupId>com.middle.platform</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
         <dependency>
             <groupId>com.middle.platform</groupId>

pom.xml

@@ -21,6 +21,7 @@
     </properties>
 
     <modules>
+        <module>iot-common</module>
         <module>iot-dependencies</module>
         <module>iot-framework</module>
         <module>iot-gateway</module>