Browse Source

项目结构调整

Longjun.Tu 2 years ago
parent
commit
42e87c6883
100 changed files with 859 additions and 913 deletions
  1. 4 1
      iot-auth-server/pom.xml
  2. 0 1
      iot-auth-server/readme.txt
  3. 58 0
      iot-common/iot-common-core/pom.xml
  4. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/ComponentClassLoader.java
  5. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/Constants.java
  6. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/ErrCode.java
  7. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/IEnum.java
  8. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/exception/BizException.java
  9. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/function/IfHandler.java
  10. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/thing/ThingService.java
  11. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/CodecUtil.java
  12. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/DeviceUtil.java
  13. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/FIUtil.java
  14. 310 310
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/HexUtil.java
  15. 44 44
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/JsonUtil.java
  16. 0 0
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ReflectUtil.java
  17. 34 34
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ThreadUtil.java
  18. 37 37
      iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java
  19. 1 1
      iot-common/iot-message-bus/iot-message-core/pom.xml
  20. 0 0
      iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/ConsumerHandler.java
  21. 0 0
      iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqConsumer.java
  22. 0 0
      iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqProducer.java
  23. 1 1
      iot-common/iot-message-bus/iot-message-rocketmq/pom.xml
  24. 0 0
      iot-common/iot-message-bus/iot-message-rocketmq/readme.md
  25. 0 0
      iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqConsumer.java
  26. 0 0
      iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqProducer.java
  27. 0 0
      iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/config/RocketMqConfig.java
  28. 1 1
      iot-common/iot-message-bus/iot-vertx-event-bus/pom.xml
  29. 0 0
      iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/BeanCodec.java
  30. 0 0
      iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxManager.java
  31. 0 0
      iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqConsumer.java
  32. 0 0
      iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqProducer.java
  33. 0 0
      iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/config/VertxConfig.java
  34. 0 0
      iot-common/iot-message-bus/iot-vertx-event-bus/src/test/java/test/MsgPubConsumeTest.java
  35. 6 3
      iot-common/iot-message-bus/pom.xml
  36. 10 4
      iot-common/iot-script-engine/pom.xml
  37. 0 0
      iot-common/iot-script-engine/src/main/java/cc/iotkit/script/IScriptEngine.java
  38. 1 0
      iot-common/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java
  39. 0 0
      iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ProcessStringToJsonExample.java
  40. 0 0
      iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ScriptEngineFactory.java
  41. 0 0
      iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ScriptException.java
  42. 22 43
      iot-common/pom.xml
  43. 0 1
      iot-common/readme.txt
  44. 0 28
      iot-common/src/main/java/cc/iotkit/common/exception/NotFoundException.java
  45. 0 29
      iot-common/src/main/java/cc/iotkit/common/exception/OfflineException.java
  46. 7 1
      iot-components/iot-DLT645-component/dependency-reduced-pom.xml
  47. 2 2
      iot-components/iot-DLT645-component/pom.xml
  48. 1 1
      iot-components/iot-component-base/pom.xml
  49. 1 1
      iot-components/iot-component-converter/pom.xml
  50. 2 2
      iot-components/iot-component-server/pom.xml
  51. 2 2
      iot-components/iot-component-tcp/dependency-reduced-pom.xml
  52. 2 2
      iot-components/iot-component-tcp/pom.xml
  53. 1 1
      iot-components/iot-ctwing-component/pom.xml
  54. 2 2
      iot-components/iot-emqx-component/dependency-reduced-pom.xml
  55. 2 2
      iot-components/iot-emqx-component/pom.xml
  56. 1 1
      iot-components/iot-http-biz-component/dependency-reduced-pom.xml
  57. 1 1
      iot-components/iot-http-biz-component/pom.xml
  58. 2 2
      iot-components/iot-mqtt-component/dependency-reduced-pom.xml
  59. 2 2
      iot-components/iot-mqtt-component/pom.xml
  60. 7 1
      iot-components/iot-websocket-component/dependency-reduced-pom.xml
  61. 2 2
      iot-components/iot-websocket-component/pom.xml
  62. 2 2
      iot-components/pom.xml
  63. 2 2
      iot-data/iot-data-cache/pom.xml
  64. 1 1
      iot-data/iot-data-service/pom.xml
  65. 1 1
      iot-data/iot-es-temporal-service/pom.xml
  66. 3 3
      iot-data/iot-model/pom.xml
  67. 6 2
      iot-data/iot-rdb-data-service/pom.xml
  68. 0 4
      iot-data/iot-rdb-data-service/readme.md
  69. 8 1
      iot-data/iot-td-temporal-service/pom.xml
  70. 0 7
      iot-data/iot-td-temporal-service/readme.md
  71. 1 1
      iot-data/iot-temporal-service/pom.xml
  72. 7 1
      iot-data/iot-ts-temporal-service/pom.xml
  73. 0 5
      iot-data/iot-ts-temporal-service/readme.md
  74. 6 1
      iot-data/pom.xml
  75. 0 4
      iot-data/readme.md
  76. 0 1
      iot-message-bus/readme.txt
  77. 0 34
      iot-package/pom.xml
  78. 0 14
      iot-package/readme.txt
  79. 7 2
      iot-rule-engine/pom.xml
  80. 0 1
      iot-rule-engine/readme.txt
  81. 0 263
      iot-standalone/pom.xml
  82. 249 0
      iot-starter/pom.xml
  83. 0 0
      iot-starter/readme.md
  84. 0 0
      iot-starter/src/main/bin/start.bat
  85. 0 0
      iot-starter/src/main/bin/start.sh
  86. 0 0
      iot-starter/src/main/bin/stop.sh
  87. 0 0
      iot-starter/src/main/java/cc/iotkit/Application.java
  88. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/config/AliyunConfig.java
  89. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/config/CrossConfig.java
  90. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java
  91. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java
  92. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java
  93. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java
  94. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java
  95. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/config/SwaggerConfig.java
  96. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/controller/DeviceController.java
  97. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/controller/ProductController.java
  98. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/controller/ProtocolController.java
  99. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java
  100. 0 0
      iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceController.java

+ 4 - 1
iot-auth-server/pom.xml

@@ -5,11 +5,14 @@
     <parent>
         <artifactId>iotkit-parent</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>iot-auth-server</artifactId>
+    <description>
+        此模块为认证服务,提供oauth2认证界面和接口
+    </description>
 
     <dependencies>
 

+ 0 - 1
iot-auth-server/readme.txt

@@ -1 +0,0 @@
-此模块为认证服务,提供oauth2认证界面和接口

+ 58 - 0
iot-common/iot-common-core/pom.xml

@@ -0,0 +1,58 @@
+<?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>
+        <artifactId>iot-common</artifactId>
+        <groupId>cc.iotkit</groupId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>iot-common-core</artifactId>
+
+    <description>
+        此模块为通用业务逻辑或工具类
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+    </dependencies>
+
+</project>

+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/ComponentClassLoader.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/ComponentClassLoader.java


+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/Constants.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/Constants.java


+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/enums/ErrCode.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/ErrCode.java


+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/enums/IEnum.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/enums/IEnum.java


+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/exception/BizException.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/exception/BizException.java


+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/function/IfHandler.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/function/IfHandler.java


+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/thing/ThingService.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/thing/ThingService.java


+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/utils/CodecUtil.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/CodecUtil.java


+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/utils/DeviceUtil.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/DeviceUtil.java


+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/utils/FIUtil.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/FIUtil.java


+ 310 - 310
iot-common/src/main/java/cc/iotkit/common/utils/HexUtil.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/HexUtil.java

@@ -1,311 +1,311 @@
-/*
- * +----------------------------------------------------------------------
- * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
- * +----------------------------------------------------------------------
- * | Licensed 未经许可不能去掉「奇特物联」相关版权
- * +----------------------------------------------------------------------
- * | Author: xw2sy@163.com
- * +----------------------------------------------------------------------
- */
-package cc.iotkit.common.utils;
-
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.nio.ByteBuffer;
-
-public class HexUtil {
-
-    private static final char[] CHARS_TABLES = "0123456789ABCDEF".toCharArray();
-    static final byte[] BYTES = new byte[128];
-
-    static {
-        for (int i = 0; i < 10; i++) {
-            BYTES['0' + i] = (byte) i;
-            BYTES['A' + i] = (byte) (10 + i);
-            BYTES['a' + i] = (byte) (10 + i);
-        }
-    }
-
-    public static String toHexString(byte[] aBytes) {
-        return toHexString(aBytes, 0, aBytes.length);
-    }
-
-    public static String toFormattedHexString(byte[] aBytes) {
-        return toFormattedHexString(aBytes, 0, aBytes.length);
-    }
-
-    public static String toHexString(byte[] aBytes, int aLength) {
-        return toHexString(aBytes, 0, aLength);
-    }
-
-    public static byte[] parseHex(String aHexString) {
-        char[] src = aHexString.replace("\n", "").replace(" ", "").toUpperCase().toCharArray();
-        byte[] dst = new byte[src.length / 2];
-
-        for (int si = 0, di = 0; di < dst.length; di++) {
-            byte high = BYTES[src[si++] & 0x7f];
-            byte low = BYTES[src[si++] & 0x7f];
-            dst[di] = (byte) ((high << 4) + low);
-        }
-
-        return dst;
-    }
-
-    public static String toFormattedHexString(byte[] aBytes, int aOffset, int aLength) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("[");
-        sb.append(aLength);
-        sb.append("] :");
-        for (int si = aOffset, di = 0; si < aOffset + aLength; si++, di++) {
-            byte b = aBytes[si];
-            if (di % 4 == 0) {
-                sb.append("  ");
-            } else {
-                sb.append(' ');
-            }
-            sb.append(CHARS_TABLES[(b & 0xf0) >>> 4]);
-            sb.append(CHARS_TABLES[(b & 0x0f)]);
-
-        }
-
-        return sb.toString();
-
-    }
-
-    public static String toHexString(byte[] aBytes, int aOffset, int aLength) {
-        char[] dst = new char[aLength * 2];
-
-        for (int si = aOffset, di = 0; si < aOffset + aLength; si++) {
-            byte b = aBytes[si];
-            dst[di++] = CHARS_TABLES[(b & 0xf0) >>> 4];
-            dst[di++] = CHARS_TABLES[(b & 0x0f)];
-        }
-
-        return new String(dst);
-    }
-
-    public static String unwrapCharString(String charStr) {
-        byte[] bytes = parseHex(charStr);
-        StringBuilder rawStr = new StringBuilder();
-        for (byte aByte : bytes) {
-            rawStr.append((char) aByte);
-        }
-        return rawStr.toString();
-    }
-
-    /**
-     * int转bytes
-     */
-    public static byte[] intToBytes(int x) {
-        ByteBuffer buffer = ByteBuffer.allocate(4);
-        buffer.putInt(0, x);
-        return buffer.array();
-    }
-
-    /**
-     * bytes转int
-     */
-    public static int bytesToInt(byte[] bytes) {
-        ByteBuffer buffer = ByteBuffer.wrap(bytes);
-        buffer.flip();
-        return buffer.getInt();
-    }
-
-    public static int checkSum(ByteBuffer buffer) {
-        buffer.flip();
-        byte sum = 0;
-        while (buffer.hasRemaining()) {
-            sum += buffer.get();
-        }
-        buffer.limit(buffer.capacity());
-        return sum % 256;
-    }
-
-    public static byte[] toLowerBytes(byte[] bytes) {
-        int len = bytes.length;
-        byte[] r = new byte[len];
-        for (int i = 0; i < len; i++) {
-            r[len - i - 1] = bytes[i];
-        }
-        return r;
-    }
-
-    public static int toLowerInt(byte[] bytes) {
-        int len = bytes.length;
-        byte[] r = new byte[len];
-        for (int i = 0; i < len; i++) {
-            r[len - i - 1] = (byte) (bytes[i] - 0x33);
-        }
-        return ByteBuffer.wrap(r).getInt();
-    }
-
-    public static byte[] shortToBytes(short x) {
-        ByteBuffer buffer = ByteBuffer.allocate(2);
-        buffer.putShort(0, x);
-        return buffer.array();
-    }
-
-    public static String readString(ByteBuffer buffer, int len) {
-        byte[] dest = new byte[len];
-        buffer.get(dest, 0, len);
-        return new String(dest);
-    }
-
-//    public static int readLowerInt(ByteBuffer buffer, int len) {
-//        int r = 0;
-//        for (int i = 0; i < len; i++) {
-//            byte b = buffer.get();
-//            r += (i == 0 ? b - 0x33 : ((b - 0x33) * Math.pow(10, i)));
-//        }
-//        return r;
-//    }
-
-    public static String readHexIntString(ByteBuffer buffer) {
-        int b = buffer.get();
-        String hex = Integer.toHexString(b - 0x33).replace("f", "");
-        return StringUtils.leftPad(hex, 2, "0");
-    }
-
-    public static byte[] add33Bytes(byte[] bytes) {
-        for (int i = 0; i < bytes.length; i++) {
-            bytes[i] = (byte) (bytes[i] + 0x33);
-        }
-        return bytes;
-    }
-
-    public static byte[] minus33Bytes(byte[] bytes) {
-        for (int i = 0; i < bytes.length; i++) {
-            bytes[i] = (byte) (bytes[i] - 0x33);
-        }
-        return bytes;
-    }
-
-    public static byte[] readBytes(ByteBuffer buffer, int len) {
-        byte[] data = new byte[len];
-        for (int i = 0; i < len; i++) {
-            data[i] = buffer.get();
-        }
-        return data;
-    }
-
-    public static byte[] readAndMinus33Bytes(ByteBuffer buffer, int len) {
-        byte[] data = new byte[len];
-        for (int i = 0; i < len; i++) {
-            data[i] = (byte) (buffer.get() - 0x33);
-        }
-        return data;
-    }
-
-    public static int bcdInt(String row) {
-        String bcd = bcdString(row);
-        bcd = bcd.replace("FF", "0");
-        return Integer.parseInt(bcd);
-    }
-
-    public static int bcdInt(ByteBuffer buffer, int len) {
-        byte[] bytes = readAndMinus33Bytes(buffer, len);
-        return bcdInt(HexUtil.toHexString(bytes));
-    }
-
-    public static String bcdString(String row) {
-        char[] chars = row.toCharArray();
-        int len = chars.length;
-        char[] newChars = new char[len];
-
-        for (int i = 0; i < len; i += 2) {
-            newChars[i] = chars[len - i - 2];
-            newChars[i + 1] = chars[len - i - 1];
-        }
-        return String.valueOf(newChars);
-    }
-
-    public static byte[] intBcdAdd33(int v, int len) {
-        String strV = String.valueOf(v);
-        strV = StringUtils.leftPad(strV, len * 2, '0');
-
-        return add33Bytes(HexUtil.parseHex(bcdString(strV)));
-    }
-
-    /**
-     * 计算CRC16校验
-     *
-     * @param data   需要计算的数组
-     * @param offset 起始位置
-     * @param len    长度
-     * @return CRC16校验值
-     */
-    public static int calcCrc16(byte[] data, int offset, int len) {
-        byte[] crc16_tab_h = {
-                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0,
-                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
-                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
-                (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
-                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
-                (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
-                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
-                (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
-                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0,
-                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
-
-                (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
-                (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
-                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0,
-                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
-                (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
-                (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
-                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0,
-                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
-                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
-                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
-
-                (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
-                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
-                (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
-                (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
-                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0,
-                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40
-        };
-        byte[] crc16_tab_l = {
-                (byte) 0x00, (byte) 0xC0, (byte) 0xC1, (byte) 0x01, (byte) 0xC3, (byte) 0x03, (byte) 0x02, (byte) 0xC2, (byte) 0xC6, (byte) 0x06,
-                (byte) 0x07, (byte) 0xC7, (byte) 0x05, (byte) 0xC5, (byte) 0xC4, (byte) 0x04, (byte) 0xCC, (byte) 0x0C, (byte) 0x0D, (byte) 0xCD,
-                (byte) 0x0F, (byte) 0xCF, (byte) 0xCE, (byte) 0x0E, (byte) 0x0A, (byte) 0xCA, (byte) 0xCB, (byte) 0x0B, (byte) 0xC9, (byte) 0x09,
-                (byte) 0x08, (byte) 0xC8, (byte) 0xD8, (byte) 0x18, (byte) 0x19, (byte) 0xD9, (byte) 0x1B, (byte) 0xDB, (byte) 0xDA, (byte) 0x1A,
-                (byte) 0x1E, (byte) 0xDE, (byte) 0xDF, (byte) 0x1F, (byte) 0xDD, (byte) 0x1D, (byte) 0x1C, (byte) 0xDC, (byte) 0x14, (byte) 0xD4,
-                (byte) 0xD5, (byte) 0x15, (byte) 0xD7, (byte) 0x17, (byte) 0x16, (byte) 0xD6, (byte) 0xD2, (byte) 0x12, (byte) 0x13, (byte) 0xD3,
-                (byte) 0x11, (byte) 0xD1, (byte) 0xD0, (byte) 0x10, (byte) 0xF0, (byte) 0x30, (byte) 0x31, (byte) 0xF1, (byte) 0x33, (byte) 0xF3,
-                (byte) 0xF2, (byte) 0x32, (byte) 0x36, (byte) 0xF6, (byte) 0xF7, (byte) 0x37, (byte) 0xF5, (byte) 0x35, (byte) 0x34, (byte) 0xF4,
-                (byte) 0x3C, (byte) 0xFC, (byte) 0xFD, (byte) 0x3D, (byte) 0xFF, (byte) 0x3F, (byte) 0x3E, (byte) 0xFE, (byte) 0xFA, (byte) 0x3A,
-                (byte) 0x3B, (byte) 0xFB, (byte) 0x39, (byte) 0xF9, (byte) 0xF8, (byte) 0x38, (byte) 0x28, (byte) 0xE8, (byte) 0xE9, (byte) 0x29,
-
-                (byte) 0xEB, (byte) 0x2B, (byte) 0x2A, (byte) 0xEA, (byte) 0xEE, (byte) 0x2E, (byte) 0x2F, (byte) 0xEF, (byte) 0x2D, (byte) 0xED,
-                (byte) 0xEC, (byte) 0x2C, (byte) 0xE4, (byte) 0x24, (byte) 0x25, (byte) 0xE5, (byte) 0x27, (byte) 0xE7, (byte) 0xE6, (byte) 0x26,
-                (byte) 0x22, (byte) 0xE2, (byte) 0xE3, (byte) 0x23, (byte) 0xE1, (byte) 0x21, (byte) 0x20, (byte) 0xE0, (byte) 0xA0, (byte) 0x60,
-                (byte) 0x61, (byte) 0xA1, (byte) 0x63, (byte) 0xA3, (byte) 0xA2, (byte) 0x62, (byte) 0x66, (byte) 0xA6, (byte) 0xA7, (byte) 0x67,
-                (byte) 0xA5, (byte) 0x65, (byte) 0x64, (byte) 0xA4, (byte) 0x6C, (byte) 0xAC, (byte) 0xAD, (byte) 0x6D, (byte) 0xAF, (byte) 0x6F,
-                (byte) 0x6E, (byte) 0xAE, (byte) 0xAA, (byte) 0x6A, (byte) 0x6B, (byte) 0xAB, (byte) 0x69, (byte) 0xA9, (byte) 0xA8, (byte) 0x68,
-                (byte) 0x78, (byte) 0xB8, (byte) 0xB9, (byte) 0x79, (byte) 0xBB, (byte) 0x7B, (byte) 0x7A, (byte) 0xBA, (byte) 0xBE, (byte) 0x7E,
-                (byte) 0x7F, (byte) 0xBF, (byte) 0x7D, (byte) 0xBD, (byte) 0xBC, (byte) 0x7C, (byte) 0xB4, (byte) 0x74, (byte) 0x75, (byte) 0xB5,
-                (byte) 0x77, (byte) 0xB7, (byte) 0xB6, (byte) 0x76, (byte) 0x72, (byte) 0xB2, (byte) 0xB3, (byte) 0x73, (byte) 0xB1, (byte) 0x71,
-                (byte) 0x70, (byte) 0xB0, (byte) 0x50, (byte) 0x90, (byte) 0x91, (byte) 0x51, (byte) 0x93, (byte) 0x53, (byte) 0x52, (byte) 0x92,
-
-                (byte) 0x96, (byte) 0x56, (byte) 0x57, (byte) 0x97, (byte) 0x55, (byte) 0x95, (byte) 0x94, (byte) 0x54, (byte) 0x9C, (byte) 0x5C,
-                (byte) 0x5D, (byte) 0x9D, (byte) 0x5F, (byte) 0x9F, (byte) 0x9E, (byte) 0x5E, (byte) 0x5A, (byte) 0x9A, (byte) 0x9B, (byte) 0x5B,
-                (byte) 0x99, (byte) 0x59, (byte) 0x58, (byte) 0x98, (byte) 0x88, (byte) 0x48, (byte) 0x49, (byte) 0x89, (byte) 0x4B, (byte) 0x8B,
-                (byte) 0x8A, (byte) 0x4A, (byte) 0x4E, (byte) 0x8E, (byte) 0x8F, (byte) 0x4F, (byte) 0x8D, (byte) 0x4D, (byte) 0x4C, (byte) 0x8C,
-                (byte) 0x44, (byte) 0x84, (byte) 0x85, (byte) 0x45, (byte) 0x87, (byte) 0x47, (byte) 0x46, (byte) 0x86, (byte) 0x82, (byte) 0x42,
-
-                (byte) 0x43, (byte) 0x83, (byte) 0x41, (byte) 0x81, (byte) 0x80, (byte) 0x40
-        };
-        int pre = 0xffff;
-        int ucCRCHi = (pre & 0xff00) >> 8;
-        int ucCRCLo = pre & 0x00ff;
-        int iIndex;
-        for (int i = 0; i < len; ++i) {
-            iIndex = (ucCRCLo ^ data[offset + i]) & 0x00ff;
-            ucCRCLo = ucCRCHi ^ crc16_tab_h[iIndex];
-            ucCRCHi = crc16_tab_l[iIndex];
-        }
-        return ((ucCRCHi & 0x00ff) << 8) | (ucCRCLo & 0x00ff) & 0xffff;
-    }
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+package cc.iotkit.common.utils;
+
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.nio.ByteBuffer;
+
+public class HexUtil {
+
+    private static final char[] CHARS_TABLES = "0123456789ABCDEF".toCharArray();
+    static final byte[] BYTES = new byte[128];
+
+    static {
+        for (int i = 0; i < 10; i++) {
+            BYTES['0' + i] = (byte) i;
+            BYTES['A' + i] = (byte) (10 + i);
+            BYTES['a' + i] = (byte) (10 + i);
+        }
+    }
+
+    public static String toHexString(byte[] aBytes) {
+        return toHexString(aBytes, 0, aBytes.length);
+    }
+
+    public static String toFormattedHexString(byte[] aBytes) {
+        return toFormattedHexString(aBytes, 0, aBytes.length);
+    }
+
+    public static String toHexString(byte[] aBytes, int aLength) {
+        return toHexString(aBytes, 0, aLength);
+    }
+
+    public static byte[] parseHex(String aHexString) {
+        char[] src = aHexString.replace("\n", "").replace(" ", "").toUpperCase().toCharArray();
+        byte[] dst = new byte[src.length / 2];
+
+        for (int si = 0, di = 0; di < dst.length; di++) {
+            byte high = BYTES[src[si++] & 0x7f];
+            byte low = BYTES[src[si++] & 0x7f];
+            dst[di] = (byte) ((high << 4) + low);
+        }
+
+        return dst;
+    }
+
+    public static String toFormattedHexString(byte[] aBytes, int aOffset, int aLength) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("[");
+        sb.append(aLength);
+        sb.append("] :");
+        for (int si = aOffset, di = 0; si < aOffset + aLength; si++, di++) {
+            byte b = aBytes[si];
+            if (di % 4 == 0) {
+                sb.append("  ");
+            } else {
+                sb.append(' ');
+            }
+            sb.append(CHARS_TABLES[(b & 0xf0) >>> 4]);
+            sb.append(CHARS_TABLES[(b & 0x0f)]);
+
+        }
+
+        return sb.toString();
+
+    }
+
+    public static String toHexString(byte[] aBytes, int aOffset, int aLength) {
+        char[] dst = new char[aLength * 2];
+
+        for (int si = aOffset, di = 0; si < aOffset + aLength; si++) {
+            byte b = aBytes[si];
+            dst[di++] = CHARS_TABLES[(b & 0xf0) >>> 4];
+            dst[di++] = CHARS_TABLES[(b & 0x0f)];
+        }
+
+        return new String(dst);
+    }
+
+    public static String unwrapCharString(String charStr) {
+        byte[] bytes = parseHex(charStr);
+        StringBuilder rawStr = new StringBuilder();
+        for (byte aByte : bytes) {
+            rawStr.append((char) aByte);
+        }
+        return rawStr.toString();
+    }
+
+    /**
+     * int转bytes
+     */
+    public static byte[] intToBytes(int x) {
+        ByteBuffer buffer = ByteBuffer.allocate(4);
+        buffer.putInt(0, x);
+        return buffer.array();
+    }
+
+    /**
+     * bytes转int
+     */
+    public static int bytesToInt(byte[] bytes) {
+        ByteBuffer buffer = ByteBuffer.wrap(bytes);
+        buffer.flip();
+        return buffer.getInt();
+    }
+
+    public static int checkSum(ByteBuffer buffer) {
+        buffer.flip();
+        byte sum = 0;
+        while (buffer.hasRemaining()) {
+            sum += buffer.get();
+        }
+        buffer.limit(buffer.capacity());
+        return sum % 256;
+    }
+
+    public static byte[] toLowerBytes(byte[] bytes) {
+        int len = bytes.length;
+        byte[] r = new byte[len];
+        for (int i = 0; i < len; i++) {
+            r[len - i - 1] = bytes[i];
+        }
+        return r;
+    }
+
+    public static int toLowerInt(byte[] bytes) {
+        int len = bytes.length;
+        byte[] r = new byte[len];
+        for (int i = 0; i < len; i++) {
+            r[len - i - 1] = (byte) (bytes[i] - 0x33);
+        }
+        return ByteBuffer.wrap(r).getInt();
+    }
+
+    public static byte[] shortToBytes(short x) {
+        ByteBuffer buffer = ByteBuffer.allocate(2);
+        buffer.putShort(0, x);
+        return buffer.array();
+    }
+
+    public static String readString(ByteBuffer buffer, int len) {
+        byte[] dest = new byte[len];
+        buffer.get(dest, 0, len);
+        return new String(dest);
+    }
+
+//    public static int readLowerInt(ByteBuffer buffer, int len) {
+//        int r = 0;
+//        for (int i = 0; i < len; i++) {
+//            byte b = buffer.get();
+//            r += (i == 0 ? b - 0x33 : ((b - 0x33) * Math.pow(10, i)));
+//        }
+//        return r;
+//    }
+
+    public static String readHexIntString(ByteBuffer buffer) {
+        int b = buffer.get();
+        String hex = Integer.toHexString(b - 0x33).replace("f", "");
+        return StringUtils.leftPad(hex, 2, "0");
+    }
+
+    public static byte[] add33Bytes(byte[] bytes) {
+        for (int i = 0; i < bytes.length; i++) {
+            bytes[i] = (byte) (bytes[i] + 0x33);
+        }
+        return bytes;
+    }
+
+    public static byte[] minus33Bytes(byte[] bytes) {
+        for (int i = 0; i < bytes.length; i++) {
+            bytes[i] = (byte) (bytes[i] - 0x33);
+        }
+        return bytes;
+    }
+
+    public static byte[] readBytes(ByteBuffer buffer, int len) {
+        byte[] data = new byte[len];
+        for (int i = 0; i < len; i++) {
+            data[i] = buffer.get();
+        }
+        return data;
+    }
+
+    public static byte[] readAndMinus33Bytes(ByteBuffer buffer, int len) {
+        byte[] data = new byte[len];
+        for (int i = 0; i < len; i++) {
+            data[i] = (byte) (buffer.get() - 0x33);
+        }
+        return data;
+    }
+
+    public static int bcdInt(String row) {
+        String bcd = bcdString(row);
+        bcd = bcd.replace("FF", "0");
+        return Integer.parseInt(bcd);
+    }
+
+    public static int bcdInt(ByteBuffer buffer, int len) {
+        byte[] bytes = readAndMinus33Bytes(buffer, len);
+        return bcdInt(HexUtil.toHexString(bytes));
+    }
+
+    public static String bcdString(String row) {
+        char[] chars = row.toCharArray();
+        int len = chars.length;
+        char[] newChars = new char[len];
+
+        for (int i = 0; i < len; i += 2) {
+            newChars[i] = chars[len - i - 2];
+            newChars[i + 1] = chars[len - i - 1];
+        }
+        return String.valueOf(newChars);
+    }
+
+    public static byte[] intBcdAdd33(int v, int len) {
+        String strV = String.valueOf(v);
+        strV = StringUtils.leftPad(strV, len * 2, '0');
+
+        return add33Bytes(HexUtil.parseHex(bcdString(strV)));
+    }
+
+    /**
+     * 计算CRC16校验
+     *
+     * @param data   需要计算的数组
+     * @param offset 起始位置
+     * @param len    长度
+     * @return CRC16校验值
+     */
+    public static int calcCrc16(byte[] data, int offset, int len) {
+        byte[] crc16_tab_h = {
+                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0,
+                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
+                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+                (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
+                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+                (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
+                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+                (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
+                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0,
+                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
+
+                (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+                (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
+                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0,
+                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
+                (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+                (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
+                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0,
+                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
+                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
+
+                (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0,
+                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40,
+                (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1,
+                (byte) 0x81, (byte) 0x40, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41,
+                (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40, (byte) 0x01, (byte) 0xC0, (byte) 0x80, (byte) 0x41, (byte) 0x01, (byte) 0xC0,
+                (byte) 0x80, (byte) 0x41, (byte) 0x00, (byte) 0xC1, (byte) 0x81, (byte) 0x40
+        };
+        byte[] crc16_tab_l = {
+                (byte) 0x00, (byte) 0xC0, (byte) 0xC1, (byte) 0x01, (byte) 0xC3, (byte) 0x03, (byte) 0x02, (byte) 0xC2, (byte) 0xC6, (byte) 0x06,
+                (byte) 0x07, (byte) 0xC7, (byte) 0x05, (byte) 0xC5, (byte) 0xC4, (byte) 0x04, (byte) 0xCC, (byte) 0x0C, (byte) 0x0D, (byte) 0xCD,
+                (byte) 0x0F, (byte) 0xCF, (byte) 0xCE, (byte) 0x0E, (byte) 0x0A, (byte) 0xCA, (byte) 0xCB, (byte) 0x0B, (byte) 0xC9, (byte) 0x09,
+                (byte) 0x08, (byte) 0xC8, (byte) 0xD8, (byte) 0x18, (byte) 0x19, (byte) 0xD9, (byte) 0x1B, (byte) 0xDB, (byte) 0xDA, (byte) 0x1A,
+                (byte) 0x1E, (byte) 0xDE, (byte) 0xDF, (byte) 0x1F, (byte) 0xDD, (byte) 0x1D, (byte) 0x1C, (byte) 0xDC, (byte) 0x14, (byte) 0xD4,
+                (byte) 0xD5, (byte) 0x15, (byte) 0xD7, (byte) 0x17, (byte) 0x16, (byte) 0xD6, (byte) 0xD2, (byte) 0x12, (byte) 0x13, (byte) 0xD3,
+                (byte) 0x11, (byte) 0xD1, (byte) 0xD0, (byte) 0x10, (byte) 0xF0, (byte) 0x30, (byte) 0x31, (byte) 0xF1, (byte) 0x33, (byte) 0xF3,
+                (byte) 0xF2, (byte) 0x32, (byte) 0x36, (byte) 0xF6, (byte) 0xF7, (byte) 0x37, (byte) 0xF5, (byte) 0x35, (byte) 0x34, (byte) 0xF4,
+                (byte) 0x3C, (byte) 0xFC, (byte) 0xFD, (byte) 0x3D, (byte) 0xFF, (byte) 0x3F, (byte) 0x3E, (byte) 0xFE, (byte) 0xFA, (byte) 0x3A,
+                (byte) 0x3B, (byte) 0xFB, (byte) 0x39, (byte) 0xF9, (byte) 0xF8, (byte) 0x38, (byte) 0x28, (byte) 0xE8, (byte) 0xE9, (byte) 0x29,
+
+                (byte) 0xEB, (byte) 0x2B, (byte) 0x2A, (byte) 0xEA, (byte) 0xEE, (byte) 0x2E, (byte) 0x2F, (byte) 0xEF, (byte) 0x2D, (byte) 0xED,
+                (byte) 0xEC, (byte) 0x2C, (byte) 0xE4, (byte) 0x24, (byte) 0x25, (byte) 0xE5, (byte) 0x27, (byte) 0xE7, (byte) 0xE6, (byte) 0x26,
+                (byte) 0x22, (byte) 0xE2, (byte) 0xE3, (byte) 0x23, (byte) 0xE1, (byte) 0x21, (byte) 0x20, (byte) 0xE0, (byte) 0xA0, (byte) 0x60,
+                (byte) 0x61, (byte) 0xA1, (byte) 0x63, (byte) 0xA3, (byte) 0xA2, (byte) 0x62, (byte) 0x66, (byte) 0xA6, (byte) 0xA7, (byte) 0x67,
+                (byte) 0xA5, (byte) 0x65, (byte) 0x64, (byte) 0xA4, (byte) 0x6C, (byte) 0xAC, (byte) 0xAD, (byte) 0x6D, (byte) 0xAF, (byte) 0x6F,
+                (byte) 0x6E, (byte) 0xAE, (byte) 0xAA, (byte) 0x6A, (byte) 0x6B, (byte) 0xAB, (byte) 0x69, (byte) 0xA9, (byte) 0xA8, (byte) 0x68,
+                (byte) 0x78, (byte) 0xB8, (byte) 0xB9, (byte) 0x79, (byte) 0xBB, (byte) 0x7B, (byte) 0x7A, (byte) 0xBA, (byte) 0xBE, (byte) 0x7E,
+                (byte) 0x7F, (byte) 0xBF, (byte) 0x7D, (byte) 0xBD, (byte) 0xBC, (byte) 0x7C, (byte) 0xB4, (byte) 0x74, (byte) 0x75, (byte) 0xB5,
+                (byte) 0x77, (byte) 0xB7, (byte) 0xB6, (byte) 0x76, (byte) 0x72, (byte) 0xB2, (byte) 0xB3, (byte) 0x73, (byte) 0xB1, (byte) 0x71,
+                (byte) 0x70, (byte) 0xB0, (byte) 0x50, (byte) 0x90, (byte) 0x91, (byte) 0x51, (byte) 0x93, (byte) 0x53, (byte) 0x52, (byte) 0x92,
+
+                (byte) 0x96, (byte) 0x56, (byte) 0x57, (byte) 0x97, (byte) 0x55, (byte) 0x95, (byte) 0x94, (byte) 0x54, (byte) 0x9C, (byte) 0x5C,
+                (byte) 0x5D, (byte) 0x9D, (byte) 0x5F, (byte) 0x9F, (byte) 0x9E, (byte) 0x5E, (byte) 0x5A, (byte) 0x9A, (byte) 0x9B, (byte) 0x5B,
+                (byte) 0x99, (byte) 0x59, (byte) 0x58, (byte) 0x98, (byte) 0x88, (byte) 0x48, (byte) 0x49, (byte) 0x89, (byte) 0x4B, (byte) 0x8B,
+                (byte) 0x8A, (byte) 0x4A, (byte) 0x4E, (byte) 0x8E, (byte) 0x8F, (byte) 0x4F, (byte) 0x8D, (byte) 0x4D, (byte) 0x4C, (byte) 0x8C,
+                (byte) 0x44, (byte) 0x84, (byte) 0x85, (byte) 0x45, (byte) 0x87, (byte) 0x47, (byte) 0x46, (byte) 0x86, (byte) 0x82, (byte) 0x42,
+
+                (byte) 0x43, (byte) 0x83, (byte) 0x41, (byte) 0x81, (byte) 0x80, (byte) 0x40
+        };
+        int pre = 0xffff;
+        int ucCRCHi = (pre & 0xff00) >> 8;
+        int ucCRCLo = pre & 0x00ff;
+        int iIndex;
+        for (int i = 0; i < len; ++i) {
+            iIndex = (ucCRCLo ^ data[offset + i]) & 0x00ff;
+            ucCRCLo = ucCRCHi ^ crc16_tab_h[iIndex];
+            ucCRCHi = crc16_tab_l[iIndex];
+        }
+        return ((ucCRCHi & 0x00ff) << 8) | (ucCRCLo & 0x00ff) & 0xffff;
+    }
 }

+ 44 - 44
iot-common/src/main/java/cc/iotkit/common/utils/JsonUtil.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/JsonUtil.java

@@ -1,44 +1,44 @@
-/*
- * +----------------------------------------------------------------------
- * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
- * +----------------------------------------------------------------------
- * | Licensed 未经许可不能去掉「奇特物联」相关版权
- * +----------------------------------------------------------------------
- * | Author: xw2sy@163.com
- * +----------------------------------------------------------------------
- */
-package cc.iotkit.common.utils;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import lombok.SneakyThrows;
-
-public final class JsonUtil {
-
-    private final static ObjectMapper MAPPER = new ObjectMapper()
-            .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
-            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
-
-    @SneakyThrows
-    public static String toJsonString(Object obj) {
-        return MAPPER.writeValueAsString(obj);
-    }
-
-    @SneakyThrows
-    public static <T> T parse(String json, Class<T> cls) {
-        return MAPPER.readValue(json, cls);
-    }
-
-    @SneakyThrows
-    public static <T> T parse(String json, TypeReference<T> type) {
-        return MAPPER.readValue(json, type);
-    }
-
-    @SneakyThrows
-    public static JsonNode parse(String json) {
-        return MAPPER.readTree(json);
-    }
-}
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+package cc.iotkit.common.utils;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import lombok.SneakyThrows;
+
+public final class JsonUtil {
+
+    private final static ObjectMapper MAPPER = new ObjectMapper()
+            .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
+            .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+
+    @SneakyThrows
+    public static String toJsonString(Object obj) {
+        return MAPPER.writeValueAsString(obj);
+    }
+
+    @SneakyThrows
+    public static <T> T parse(String json, Class<T> cls) {
+        return MAPPER.readValue(json, cls);
+    }
+
+    @SneakyThrows
+    public static <T> T parse(String json, TypeReference<T> type) {
+        return MAPPER.readValue(json, type);
+    }
+
+    @SneakyThrows
+    public static JsonNode parse(String json) {
+        return MAPPER.readTree(json);
+    }
+}

+ 0 - 0
iot-common/src/main/java/cc/iotkit/common/utils/ReflectUtil.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ReflectUtil.java


+ 34 - 34
iot-common/src/main/java/cc/iotkit/common/utils/ThreadUtil.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/ThreadUtil.java

@@ -1,34 +1,34 @@
-/*
- * +----------------------------------------------------------------------
- * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
- * +----------------------------------------------------------------------
- * | Licensed 未经许可不能去掉「奇特物联」相关版权
- * +----------------------------------------------------------------------
- * | Author: xw2sy@163.com
- * +----------------------------------------------------------------------
- */
-package cc.iotkit.common.utils;
-
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-
-public class ThreadUtil {
-
-    public static ScheduledThreadPoolExecutor newScheduled(int poolSize, String threadName) {
-        return new ScheduledThreadPoolExecutor(poolSize, (Runnable r) -> {
-            SecurityManager s = System.getSecurityManager();
-            ThreadGroup group = (s != null) ? s.getThreadGroup() :
-                    Thread.currentThread().getThreadGroup();
-            Thread t = new Thread(group, r,
-                    threadName,
-                    0);
-            if (t.isDaemon()) {
-                t.setDaemon(false);
-            }
-            if (t.getPriority() != Thread.NORM_PRIORITY) {
-                t.setPriority(Thread.NORM_PRIORITY);
-            }
-            return t;
-        });
-    }
-
-}
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+package cc.iotkit.common.utils;
+
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
+public class ThreadUtil {
+
+    public static ScheduledThreadPoolExecutor newScheduled(int poolSize, String threadName) {
+        return new ScheduledThreadPoolExecutor(poolSize, (Runnable r) -> {
+            SecurityManager s = System.getSecurityManager();
+            ThreadGroup group = (s != null) ? s.getThreadGroup() :
+                    Thread.currentThread().getThreadGroup();
+            Thread t = new Thread(group, r,
+                    threadName,
+                    0);
+            if (t.isDaemon()) {
+                t.setDaemon(false);
+            }
+            if (t.getPriority() != Thread.NORM_PRIORITY) {
+                t.setPriority(Thread.NORM_PRIORITY);
+            }
+            return t;
+        });
+    }
+
+}

+ 37 - 37
iot-common/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java → iot-common/iot-common-core/src/main/java/cc/iotkit/common/utils/UniqueIdUtil.java

@@ -1,37 +1,37 @@
-/*
- * +----------------------------------------------------------------------
- * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
- * +----------------------------------------------------------------------
- * | Licensed 未经许可不能去掉「奇特物联」相关版权
- * +----------------------------------------------------------------------
- * | Author: xw2sy@163.com
- * +----------------------------------------------------------------------
- */
-package cc.iotkit.common.utils;
-
-import org.apache.commons.lang3.RandomUtils;
-
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public final class UniqueIdUtil {
-
-    private static final int MACHINE_ID = RandomUtils.nextInt(10, 99);
-
-    private static final AtomicInteger SEQUENCE = new AtomicInteger(1000);
-
-    public static String newRequestId() {
-        return newUniqueId("RID");
-    }
-
-    public static String newUniqueId(String prefix) {
-        int id = SEQUENCE.getAndIncrement();
-        if (id >= 5000) {
-            SEQUENCE.set(1000);
-        }
-
-        return prefix + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + id + MACHINE_ID;
-    }
-
-}
+/*
+ * +----------------------------------------------------------------------
+ * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
+ * +----------------------------------------------------------------------
+ * | Licensed 未经许可不能去掉「奇特物联」相关版权
+ * +----------------------------------------------------------------------
+ * | Author: xw2sy@163.com
+ * +----------------------------------------------------------------------
+ */
+package cc.iotkit.common.utils;
+
+import org.apache.commons.lang3.RandomUtils;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public final class UniqueIdUtil {
+
+    private static final int MACHINE_ID = RandomUtils.nextInt(10, 99);
+
+    private static final AtomicInteger SEQUENCE = new AtomicInteger(1000);
+
+    public static String newRequestId() {
+        return newUniqueId("RID");
+    }
+
+    public static String newUniqueId(String prefix) {
+        int id = SEQUENCE.getAndIncrement();
+        if (id >= 5000) {
+            SEQUENCE.set(1000);
+        }
+
+        return prefix + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) + id + MACHINE_ID;
+    }
+
+}

+ 1 - 1
iot-message-bus/iot-message-core/pom.xml → iot-common/iot-message-bus/iot-message-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-message-bus</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 0 - 0
iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/ConsumerHandler.java → iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/ConsumerHandler.java


+ 0 - 0
iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqConsumer.java → iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqConsumer.java


+ 0 - 0
iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqProducer.java → iot-common/iot-message-bus/iot-message-core/src/main/java/cc/iotkit/mq/MqProducer.java


+ 1 - 1
iot-message-bus/iot-message-rocketmq/pom.xml → iot-common/iot-message-bus/iot-message-rocketmq/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-message-bus</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 0 - 0
iot-message-bus/iot-message-rocketmq/readme.md → iot-common/iot-message-bus/iot-message-rocketmq/readme.md


+ 0 - 0
iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqConsumer.java → iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqConsumer.java


+ 0 - 0
iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqProducer.java → iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/RocketMqProducer.java


+ 0 - 0
iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/config/RocketMqConfig.java → iot-common/iot-message-bus/iot-message-rocketmq/src/main/java/cc/iotkit/rocketmq/config/RocketMqConfig.java


+ 1 - 1
iot-message-bus/iot-vertx-event-bus/pom.xml → iot-common/iot-message-bus/iot-vertx-event-bus/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-message-bus</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 0 - 0
iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/BeanCodec.java → iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/BeanCodec.java


+ 0 - 0
iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxManager.java → iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxManager.java


+ 0 - 0
iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqConsumer.java → iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqConsumer.java


+ 0 - 0
iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqProducer.java → iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/VertxMqProducer.java


+ 0 - 0
iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/config/VertxConfig.java → iot-common/iot-message-bus/iot-vertx-event-bus/src/main/java/cc/iotkit/vertx/config/VertxConfig.java


+ 0 - 0
iot-message-bus/iot-vertx-event-bus/src/test/java/test/MsgPubConsumeTest.java → iot-common/iot-message-bus/iot-vertx-event-bus/src/test/java/test/MsgPubConsumeTest.java


+ 6 - 3
iot-message-bus/pom.xml → iot-common/iot-message-bus/pom.xml

@@ -3,12 +3,15 @@
          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">
     <parent>
-        <artifactId>iotkit-parent</artifactId>
+        <artifactId>iot-common</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
+    <description>
+        消息队列适配模块,用于提供默认消息队列和适配不同消息队列接入
+    </description>
 
     <artifactId>iot-message-bus</artifactId>
 
@@ -36,7 +39,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
     </dependencies>

+ 10 - 4
iot-script-engine/pom.xml → iot-common/iot-script-engine/pom.xml

@@ -2,15 +2,21 @@
 <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>
-        <artifactId>iotkit-parent</artifactId>
+        <artifactId>iot-common</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>iot-script-engine</artifactId>
 
+
+    <description>
+        此模块为脚本引擎
+    </description>
+
+
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
@@ -56,7 +62,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
     </dependencies>

+ 0 - 0
iot-script-engine/src/main/java/cc/iotkit/script/IScriptEngine.java → iot-common/iot-script-engine/src/main/java/cc/iotkit/script/IScriptEngine.java


+ 1 - 0
iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java → iot-common/iot-script-engine/src/main/java/cc/iotkit/script/JavaScriptEngine.java

@@ -9,6 +9,7 @@
  */
 package cc.iotkit.script;
 
+
 import cc.iotkit.common.utils.JsonUtil;
 import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.extern.slf4j.Slf4j;

+ 0 - 0
iot-script-engine/src/main/java/cc/iotkit/script/ProcessStringToJsonExample.java → iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ProcessStringToJsonExample.java


+ 0 - 0
iot-script-engine/src/main/java/cc/iotkit/script/ScriptEngineFactory.java → iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ScriptEngineFactory.java


+ 0 - 0
iot-script-engine/src/main/java/cc/iotkit/script/ScriptException.java → iot-common/iot-script-engine/src/main/java/cc/iotkit/script/ScriptException.java


+ 22 - 43
iot-common/pom.xml

@@ -2,53 +2,32 @@
 <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>
         <artifactId>iotkit-parent</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
+    <packaging>pom</packaging>
 
     <artifactId>iot-common</artifactId>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-    </dependencies>
-
+    <description>
+        技术组件,也分成两类:
+        1. 框架组件:脚本引擎、通讯总线等等的拓展
+        2. 业务组件:物模型、鉴权、工具
+    </description>
+
+    <modules>
+        <module>iot-common-core</module>
+        <module>iot-script-engine</module>
+        <module>iot-message-bus</module>
+    </modules>
+
+
+    <properties>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    
 </project>

+ 0 - 1
iot-common/readme.txt

@@ -1 +0,0 @@
-此模块为通用业务逻辑或工具类

+ 0 - 28
iot-common/src/main/java/cc/iotkit/common/exception/NotFoundException.java

@@ -1,28 +0,0 @@
-/*
- * +----------------------------------------------------------------------
- * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
- * +----------------------------------------------------------------------
- * | Licensed 未经许可不能去掉「奇特物联」相关版权
- * +----------------------------------------------------------------------
- * | Author: xw2sy@163.com
- * +----------------------------------------------------------------------
- */
-package cc.iotkit.common.exception;
-
-
-public class NotFoundException extends BizException {
-    public NotFoundException() {
-    }
-
-    public NotFoundException(String message) {
-        super(message);
-    }
-
-    public NotFoundException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public NotFoundException(Throwable cause) {
-        super(cause);
-    }
-}

+ 0 - 29
iot-common/src/main/java/cc/iotkit/common/exception/OfflineException.java

@@ -1,29 +0,0 @@
-/*
- * +----------------------------------------------------------------------
- * | Copyright (c) 奇特物联 2021-2022 All rights reserved.
- * +----------------------------------------------------------------------
- * | Licensed 未经许可不能去掉「奇特物联」相关版权
- * +----------------------------------------------------------------------
- * | Author: xw2sy@163.com
- * +----------------------------------------------------------------------
- */
-package cc.iotkit.common.exception;
-
-
-public class OfflineException extends BizException {
-
-    public OfflineException() {
-    }
-
-    public OfflineException(String message) {
-        super(message);
-    }
-
-    public OfflineException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public OfflineException(Throwable cause) {
-        super(cause);
-    }
-}

+ 7 - 1
iot-components/iot-DLT645-component/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>0.4.3-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>iot-DLT645-component</artifactId>
@@ -61,6 +61,12 @@
       <version>0.4.3-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-common-core</artifactId>
+      <version>0.4.3-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>cn.hutool</groupId>
       <artifactId>hutool-core</artifactId>

+ 2 - 2
iot-components/iot-DLT645-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-components</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
         <dependency>

+ 1 - 1
iot-components/iot-component-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-components</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
iot-components/iot-component-converter/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-components</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
iot-components/iot-component-server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-components</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -59,7 +59,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
         <dependency>

+ 2 - 2
iot-components/iot-component-tcp/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>0.4.3-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>iot-component-tcp</artifactId>
@@ -78,7 +78,7 @@
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
-      <artifactId>iot-common</artifactId>
+      <artifactId>iot-common-core</artifactId>
       <version>0.4.3-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>

+ 2 - 2
iot-components/iot-component-tcp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-components</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -42,7 +42,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
         <dependency>

+ 1 - 1
iot-components/iot-ctwing-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-components</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
iot-components/iot-emqx-component/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>0.4.3-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>iot-emqx-component</artifactId>
@@ -89,7 +89,7 @@
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
-      <artifactId>iot-common</artifactId>
+      <artifactId>iot-common-core</artifactId>
       <version>0.4.3-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>

+ 2 - 2
iot-components/iot-emqx-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-components</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -40,7 +40,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
         <dependency>

+ 1 - 1
iot-components/iot-http-biz-component/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>0.4.3-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>iot-http-biz-component</artifactId>

+ 1 - 1
iot-components/iot-http-biz-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-components</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
iot-components/iot-mqtt-component/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>0.4.3-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>iot-mqtt-component</artifactId>
@@ -81,7 +81,7 @@
     </dependency>
     <dependency>
       <groupId>cc.iotkit</groupId>
-      <artifactId>iot-common</artifactId>
+      <artifactId>iot-common-core</artifactId>
       <version>0.4.3-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>

+ 2 - 2
iot-components/iot-mqtt-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-components</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -45,7 +45,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
         <dependency>

+ 7 - 1
iot-components/iot-websocket-component/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>iot-components</artifactId>
     <groupId>cc.iotkit</groupId>
-    <version>0.4.3-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>iot-websocket-component</artifactId>
@@ -53,6 +53,12 @@
       <version>1.18.24</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-common-core</artifactId>
+      <version>0.4.3-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>

+ 2 - 2
iot-components/iot-websocket-component/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-components</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -25,7 +25,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
         <dependency>

+ 2 - 2
iot-components/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iotkit-parent</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -21,7 +21,7 @@
         <module>iot-component-tcp</module>
         <module>iot-DLT645-component</module>
         <module>iot-websocket-component</module>
-        <!--        <module>iot-ctwing-component</module>-->
+   <!--     <module>iot-ctwing-component</module>-->
     </modules>
 
 </project>

+ 2 - 2
iot-data/iot-data-cache/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-data</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,7 +30,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
         <dependency>

+ 1 - 1
iot-data/iot-data-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-data</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
iot-data/iot-es-temporal-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-data</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 3 - 3
iot-data/iot-model/pom.xml

@@ -5,9 +5,9 @@
     <parent>
         <artifactId>iot-data</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
-    <version>0.4.3-SNAPSHOT</version>
+    <version>${revision}</version>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>iot-model</artifactId>
@@ -27,7 +27,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
     </dependencies>

+ 6 - 2
iot-data/iot-rdb-data-service/pom.xml

@@ -5,12 +5,16 @@
     <parent>
         <artifactId>iot-data</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
-    <version>0.4.3-SNAPSHOT</version>
+    <version>${revision}</version>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>iot-rdb-data-service</artifactId>
+    <description>
+        关系型数据库的数据服务实现模块
+        如:h2、mysql,由jpa兼容不同数据库
+    </description>
 
     <dependencies>
 

+ 0 - 4
iot-data/iot-rdb-data-service/readme.md

@@ -1,4 +0,0 @@
-## 关系型数据库的数据服务实现模块
-
-如:h2、mysql,由jpa兼容不同数据库方言
-

+ 8 - 1
iot-data/iot-td-temporal-service/pom.xml

@@ -5,12 +5,19 @@
     <parent>
         <artifactId>iot-data</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>iot-td-temporal-service</artifactId>
 
+    <description>
+        时序数据库服务接口的TDengine实现
+        支持版本:v0.4.1
+        TDengine版本:2.6.0.12
+    </description>
+
+
     <dependencies>
 
         <dependency>

+ 0 - 7
iot-data/iot-td-temporal-service/readme.md

@@ -1,7 +0,0 @@
-### 时序数据库服务接口的TDengine实现
-
-支持版本:v0.4.1
-
-TDengine版本:2.6.0.12
-
-

+ 1 - 1
iot-data/iot-temporal-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>iot-data</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 7 - 1
iot-data/iot-ts-temporal-service/pom.xml

@@ -6,11 +6,17 @@
     <parent>
         <groupId>cc.iotkit</groupId>
         <artifactId>iot-data</artifactId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
 
     <artifactId>iot-ts-temporal-service</artifactId>
 
+    <description>
+        时序数据库服务接口的TimescaleDB实现
+        postgrep 14
+    </description>
+
+
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>

+ 0 - 5
iot-data/iot-ts-temporal-service/readme.md

@@ -1,5 +0,0 @@
-### 时序数据库服务接口的TimescaleDB实现
-
-postgrep 14
-
-

+ 6 - 1
iot-data/pom.xml

@@ -5,11 +5,16 @@
     <parent>
         <artifactId>iotkit-parent</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
+    <description>
+        与数据存取相关内容的模块
+        包含:数据接口定义、数据实体类定义、关系型数据库接口实现、NoSQL数据库接口实现、数据缓存服务
+    </description>
+
     <modules>
         <module>iot-model</module>
         <module>iot-data-service</module>

+ 0 - 4
iot-data/readme.md

@@ -1,4 +0,0 @@
-## 与数据存取相关内容的模块
-
-包含:数据接口定义、数据实体类定义、关系型数据库接口实现、NoSQL数据库接口实现、数据缓存服务
-

+ 0 - 1
iot-message-bus/readme.txt

@@ -1 +0,0 @@
-消息队列适配模块,用于提供默认消息队列和适配不同消息队列接入

+ 0 - 34
iot-package/pom.xml

@@ -1,34 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>iotkit-parent</artifactId>
-        <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>iot-package</artifactId>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

+ 0 - 14
iot-package/readme.txt

@@ -1,14 +0,0 @@
-用于将程序组织打包成zip包
-
-打包后的结构:
-lib
-   xx.jar
-   ...
-
-
-打包后启动脚本:
-如linux:
-java -classpath ".:lib/*" cc.iotkit.manager.Application
-
-
-

+ 7 - 2
iot-rule-engine/pom.xml

@@ -5,11 +5,16 @@
     <parent>
         <artifactId>iotkit-parent</artifactId>
         <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
+        <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>iot-rule-engine</artifactId>
+    <description>
+        规则引擎模块,包含场景引擎、数据流转等
+    </description>
+
+
 
     <dependencies>
 
@@ -70,7 +75,7 @@
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
+            <artifactId>iot-common-core</artifactId>
         </dependency>
 
         <dependency>

+ 0 - 1
iot-rule-engine/readme.txt

@@ -1 +0,0 @@
-规则引擎模块,包含场景引擎、数据流转等

+ 0 - 263
iot-standalone/pom.xml

@@ -1,263 +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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>iotkit-parent</artifactId>
-        <groupId>cc.iotkit</groupId>
-        <version>0.4.3-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>iot-standalone</artifactId>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-logging</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.logging.log4j</groupId>
-                    <artifactId>log4j-to-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.bouncycastle</groupId>
-            <artifactId>bcprov-jdk15on</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>it.ozimov</groupId>
-            <artifactId>embedded-redis</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-simple</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.elasticsearch.plugin</groupId>
-            <artifactId>transport-netty4-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-model</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-common</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-rule-engine</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-component-server</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-component-converter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-auth-server</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-virtual-device</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-message-core</artifactId>
-        </dependency>
-
-        <!--内置vertx消息总线-->
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-vertx-event-bus</artifactId>
-        </dependency>
-
-        <!--打开注释使用rocketmq消息总线-->
-        <!--        <dependency>-->
-        <!--            <groupId>cc.iotkit</groupId>-->
-        <!--            <artifactId>iot-message-rocketmq</artifactId>-->
-        <!--        </dependency>-->
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-temporal-service</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-rdb-data-service</artifactId>
-        </dependency>
-
-        <!--打开注释 启用es数据库-->
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-es-temporal-service</artifactId>
-        </dependency>
-
-        <!--打开注释 启用timescale数据库-->
-<!--        <dependency>-->
-<!--            <groupId>cc.iotkit</groupId>-->
-<!--            <artifactId>iot-ts-temporal-service</artifactId>-->
-<!--        </dependency>-->
-
-        <!--打开注释 启用tdengine数据库-->
-        <!--        <dependency>-->
-        <!--            <groupId>cc.iotkit</groupId>-->
-        <!--            <artifactId>iot-td-temporal-service</artifactId>-->
-        <!--        </dependency>-->
-
-        <dependency>
-            <groupId>cc.iotkit</groupId>
-            <artifactId>iot-data-cache</artifactId>
-        </dependency>
-
-        <!--springfox swagger官方Starter-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-            <version>3.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-models</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.6.8</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <version>3.0.3</version>
-        </dependency>
-
-
-
-    </dependencies>
-
-    <build>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <source>11</source>
-                    <target>11</target>
-                    <encoding>UTF-8</encoding>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <dependencies>
-                    <dependency>
-                        <groupId>cc.iotkit</groupId>
-                        <artifactId>iot-package</artifactId>
-                        <version>${project.version}</version>
-                    </dependency>
-                </dependencies>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptorRefs>
-                        <descriptorRef>standalone-package</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-
-</project>

+ 249 - 0
iot-starter/pom.xml

@@ -0,0 +1,249 @@
+<?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">
+  <parent>
+    <artifactId>iotkit-parent</artifactId>
+    <groupId>cc.iotkit</groupId>
+    <version>${revision}</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>iot-starter</artifactId>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-logging</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-to-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.aliyun.oss</groupId>
+      <artifactId>aliyun-sdk-oss</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>it.ozimov</groupId>
+      <artifactId>embedded-redis</artifactId>
+      <exclusions>
+        <exclusion>
+          <artifactId>slf4j-simple</artifactId>
+          <groupId>org.slf4j</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>org.elasticsearch</groupId>
+      <artifactId>elasticsearch</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.elasticsearch.plugin</groupId>
+      <artifactId>transport-netty4-client</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-model</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-common-core</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-rule-engine</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-component-server</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-component-converter</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-auth-server</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-virtual-device</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-message-core</artifactId>
+    </dependency>
+
+    <!--内置vertx消息总线-->
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-vertx-event-bus</artifactId>
+    </dependency>
+
+    <!--打开注释使用rocketmq消息总线-->
+    <!--        <dependency>-->
+    <!--            <groupId>cc.iotkit</groupId>-->
+    <!--            <artifactId>iot-message-rocketmq</artifactId>-->
+    <!--        </dependency>-->
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-temporal-service</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-rdb-data-service</artifactId>
+    </dependency>
+
+    <!--打开注释 启用es数据库-->
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-es-temporal-service</artifactId>
+    </dependency>
+
+    <!--打开注释 启用timescale数据库-->
+    <!--        <dependency>-->
+    <!--            <groupId>cc.iotkit</groupId>-->
+    <!--            <artifactId>iot-ts-temporal-service</artifactId>-->
+    <!--        </dependency>-->
+
+    <!--打开注释 启用tdengine数据库-->
+    <!--        <dependency>-->
+    <!--            <groupId>cc.iotkit</groupId>-->
+    <!--            <artifactId>iot-td-temporal-service</artifactId>-->
+    <!--        </dependency>-->
+
+    <dependency>
+      <groupId>cc.iotkit</groupId>
+      <artifactId>iot-data-cache</artifactId>
+    </dependency>
+
+    <!--springfox swagger官方Starter-->
+    <dependency>
+      <groupId>io.springfox</groupId>
+      <artifactId>springfox-boot-starter</artifactId>
+      <version>3.0.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.swagger</groupId>
+          <artifactId>swagger-models</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.swagger</groupId>
+      <artifactId>swagger-models</artifactId>
+      <version>1.6.8</version>
+    </dependency>
+
+
+    <dependency>
+      <groupId>com.github.xiaoymin</groupId>
+      <artifactId>knife4j-spring-boot-starter</artifactId>
+      <version>3.0.3</version>
+    </dependency>
+
+
+  </dependencies>
+
+  <build>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.0</version>
+        <configuration>
+          <source>11</source>
+          <target>11</target>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <appendAssemblyId>false</appendAssemblyId>
+          <descriptors>
+            <descriptor>${project.parent.basedir}/iot-starter/src/main/resources/assemblies/standalone-package.xml</descriptor>
+          </descriptors>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+
+</project>

+ 0 - 0
iot-standalone/readme.md → iot-starter/readme.md


+ 0 - 0
iot-standalone/src/main/bin/start.bat → iot-starter/src/main/bin/start.bat


+ 0 - 0
iot-standalone/src/main/bin/start.sh → iot-starter/src/main/bin/start.sh


+ 0 - 0
iot-standalone/src/main/bin/stop.sh → iot-starter/src/main/bin/stop.sh


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/Application.java → iot-starter/src/main/java/cc/iotkit/Application.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/config/AliyunConfig.java → iot-starter/src/main/java/cc/iotkit/manager/config/AliyunConfig.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/config/CrossConfig.java → iot-starter/src/main/java/cc/iotkit/manager/config/CrossConfig.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java → iot-starter/src/main/java/cc/iotkit/manager/config/EmbeddedElasticSearchConfig.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java → iot-starter/src/main/java/cc/iotkit/manager/config/EmbeddedRedisConfig.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java → iot-starter/src/main/java/cc/iotkit/manager/config/GlobalExceptionHandler.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java → iot-starter/src/main/java/cc/iotkit/manager/config/ResponseResultHandler.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java → iot-starter/src/main/java/cc/iotkit/manager/config/SaTokenConfigure.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/config/SwaggerConfig.java → iot-starter/src/main/java/cc/iotkit/manager/config/SwaggerConfig.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/controller/DeviceController.java → iot-starter/src/main/java/cc/iotkit/manager/controller/DeviceController.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/controller/ProductController.java → iot-starter/src/main/java/cc/iotkit/manager/controller/ProductController.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/controller/ProtocolController.java → iot-starter/src/main/java/cc/iotkit/manager/controller/ProtocolController.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java → iot-starter/src/main/java/cc/iotkit/manager/controller/RuleEngineController.java


+ 0 - 0
iot-standalone/src/main/java/cc/iotkit/manager/controller/SpaceController.java → iot-starter/src/main/java/cc/iotkit/manager/controller/SpaceController.java


Some files were not shown because too many files changed in this diff